August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16727-g9cda174
by Michal Čihař 22 Aug '11

22 Aug '11

The branch, master has been updated via 9cda17487c6068fdd839bc99d8223dd07a028cbb (commit) from 19ab72bf8584affddda369cae8d16a0b00c5cc4a (commit) - Log ----------------------------------------------------------------- commit 9cda17487c6068fdd839bc99d8223dd07a028cbb Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 15:56:01 2011 +0200 Fix CSS rule ----------------------------------------------------------------------- Summary of changes: libraries/Theme.class.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index 1aca278d..817e4c3 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -401,7 +401,7 @@ class PMA_Theme $result[] = ' color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['punct'] . ';'; $result[] = '}'; $result[] = 'span.cm-mysql-word {'; - $result[] = ' color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha'] . ';'; + $result[] = ' color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_identifier'] . ';'; $result[] = '}'; $result[] = 'span.cm-builtin {'; $result[] = ' color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_functionName'] . ';'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16726-g19ab72b
by Michal Čihař 22 Aug '11

22 Aug '11

The branch, master has been updated via 19ab72bf8584affddda369cae8d16a0b00c5cc4a (commit) from a59daa10b5b5dc58a754b9cd53de3ce1ab52d633 (commit) - Log ----------------------------------------------------------------- commit 19ab72bf8584affddda369cae8d16a0b00c5cc4a Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 15:52:35 2011 +0200 One place to generate CodeMirror CSS ----------------------------------------------------------------------- Summary of changes: libraries/Theme.class.php | 43 +++++++++++++++++++++++++++++++ themes/original/css/theme_right.css.php | 34 +----------------------- themes/pmahomme/css/theme_right.css.php | 34 +----------------------- 3 files changed, 45 insertions(+), 66 deletions(-) diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index 155d34d..1aca278d 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -377,5 +377,48 @@ class PMA_Theme } return implode("\n", $result); } + + /** + * Returns CSS styles for CodeMirror editor based on query formatter colors. + * + * @return string CSS code. + */ + function getCssCodeMirror() + { + $result[] = 'span.cm-keyword, span.cm-statement-verb {'; + $result[] = ' color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_reservedWord'] . ';'; + $result[] = '}'; + $result[] = 'span.cm-variable {'; + $result[] = ' color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_identifier'] . ';'; + $result[] = '}'; + $result[] = 'span.cm-comment {'; + $result[] = ' color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['comment'] . ';'; + $result[] = '}'; + $result[] = 'span.cm-mysql-string {'; + $result[] = ' color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['quote'] . ';'; + $result[] = '}'; + $result[] = 'span.cm-operator {'; + $result[] = ' color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['punct'] . ';'; + $result[] = '}'; + $result[] = 'span.cm-mysql-word {'; + $result[] = ' color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha'] . ';'; + $result[] = '}'; + $result[] = 'span.cm-builtin {'; + $result[] = ' color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_functionName'] . ';'; + $result[] = '}'; + $result[] = 'span.cm-variable-2 {'; + $result[] = ' color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnType'] . ';'; + $result[] = '}'; + $result[] = 'span.cm-variable-3 {'; + $result[] = ' color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnAttrib'] . ';'; + $result[] = '}'; + $result[] = 'span.cm-separator {'; + $result[] = ' color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['punct'] . ';'; + $result[] = '}'; + $result[] = 'span.cm-number {'; + $result[] = ' color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['digit_integer'] . ';'; + $result[] = '}'; + return implode("\n", $result); + } } ?> diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 64b4b00..badeb92 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -2299,39 +2299,7 @@ span.CodeMirror-selected { .CodeMirror-matchingbracket {color: #0f0 !important;} .CodeMirror-nonmatchingbracket {color: #f22 !important;} -span.cm-keyword, span.cm-statement-verb { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_reservedWord']; ?>; -} -span.cm-variable { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_identifier']; ?>; -} -span.cm-comment { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['comment']; ?>; -} -span.cm-mysql-string { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['quote']; ?>; -} -span.cm-operator { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['punct']; ?>; -} -span.cm-mysql-word { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha']; ?>; -} -span.cm-builtin { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_functionName']; ?>; -} -span.cm-variable-2 { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnType']; ?>; -} -span.cm-variable-3 { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnAttrib']; ?>; -} -span.cm-separator { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['punct']; ?>; -} -span.cm-number { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['digit_integer']; ?>; -} +<?php echo $_SESSION['PMA_Theme']->getCssCodeMirror(); ?> .colborder { border-right: solid 1px #FFFFFF; diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index fdfa404..c52a973 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -2670,39 +2670,7 @@ span.CodeMirror-selected { .CodeMirror-matchingbracket {color: #0f0 !important;} .CodeMirror-nonmatchingbracket {color: #f22 !important;} -span.cm-keyword, span.cm-statement-verb { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_reservedWord']; ?>; -} -span.cm-variable { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_identifier']; ?>; -} -span.cm-comment { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['comment']; ?>; -} -span.cm-mysql-string { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['quote']; ?>; -} -span.cm-operator { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['punct']; ?>; -} -span.cm-mysql-word { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha']; ?>; -} -span.cm-builtin { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_functionName']; ?>; -} -span.cm-variable-2 { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnType']; ?>; -} -span.cm-variable-3 { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnAttrib']; ?>; -} -span.cm-separator { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['punct']; ?>; -} -span.cm-number { - color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['digit_integer']; ?>; -} +<?php echo $_SESSION['PMA_Theme']->getCssCodeMirror(); ?> .colborder { border-right: 1px solid #FFF; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16725-ga59daa1
by Michal Čihař 22 Aug '11

22 Aug '11

The branch, master has been updated via a59daa10b5b5dc58a754b9cd53de3ce1ab52d633 (commit) from e898b1ec1918cd2734b69fd8253dd7013f368cd5 (commit) - Log ----------------------------------------------------------------- commit a59daa10b5b5dc58a754b9cd53de3ce1ab52d633 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 15:43:32 2011 +0200 Cleanup po files ----------------------------------------------------------------------- Summary of changes: po/af.po | 1 - po/ar.po | 1 - po/be.po | 5 ----- po/be(a)latin.po | 5 ----- po/bg.po | 2 -- po/bn.po | 1 - po/ca.po | 2 -- po/cs.po | 1 - po/cy.po | 2 -- po/da.po | 2 -- po/de.po | 1 - po/el.po | 1 - po/en_GB.po | 1 - po/et.po | 1 - po/fa.po | 1 - po/fi.po | 6 ------ po/fr.po | 1 - po/gl.po | 6 ------ po/hi.po | 1 - po/hr.po | 5 ----- po/hu.po | 6 ------ po/it.po | 2 -- po/ka.po | 5 ----- po/lt.po | 1 - po/mn.po | 1 - po/nb.po | 2 -- po/nl.po | 2 -- po/pl.po | 2 -- po/pt_BR.po | 6 ------ po/ro.po | 5 ----- po/ru.po | 2 -- po/si.po | 1 - po/sk.po | 2 -- po/sr.po | 5 ----- po/sr(a)latin.po | 5 ----- po/sv.po | 1 - po/tt.po | 1 - po/uk.po | 1 - po/ur.po | 1 - po/uz.po | 6 ------ po/uz(a)latin.po | 6 ------ po/zh_CN.po | 1 - po/zh_TW.po | 2 -- 43 files changed, 0 insertions(+), 112 deletions(-) diff --git a/po/af.po b/po/af.po index 4675a98..c4364a1 100644 --- a/po/af.po +++ b/po/af.po @@ -12560,7 +12560,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Space usage" #~ msgid "Query Cache usage" #~ msgstr "Spasie verbruik" diff --git a/po/ar.po b/po/ar.po index 6234de2..2df81a5 100644 --- a/po/ar.po +++ b/po/ar.po @@ -12597,7 +12597,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Space usage" #~ msgid "Query Cache usage" #~ msgstr "المساحة المستخدمة" diff --git a/po/be.po b/po/be.po index a28c203..8b80f44 100644 --- a/po/be.po +++ b/po/be.po @@ -13263,10 +13263,6 @@ msgstr "" #~ "Каб выбраць сувязь, націсьніце на кропцы злучэньня, як паказана на выяве:" #, fuzzy -#~| msgid "" -#~| "The display field is shown in pink. To set/unset a field as the display " -#~| "field, click the \"Choose field to display\" icon, then click on the " -#~| "appropriate field name." #~ msgid "" #~ "The display column is shown in pink. To set/unset a column as the display " #~ "column, click the \"Choose column to display\" icon, then click on the " @@ -13277,7 +13273,6 @@ msgstr "" #~ "і націсьніце на адпаведнае імя поля." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Кэш запытаў" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 11e9955..e5e025e 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -13229,10 +13229,6 @@ msgstr "" #~ "vyjavie:" #, fuzzy -#~| msgid "" -#~| "The display field is shown in pink. To set/unset a field as the display " -#~| "field, click the \"Choose field to display\" icon, then click on the " -#~| "appropriate field name." #~ msgid "" #~ "The display column is shown in pink. To set/unset a column as the display " #~ "column, click the \"Choose column to display\" icon, then click on the " @@ -13243,7 +13239,6 @@ msgstr "" #~ "adlustravańnia» i naciśnicie na adpaviednaje imia pola." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Keš zapytaŭ" diff --git a/po/bg.po b/po/bg.po index 3e1f2e6..8b0f1af 100644 --- a/po/bg.po +++ b/po/bg.po @@ -12347,7 +12347,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "Филтър" @@ -12355,7 +12354,6 @@ msgstr "" #~ msgstr "За избор на отношение, щракнете:" #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Буфер за заявки" diff --git a/po/bn.po b/po/bn.po index b66a8ea..0d4add9 100644 --- a/po/bn.po +++ b/po/bn.po @@ -13121,7 +13121,6 @@ msgstr "" #~ msgstr "ক্ষেত্রসমূহ" #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Query cache" diff --git a/po/ca.po b/po/ca.po index 0487c32..c52efb3 100644 --- a/po/ca.po +++ b/po/ca.po @@ -13152,7 +13152,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "Filtre" @@ -13169,7 +13168,6 @@ msgstr "" #~ "i clica també en el nom de camp adient." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Memòria cau de consultes" diff --git a/po/cs.po b/po/cs.po index 7dc6b97..d57c76a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -12736,7 +12736,6 @@ msgstr "" #~ "ikonu „Zvolte které pole zobrazit“ a poté zvolte odpovídající pole." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Vyrovnávací paměť dotazů" diff --git a/po/cy.po b/po/cy.po index 76a0ba8..0844cbb 100644 --- a/po/cy.po +++ b/po/cy.po @@ -12631,12 +12631,10 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "Hidlydd" #, fuzzy -#~| msgid "Query results" #~ msgid "Query Cache usage" #~ msgstr "Gweithrediadau canlyniadau ymholiad" diff --git a/po/da.po b/po/da.po index 77a42ca..cbe2efb 100644 --- a/po/da.po +++ b/po/da.po @@ -12809,7 +12809,6 @@ msgstr "" msgid "concurrent_insert is set to 0" msgstr "" -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "Filtre" @@ -12829,7 +12828,6 @@ msgstr "" #~ "derefter på det pågældende kolonnenavn." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Forespørgsel-mellemlager" diff --git a/po/de.po b/po/de.po index fb1e379..dc69866 100644 --- a/po/de.po +++ b/po/de.po @@ -13025,7 +13025,6 @@ msgstr "" #~ "\"Anzeigespalte wählen\", dann auf den passenden Spaltennamen." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Abfragen-Cache" diff --git a/po/el.po b/po/el.po index 293d03a..d0d355e 100644 --- a/po/el.po +++ b/po/el.po @@ -13152,7 +13152,6 @@ msgstr "" #~ "και μετά πατήστε το κατάλληλο όνομα στήλης." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Λανθάνουσα μνήμη ερωτήματος" diff --git a/po/en_GB.po b/po/en_GB.po index 6980985..5cdc804 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -12866,7 +12866,6 @@ msgstr "" #~ "appropriate column name." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Query cache" diff --git a/po/et.po b/po/et.po index 261b25d..f30dd10 100644 --- a/po/et.po +++ b/po/et.po @@ -13122,7 +13122,6 @@ msgstr "" #~ msgstr "Et valida suhe, kliki :" #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Päringute vahemälu" diff --git a/po/fa.po b/po/fa.po index 317917b..b1d28ed 100644 --- a/po/fa.po +++ b/po/fa.po @@ -12532,7 +12532,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Space usage" #~ msgid "Query Cache usage" #~ msgstr "فضاي استفاده‌شده" diff --git a/po/fi.po b/po/fi.po index 10747f2..0bb467b 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13490,7 +13490,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "Suodatin" @@ -13498,10 +13497,6 @@ msgstr "" #~ msgstr "Valitaksesi relaation, paina :" #, fuzzy -#~| msgid "" -#~| "The display field is shown in pink. To set/unset a field as the display " -#~| "field, click the \"Choose field to display\" icon, then click on the " -#~| "appropriate field name." #~ msgid "" #~ "The display column is shown in pink. To set/unset a column as the display " #~ "column, click the \"Choose column to display\" icon, then click on the " @@ -13512,7 +13507,6 @@ msgstr "" #~ "kenttänimeä." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Kyselyvälimuisti" diff --git a/po/fr.po b/po/fr.po index 10dc8c9..e681f69 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13028,7 +13028,6 @@ msgstr "" #~ "descriptive», puis cliquer sur le nom de colonne approprié." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Cache des requêtes" diff --git a/po/gl.po b/po/gl.po index fffa427..4108d0e 100644 --- a/po/gl.po +++ b/po/gl.po @@ -13725,7 +13725,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "Filtro" @@ -13733,10 +13732,6 @@ msgstr "" #~ msgstr "Para seleccionar unha relación, prema:" #, fuzzy -#~| msgid "" -#~| "The display field is shown in pink. To set/unset a field as the display " -#~| "field, click the \"Choose field to display\" icon, then click on the " -#~| "appropriate field name." #~ msgid "" #~ "The display column is shown in pink. To set/unset a column as the display " #~ "column, click the \"Choose column to display\" icon, then click on the " @@ -13747,7 +13742,6 @@ msgstr "" #~ "campo a mostrar\" e a seguir o nome do campo apropiado." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "caché de procuras" diff --git a/po/hi.po b/po/hi.po index ded02c6..c15f187 100644 --- a/po/hi.po +++ b/po/hi.po @@ -12574,7 +12574,6 @@ msgstr "" #~ msgstr "संबंध चयन करने के लिए क्लिक करें :" #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "क्वेरी कैश" diff --git a/po/hr.po b/po/hr.po index 5121c6f..6a4ef77 100644 --- a/po/hr.po +++ b/po/hr.po @@ -13217,10 +13217,6 @@ msgstr "" #~ msgstr "Za odabir relacije pritisnite:" #, fuzzy -#~| msgid "" -#~| "The display field is shown in pink. To set/unset a field as the display " -#~| "field, click the \"Choose field to display\" icon, then click on the " -#~| "appropriate field name." #~ msgid "" #~ "The display column is shown in pink. To set/unset a column as the display " #~ "column, click the \"Choose column to display\" icon, then click on the " @@ -13232,7 +13228,6 @@ msgstr "" #~ "naziv polja." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Pohrana upita" diff --git a/po/hu.po b/po/hu.po index baa5a88..85d520a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -13315,7 +13315,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "Szűrő" @@ -13323,10 +13322,6 @@ msgstr "" #~ msgstr "A kapcsolat kiválasztásához, kattintson :" #, fuzzy -#~| msgid "" -#~| "The display field is shown in pink. To set/unset a field as the display " -#~| "field, click the \"Choose field to display\" icon, then click on the " -#~| "appropriate field name." #~ msgid "" #~ "The display column is shown in pink. To set/unset a column as the display " #~ "column, click the \"Choose column to display\" icon, then click on the " @@ -13337,7 +13332,6 @@ msgstr "" #~ "a megjelenítendő mezőt\" ikonra, majd kattintson a megfelelő mező nevére." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Lekérdezési gyorsítótár" diff --git a/po/it.po b/po/it.po index ca9d5d8..d957ee7 100644 --- a/po/it.po +++ b/po/it.po @@ -13058,7 +13058,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "Filtra" @@ -13075,7 +13074,6 @@ msgstr "" #~ "\", e poi clicca sul nome del campo." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Cache delle query" diff --git a/po/ka.po b/po/ka.po index c40599a..a0279f5 100644 --- a/po/ka.po +++ b/po/ka.po @@ -13562,10 +13562,6 @@ msgstr "" #~ msgstr "To select relation, click :" #, fuzzy -#~| msgid "" -#~| "The display field is shown in pink. To set/unset a field as the display " -#~| "field, click the \"Choose field to display\" icon, then click on the " -#~| "appropriate field name." #~ msgid "" #~ "The display column is shown in pink. To set/unset a column as the display " #~ "column, click the \"Choose column to display\" icon, then click on the " @@ -13576,7 +13572,6 @@ msgstr "" #~ "appropriate field name." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Query cache" diff --git a/po/lt.po b/po/lt.po index 5889209..086f566 100644 --- a/po/lt.po +++ b/po/lt.po @@ -12610,7 +12610,6 @@ msgstr "" #~ "tada paspauskite ant pasirinkto stulpelio vardo." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Užklausų saugykla" diff --git a/po/mn.po b/po/mn.po index e539d1c..dcd5026 100644 --- a/po/mn.po +++ b/po/mn.po @@ -12940,7 +12940,6 @@ msgstr "" #~ msgstr "Холбоо сонгохдоо, дарах нь :" #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Асуудлын нөөцлөл" diff --git a/po/nb.po b/po/nb.po index 65095be..cb2baf2 100644 --- a/po/nb.po +++ b/po/nb.po @@ -13235,7 +13235,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "Filter" @@ -13252,7 +13251,6 @@ msgstr "" #~ "på det aktuelle kolonnenavnet." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Spørringsmellomlager" diff --git a/po/nl.po b/po/nl.po index 551437b..1ff8887 100644 --- a/po/nl.po +++ b/po/nl.po @@ -13155,7 +13155,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "Filter" @@ -13172,7 +13171,6 @@ msgstr "" #~ "weer te geven veld." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Query cache" diff --git a/po/pl.po b/po/pl.po index 2ea6c29..50a1a48 100644 --- a/po/pl.po +++ b/po/pl.po @@ -13520,7 +13520,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "Filtr" @@ -13528,7 +13527,6 @@ msgstr "" #~ msgstr "Aby wybrać powiązanie, kliknij :" #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Pamięć podręczna zapytań" diff --git a/po/pt_BR.po b/po/pt_BR.po index c995c9a..605a285 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13010,7 +13010,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "Filtro" @@ -13018,10 +13017,6 @@ msgstr "" #~ msgstr "Para selecionar relacionamento, clique :" #, fuzzy -#~| msgid "" -#~| "The display field is shown in pink. To set/unset a field as the display " -#~| "field, click the \"Choose field to display\" icon, then click on the " -#~| "appropriate field name." #~ msgid "" #~ "The display column is shown in pink. To set/unset a column as the display " #~ "column, click the \"Choose column to display\" icon, then click on the " @@ -13032,7 +13027,6 @@ msgstr "" #~ "então clique no nome do campo apropriado." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Consulta do cache" diff --git a/po/ro.po b/po/ro.po index 70b9228..40429dc 100644 --- a/po/ro.po +++ b/po/ro.po @@ -13236,10 +13236,6 @@ msgstr "" #~ msgstr "Pentru a alege relația, faceți clic:" #, fuzzy -#~| msgid "" -#~| "The display field is shown in pink. To set/unset a field as the display " -#~| "field, click the \"Choose field to display\" icon, then click on the " -#~| "appropriate field name." #~ msgid "" #~ "The display column is shown in pink. To set/unset a column as the display " #~ "column, click the \"Choose column to display\" icon, then click on the " @@ -13250,7 +13246,6 @@ msgstr "" #~ "appropriate field name." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Cache interogări" diff --git a/po/ru.po b/po/ru.po index 70b8d15..04fd017 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13088,7 +13088,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "Фильтр" @@ -13105,7 +13104,6 @@ msgstr "" #~ "отображаемого столбца\" и выберите необходимый столбец." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Кеш запросов" diff --git a/po/si.po b/po/si.po index d9f40ac..052a4c9 100644 --- a/po/si.po +++ b/po/si.po @@ -12811,7 +12811,6 @@ msgstr "" #~ msgst7 +12811,6 @@ msgstr """лбца\" и выберите необходимый столбец."�азана на выяве:"��u�]�*�� ]�*�@]�*��<^�*��^^�*��p ��k�]�*6 ��!�!@��x�<^�*��]�*��]�*@��`�]�*��^�*u�]�*��^�*؄�^�*��^�*�� ]�*x�<^�*��p��k�]�*�!�!@��H^^�*��]�*��]�*@��`�]�*��p��h��8�@]�*�p��u�]�*�� ]�*��P��k�]�*GHIJKMNOP@��H�]�* ��]�*��]�*@��0��^�*u�]�*�<^�*�I�]�*��^�*؄�^�*��^�*�� ]�*H�]�* ��`��k�]�*8�]�* ��k�]�*(�]�* ��k�]�*�]�* ��k�]�* ��^�*u�]�*��^�*p��]�*e�]�*؄�^�*��y��]�*e�]�*��^�*��Z��]�*e�]�*�D�]�*�<^�*�I�]�*��^�*ؤ<^�*؄�^�*��^�*�� ]�*8�@]�* �]�*��p��]�*p��@��k�]�*5678:<=>?@BD@�� ]�*��u�]�*�@]�*�� ]�*e�]�*�@]�*�_@f�S Q��l��#h]�*�� ]�*��P��k�]�*u]�� 4Q��U^Qʉ��u��*ēv@��H^e]�*��]�*��_�*��_�*��]�*��h��<^�*u�]�*ؤ<^�*0��_�*��_�*��r "ක්ෂේත්‍ර" #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "විමසුම් කෑෂ්" diff --git a/po/sk.po b/po/sk.po index 13e802e..9196617 100644 --- a/po/sk.po +++ b/po/sk.po @@ -12817,12 +12817,10 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "Filter" #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Vyrovnávacia pamäť príkazov" diff --git a/po/sr.po b/po/sr.po index 3b85494..9546cb3 100644 --- a/po/sr.po +++ b/po/sr.po @@ -13135,10 +13135,6 @@ msgstr "" #~ msgstr "Да одаберете релацију, кликните :" #, fuzzy -#~| msgid "" -#~| "The display field is shown in pink. To set/unset a field as the display " -#~| "field, click the \"Choose field to display\" icon, then click on the " -#~| "appropriate field name." #~ msgid "" #~ "The display column is shown in pink. To set/unset a column as the display " #~ "column, click the \"Choose column to display\" icon, then click on the " @@ -13149,7 +13145,6 @@ msgstr "" #~ "назив одговарајућег поља." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Кеш упита" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index decfb0a..6a9a5b6 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -13127,10 +13127,6 @@ msgstr "" #~ msgstr "Da odaberete relaciju, kliknite :" #, fuzzy -#~| msgid "" -#~| "The display field is shown in pink. To set/unset a field as the display " -#~| "field, click the \"Choose field to display\" icon, then click on the " -#~| "appropriate field name." #~ msgid "" #~ "The display column is shown in pink. To set/unset a column as the display " #~ "column, click the \"Choose column to display\" icon, then click on the " @@ -13141,7 +13137,6 @@ msgstr "" #~ "na naziv odgovarajućeg polja." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Keš upita" diff --git a/po/sv.po b/po/sv.po index c5bc7d3..faa897d 100644 --- a/po/sv.po +++ b/po/sv.po @@ -12915,7 +12915,6 @@ msgstr "" #~ "sedan på lämpligt fältnamn." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Frågecache" diff --git a/po/tt.po b/po/tt.po index 1634e98..3a4afe1 100644 --- a/po/tt.po +++ b/po/tt.po @@ -12935,7 +12935,6 @@ msgstr "" #~ msgstr "Alan" #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Soraw alxätere" diff --git a/po/uk.po b/po/uk.po index c866460..7758bda 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12500,7 +12500,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Space usage" #~ msgid "Query Cache usage" #~ msgstr "Простір, що використовується" diff --git a/po/ur.po b/po/ur.po index 1f0eb8b..b2f297e 100644 --- a/po/ur.po +++ b/po/ur.po @@ -12500,7 +12500,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Query results" #~ msgid "Query Cache usage" #~ msgstr "طلب نتائج" diff --git a/po/uz.po b/po/uz.po index 1a4fc6f..d2ef5bd 100644 --- a/po/uz.po +++ b/po/uz.po @@ -13746,7 +13746,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "Фильтр" @@ -13755,10 +13754,6 @@ msgstr "" #~ "Алоқани танлаш учун расмда кўрсатилганикаби уланиш нуқтасига босинг:" #, fuzzy -#~| msgid "" -#~| "The display field is shown in pink. To set/unset a field as the display " -#~| "field, click the \"Choose field to display\" icon, then click on the " -#~| "appropriate field name." #~ msgid "" #~ "The display column is shown in pink. To set/unset a column as the display " #~ "column, click the \"Choose column to display\" icon, then click on the " @@ -13769,7 +13764,6 @@ msgstr "" #~ "танланг." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "Сўровлар кеши" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 1759cc2..fda39fc 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -13809,7 +13809,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "Filtr" @@ -13818,10 +13817,6 @@ msgstr "" #~ "Aloqani tanlash uchun rasmda ko‘rsatilganikabi ulanish nuqtasiga bosing:" #, fuzzy -#~| msgid "" -#~| "The display field is shown in pink. To set/unset a field as the display " -#~| "field, click the \"Choose field to display\" icon, then click on the " -#~| "appropriate field name." #~ msgid "" #~ "The display column is shown in pink. To set/unset a column as the display " #~ "column, click the \"Choose column to display\" icon, then click on the " @@ -13832,7 +13827,6 @@ msgstr "" #~ "bo‘limidan mos maydonni tanlang." #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "So‘rovlar keshi" diff --git a/po/zh_CN.po b/po/zh_CN.po index f5ae0be..6563085 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12463,7 +12463,6 @@ msgstr "" #~ "择需要的字段名。" #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "查询缓存" diff --git a/po/zh_TW.po b/po/zh_TW.po index 26c174b..5785986 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -12640,7 +12640,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "Filter" #~ msgid "Filters" #~ msgstr "過濾" @@ -12656,7 +12655,6 @@ msgstr "" #~ "擇需要的欄位名稱" #, fuzzy -#~| msgid "Query cache" #~ msgid "Query Cache usage" #~ msgstr "查詢快取" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16724-ge898b1e
by Michal Čihař 22 Aug '11

22 Aug '11

The branch, master has been updated via e898b1ec1918cd2734b69fd8253dd7013f368cd5 (commit) from 85e778ffc8c784cdd860515d20173f63d66afb43 (commit) - Log ----------------------------------------------------------------- commit e898b1ec1918cd2734b69fd8253dd7013f368cd5 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 15:42:37 2011 +0200 Move theme helpers to theme class ----------------------------------------------------------------------- Summary of changes: libraries/Theme.class.php | 33 ++++++++++++++++++++++++ libraries/theme.lib.php | 42 ------------------------------- themes/original/css/theme_right.css.php | 7 +---- themes/pmahomme/css/theme_left.css.php | 9 +----- themes/pmahomme/css/theme_right.css.php | 32 +++++++++-------------- 5 files changed, 49 insertions(+), 74 deletions(-) delete mode 100644 libraries/theme.lib.php diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index 87f6a3e..155d34d 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -344,5 +344,38 @@ class PMA_Theme .'</p>' .'</div>'; } + + /** + * Remove filter for IE. + * + * @return string CSS code. + */ + function getCssIEClearFilter() { + return PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8 + ? 'filter: none' + : ''; + } + + /** + * Generates code for CSS gradient using various browser extensions. + * + * @param string $start_color Color of gradient start, hex value without # + * @param string $end_color Color of gradient end, hex value without # + * + * @return string CSS code. + */ + function getCssGradient($start_color, $end_color) + { + $result = array(); + $result[] = 'background-image: url(./themes/svg_gradient.php?from=' . $start_color . '&to=' . $end_color . ');'; + $result[] = 'background-size: 100% 100%;'; + $result[] = 'background: -webkit-gradient(linear, left top, left bottom, from(#' . $start_color . '), to(#' . $end_color . '));'; + $result[] = 'background: -moz-linear-gradient(top, #' . $start_color . ', #' . $end_color . ');'; + $result[] = 'background: -o-linear-gradient(top, #' . $start_color . ', #' . $end_color . ');'; + if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8) { + $result[] = 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#' . $start_color . '", endColorstr="#' . $end_color . '");'; + } + return implode("\n", $result); + } } ?> diff --git a/libraries/theme.lib.php b/libraries/theme.lib.php deleted file mode 100644 index 1030d80..0000000 --- a/libraries/theme.lib.php +++ /dev/null @@ -1,42 +0,0 @@ -<?php -/* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * Helper functions for themes. - * - * @package phpMyAdmin - */ - -/** - * Remove filter for IE. - * - * @return string CSS code. - */ -function PMA_ieClearFilter() { - return PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8 - ? 'filter: none' - : ''; -} - -/** - * Generates code for CSS gradient using various browser extensions. - * - * @param string $start_color Color of gradient start, hex value without # - * @param string $end_color Color of gradient end, hex value without # - * - * @return string CSS code. - */ -function PMA_css_gradient($start_color, $end_color) -{ - $result = array(); - $result[] = 'background-image: url(./themes/svg_gradient.php?from=' . $start_color . '&to=' . $end_color . ');'; - $result[] = 'background-size: 100% 100%;'; - $result[] = 'background: -webkit-gradient(linear, left top, left bottom, from(#' . $start_color . '), to(#' . $end_color . '));'; - $result[] = 'background: -moz-linear-gradient(top, #' . $start_color . ', #' . $end_color . ');'; - $result[] = 'background: -o-linear-gradient(top, #' . $start_color . ', #' . $end_color . ');'; - if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8) { - $result[] = 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#' . $start_color . '", endColorstr="#' . $end_color . '");'; - } - return implode("\n", $result); -} - -?> diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 69d01c1..64b4b00 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -11,11 +11,6 @@ if (!defined('PMA_MINIMUM_COMMON') && !defined('TESTSUITE')) { exit(); } - -/** - * Theme helpers. - */ -require 'libraries/theme.lib.php'; ?> /******************************************************************************/ /* general tags */ @@ -1671,7 +1666,7 @@ table#serverconnection_trg_local { -moz-border-radius: 11px; -webkit-border-radius: 11px; border-radius: 11px; - <?php echo PMA_css_gradient('ffffff', 'cccccc'); ?> + <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'cccccc'); ?> border: 1px solid #444444; cursor: pointer; } diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php index 65df208..461329d 100644 --- a/themes/pmahomme/css/theme_left.css.php +++ b/themes/pmahomme/css/theme_left.css.php @@ -11,11 +11,6 @@ if (!defined('PMA_MINIMUM_COMMON')) { exit(); } - -/** - * Theme helpers. - */ -require 'libraries/theme.lib.php'; ?> /******************************************************************************/ /* general tags */ @@ -245,7 +240,7 @@ div#left_tableList li { #newtable a { display: block; padding: 1px; - <?php echo PMA_css_gradient('ffffff', 'cccccc'); ?> + <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'cccccc'); ?> border: 1px solid #aaa; -moz-border-radius: 20px; -webkit-border-radius: 20px; @@ -257,7 +252,7 @@ div#left_tableList li { } #newtable a:hover { - <?php echo PMA_css_gradient('cccccc', 'dddddd'); ?> + <?php echo $_SESSION['PMA_Theme']->getCssGradient('cccccc', 'dddddd'); ?> } #newtable li a:hover { diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 9e25638..fdfa404 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -11,12 +11,6 @@ if (!defined('PMA_MINIMUM_COMMON')) { exit(); } - -/** - * Theme helpers. - */ -require 'libraries/theme.lib.php'; - ?> /******************************************************************************/ @@ -105,7 +99,7 @@ a:hover { -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; - <?php echo PMA_css_gradient('ffffff', 'cccccc'); ?> + <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'cccccc'); ?> } dfn { @@ -121,7 +115,7 @@ th { font-weight: bold; color: <?php echo $GLOBALS['cfg']['ThColor']; ?>; background: #f3f3f3; - <?php echo PMA_css_gradient('ffffff', 'cccccc'); ?> + <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'cccccc'); ?> } a img { @@ -190,11 +184,11 @@ input[type=submit]{ text-shadow: 0 1px 0 #fff; - <?php echo PMA_css_gradient('ffffff', 'cccccc'); ?> + <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'cccccc'); ?> } input[type=submit]:hover{position: relative; - <?php echo PMA_css_gradient('cccccc', 'dddddd'); ?> + <?php echo $_SESSION['PMA_Theme']->getCssGradient('cccccc', 'dddddd'); ?> cursor:pointer; } @@ -289,7 +283,7 @@ select{ } select[multiple] { - <?php echo PMA_css_gradient('ffffff', 'f2f2f2'); ?> + <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'f2f2f2'); ?> } /* Icon sprites */ @@ -503,14 +497,14 @@ button.mult_submit { table tr.odd th, .odd { background: #fff; - <?php echo PMA_ieClearFilter(); ?> + <?php echo $_SESSION['PMA_Theme']->getCssIEClearFilter(); ?> } /* even items 2,4,6,8,... */ table tr.even th, .even { background: #f3f3f3; - <?php echo PMA_ieClearFilter(); ?> + <?php echo $_SESSION['PMA_Theme']->getCssIEClearFilter(); ?> } /* odd table rows 1,3,5,7,... */ @@ -1598,10 +1592,10 @@ div#profilingchart { -moz-box-shadow: 1px 1px 2px rgba(0,0,0,.5); text-shadow: #fff 0 1px 0; */ - <?php echo PMA_css_gradient('ffffff', 'cccccc'); ?> + <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'cccccc'); ?> } #sectionlinks a:hover, .buttonlinks a:hover, a.button:hover { - <?php echo PMA_css_gradient('cccccc', 'dddddd'); ?> + <?php echo $_SESSION['PMA_Theme']->getCssGradient('cccccc', 'dddddd'); ?> } div#sqlquerycontainer { @@ -2018,11 +2012,11 @@ input[type=text].invalid_value, text-shadow: 0 1px 0 #fff; - <?php echo PMA_css_gradient('ffffff', 'cccccc'); ?> + <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'cccccc'); ?> cursor: pointer; } #buttonGo:hover{ - <?php echo PMA_css_gradient('cccccc', 'dddddd'); ?> + <?php echo $_SESSION['PMA_Theme']->getCssGradient('cccccc', 'dddddd'); ?> } .format_specific_options h3 { @@ -2857,7 +2851,7 @@ span.cm-number { -webkit-border-radius: 5px; -moz-border-radius: 5px; - <?php echo PMA_css_gradient('eeeeee', 'cccccc'); ?> + <?php echo $_SESSION['PMA_Theme']->getCssGradient('eeeeee', 'cccccc'); ?> } .navigation td { @@ -2894,7 +2888,7 @@ span.cm-number { cursor: pointer; text-shadow: none; - <?php echo PMA_css_gradient('333333', '555555'); ?> + <?php echo $_SESSION['PMA_Theme']->getCssGradient('333333', '555555'); ?> } .navigation select { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16723-g85e778f
by Michal Čihař 22 Aug '11

22 Aug '11

The branch, master has been updated via 85e778ffc8c784cdd860515d20173f63d66afb43 (commit) from a0309eb384af0b4a92b8a13aba0f8e9df04178e3 (commit) - Log ----------------------------------------------------------------- commit 85e778ffc8c784cdd860515d20173f63d66afb43 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 15:36:54 2011 +0200 Should not be called anymore ----------------------------------------------------------------------- Summary of changes: libraries/theme.lib.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libraries/theme.lib.php b/libraries/theme.lib.php index 7c773c9..1030d80 100644 --- a/libraries/theme.lib.php +++ b/libraries/theme.lib.php @@ -33,7 +33,6 @@ function PMA_css_gradient($start_color, $end_color) $result[] = 'background: -webkit-gradient(linear, left top, left bottom, from(#' . $start_color . '), to(#' . $end_color . '));'; $result[] = 'background: -moz-linear-gradient(top, #' . $start_color . ', #' . $end_color . ');'; $result[] = 'background: -o-linear-gradient(top, #' . $start_color . ', #' . $end_color . ');'; - $result[] = PMA_ieFilter($start_color, $end_color); if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8) { $result[] = 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#' . $start_color . '", endColorstr="#' . $end_color . '");'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16722-ga0309eb
by Michal Čihař 22 Aug '11

22 Aug '11

The branch, master has been updated via a0309eb384af0b4a92b8a13aba0f8e9df04178e3 (commit) via d15abfb25b6d103670aa627fb88c7545b0937429 (commit) via 0705c6a87fb36195027f34d23c50dc04aab00ffb (commit) via ccbefbb5ef143816992fc71a278f555e9d3687cf (commit) via a2485d0379f4496cee0b7a37790f7bef8890849c (commit) from 5b8bb36168161fd92cfb63f9dddeab3e10a23bf5 (commit) - Log ----------------------------------------------------------------- commit a0309eb384af0b4a92b8a13aba0f8e9df04178e3 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 15:35:46 2011 +0200 Fix function name commit d15abfb25b6d103670aa627fb88c7545b0937429 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 15:35:32 2011 +0200 Fold PMA_ieFilter into PMA_css_Gradied commit 0705c6a87fb36195027f34d23c50dc04aab00ffb Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 15:10:41 2011 +0200 Convert left CSS to use new helper as well commit ccbefbb5ef143816992fc71a278f555e9d3687cf Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 15:09:21 2011 +0200 Adjust calling convention, do not include # in color commit a2485d0379f4496cee0b7a37790f7bef8890849c Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 15:05:45 2011 +0200 Use new function for gradient instead of doing it manually ----------------------------------------------------------------------- Summary of changes: libraries/theme.lib.php | 29 ++++++------ themes/original/css/theme_right.css.php | 7 +-- themes/pmahomme/css/theme_left.css.php | 24 ++------- themes/pmahomme/css/theme_right.css.php | 77 ++++-------------------------- 4 files changed, 32 insertions(+), 105 deletions(-) diff --git a/libraries/theme.lib.php b/libraries/theme.lib.php index 9155a6d..7c773c9 100644 --- a/libraries/theme.lib.php +++ b/libraries/theme.lib.php @@ -6,19 +6,10 @@ * @package phpMyAdmin */ - -/** - * Gradient filter for IE. - */ -function PMA_ieFilter($start_color, $end_color) -{ - return PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8 - ? 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="' . $start_color . '", endColorstr="' . $end_color . '");' - : ''; -} - /** * Remove filter for IE. + * + * @return string CSS code. */ function PMA_ieClearFilter() { return PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8 @@ -28,16 +19,24 @@ function PMA_ieClearFilter() { /** * Generates code for CSS gradient using various browser extensions. + * + * @param string $start_color Color of gradient start, hex value without # + * @param string $end_color Color of gradient end, hex value without # + * + * @return string CSS code. */ -function PMA_css_Gradied($start_color, $end_color) +function PMA_css_gradient($start_color, $end_color) { $result = array(); $result[] = 'background-image: url(./themes/svg_gradient.php?from=' . $start_color . '&to=' . $end_color . ');'; $result[] = 'background-size: 100% 100%;'; - $result[] = 'background: -webkit-gradient(linear, left top, left bottom, from(' . $start_color . '), to(' . $end_color . '));'; - $result[] = 'background: -moz-linear-gradient(top, ' . $start_color . ', ' . $end_color . ');'; - $result[] = 'background: -o-linear-gradient(top, ' . $start_color . ', ' . $end_color . ');'; + $result[] = 'background: -webkit-gradient(linear, left top, left bottom, from(#' . $start_color . '), to(#' . $end_color . '));'; + $result[] = 'background: -moz-linear-gradient(top, #' . $start_color . ', #' . $end_color . ');'; + $result[] = 'background: -o-linear-gradient(top, #' . $start_color . ', #' . $end_color . ');'; $result[] = PMA_ieFilter($start_color, $end_color); + if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8) { + $result[] = 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#' . $start_color . '", endColorstr="#' . $end_color . '");'; + } return implode("\n", $result); } diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index c69c18e..69d01c1 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1671,12 +1671,7 @@ table#serverconnection_trg_local { -moz-border-radius: 11px; -webkit-border-radius: 11px; border-radius: 11px; - background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc); - background-size: 100% 100%; - background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); - background: -moz-linear-gradient(top, #ffffff, #cccccc); - background: -o-linear-gradient(top, #ffffff, #cccccc); - <?php echo PMA_ieFilter('#ffffff', '#cccccc'); ?> + <?php echo PMA_css_gradient('ffffff', 'cccccc'); ?> border: 1px solid #444444; cursor: pointer; } diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php index e6b586c..65df208 100644 --- a/themes/pmahomme/css/theme_left.css.php +++ b/themes/pmahomme/css/theme_left.css.php @@ -12,12 +12,10 @@ if (!defined('PMA_MINIMUM_COMMON')) { exit(); } -function PMA_ieFilter($start_color, $end_color) -{ - return PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8 - ? 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="' . $start_color . '", endColorstr="' . $end_color . '");' - : ''; -} +/** + * Theme helpers. + */ +require 'libraries/theme.lib.php'; ?> /******************************************************************************/ /* general tags */ @@ -247,12 +245,7 @@ div#left_tableList li { #newtable a { display: block; padding: 1px; - background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc); - background-size: 100% 100%; - background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); - background: -moz-linear-gradient(top, #ffffff, #cccccc); - background: -o-linear-gradient(top, #ffffff, #cccccc); - <?php echo PMA_ieFilter('#ffffff', '#cccccc'); ?> + <?php echo PMA_css_gradient('ffffff', 'cccccc'); ?> border: 1px solid #aaa; -moz-border-radius: 20px; -webkit-border-radius: 20px; @@ -264,12 +257,7 @@ div#left_tableList li { } #newtable a:hover { - background-image: url(./themes/svg_gradient.php?from=cccccc&to=dddddd); - background-size: 100% 100%; - background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd)) !important; - background: -moz-linear-gradient(top, #cccccc, #dddddd) !important; - background: -o-linear-gradient(top, #cccccc, #dddddd) !important; - <?php echo PMA_ieFilter('#cccccc', '#dddddd'); ?> + <?php echo PMA_css_gradient('cccccc', 'dddddd'); ?> } #newtable li a:hover { diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 996f259..9e25638 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -105,12 +105,7 @@ a:hover { -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; - background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc); - background-size: 100% 100%; - background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); - background: -moz-linear-gradient(top, #ffffff, #cccccc); - background: -o-linear-gradient(top, #ffffff, #cccccc); - <?php echo PMA_ieFilter('#ffffff', '#cccccc'); ?> + <?php echo PMA_css_gradient('ffffff', 'cccccc'); ?> } dfn { @@ -126,12 +121,7 @@ th { font-weight: bold; color: <?php echo $GLOBALS['cfg']['ThColor']; ?>; background: #f3f3f3; - background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc); - background-size: 100% 100%; - background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); - background: -moz-linear-gradient(top, #ffffff, #cccccc); - background: -o-linear-gradient(top, #ffffff, #cccccc); - <?php echo PMA_ieFilter('#ffffff', '#cccccc'); ?> + <?php echo PMA_css_gradient('ffffff', 'cccccc'); ?> } a img { @@ -200,21 +190,11 @@ input[type=submit]{ text-shadow: 0 1px 0 #fff; - background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc); - background-size: 100% 100%; - background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); - background: -moz-linear-gradient(top, #ffffff, #cccccc); - background: -o-linear-gradient(top, #ffffff, #cccccc); - <?php echo PMA_ieFilter('#ffffff', '#cccccc'); ?> + <?php echo PMA_css_gradient('ffffff', 'cccccc'); ?> } input[type=submit]:hover{position: relative; - background-image: url(./themes/svg_gradient.php?from=cccccc&to=dddddd); - background-size: 100% 100%; - background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd)); - background: -moz-linear-gradient(top, #cccccc, #dddddd); - background: -o-linear-gradient(top, #cccccc, #dddddd); - <?php echo PMA_ieFilter('#cccccc', '#dddddd'); ?> + <?php echo PMA_css_gradient('cccccc', 'dddddd'); ?> cursor:pointer; } @@ -309,12 +289,7 @@ select{ } select[multiple] { - background: #fff; - background: -webkit-gradient(linear, center top, center bottom, from(#fff), color-stop(0.8, #f1f1f1), to(#fbfbfb)); - background: -webkit-linear-gradient(#fff, #f1f1f1 80%, #fbfbfb); - background: -moz-linear-gradient(#fff, #f1f1f1 80%, #fbfbfb); - /* none for Opera 11.10 as <option>s always have solid white background */ - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#ffffff", endColorstr="#f2f2f2"); + <?php echo PMA_css_gradient('ffffff', 'f2f2f2'); ?> } /* Icon sprites */ @@ -1623,20 +1598,10 @@ div#profilingchart { -moz-box-shadow: 1px 1px 2px rgba(0,0,0,.5); text-shadow: #fff 0 1px 0; */ - background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc); - background-size: 100% 100%; - background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); - background: -moz-linear-gradient(top, #ffffff, #cccccc); - background: -o-linear-gradient(top, #ffffff, #cccccc); - <?php echo PMA_ieFilter('#ffffff', '#cccccc'); ?> + <?php echo PMA_css_gradient('ffffff', 'cccccc'); ?> } #sectionlinks a:hover, .buttonlinks a:hover, a.button:hover { - background-image: url(./themes/svg_gradient.php?from=cccccc&to=dddddd); - background-size: 100% 100%; - background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd)); - background: -moz-linear-gradient(top, #cccccc, #dddddd); - background: -o-linear-gradient(top, #cccccc, #dddddd); - <?php echo PMA_ieFilter('#cccccc', '#dddddd'); ?> + <?php echo PMA_css_gradient('cccccc', 'dddddd'); ?> } div#sqlquerycontainer { @@ -2053,21 +2018,11 @@ input[type=text].invalid_value, text-shadow: 0 1px 0 #fff; - background-image: url(./themes/svg_gradient.php?from=ffffff&to=cccccc); - background-size: 100% 100%; - background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); - background: -moz-linear-gradient(top, #ffffff, #cccccc); - background: -o-linear-gradient(top, #ffffff, #cccccc); - <?php echo PMA_ieFilter('#ffffff', '#cccccc'); ?> + <?php echo PMA_css_gradient('ffffff', 'cccccc'); ?> cursor: pointer; } #buttonGo:hover{ - background-image: url(./themes/svg_gradient.php?from=cccccc&to=dddddd); - background-size: 100% 100%; - background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd)); - background: -moz-linear-gradient(top, #cccccc, #dddddd); - background: -o-linear-gradient(top, #cccccc, #dddddd); - <?php echo PMA_ieFilter('#cccccc', '#dddddd'); ?> + <?php echo PMA_css_gradient('cccccc', 'dddddd'); ?> } .format_specific_options h3 { @@ -2902,12 +2857,7 @@ span.cm-number { -webkit-border-radius: 5px; -moz-border-radius: 5px; - background-image: url(./themes/svg_gradient.php?from=eeeeee&to=cccccc); - background-size: 100% 100%; - background: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#cccccc)); - background: -moz-linear-gradient(top, #eeeeee, #cccccc); - background: -o-linear-gradient(top, #eeeeee, #cccccc); - <?php echo PMA_ieFilter('#eeeeee', '#cccccc'); ?> + <?php echo PMA_css_gradient('eeeeee', 'cccccc'); ?> } .navigation td { @@ -2944,12 +2894,7 @@ span.cm-number { cursor: pointer; text-shadow: none; - background-image: url(./themes/svg_gradient.php?from=333333&to=555555); - background-size: 100% 100%; - background: -webkit-gradient(linear, left top, left bottom, from(#333333), to(#555555)); - background: -moz-linear-gradient(top, #333333, #555555); - background: -o-linear-gradient(top, #333333, #555555); - <?php echo PMA_ieFilter('#333333', '#555555'); ?> + <?php echo PMA_css_gradient('333333', '555555'); ?> } .navigation select { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16717-g5b8bb36
by Michal Čihař 22 Aug '11

22 Aug '11

The branch, master has been updated via 5b8bb36168161fd92cfb63f9dddeab3e10a23bf5 (commit) via 00fab435332475c73126903522217f2ad559af87 (commit) from 98112c58f2a7cec766739ed57e66b5628e1667ae (commit) - Log ----------------------------------------------------------------- commit 5b8bb36168161fd92cfb63f9dddeab3e10a23bf5 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 15:01:54 2011 +0200 Add forgotten file commit 00fab435332475c73126903522217f2ad559af87 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 14:57:12 2011 +0200 Factor out function out of themes ----------------------------------------------------------------------- Summary of changes: libraries/theme.lib.php | 44 +++++++++++++++++++++++++++++++ themes/original/css/theme_right.css.php | 10 +++---- themes/pmahomme/css/theme_right.css.php | 16 +++------- 3 files changed, 53 insertions(+), 17 deletions(-) create mode 100644 libraries/theme.lib.php diff --git a/libraries/theme.lib.php b/libraries/theme.lib.php new file mode 100644 index 0000000..9155a6d --- /dev/null +++ b/libraries/theme.lib.php @@ -0,0 +1,44 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Helper functions for themes. + * + * @package phpMyAdmin + */ + + +/** + * Gradient filter for IE. + */ +function PMA_ieFilter($start_color, $end_color) +{ + return PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8 + ? 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="' . $start_color . '", endColorstr="' . $end_color . '");' + : ''; +} + +/** + * Remove filter for IE. + */ +function PMA_ieClearFilter() { + return PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8 + ? 'filter: none' + : ''; +} + +/** + * Generates code for CSS gradient using various browser extensions. + */ +function PMA_css_Gradied($start_color, $end_color) +{ + $result = array(); + $result[] = 'background-image: url(./themes/svg_gradient.php?from=' . $start_color . '&to=' . $end_color . ');'; + $result[] = 'background-size: 100% 100%;'; + $result[] = 'background: -webkit-gradient(linear, left top, left bottom, from(' . $start_color . '), to(' . $end_color . '));'; + $result[] = 'background: -moz-linear-gradient(top, ' . $start_color . ', ' . $end_color . ');'; + $result[] = 'background: -o-linear-gradient(top, ' . $start_color . ', ' . $end_color . ');'; + $result[] = PMA_ieFilter($start_color, $end_color); + return implode("\n", $result); +} + +?> diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index b6354d8..c69c18e 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -12,12 +12,10 @@ if (!defined('PMA_MINIMUM_COMMON') && !defined('TESTSUITE')) { exit(); } -function PMA_ieFilter($start_color, $end_color) -{ - return PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8 - ? 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="' . $start_color . '", endColorstr="' . $end_color . '");' - : ''; -} +/** + * Theme helpers. + */ +require 'libraries/theme.lib.php'; ?> /******************************************************************************/ /* general tags */ diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index a766855..996f259 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -12,17 +12,11 @@ if (!defined('PMA_MINIMUM_COMMON')) { exit(); } -function PMA_ieFilter($start_color, $end_color) -{ - return PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8 - ? 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="' . $start_color . '", endColorstr="' . $end_color . '");' - : ''; -} -function PMA_ieClearFilter() { - return PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8 - ? 'filter: none' - : ''; -} +/** + * Theme helpers. + */ +require 'libraries/theme.lib.php'; + ?> /******************************************************************************/ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16715-g98112c5
by Michal Čihař 22 Aug '11

