diff --git a/db_printview.php b/db_printview.php index 751b953c40..7a7bfc6b6b 100644 --- a/db_printview.php +++ b/db_printview.php @@ -13,9 +13,7 @@ require_once 'libraries/common.inc.php'; /** * Gets the variables sent or posted to this script, then displays headers */ -$print_view = true; -define('PMA_DISPLAY_HEADING', 0); -require_once 'libraries/header.inc.php'; +require_once 'libraries/header_printview.inc.php'; PMA_checkParameters(array('db')); diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index 96176b7522..77dbdd2176 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -57,7 +57,7 @@ class PMA_Theme * @var array valid css types * @access protected */ - var $types = array('left', 'right', 'print'); + var $types = array('left', 'right'); /** * @var integer last modification time for info file @@ -436,9 +436,11 @@ class PMA_Theme /** * Returns CSS styles for CodeMirror editor based on query formatter colors. * + * @param boolean $generic Whether to include generic CodeMirror CSS as well + * * @return string CSS code. */ - function getCssCodeMirror() + function getCssCodeMirror($generic = false) { if (! $GLOBALS['cfg']['CodemirrorEnable']) { return ''; @@ -477,6 +479,98 @@ class PMA_Theme $result[] = 'span.cm-number {'; $result[] = ' color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['digit_integer'] . ';'; $result[] = '}'; + + if ($generic) { + $height = ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); + $result[] = << - + diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php index 51f971467d..47188ad472 100644 --- a/libraries/header_printview.inc.php +++ b/libraries/header_printview.inc.php @@ -14,11 +14,6 @@ if (! defined('PHPMYADMIN')) { require_once './libraries/ob.lib.php'; PMA_outBufferPre(); -// Check parameters - -PMA_checkParameters(array('db', 'full_sql_query')); - - // For re-usability, moved http-headers // to a separate file. It can now be included by libraries/header.inc.php, // querywindow.php. @@ -44,29 +39,14 @@ if ($text_dir == 'ltr') { -<?php echo __('SQL result'); ?> - phpMyAdmin <?php echo PMA_VERSION ?> - +<?php echo __('Print view'); ?> - phpMyAdmin <?php echo PMA_VERSION ?> + - -

-

- :
- :
- :
- : phpMyAdmin  / MySQL 
- : ; -
- : - -

- - + \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -5444,11 +5444,11 @@ msgstr "Показване връзка към phpinfo()" #: libraries/config/messages.inc.php:475 msgid "Show detailed MySQL server information" -msgstr "Показва подробна информация за MySQL сървърът" +msgstr "Показва подробна информация за MySQL сървъра" #: libraries/config/messages.inc.php:476 msgid "Defines whether SQL queries generated by phpMyAdmin should be displayed" -msgstr "" +msgstr "Определя дали SQL заявките, генерирани от phpMyAdmin да бъдат показвани" #: libraries/config/messages.inc.php:477 msgid "Show SQL queries" @@ -5458,10 +5458,11 @@ msgstr "Показване на SQL заявките" msgid "" "Defines whether the query box should stay on-screen after its submission" msgstr "" +"Определя дали прозорецът със заявката да остане екрана след изпращането му" #: libraries/config/messages.inc.php:479 libraries/sql_query_form.lib.php:358 msgid "Retain query box" -msgstr "" +msgstr "Запазване на прозореца за заявки" #: libraries/config/messages.inc.php:480 msgid "Allow to display database and table statistics (eg. space usage)" @@ -5491,11 +5492,11 @@ msgstr "" #: libraries/config/messages.inc.php:485 msgid "Display table comment instead of its name" -msgstr "" +msgstr "Показване на коментара на таблицата вместо името" #: libraries/config/messages.inc.php:486 msgid "Display table comments in tooltips" -msgstr "" +msgstr "Показване на коментара на таблицата в подсказка" #: libraries/config/messages.inc.php:487 msgid "" @@ -5508,7 +5509,7 @@ msgstr "Пропускане заключени таблици" #: libraries/config/messages.inc.php:493 msgid "Requires SQL Validator to be enabled" -msgstr "" +msgstr "Изисква SQL валидаторът да бъде включван" #: libraries/config/messages.inc.php:495 #: libraries/display_change_password.lib.php:40 @@ -5525,16 +5526,19 @@ msgid "" "[strong]Warning:[/strong] requires PHP SOAP extension or PEAR SOAP to be " "installed" msgstr "" +"[strong]Предупреждение:[/strong] изисква инсталиран PHP SOAP или PEAR SOAP" #: libraries/config/messages.inc.php:497 msgid "Enable SQL Validator" -msgstr "" +msgstr "Включване на SQL валидатора" #: libraries/config/messages.inc.php:498 msgid "" "If you have a custom username, specify it here (defaults to [kbd]anonymous[/" "kbd])" msgstr "" +"Ако имате отделно потребителско име, въведете го тук (по подразбиране е " +"[kbd]anonymous[/kbd])" #: libraries/config/messages.inc.php:499 tbl_tracking.php:518 #: tbl_tracking.php:577 @@ -5571,11 +5575,11 @@ msgstr "Реда в текстово поле" #: libraries/config/messages.inc.php:506 msgid "Title of browser window when a database is selected" -msgstr "" +msgstr "Заглавие на прозореца на браузъра, когато е избрана БД" #: libraries/config/messages.inc.php:508 msgid "Title of browser window when nothing is selected" -msgstr "" +msgstr "Заглавие на прозореца на браузъра, когато не е избрано нищо" #: libraries/config/messages.inc.php:509 msgid "Default title" @@ -5583,11 +5587,11 @@ msgstr "Заглавие по подразбиране" #: libraries/config/messages.inc.php:510 msgid "Title of browser window when a server is selected" -msgstr "" +msgstr "Заглавие на прозореца на браузъра, когато е избран сървър" #: libraries/config/messages.inc.php:512 msgid "Title of browser window when a table is selected" -msgstr "" +msgstr "Заглавие на прозореца на браузъра, когато е избрана таблица" #: libraries/config/messages.inc.php:514 msgid "" @@ -5604,10 +5608,11 @@ msgstr "" #: libraries/config/messages.inc.php:516 msgid "Directory on server where you can upload files for import" msgstr "" +"Папка на сървъра, в която можете да качвате файлове, за да бъдат импортирани" #: libraries/config/messages.inc.php:517 msgid "Upload directory" -msgstr "" +msgstr "Папка за качване на файлове" #: libraries/config/messages.inc.php:518 msgid "Allow for searching inside the entire database" @@ -5629,7 +5634,7 @@ msgstr "" #: libraries/config/messages.inc.php:522 setup/frames/index.inc.php:271 msgid "Check for latest version" -msgstr "" +msgstr "Проверка за обновление" #: libraries/config/messages.inc.php:523 msgid "Enables check for latest version on main phpMyAdmin page" @@ -5648,6 +5653,8 @@ msgid "" "Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression " "for import and export operations" msgstr "" +"Включване на [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] " +"компресия при импорт и експорт" #: libraries/config/messages.inc.php:526 msgid "ZIP" @@ -5655,15 +5662,15 @@ msgstr "ZIP" #: libraries/config/setup.forms.php:41 msgid "Config authentication" -msgstr "" +msgstr "Удостоверяване от настройките" #: libraries/config/setup.forms.php:45 msgid "Cookie authentication" -msgstr "" +msgstr "Удостоверяване чрез бисквитка" #: libraries/config/setup.forms.php:48 msgid "HTTP authentication" -msgstr "" +msgstr "HTTP удостоверяване" #: libraries/config/setup.forms.php:51 msgid "Signon authentication" @@ -5689,7 +5696,7 @@ msgstr "Бърз" #: libraries/config/setup.forms.php:270 #: libraries/config/user_preferences.forms.php:171 msgid "Custom" -msgstr "" +msgstr "Потребителски" #: libraries/config/setup.forms.php:291 #: libraries/config/user_preferences.forms.php:191 @@ -5723,11 +5730,13 @@ msgstr "" #: libraries/config/validate.lib.php:239 libraries/config/validate.lib.php:246 msgid "Could not connect to MySQL server" -msgstr "" +msgstr "Невъзможност за свързване с MySQL сървър" #: libraries/config/validate.lib.php:279 msgid "Empty username while using config authentication method" msgstr "" +"Празно потребителско име при използване на метод за удостоверяване от " +"настройките" #: libraries/config/validate.lib.php:286 msgid "Empty signon session name while using signon authentication method" @@ -5759,17 +5768,19 @@ msgstr "en" #: libraries/core.lib.php:276 #, php-format msgid "The %s extension is missing. Please check your PHP configuration." -msgstr "" +msgstr "Разширението %s липсва. Проверете конфигурацията на PHP." #: libraries/core.lib.php:430 msgid "possible deep recursion attack" -msgstr "" +msgstr "възможна атака чрез дълбока рекурсия" #: libraries/database_interface.lib.php:1846 msgid "" "The server is not responding (or the local server's socket is not correctly " "configured)." msgstr "" +"Сървърът не отговаря (или местният сокет на сървъра не е конфигуриран " +"правилно)." #: libraries/database_interface.lib.php:1849 msgid "The server is not responding." @@ -5777,7 +5788,7 @@ msgstr "Сървърът не отговаря." #: libraries/database_interface.lib.php:1853 msgid "Please check privileges of directory containing database." -msgstr "" +msgstr "Проверете правата на папката, съдържаща БД." #: libraries/database_interface.lib.php:1861 msgid "Details..." @@ -5832,7 +5843,7 @@ msgstr "Създаване" #: libraries/display_create_database.lib.php:43 server_privileges.php:181 #: server_privileges.php:1738 server_replication.php:33 msgid "No Privileges" -msgstr "Няма права" +msgstr "Без права" #: libraries/display_create_table.lib.php:46 pmd_general.php:86 #: server_synchronize.php:525 server_synchronize.php:1045 @@ -5897,6 +5908,7 @@ msgid "Rows:" msgstr "Редове:" #: libraries/display_export.lib.php:155 +#, fuzzy msgid "Dump some row(s)" msgstr "Схема на ред(ове)" @@ -5985,7 +5997,7 @@ msgstr "Формат:" #: libraries/display_export.lib.php:348 msgid "Format-specific options:" -msgstr "Формат-специфични настройки:" +msgstr "Специфични настройки:" #: libraries/display_export.lib.php:349 msgid "" @@ -6117,7 +6129,7 @@ msgstr "Брой редове, които да бъдат пропуснати #: libraries/display_import.lib.php:302 msgid "Format-Specific Options:" -msgstr "" +msgstr "Специфични настройки:" #: libraries/display_select_lang.lib.php:52 #: libraries/display_select_lang.lib.php:53 setup/frames/index.inc.php:75 @@ -6126,11 +6138,11 @@ msgstr "Език" #: libraries/display_tbl.lib.php:454 msgid "Save edited data" -msgstr "" +msgstr "Съхраняване на редактираните данни" #: libraries/display_tbl.lib.php:460 msgid "Restore column order" -msgstr "" +msgstr "Възстановяване на подредбата на колоните" #: libraries/display_tbl.lib.php:483 msgid "Start row" @@ -6142,7 +6154,7 @@ msgstr "Брой редове" #: libraries/display_tbl.lib.php:496 msgid "Mode" -msgstr "" +msgstr "Режим" #: libraries/display_tbl.lib.php:498 msgid "horizontal" @@ -6213,11 +6225,11 @@ msgstr "Без трансформация от браузъра" #: libraries/display_tbl.lib.php:826 msgid "Well Known Text" -msgstr "" +msgstr "Добре познат текст" #: libraries/display_tbl.lib.php:827 msgid "Well Known Binary" -msgstr "" +msgstr "Добре позната двоична стойност" #: libraries/display_tbl.lib.php:1638 libraries/display_tbl.lib.php:1654 msgid "The row has been deleted" @@ -9885,8 +9897,8 @@ msgid "" "The number of connections that were aborted because the client died without " "closing the connection properly." msgstr "" -"Броят връзки, които са прекратени, защото клиентът е изчезнал без правилно " -"да затвори връзките." +"Броят връзки, които са прекъснати, защото клиентът е изчезнал без да затвори " +"правилно връзките." #: server_status.php:1318 msgid "The number of failed attempts to connect to the MySQL server." @@ -12658,11 +12670,11 @@ msgstr "" #: libraries/advisory_rules.txt:392 msgid "Percentage of aborted connections" -msgstr "Процент прекратени връзки" +msgstr "Процент прекъснати връзки" #: libraries/advisory_rules.txt:395 libraries/advisory_rules.txt:402 msgid "Too many connections are aborted." -msgstr "" +msgstr "Твърде много прекъснати връзки." #: libraries/advisory_rules.txt:396 libraries/advisory_rules.txt:403 msgid "" @@ -12671,29 +12683,35 @@ msgid "" "source-of-aborted_connects/\">This article might help you track down the " "source." msgstr "" +"Връзки обикновено биват прекъснати, когато не могат да бъдат удостоверени. " +"Тази статия може да ви помогне да " +"проследите на източника." #: libraries/advisory_rules.txt:397 #, php-format msgid "%s%% of all connections are aborted. This value should be below 1%%" -msgstr "" +msgstr "%s%% на всички прекъснати клиенти. Тази стойност трябва да бъде под 1%%" #: libraries/advisory_rules.txt:399 msgid "Rate of aborted connections" -msgstr "Стойност прекратени връзки" +msgstr "Стойност прекъснати връзки" #: libraries/advisory_rules.txt:404 #, php-format msgid "" "Aborted connections rate is at %s, this value should be less than 1 per hour" msgstr "" +"Стойността на прекъснатите клиенти е %s, тази стойност трябва да бъде " +"по-малка от 1 за час" #: libraries/advisory_rules.txt:406 msgid "Percentage of aborted clients" -msgstr "Процент отказани клиенти" +msgstr "Процент прекъснати клиенти" #: libraries/advisory_rules.txt:409 libraries/advisory_rules.txt:416 msgid "Too many clients are aborted." -msgstr "Твърде много отказани клиенти." +msgstr "Твърде много прекъснати клиенти." #: libraries/advisory_rules.txt:410 libraries/advisory_rules.txt:417 msgid "" @@ -12701,36 +12719,41 @@ msgid "" "MySQL properly. This can be due to network issues or code not closing a " "database handler properly. Check your network and code." msgstr "" +"Клиенти обикновено са прекъсвани, когато не затварят правилно връзката си " +"към MySQL. Това може да се дължи на мрежови проблеми или код, не затварящ " +"правилно манипулатора към БД. Проверете вашата мрежа и код." #: libraries/advisory_rules.txt:411 #, php-format msgid "%s%% of all clients are aborted. This value should be below 2%%" -msgstr "" +msgstr "%s%% на всички прекъснати клиенти. Тази стойност трябва да бъде под 2%%" #: libraries/advisory_rules.txt:413 msgid "Rate of aborted clients" -msgstr "Стойност отказани клиенти" +msgstr "Стойност прекъснати клиенти" #: libraries/advisory_rules.txt:418 #, php-format msgid "Aborted client rate is at %s, this value should be less than 1 per hour" msgstr "" +"Стойността на отказаните клиенти е %s, тази стойност трябва да бъде по-малка " +"от 1 за час" #: libraries/advisory_rules.txt:422 msgid "Is InnoDB disabled?" -msgstr "InnoDB забранен ли е?" +msgstr "Забранен ли е InnoDB?" #: libraries/advisory_rules.txt:425 msgid "You do not have InnoDB enabled." -msgstr "Няма вграден InnoDB." +msgstr "InnoDB е забранен." #: libraries/advisory_rules.txt:426 msgid "InnoDB is usually the better choice for table engines." -msgstr "" +msgstr "Обикновено InnoDB е по-добър избор на хранилище." #: libraries/advisory_rules.txt:427 msgid "have_innodb is set to 'value'" -msgstr "" +msgstr "have_innodb е 'value'" #: libraries/advisory_rules.txt:429 msgid "InnoDB log size" @@ -12769,7 +12792,7 @@ msgstr "Максимален размер на дневника на InnoDB" #: libraries/advisory_rules.txt:439 msgid "The InnoDB log file size is inadequately large." -msgstr "" +msgstr "Дневникът на InnoDB е неоправдано голям." #: libraries/advisory_rules.txt:440 #, php-format diff --git a/po/et.po b/po/et.po index d8765e1845..ffed33567a 100644 --- a/po/et.po +++ b/po/et.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-05-09 13:14+0200\n" -"PO-Revision-Date: 2012-05-04 21:42+0200\n" +"PO-Revision-Date: 2012-05-12 21:12+0200\n" "Last-Translator: LiivaneLord \n" "Language-Team: estonian \n" "Language: et\n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 0.10\n" +"X-Generator: Weblate 1.0\n" #: browse_foreigners.php:35 browse_foreigners.php:59 js/messages.php:358 #: libraries/display_tbl.lib.php:399 server_privileges.php:1828 @@ -3035,24 +3035,21 @@ msgstr "Igat tüüpi geomeetriliste objektide kogum" #: libraries/Types.class.php:619 libraries/Types.class.php:971 msgctxt "numeric types" msgid "Numeric" -msgstr "" +msgstr "Arv" #: libraries/Types.class.php:638 libraries/Types.class.php:974 -#, fuzzy #| msgid "Create an index" msgctxt "date and time types" msgid "Date and time" -msgstr "Loo indeks" +msgstr "Kuupäev ja aeg" #: libraries/Types.class.php:647 libraries/Types.class.php:977 -#, fuzzy #| msgid "Linestring" msgctxt "string types" msgid "String" -msgstr "Rea sõne" +msgstr "Sõne" #: libraries/Types.class.php:668 -#, fuzzy #| msgid "Spatial" msgctxt "spatial types" msgid "Spatial" @@ -7271,7 +7268,7 @@ msgstr "ESRI Shape fail" #: libraries/import/shp.php:199 #, php-format msgid "Geometry type '%s' is not supported by MySQL." -msgstr "" +msgstr "Geomeetria tüüpi '%s' ei toeta MySQL." #: libraries/import/shp.php:360 #, php-format diff --git a/po/ja.po b/po/ja.po index eda8191210..eec283b211 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-05-09 13:14+0200\n" -"PO-Revision-Date: 2012-05-12 00:58+0200\n" +"PO-Revision-Date: 2012-05-13 09:01+0200\n" "Last-Translator: Yuichiro Takahashi \n" "Language-Team: japanese \n" "Language: ja\n" @@ -2695,16 +2695,16 @@ msgid "unknown table status: " msgstr "不明なテーブルステータス: " #: libraries/Table.class.php:750 -#, fuzzy, php-format +#, php-format #| msgid "Source database" msgid "Source database `%s` was not found!" -msgstr "元にするデータベース" +msgstr "元にするデータベース `%s` が見つかりません！" #: libraries/Table.class.php:756 -#, fuzzy, php-format +#, php-format #| msgid "Theme %s not found!" msgid "Target database `%s` was not found!" -msgstr "テーマ %s が見つかりません!" +msgstr "対象先のデータベース `%s` が見つかりません！" #: libraries/Table.class.php:1174 msgid "Invalid database" @@ -2860,8 +2860,8 @@ msgstr "TINYINT(1) と同義、0 が FALSE と見なされ、0 以外が TRUE #: libraries/Types.class.php:311 msgid "An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE" msgstr "" -"BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE の別名 " -"(BIGINT、符号なし、NULLなし、AUTO_INCREMENT、ユニークキー)" +"BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE の別名 (BIGINT、符号なし、NULL " +"なし、AUTO_INCREMENT、ユニークキー)" #: libraries/Types.class.php:313 libraries/Types.class.php:717 #, php-format @@ -2914,25 +2914,19 @@ msgstr "" msgid "" "A TEXT column with a maximum length of 255 (2^8 - 1) characters, stored with " "a one-byte prefix indicating the length of the value in bytes" -msgstr "" -"TEXT カラム、最大長 255 (2^8 - 1)、この長さは単位がバイトで、1 バイト値で表現" -"できる範囲です" +msgstr "TEXT カラム、最大長 255 (2^8 - 1)、これの長さは単位がバイトで、1 バイト値で表現できる範囲です" #: libraries/Types.class.php:329 libraries/Types.class.php:727 msgid "" "A TEXT column with a maximum length of 65,535 (2^16 - 1) characters, stored " "with a two-byte prefix indicating the length of the value in bytes" -msgstr "" -"TEXT カラム、最大長 65,535 (2^16 - 1)、この長さは単位がバイトで、2 バイト値で" -"表現できる範囲です" +msgstr "TEXT カラム、最大長 65,535 (2^16 - 1)、これの長さは単位がバイトで、2 バイト値で表現できる範囲です" #: libraries/Types.class.php:331 msgid "" "A TEXT column with a maximum length of 16,777,215 (2^24 - 1) characters, " "stored with a three-byte prefix indicating the length of the value in bytes" -msgstr "" -"TEXT カラム、最大長 16,777,215 (2^24 - 1)、この長さは単位がバイトで、3 バイト" -"値で表現できる範囲です" +msgstr "TEXT カラム、最大長 16,777,215 (2^24 - 1)、これの長さは単位がバイトで、3 バイト値で表現できる範囲です" #: libraries/Types.class.php:333 msgid "" @@ -2940,8 +2934,8 @@ msgid "" "characters, stored with a four-byte prefix indicating the length of the " "value in bytes" msgstr "" -"TEXT カラム、最大長 4,294,967,295 または 4GiB (2^32 - 1)、この長さは単位がバ" -"イトで、4 バイト値で表現できる範囲です" +"TEXT カラム、最大長 4,294,967,295 または 4GiB (2^32 - 1)、これの長さは単位がバイトで、4 " +"バイト値で表現できる範囲です" #: libraries/Types.class.php:335 msgid "" @@ -2959,43 +2953,36 @@ msgstr "VARCHAR 型と似ていますが、非バイナリ文字列ではなく msgid "" "A BLOB column with a maximum length of 255 (2^8 - 1) bytes, stored with a " "one-byte prefix indicating the length of the value" -msgstr "" -"BLOB カラム、最大 255 (2^8 - 1) バイト、この長さは 1 バイト値で表現できる範囲" -"です" +msgstr "BLOB カラム、最大 255 (2^8 - 1) バイト、これの長さは 1 バイト値で表現できる範囲です" #: libraries/Types.class.php:341 msgid "" "A BLOB column with a maximum length of 16,777,215 (2^24 - 1) bytes, stored " "with a three-byte prefix indicating the length of the value" -msgstr "" -"BLOB カラム、最大 16,777,215 (2^24 - 1) バイト、この長さは 3 バイト値で表現で" -"きる範囲です" +msgstr "BLOB カラム、最大 16,777,215 (2^24 - 1) バイト、これの長さは 3 バイト値で表現できる範囲です" #: libraries/Types.class.php:343 msgid "" "A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with " "a two-byte prefix indicating the length of the value" -msgstr "" -"BLOB カラム、最大 65,535 (2^16 - 1) バイト、この長さは 2 バイト値で表現できる" -"範囲です" +msgstr "BLOB カラム、最大 65,535 (2^16 - 1) バイト、これの長さは 2 バイト値で表現できる範囲です" #: libraries/Types.class.php:345 msgid "" "A BLOB column with a maximum length of 4,294,967,295 or 4GiB (2^32 - 1) " "bytes, stored with a four-byte prefix indicating the length of the value" msgstr "" -"BLOB カラム、最大 4,294,967,295 バイトまたは 4GiB (2^32 - 1)、この長さは 4 バ" -"イト値で表現できる範囲です" +"BLOB カラム、最大 4,294,967,295 バイトまたは 4GiB (2^32 - 1)、これの長さは 4 バイト値で表現できる範囲です" #: libraries/Types.class.php:347 msgid "" "An enumeration, chosen from the list of up to 65,535 values or the special " "'' error value" -msgstr "" +msgstr "列挙型、最大 65,535 個の列挙値または特殊な値 (エラー値 '') を取ることができます" #: libraries/Types.class.php:349 msgid "A single value chosen from a set of up to 64 members" -msgstr "" +msgstr "最大 64 メンバに対しての有無を一括で扱う単一の値" #: libraries/Types.class.php:351 msgid "A type that can store a geometry of any type" @@ -3066,7 +3053,7 @@ msgstr "" #: libraries/Types.class.php:709 msgid "A system's default double-precision floating-point number" -msgstr "" +msgstr "システムでデフォルトの倍精度浮動小数" #: libraries/Types.class.php:711 msgid "True or false" @@ -3075,12 +3062,12 @@ msgstr "TRUE または FALSE" #: libraries/Types.class.php:713 msgid "An alias for BIGINT NOT NULL AUTO_INCREMENT UNIQUE" msgstr "" -"BIGINT NOT NULL AUTO_INCREMENT UNIQUE の別名 " -"(BIGINT、NULLなし、AUTO_INCREMENT、ユニークキー)" +"BIGINT NOT NULL AUTO_INCREMENT UNIQUE の別名 (BIGINT、NULL " +"なし、AUTO_INCREMENT、ユニークキー)" #: libraries/Types.class.php:715 msgid "Stores a Universally Unique Identifier (UUID)" -msgstr "" +msgstr "汎用一意識別子 (UUID) 保存用" #: libraries/Types.class.php:721 msgid "" @@ -3094,7 +3081,7 @@ msgstr "" msgid "" "A variable-length (0-65,535) string, uses binary collation for all " "comparisons" -msgstr "" +msgstr "可変長文字列 (長さは 0-65,535)、文字列の比較はバイナリで行われます" #: libraries/Types.class.php:731 msgid "" @@ -3104,7 +3091,7 @@ msgstr "" #: libraries/Types.class.php:733 msgid "An enumeration, chosen from the list of defined values" -msgstr "" +msgstr "列挙型、定義しておいた列挙リストより値を取ることができます" #: libraries/auth/config.auth.lib.php:72 msgid "Cannot connect: invalid settings." diff --git a/print.css b/print.css index 632a7553ee..1aa2f98279 100644 --- a/print.css +++ b/print.css @@ -1,11 +1,14 @@ -.print_ignore { +.nowrap { + white-space: nowrap; +} + +.hide { display: none; } body, table, th, td { - color: #000000; - background-color: #ffffff; - font-size: 8pt; + color: #000; + background-color: #fff; } img { @@ -13,9 +16,7 @@ img { } table, th, td { - border-width: 0.1em; - border-color: #000000; - border-style: solid; + border: .1em solid #000; } table { @@ -32,15 +33,30 @@ th { background-color: #e5e5e5; } +th.vtop, td.vtop { + vertical-align: top; +} + +th.vbottom, td.vbottom { + vertical-align: bottom; +} + @media print { .print_ignore { display: none; } + .nowrap { + white-space: nowrap; + } + + .hide { + display: none; + } + body, table, th, td { - color: #000000; - background-color: #ffffff; - font-size: 8pt; + color: #000; + background-color: #fff; } img { @@ -48,9 +64,7 @@ th { } table, th, td { - border-width: 1px; - border-color: #000000; - border-style: solid; + border: .1em solid #000; } table { @@ -66,4 +80,13 @@ th { font-weight: bold; background-color: #e5e5e5; } + + th.vtop, td.vtop { + vertical-align: top; + } + + th.vbottom, td.vbottom { + vertical-align: bottom; + } } + diff --git a/sql.php b/sql.php index 498d7f3caa..9a33f315f7 100644 --- a/sql.php +++ b/sql.php @@ -909,7 +909,36 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { unset($show_query); } if (isset($printview) && $printview == '1') { + PMA_checkParameters(array('db', 'full_sql_query')); + include_once 'libraries/header_printview.inc.php'; + + $hostname = ''; + if ($cfg['Server']['verbose']) { + $hostname = $cfg['Server']['verbose']; + } else { + $hostname = $cfg['Server']['host']; + if (! empty($cfg['Server']['port'])) { + $hostname .= $cfg['Server']['port']; + } + } + + $versions = "phpMyAdmin " . PMA_VERSION; + $versions .= " / "; + $versions .= "MySQL " . PMA_MYSQL_STR_VERSION; + + echo "

" . __('SQL result') . "

"; + echo "

"; + echo "" . __('Host') . ": $hostname
"; + echo "" . __('Database') . ": " . htmlspecialchars($db) . "
"; + echo "" . __('Generation Time') . ": " . PMA_localisedDate() . "
"; + echo "" . __('Generated by') . ": $versions
"; + echo "" . __('SQL query') . ": " . htmlspecialchars($full_sql_query) . ";"; + if (isset($num_rows)) { + echo "
"; + echo "" . __('Rows') . ": $num_rows"; + } + echo "

"; } else { $GLOBALS['js_include'][] = 'functions.js'; diff --git a/tbl_printview.php b/tbl_printview.php index ea16713fa6..8db2904e39 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -13,10 +13,8 @@ require_once 'libraries/common.inc.php'; /** * Gets the variables sent or posted to this script, then displays headers */ -$print_view = true; -define('PMA_DISPLAY_HEADING', 0); if (! isset($selected_tbl)) { - include_once 'libraries/header.inc.php'; + include_once 'libraries/header_printview.inc.php'; } require 'libraries/tbl_common.inc.php'; diff --git a/themes/original/css/theme_print.css.php b/themes/original/css/theme_print.css.php deleted file mode 100644 index 3d8551f93d..0000000000 --- a/themes/original/css/theme_print.css.php +++ /dev/null @@ -1,52 +0,0 @@ - -/* For printview */ -body, table, th, td { - color: #000; - background: #fff; -} - -img { - border: 0; -} - -table, th, td { - border: .1em solid #000; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} - -th, td { - padding: .2em; -} - -th.vtop, td.vtop { - vertical-align: top; -} - -th.vbottom, td.vbottom { - vertical-align: bottom; -} - -th { - font-weight: bold; - background: #e5e5e5; -} - -.nowrap { - white-space: nowrap; -} - -.hide { - display: none; -} diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index cde5594fd5..c47859e710 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -13,16 +13,20 @@ if (!defined('PMA_MINIMUM_COMMON') && !defined('TESTSUITE')) { } ?> /******************************************************************************/ + /* general tags */ html { font-size: get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : ( isset($_COOKIE['pma_fontsize']) ? $_COOKIE['pma_fontsize'] : '82%'));?>; } -input, select, textarea { +input, +select, +textarea { font-size: 1em; } + body { font-family: ; @@ -1141,31 +1145,31 @@ div#logTable table { a.editLink { float: ; - font-family:sans-serif; + font-family: sans-serif; } table.serverVariableEditTable { - border:0; - margin:0; - padding:0; - width:100%; + border: 0; + margin: 0; + padding: 0; + width: 100%; } table.serverVariableEditTable td { - border:0; - margin:0; - padding:0; + border: 0; + margin: 0; + padding: 0; } table.serverVariableEditTable td:first-child { - white-space:nowrap; - vertical-align:middle; + white-space: nowrap; + vertical-align: middle; } table.serverVariableEditTable input { - width:95%; + width: 95%; } table#serverVariables td { - height:18px; + height: 18px; } /* end server variables */ @@ -1192,9 +1196,9 @@ div#querywindowcontainer fieldset { /* profiling */ div#profilingchart { - width:550px; - height:370px; - float:left; + width: 550px; + height: 370px; + float: left; } /* END profiling */ @@ -1222,13 +1226,13 @@ textarea#sqlquery { width: 100%; /* height: 100%; */ } -textarea#sql_query_edit{ - height:7em; +textarea#sql_query_edit { + height: 7em; width: 95%; - display:block; + display: block; } div#queryboxcontainer div#bookmarkoptions { - margin-top: 0.5em; + margin-top: .5em; } /* end querybox */ @@ -1269,31 +1273,31 @@ li#li_select_mysql_collation { list-style-image: url(getImgPath(); ?>s_asci.png); } -li#li_select_theme{ +li#li_select_theme { list-style-image: url(getImgPath(); ?>s_theme.png); } -li#li_user_info{ +li#li_user_info { /* list-style-image: url(getImgPath(); ?>s_rights.png); */ } -li#li_mysql_status{ +li#li_mysql_status { list-style-image: url(getImgPath(); ?>s_status.png); } -li#li_mysql_variables{ +li#li_mysql_variables { list-style-image: url(getImgPath(); ?>s_vars.png); } -li#li_mysql_processes{ +li#li_mysql_processes { list-style-image: url(getImgPath(); ?>s_process.png); } -li#li_mysql_collations{ +li#li_mysql_collations { list-style-image: url(getImgPath(); ?>s_asci.png); } -li#li_mysql_engines{ +li#li_mysql_engines { list-style-image: url(getImgPath(); ?>b_engine.png); } @@ -1321,7 +1325,7 @@ li#li_log_out { list-style-image: url(getImgPath(); ?>s_loggoff.png); } -li#li_mysql_privilegs{ +li#li_mysql_privilegs { list-style-image: url(getImgPath(); ?>s_rights.png); } @@ -1341,7 +1345,7 @@ li#li_user_preferences { #body_browse_foreigners { background: ; - margin: 0.5em 0.5em 0 0.5em; + margin: .5em .5em 0 .5em; } #bodyquerywindow { @@ -1355,11 +1359,11 @@ li#li_user_preferences { } #bodythemes img { - border: 0.1em solid black; + border: .1em solid #000; } #bodythemes a:hover img { - border: 0.1em solid red; + border: .1em solid red; } #fieldset_select_fields { @@ -1372,7 +1376,7 @@ li#li_user_preferences { margin-top: 1em; margin-bottom: 1em; width: 100%; - border-top: 0.1em solid silver; + border-top: .1em solid silver; text-align: ; } @@ -1412,7 +1416,8 @@ label.desc sup { position: absolute; } -code.sql, div.sqlvalidate { +code.sql, +div.sqlvalidate { display: block; padding: 0.3em; margin-top: 0; @@ -1524,13 +1529,15 @@ table#serverconnection_src_remote, table#serverconnection_trg_remote, table#serverconnection_src_local, table#serverconnection_trg_local { - float:left; + float: left; } /** * Validation error message styles */ -.invalid_value -{background:#F00;} +input[type=text].invalid_value, +.invalid_value { + background: #FFCCCC; +} /** * Ajax notification styling @@ -1597,7 +1604,7 @@ table#serverconnection_trg_local { } .format_specific_options { - border: 1px solid #999999; + border: 1px solid #999; margin: 7px 0; padding: 3px; } @@ -1609,7 +1616,8 @@ p.desc { /** * Export styles only */ -select#db_select, select#table_select { +select#db_select, +select#table_select { width: 400px; } @@ -1618,7 +1626,7 @@ select#db_select, select#table_select { } .export_sub_options h4 { - border-bottom: 1px #999999 solid; + border-bottom: 1px #999 solid; } .export_sub_options li.subgroup { @@ -1630,7 +1638,8 @@ select#db_select, select#table_select { margin-bottom: 0; } -#quick_or_custom, #output_quick_export { +#quick_or_custom, +#output_quick_export { display: none; } /** @@ -1821,7 +1830,7 @@ td.more_opts { #index_frm .slider { width: 10em; - margin: 0.6em; + margin: .6em; float: ; } @@ -1861,11 +1870,13 @@ iframe.IE_hack { #move_columns_dialog div { padding: 1em; } + #move_columns_dialog ul { list-style: none; margin: 0; padding: 0; } + #move_columns_dialog li { background: ; border: 1px solid #aaa; @@ -1930,7 +1941,7 @@ iframe.IE_hack { .config-form fieldset .errors { /* form error list */ margin: 0 -2px 1em -2px; - padding: 0.5em 1.5em; + padding: .5em 1.5em; background: #FBEAD9; border: 0 #C83838 solid; border-width: 1px 0; @@ -1940,7 +1951,7 @@ iframe.IE_hack { } .config-form fieldset .inline_errors { /* field error list */ - margin: 0.3em 0.3em 0.3em 0; + margin: .3em .3em .3em 0; padding: 0; list-style: none; color: #9A0000; @@ -1948,14 +1959,15 @@ iframe.IE_hack { } .config-form fieldset th { - padding: 0.3em 0.3em 0.3em 0.5em; + padding: .3em .3em .3em .5em; text-align: left; vertical-align: top; width: 40%; background: transparent; } -.config-form fieldset .doc, .config-form fieldset .disabled-notice { +.config-form fieldset .doc, +.config-form fieldset .disabled-notice { margin-left: 1em; } @@ -1967,8 +1979,8 @@ iframe.IE_hack { } .config-form fieldset td { - padding-top: 0.3em; - padding-bottom: 0.3em; + padding-top: .3em; + padding-bottom: .3em; vertical-align: top; } @@ -1980,7 +1992,8 @@ iframe.IE_hack { color: #444; } -.config-form fieldset th, .config-form fieldset td { +.config-form fieldset th, +.config-form fieldset td { border-top: 1px solid; } @@ -1989,14 +2002,16 @@ fieldset .group-header th { } fieldset .group-header + tr th { - padding-top: 0.6em; + padding-top: .6em; } -fieldset .group-field-1 th, fieldset .group-header-2 th { +fieldset .group-field-1 th, +fieldset .group-header-2 th { padding-left: 1.5em; } -fieldset .group-field-2 th, fieldset .group-header-3 th { +fieldset .group-field-2 th, +fieldset .group-header-3 th { padding-left: 3em; } @@ -2017,7 +2032,7 @@ fieldset .disabled-field td { .config-form .lastrow { background: ;; - padding: 0.5em; + padding: .5em; text-align: center; } @@ -2075,7 +2090,7 @@ fieldset .disabled-field td { /* error list */ .config-form dd { - margin-left: 0.5em; + margin-left: .5em; } .config-form dd:before { @@ -2091,7 +2106,7 @@ fieldset .disabled-field td { } #prefs_autoload { - margin-bottom: 0.5em; + margin-bottom: .5em; } .rte_table { @@ -2107,7 +2122,9 @@ fieldset .disabled-field td { font-weight: bold; } -.rte_table input, .rte_table select, .rte_table textarea { +.rte_table input, +.rte_table select, +.rte_table textarea { width: 100%; margin: 0; box-sizing: border-box; @@ -2139,13 +2156,13 @@ fieldset .disabled-field td { .toggleButton { position: relative; cursor: pointer; - font-size: 0.8em; + font-size: .8em; text-align: center; line-height: 1.4em; height: 1.55em; overflow: hidden; - border-right: 0.1em solid #888; - border-left: 0.1em solid #888; + border-right: .1em solid #888; + border-left: .1em solid #888; } .toggleButton table, .toggleButton td, @@ -2157,7 +2174,7 @@ fieldset .disabled-field td { position: absolute; } .toggleButton .toggleOn { - color: white; + color: #fff; padding: 0 1em; } .toggleButton .toggleOff { @@ -2182,7 +2199,8 @@ fieldset .disabled-field td { padding: 0.5em; } -#table_columns input[type="text"], #table_columns select { +#table_columns input[type="text"], +#table_columns select { width: 10em; box-sizing: border-box; -ms-box-sizing: border-box; @@ -2206,38 +2224,38 @@ fieldset .disabled-field td { } #left_arrow { - left:8px; - top:26px; + left: 8px; + top: 26px; } #right_arrow { - left:26px; - top:26px; + left: 26px; + top: 26px; } #up_arrow { - left:17px; - top:8px; + left: 17px; + top: 8px; } #down_arrow { - left:17px; - top:44px; + left: 17px; + top: 44px; } #zoom_in { - left:17px; - top:67px; + left: 17px; + top: 67px; } #zoom_world { - left:17px; - top:85px; + left: 17px; + top: 85px; } #zoom_out { - left:17px; - top:103px; + left: 17px; + top: 103px; } .gis_table td { @@ -2259,90 +2277,10 @@ fieldset .disabled-field td { } .gis_table .choice { - display:none; + display: none; } -.CodeMirror { - font-size: 140%; - font-family: monospace; - background: white; - border: 1px solid black; -} - -.CodeMirror-scroll { - overflow: auto; - height: em; - /* This is needed to prevent an IE[67] bug where the scrolled content - is visible outside of the scrolling box. */ - position: relative; -} - -.CodeMirror-gutter { - position: absolute; left: 0; top: 0; - z-index: 10; - background-color: #f7f7f7; - border-right: 1px solid #eee; - min-width: 2em; - height: 100%; -} -.CodeMirror-gutter-text { - color: #aaa; - text-align: right; - padding: .4em .2em .4em .4em; - white-space: pre !important; -} -.CodeMirror-lines { - padding: .4em; -} - -.CodeMirror pre { - -moz-border-radius: 0; - -webkit-border-radius: 0; - -o-border-radius: 0; - border-radius: 0; - border-width: 0; margin: 0; padding: 0; background: transparent; - font-family: inherit; - font-size: inherit; - padding: 0; margin: 0; - white-space: pre; - word-wrap: normal; -} - -.CodeMirror-wrap pre { - word-wrap: break-word; - white-space: pre-wrap; -} -.CodeMirror-wrap .CodeMirror-scroll { - overflow-x: hidden; -} - -.CodeMirror textarea { - font-family: inherit !important; - font-size: inherit !important; -} - -.CodeMirror-cursor { - z-index: 10; - position: absolute; - visibility: hidden; - border-left: 1px solid black !important; -} -.CodeMirror-focused .CodeMirror-cursor { - visibility: visible; -} - -span.CodeMirror-selected { - background: #ccc !important; - color: HighlightText !important; -} -.CodeMirror-focused span.CodeMirror-selected { - background: Highlight !important; -} - -.CodeMirror-matchingbracket {color: #0f0 !important;} -.CodeMirror-nonmatchingbracket {color: #f22 !important;} - -getCssCodeMirror(); ?> +getCssCodeMirror(true); ?> .colborder { cursor: col-resize; @@ -2360,7 +2298,8 @@ span.CodeMirror-selected { position: static; } -.pma_table th.draggable span, .pma_table tbody td span { +.pma_table th.draggable span, +.pma_table tbody td span { display: block; overflow: hidden; } @@ -2400,13 +2339,13 @@ span.CodeMirror-selected { .normalqTip { background: #333 !important; - opacity: 0.8 !important; - border:1px solid #000 !important; - -moz-border-radius: 0.3em !important; - -webkit-border-radius: 0.3em !important; - border-radius: 0.3em !important; + opacity: .8 !important; + border: 1px solid #000 !important; + -moz-border-radius: .3em !important; + -webkit-border-radius: .3em !important; + border-radius: .3em !important; text-shadow: -1px -1px #000 !important; - font-size: 0.8em !important; + font-size: .8em !important; font-weight: bold !important; } @@ -2454,7 +2393,8 @@ span.CodeMirror-selected { width: 16px; } -.coldrop:hover, .coldrop-hover { +.coldrop:hover, +.coldrop-hover { background-color: #999; } @@ -2465,7 +2405,7 @@ span.CodeMirror-selected { } .cList .lDiv div { - padding: 0.2em 0.5em 0.2em 0.2em; + padding: .2em .5em .2em .2em; } .cList .lDiv div:hover { @@ -2481,9 +2421,9 @@ span.CodeMirror-selected { border-bottom: solid 1px #999; border-top: solid 1px #999; cursor: pointer; - font-size: 0.9em; + font-size: .9em; font-weight: bold; - padding: 0.35em 1em; + padding: .35em 1em; text-align: center; } @@ -2528,7 +2468,7 @@ span.CodeMirror-selected { } .navigation select { - margin: 0 0.8em; + margin: 0 .8em; } .cEdit { @@ -2548,17 +2488,18 @@ span.CodeMirror-selected { background: #FFF; border: 1px solid #999; min-width: 10em; - padding: 0.3em 0.5em; + padding: .3em .5em; } -.cEdit .edit_area select, .cEdit .edit_area textarea { +.cEdit .edit_area select, +.cEdit .edit_area textarea { width: 97%; } .cEdit .cell_edit_hint { color: #555; - font-size: 0.8em; - margin: 0.3em 0.2em; + font-size: .8em; + margin: .3em .2em; } .cEdit .edit_box { @@ -2579,7 +2520,7 @@ span.CodeMirror-selected { .cEdit .goto_link { background: #EEE; color: #555; - padding: 0.2em 0.3em; + padding: .2em .3em; } .saving_edited_data { @@ -2597,12 +2538,12 @@ span.CodeMirror-selected { /* Designer */ .input_tab { background-color: #A6C7E1; - color: #000000; + color: #000; } #canvas { - background-color: #FFFFFF; - color: #000000; + background-color: #fff; + color: #000; } canvas.pmd { @@ -2616,10 +2557,10 @@ canvas.pmd * { } .pmd_tab { - background-color: #FFFFFF; - color: #000000; + background-color: #fff; + color: #000; border-collapse: collapse; - border: 1px solid #AAAAAA; + border: 1px solid #aaa; z-index: 1; -moz-user-select: none; } @@ -2643,21 +2584,21 @@ canvas.pmd * { } .tab_field { - background: #FFFFFF; - color: #000000; + background: #fff; + color: #000; cursor: default; } .tab_field_2 { background-color: #CCFFCC; - color: #000000; + color: #000; background-repeat: repeat-x; cursor: default; } .tab_field_3 { background-color: #FFE6E6; /*#DDEEFF*/ - color: #000000; + color: #000; cursor: default; } @@ -2665,7 +2606,7 @@ canvas.pmd * { white-space: nowrap; position: absolute; background-color: #99FF99; - color: #000000; + color: #000; left: 200px; top: 50px; z-index: 3; @@ -2688,9 +2629,9 @@ canvas.pmd * { font-weight: bold; margin-left: 2px; text-align: left; - background-color: #FFFFFF; + background-color: #fff; background-image: url(getImgPath(); ?>pmd/left_panel_butt.png); - border: #CCCCCC solid 1px; + border: #ccc solid 1px; } .pmd_Tabs2 { @@ -2707,7 +2648,7 @@ canvas.pmd * { .owner { font-weight: normal; - color: #888888; + color: #888; } .option_tab { @@ -2722,7 +2663,7 @@ canvas.pmd * { padding-right: 2px; cursor: default; width: 1px; - color: #000000; + color: #000; background-image: url(getImgPath(); ?>pmd/Header.png); background-repeat: repeat-x; } @@ -2730,7 +2671,7 @@ canvas.pmd * { .small_tab { vertical-align: top; background-color: #0064ea; - color: #FFFFFF; + color: #fff; background-image: url(getImgPath(); ?>pmd/small_tab.png); cursor: default; text-align: center; @@ -2743,7 +2684,7 @@ canvas.pmd * { .small_tab2 { vertical-align: top; - color: #FFFFFF; + color: #fff; background-color: #FF9966; cursor: default; padding-left: 2px; @@ -2763,7 +2704,7 @@ canvas.pmd * { .small_tab_pref2 { vertical-align: top; - color: #FFFFFF; + color: #fff; background-color: #FF9966; cursor: default; text-align: center; @@ -2777,16 +2718,16 @@ canvas.pmd * { font-weight: bold; height: 19px; width: 70px; - background-color: #FFFFFF; - color: #000000; + background-color: #fff; + color: #000; vertical-align: baseline; } .L_butt2_1 { padding: 1px; text-decoration: none; - background-color: #ffffff; - color: #000000; + background-color: #fff; + color: #000; vertical-align: middle; cursor: default; } @@ -2796,7 +2737,7 @@ canvas.pmd * { border: #0099CC solid 1px; background: #FFEE99; text-decoration: none; - color: #000000; + color: #000; cursor: default; } @@ -2839,14 +2780,14 @@ canvas.pmd * { } #osn_tab { - background-color: #FFFFFF; - color: #000000; + background-color: #fff; + color: #000; border: #A9A9A9 solid 1px; } .pmd_header { background-color: #EAEEF0; - color: #000000; + color: #000; text-align: center; font-weight: bold; margin: 0; @@ -2854,8 +2795,8 @@ canvas.pmd * { background-image: url(getImgPath(); ?>pmd/top_panel.png); background-position: top; background-repeat: repeat-x; - border-right: #999999 solid 1px; - border-left: #999999 solid 1px; + border-right: #999 solid 1px; + border-left: #999 solid 1px; height: 28px; } @@ -2864,7 +2805,7 @@ canvas.pmd * { float: left; margin: 3px 1px 4px 1px; height: 20px; - border: 1px dotted #ffffff; + border: 1px dotted #fff; } .pmd_header .M_bord { @@ -2887,7 +2828,7 @@ a.M_butt_Selected_down_IE, a.M_butt_Selected_down { border: 1px solid #C0C0BB; background-color: #99FF99; - color: #000000; + color: #000; } a.M_butt_Selected_down_IE:hover, @@ -2895,7 +2836,7 @@ a.M_butt_Selected_down:hover, a.M_butt:hover { border: 1px solid #0099CC; background-color: #FFEE99; - color: #000000; + color: #000; } #layer_menu { @@ -2903,7 +2844,7 @@ a.M_butt:hover { position: absolute; left: 0; background-color: #EAEEF0; - border: #999999 solid 1px; + border: #999 solid 1px; } #layer_upd_relation { @@ -2942,47 +2883,47 @@ a.M_butt:hover { right: 0; display: none; background: #FFF; - border:1px solid #F5F5F5; + border: 1px solid #F5F5F5; width: 350 px; height: auto; padding: 30px 170px 30px 30px; - color:#FFF; - z-index:99; + color: #FFF; + z-index: 99; } -a.trigger{ +a.trigger { position: fixed; text-decoration: none; top: 60px; right: 0; - color:#fff; + color: #fff; padding: 10px 40px 10px 15px; - background:#333333 url(getImgPath(); ?>pmd/plus.png) 85% 55% no-repeat; - border:1px solid #444444; + background: #333 url(getImgPath(); ?>pmd/plus.png) 85% 55% no-repeat; + border: 1px solid #444; display: block; } -a.trigger:hover{ +a.trigger:hover { position: fixed; text-decoration: none; top: 60px; right: 0; - color:#080808; + color: #080808; padding: 10px 40px 10px 15px; - background:#fff696 url(getImgPath(); ?>pmd/plus.png) 85% 55% no-repeat; - border:1px solid #999; + background: #fff696 url(getImgPath(); ?>pmd/plus.png) 85% 55% no-repeat; + border: 1px solid #999; display: block; } a.active.trigger { - background:#222222 url(getImgPath(); ?>pmd/minus.png) 85% 55% no-repeat; - z-index:999; + background: #222 url(getImgPath(); ?>pmd/minus.png) 85% 55% no-repeat; + z-index: 999; } a.active.trigger:hover { - background:#fff696 url(getImgPath(); ?>pmd/minus.png) 85% 55% no-repeat; - z-index:999; + background: #fff696 url(getImgPath(); ?>pmd/minus.png) 85% 55% no-repeat; + z-index: 999; } -h2.tiger{ +h2.tiger { background-repeat: repeat-x; padding: 1px; font-weight: bold; @@ -3027,9 +2968,9 @@ h2.active { .toggle_container .block { background-color: #DBE4E8; - padding:40 15 40 15px; /*--Padding of Container--*/ + padding: 40 15 40 15px; /*--Padding of Container--*/ border:1px solid #999; - color:#000; + color: #000; } .history_table { @@ -3050,8 +2991,8 @@ h2.active { width: 100%; height: 100%; background-color: #CCA; - z-index:10; - opacity:0.5; + z-index: 10; + opacity: .5; filter: alpha(opacity=50); } @@ -3063,36 +3004,36 @@ h2.active { width: 500px; height: 220px; padding: 48px; - margin:0; - border: 1px solid black; - background-color: white; - z-index:101; + margin: 0; + border: 1px solid #000; + background-color: #fff; + z-index: 101; overflow: visible; } #boxtitle { - position:absolute; - float:center; - top:0; - left:0; - width:593px; - height:20px; - padding:0; - padding-top:4px; - left-padding:8px; - margin:0; - border-bottom:4px solid #3CF; + position: absolute; + float: center; + top: 0; + left: 0; + width: 593px; + height: 20px; + padding: 0; + padding-top: 4px; + left-padding: 8px; + margin: 0; + border-bottom: 4px solid #3CF; background-color: #D0DCE0; - color:black; - font-weight:bold; + color: black; + font-weight: bold; padding-left: 2px; - text-align:left; + text-align: left; } #tblfooter { background-color: #D3DCE3; float: right; - padding-top:10px; + padding-top: 10px; color: black; font-weight: normal; } @@ -3104,7 +3045,7 @@ h2.active { } input.btn { - color:#333; + color: #333; background-color: #D0DCE0; } diff --git a/themes/pmahomme/css/theme_print.css.php b/themes/pmahomme/css/theme_print.css.php deleted file mode 100644 index 59ba3db069..0000000000 --- a/themes/pmahomme/css/theme_print.css.php +++ /dev/null @@ -1,52 +0,0 @@ - -/* For printview */ -body, table, th, td { - color: #000; - background: #fff; -} - -img { - border: 0; -} - -table, th, td { - border: .1em solid #000; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} - -th, td { - padding: .2em; -} - -th.vtop, td.vtop { - vertical-align: top; -} - -th.vbottom, td.vbottom { - vertical-align: bottom; -} - -th { - font-weight: bold; - background: #e5e5e5; -} - -.nowrap { - white-space: nowrap; -} - -.hide { - display: none; -} diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index cbf3157261..feb9c2231b 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1422,7 +1422,6 @@ div#queryAnalyzerDialog table.queryNums { padding-left: 7px; } - /* end serverstatus */ /* server variables */ @@ -1761,8 +1760,6 @@ li#li_user_preferences { width: 100%; border-top: .1em solid silver; text-align: ; - - } #table_innodb_bufferpool_usage, @@ -1863,6 +1860,7 @@ textarea#partitiondefinition { height: 3em; } + /* for elements that should be revealed only via js */ .hide { display: none; @@ -1879,7 +1877,6 @@ textarea#partitiondefinition { /** * Progress bar styles */ - div.upload_progress { width: 400px; @@ -2764,94 +2761,7 @@ fieldset .disabled-field td { display: none; } -.CodeMirror { - font-size: 140%; - font-family: monospace; - background: #fff; - border: 1px solid #000; -} - -.CodeMirror-scroll { - overflow: auto; - height: em; - /* This is needed to prevent an IE[67] bug where the scrolled content - is visible outside of the scrolling box. */ - position: relative; -} - -.CodeMirror-gutter { - position: absolute; left: 0; top: 0; - z-index: 10; - background-color: #f7f7f7; - border-right: 1px solid #eee; - min-width: 2em; - height: 100%; -} -.CodeMirror-gutter-text { - color: #aaa; - text-align: right; - padding: .4em .2em .4em .4em; - white-space: pre !important; -} -.CodeMirror-lines { - padding: .4em; -} - -.CodeMirror pre { - -moz-border-radius: 0; - -webkit-border-radius: 0; - -o-border-radius: 0; - border-radius: 0; - border-width: 0; margin: 0; padding: 0; background: transparent; - font-family: inherit; - font-size: inherit; - padding: 0; margin: 0; - white-space: pre; - word-wrap: normal; -} - -.CodeMirror-wrap pre { - word-wrap: break-word; - white-space: pre-wrap; -} -.CodeMirror-wrap .CodeMirror-scroll { - overflow-x: hidden; -} - -.CodeMirror textarea { - font-family: inherit !important; - font-size: inherit !important; -} - -.CodeMirror-cursor { - z-index: 10; - position: absolute; - visibility: hidden; - border-left: 1px solid black !important; -} - -.CodeMirror-focused .CodeMirror-cursor { - visibility: visible; -} - -span.CodeMirror-selected { - background: #ccc !important; - color: HighlightText !important; -} - -.CodeMirror-focused span.CodeMirror-selected { - background: Highlight !important; -} - -.CodeMirror-matchingbracket { - color: #0f0 !important; -} - -.CodeMirror-nonmatchingbracket { - color: #f22 !important; -} - -getCssCodeMirror(); ?> +getCssCodeMirror(true); ?> .colborder { cursor: col-resize;