22 Aug '11

The branch, master has been updated via 98112c58f2a7cec766739ed57e66b5628e1667ae (commit) from 162da2c1497a9dbfb800c593141fd4499596364c (commit) - Log ----------------------------------------------------------------- commit 98112c58f2a7cec766739ed57e66b5628e1667ae Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 14:53:25 2011 +0200 Fix path to image ----------------------------------------------------------------------- Summary of changes: themes/original/css/theme_right.css.php | 2 +- themes/pmahomme/css/theme_right.css.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 053d3d9..b6354d8 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -2929,7 +2929,7 @@ a.M_butt:hover { } #layer_menu_sizer { - background-image: url(../../images/resize.png); + background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/resize.png); cursor: nw-resize; width: 16px; height: 16px; diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 48ab4ca..a766855 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3373,7 +3373,7 @@ a.M_butt:hover { } #layer_menu_sizer { - background-image: url(../../images/resize.png); + background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/resize.png); cursor: nw-resize; width: 16px; height: 16px; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16714-g162da2c
by Michal Čihař 22 Aug '11

22 Aug '11

The branch, master has been updated via 162da2c1497a9dbfb800c593141fd4499596364c (commit) from 446d947c6e7dbf154523c65d904178757fc897f2 (commit) - Log ----------------------------------------------------------------- commit 162da2c1497a9dbfb800c593141fd4499596364c Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 22 14:50:48 2011 +0200 Drop pmd directory, not used for anything ----------------------------------------------------------------------- Summary of changes: pmd/styles/default/style1.css | 582 ----------------------------------------- 1 files changed, 0 insertions(+), 582 deletions(-) delete mode 100644 pmd/styles/default/style1.css diff --git a/pmd/styles/default/style1.css b/pmd/styles/default/style1.css deleted file mode 100644 index 21ddbce..0000000 --- a/pmd/styles/default/style1.css +++ /dev/null @@ -1,582 +0,0 @@ -/* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * @package phpMyAdmin-Designer - */ -body { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - background-color: #EAEEF0; - color: #000000; - margin: 0; -} - -img { - border: 0; -} - -.input_tab { - background-color: #A6C7E1; - color: #000000; -} - -table { - font-size: 12px; -} - -#canvas { - background-color: #FFFFFF; - color: #000000; -} - -canvas { - display: inline-block; - overflow: hidden; - text-align: left; -} - -canvas * { - behavior: url(#default#VML); -} - -.tab { - background-color: #FFFFFF; - color: #000000; - border-collapse: collapse; - border: 1px solid #AAAAAA; - font-family: Tahoma, sans-serif; - font-size: 10px; - z-index: 1; - -moz-user-select: none; -} - -.tab_zag { - background-image: url(images/Header.png); - background-repeat: repeat-x; - text-align: center; - cursor: move; - padding: 1px; - font-weight: bold; -} - -.tab_zag_2 { - background-image: url(images/Header_Linked.png); - background-repeat: repeat-x; - text-align: center; - cursor: move; - padding: 1px; - font-weight: bold; -} - -.tab_field { - background: #FFFFFF; - color: #000000; - cursor: default; -} - -.tab_field_2 { - background-color: #CCFFCC; - color: #000000; - background-repeat: repeat-x; - cursor: default; -} - -.tab_field_3 { - background-color: #FFE6E6; /*#DDEEFF*/ - color: #000000; - cursor: default; -} - -#hint { - white-space: nowrap; - position: absolute; - background-color: #99FF99; - color: #000000; - left: 200px; - top: 50px; - z-index: 3; - border: #00CC66 solid 1px; - visibility: hidden; -} - -form { - margin: 0; -} - -.scroll_tab { - overflow: auto; - width: 100%; - height: 500px; -} - -.Tabs { - cursor: default; - font-family: Tahoma, sans-serif; - font-size: 10px; - color: #0055bb; - white-space: nowrap; - text-decoration: none; - text-indent: 3px; - font-weight: bold; - margin-left: 2px; - text-align: left; - background-color: #FFFFFF; - background-image: url(images/left_panel_butt.png); - border: #CCCCCC solid 1px; -} - -.Tabs2 { - cursor: default; - font-family: Tahoma, sans-serif; - font-size: 10px; - color: #0055bb; - background: #FFEE99; - text-indent: 3px; - font-weight: bold; - white-space: nowrap; - text-decoration: none; - border: #9999FF solid 1px; - text-align: left; -} - -.owner { - font-family: Tahoma, sans-serif; - font-size: 9px; - font-weight: normal; -/* background-color: #ffffff;*/ - color: #888888; -} - -.option_tab { - padding-left: 2px; - padding-right: 2px; - width: 5px; -} - -.select_all { - vertical-align: top; - padding-left: 2px; - padding-right: 2px; - cursor: default; - width: 1px; - color: #000000; - background-image: url(images/Header.png); - background-repeat: repeat-x; -} - -.small_tab { - vertical-align: top; - background-color: #0064ea; - color: #FFFFFF; - background-image: url(images/small_tab.png); - cursor: default; - text-align: center; - font-weight: bold; - padding-left: 2px; - padding-right: 2px; - width: 1px; - text-decoration: none; -} - -.small_tab2 { - vertical-align: top; - color: #FFFFFF; - background-color: #FF9966; - cursor: default; - padding-left: 2px; - padding-right: 2px; - text-align: center; - font-weight: bold; - width: 1px; - text-decoration: none; -} - -.small_tab_pref { - background-image: url(images/Header.png); - background-repeat: repeat-x; - text-align: center; - width: 1px; -} - -.small_tab_pref2 { - vertical-align: top; - color: #FFFFFF; - background-color: #FF9966; - cursor: default; - text-align: center; - font-weight: bold; - width: 1px; - text-decoration: none; -} - -input, select, textarea { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - border: #6699CC solid 1px; - background-color: #FFFFFF; - color: #000000; -} - -.butt { - border: #4477aa solid 1px; - font-size: 11px; - font-weight: bold; - height: 19px; - width: 70px; - background-color: #FFFFFF; - color: #000000; - vertical-align: baseline; -} - -.L_butt2_1 { - font-size: 12px; - padding: 1px; - text-decoration: none; - background-color: #ffffff; - color: #000000; - vertical-align: middle; - cursor: default; -} - -.L_butt2_2 { - font-size: 12px; - padding: 0; - border: #0099CC solid 1px; - background: #FFEE99; - text-decoration: none; - color: #000000; - cursor: default; -} - -/* ---------------------------------------------------------------------------*/ -.bor { - width: 10px; - height: 10px; -} - -.frams1 { - background: url(images/1.png) no-repeat right bottom; -} - -.frams2 { - background: url(images/2.png) no-repeat left bottom; -} - -.frams3 { - background: url(images/3.png) no-repeat left top; -} - -.frams4 { - background: url(images/4.png) no-repeat right top; -} - -.frams5 { - background: url(images/5.png) repeat-x center bottom; -} - -.frams6 { - background: url(images/6.png) repeat-y left; -} - -.frams7 { - background: url(images/7.png) repeat-x top; -} - -.frams8 { - background: url(images/8.png) repeat-y right; -} - -#osn_tab { - background-color: #FFFFFF; - color: #000000; - border: #A9A9A9 solid 1px; -} - -.header { -/* width: 350px; */ - background-color: #EAEEF0; - color: #000000; - text-align: center; - font-weight: bold; - left: 0; - top: 0; - position: fixed; - margin: 0; - z-index: 1001; - padding: 0; - background-image: url(images/top_panel.png); - background-position: top; - background-repeat: repeat-x; - border-right: #999999 solid 1px; -/* border-bottom:#999999 solid 1px;*/ - border-left: #999999 solid 1px; - height: 28px; -} - -.header a { - display: block; - float: left; - margin: 3px 1px 4px 1px; - height: 20px; - border: 1px dotted #ffffff; -} - -.header .M_bord { - display: block; - float: left; - margin: 4px; - height: 20px; - width: 2px; -} - -.header a.first { - margin-right: 1em; -} - -.header a.last { - margin-left: 1em; -} - -a.M_butt_Selected_down_IE, -a.M_butt_Selected_down { - border: 1px solid #C0C0BB; - background-color: #99FF99; - color: #000000; -} - -a.M_butt_Selected_down_IE:hover, -a.M_butt_Selected_down:hover, -a.M_butt:hover { - border: 1px solid #0099CC; - background-color: #FFEE99; - color: #000000; -} - -#layer_menu { - left: 0; - top: 28px; - width: 150px; - position: fixed; - z-index: 1000; - background-color: #EAEEF0; - border: #999999 solid 1px; -} - -#layer_action { - position: absolute; - left: 638px; - top: 52px; - z-index: 1000; - background-color: #CCFF99; - padding: 3px; - border: #009933 solid 1px; - white-space: nowrap; - font-weight: bold; -} - -#layer_upd_relation { - position: absolute; - left: 637px; - top: 224px; - z-index: 1000; -} - -#layer_new_relation { - position: absolute; - left: 636px; - top: 85px; - z-index: 1000; - width: 153px; -} - -#pmd_optionse { - position: absolute; - left: 636px; - top: 85px; - z-index: 1000; - width: 153px; -} - -#layer_menu_sizer { - background-image: url(../../images/resize.png); - cursor: nw-resize; - width: 16px; - height: 16px; -} - -.panel { -position: fixed; -top: 50px; -right: 0; -display: none; -background: #FFF; -border:1px solid #F5F5F5; -width: 350 px; -height: auto; -padding: 30px 170px 30px 30px; -color:#FFF; -z-index:99; -} - -a.trigger{ -position: fixed; -text-decoration: none; -top: 60px; right: 0; -font-size: 16px; -font-family: verdana, helvetica, arial, sans-serif; -color:#fff; -padding: 10px 40px 10px 15px; -font-weight: 700; -background:#333333 url(images/plus.png) 85% 55% no-repeat; -border:1px solid #444444; -display: block; -} - -a.trigger:hover{ -position: fixed; -text-decoration: none; -top: 60px; right: 0; -font-size: 16px; -font-family: verdana, helvetica, arial, sans-serif; -color:#080808; -padding: 10px 40px 10px 15px; -font-weight: 700; -background:#fff696 url(images/plus.png) 85% 55% no-repeat; -border:1px solid #999; -display: block; -} - -a.active.trigger { -background:#222222 url(images/minus.png) 85% 55% no-repeat; -z-index:999; -} - -a.active.trigger:hover { -background:#fff696 url(images/minus.png) 85% 55% no-repeat; -z-index:999; -} - -h2.tiger{ - background-repeat: repeat-x; - padding: 1px; - font-weight: bold; - font-size:14px; - padding: 50 20 50 20px; - margin: 0 0 5px 0; - width: 250px; - float: left; - color : #333; - text-align: center; -} - -h2.tiger a { - background-image: url(images/Header.png); - text-align: center; - text-decoration: none; - color : #333; - display: block; -} - -h2.tiger a:hover { - color: #000; - background-image: url(images/Header_Linked.png); -} - -h2.active { - background-image: url(images/Header.png); - background-repeat: repeat-x; - padding: 1px; - background-position: left bottom; -} - -.toggle_container { - margin: 0 0 5px; - padding: 0; - border-top: 1px solid #d6d6d6; - background: #FFF ; - width: 250px; - overflow: hidden; - font-size: 1.2em; - clear: both; -} - -.toggle_container .block { - background-color: #DBE4E8; - padding:40 15 40 15px; /*--Padding of Container--*/ - border:1px solid #999; - color:#000; -} - -.history_table { - text-align: center; - background-color: #9999CC; -} - -.history_table2 { - text-align: center; - background-color: #DBE4E8; -} - -#filter { - display: none; - position: absolute; - top: 0%; - left: 0%; - width: 100%; - height: 100%; - background-color: #CCA; - z-index:10; - opacity:0.5; - filter: alpha(opacity=50); -} - -#box { - display: none; - position: absolute; - top: 20%; - left: 30%; - width: 500px; - height: 220px; - padding: 48px; - margin:0; - border: 1px solid black; - background-color: white; - 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; - background-color: #D0DCE0; //#09c; - color:black; - font-weight:bold; - padding-left: 2px; - font-family:"Times New Roman", Times, serif; - font-size:16px; - text-align:left; -} - -#tblfooter { - background-color: D3DCE3; - float: right; - padding-top:10px; - color: black; - font-weight: normal; -} - -input.btn { - color:#333; - font: bold 84%'trebuchet ms',helvetica,sans-serif; - background-color: #D0DCE0; -} - - hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16712-g59eca87
by Michal Čihař 22 Aug '11

22 Aug '11

The branch, master has been updated via 59eca878bc01657d6fe20b4132caf3299cbeaa31 (commit) via b6bee6af8ab7a6eb9b00d62bc7481c5c2db24f57 (commit) via 551f82e53a918996b3beb3a81d4bd9f690f01d52 (commit) via 6c45a95ede267d3cac0e7c7f3e451fe9ebdb28a2 (commit) via 312638ab64a46cf8a8e78e86944f7089610c85b8 (commit) via 81b816c6aaafe483efa54f0f3acac9b03f3063c3 (commit) via 797c7a7745373deac98dce17d73af29b7068c141 (commit) via 5567ed01953b270ff466820d981ec0632d17c06c (commit) from 80a29d3d149680ddf26819014a4494fdc03283f1 (commit) - Log ----------------------------------------------------------------- commit 59eca878bc01657d6fe20b4132caf3299cbeaa31 Merge: b6bee6a 80a29d3 Author: Pootle server <pootle(a)cihar.com> Date: Mon Aug 22 14:40:09 2011 +0200 Merge remote-tracking branch 'origin/master' commit b6bee6af8ab7a6eb9b00d62bc7481c5c2db24f57 Merge: 551f82e 958fcf9 Author: Pootle server <pootle(a)cihar.com> Date: Mon Aug 22 12:40:14 2011 +0200 Merge remote-tracking branch 'origin/master' commit 551f82e53a918996b3beb3a81d4bd9f690f01d52 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Aug 22 12:15:14 2011 +0200 Translation update done using Pootle. commit 6c45a95ede267d3cac0e7c7f3e451fe9ebdb28a2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Aug 22 12:14:04 2011 +0200 Translation update done using Pootle. commit 312638ab64a46cf8a8e78e86944f7089610c85b8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Aug 22 12:12:17 2011 +0200 Translation update done using Pootle. commit 81b816c6aaafe483efa54f0f3acac9b03f3063c3 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Aug 22 12:10:09 2011 +0200 Translation update done using Pootle. commit 797c7a7745373deac98dce17d73af29b7068c141 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Aug 22 12:07:12 2011 +0200 Translation update done using Pootle. commit 5567ed01953b270ff466820d981ec0632d17c06c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Aug 22 12:01:17 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/po/ja.po b/po/ja.po index ef95ace..0fbfd91 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-22 11:43+0200\n" +"PO-Revision-Date: 2011-08-22 12:15+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -8020,10 +8020,9 @@ msgid "Operator" msgstr "演算子" #: libraries/tbl_select.lib.php:143 -#, fuzzy #| msgid "Search" msgid "Table Search" -msgstr "検索" +msgstr "テーブル検索" #: libraries/tbl_select.lib.php:229 tbl_change.php:994 #, fuzzy @@ -11617,32 +11616,28 @@ msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns" msgstr "\"query by example\"を実行 (ワイルドカード: \"%\")" #: tbl_zoom_select.php:151 -#, fuzzy #| msgid "Hide search criteria" msgid "Additional search criteria" -msgstr "検索条件を隠す" +msgstr "更なる検索条件" #: tbl_zoom_select.php:281 -#, fuzzy #| msgid "Label" msgid "Data Label" -msgstr "ラベル" +msgstr "ラベルにするデータ" #: tbl_zoom_select.php:297 -#, fuzzy #| msgid "Maximum number of rows to display" msgid "Maximum rows to plot" -msgstr "行の最大表示数" +msgstr "プロットする結果の最大数" #: tbl_zoom_select.php:388 msgid "Browse/Edit the points" -msgstr "" +msgstr "結果表示／プロット点の編集" #: tbl_zoom_select.php:394 -#, fuzzy #| msgid "Control user" msgid "How to use" -msgstr "phpMyAdmin ユーザ" +msgstr "使い方" #: themes.php:28 msgid "Get more themes!" hooks/post-receive -- phpMyAdmin

1 0