Merge commit 'origin/master' into local

Conflicts: server_status.php
2010-07-29 14:14:26 +03:00
parent aecac3a691 d0fc397fe1
commit b0888714b6
342 changed files with 194811 additions and 179626 deletions
--- a/themes/.gitignore
+++ b/themes/.gitignore
@@ -1,3 +1,27 @@
-*/
-!darkblue_orange/
-!original/
+aqua
+aqua_brushed
+arctic_ocean
+cactica_blues
+clearview3
+crimson_gray
+dark_lime
+darkblue_gray
+garvblue
+graphivore
+green_orange
+grid
+hillside
+openphpnuke
+original_small
+paradice
+pixeline
+silk
+silkline
+smooth_yellow
+very_small
+xampp
+xp_basic
+xp_blue
+xp_dirty
+xp_green
+xp_silver
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -3,7 +3,6 @@
 /**
 * main css file from theme Darkblue Orange
 *
- * @version $Id$
 * @package phpMyAdmin-theme
 * @subpackage Darkblue_orange
 */
@@ -430,6 +429,14 @@ div.success {
    border-color:       #00FF00;
    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
    background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_success.png);
+    background-repeat:  no-repeat;
+        <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
+    background-position: 5px 50%;
+    padding:            0.2em 0.2em 0.2em 25px;
+        <?php } else { ?>
+    background-position: 97% 50%;
+    padding:            0.2em 25px 0.2em 0.2em;
+        <?php } ?>
    <?php } ?>
 }
 .success h1 {
@@ -445,6 +452,14 @@ div.notice {
    border-color:       #FFD700;
    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
    background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
+    background-repeat:  no-repeat;
+        <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
+    background-position: 5px 50%;
+    padding:            0.2em 0.2em 0.2em 25px;
+        <?php } else { ?>
+    background-position: 97% 50%;
+    padding:            0.2em 25px 0.2em 0.2em;
+        <?php } ?>
    <?php } ?>
 }
 .notice h1 {
@@ -461,6 +476,14 @@ div.warning {
    border-color:       #CC0000;
    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
    background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png);
+    background-repeat:  no-repeat;
+        <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
+    background-position: 5px 50%;
+    padding:            0.2em 0.2em 0.2em 25px;
+        <?php } else { ?>
+    background-position: 97% 50%;
+    padding:            0.2em 25px 0.2em 0.2em;
+        <?php } ?>
    <?php } ?>
 }
 .warning h1 {
@@ -477,6 +500,14 @@ div.error {
    border-color:       #ff0000;
    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
    background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
+    background-repeat:  no-repeat;
+        <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
+    background-position: 5px 50%;
+    padding:            0.2em 0.2em 0.2em 25px;
+        <?php } else { ?>
+    background-position: 97% 50%;
+    padding:            0.2em 25px 0.2em 0.2em;
+        <?php } ?>
    <?php } ?>
 }
 div.error h1 {
@@ -652,6 +683,13 @@ a.tabcaution:hover {
    color: #FFFFFF;
    background-color:   #FF0000;
 }
+fieldset.caution a {
+    color:              #FF0000;
+}
+fieldset.caution a:hover {
+    color:              #ffffff;
+    background-color:   #FF0000;
+}

 <?php if ($GLOBALS['cfg']['LightTabs']) { ?>
 /* active tab */
@@ -1178,7 +1216,7 @@ li#li_flush_privileges {
    float: <?php echo $left; ?>;
 }

-#div_table_copy, #div_partition_maintenance, #div_referential_integrity, #div_table_maintenance {
+#div_table_copy, #div_partition_maintenance, #div_referential_integrity, #div_table_removal, #div_table_maintenance {
    min-width: 48%;
    float: <?php echo $left; ?>;
 }
@@ -1202,7 +1240,7 @@ label.desc {
    float: <?php echo $left; ?>;
 }

-code.sql {
+code.sql, div.sqlvalidate {
    display:            block;
    padding:            0.3em;
    margin-top:         0;
--- a/themes/darkblue_orange/info.inc.php
+++ b/themes/darkblue_orange/info.inc.php
@@ -3,7 +3,6 @@
 /**
 * Theme information
 *
- * @version $Id$
 * @package phpMyAdmin-theme
 * @subpackage Darkblue_orange
 */
--- a/themes/darkblue_orange/layout.inc.php
+++ b/themes/darkblue_orange/layout.inc.php
@@ -4,7 +4,6 @@
 * configures general layout
 * for detailed layout configuration please refer to the css files
 *
- * @version $Id$
 * @package phpMyAdmin-theme
 * @subpackage Darkblue_orange
 */
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -3,7 +3,6 @@
 /**
 * navigation css file from theme Original
 *
- * @version $Id$
 * @package phpMyAdmin-theme
 * @subpackage Original
 */
--- a/themes/original/css/theme_print.css.php
+++ b/themes/original/css/theme_print.css.php
@@ -3,7 +3,6 @@
 /**
 * print css file from theme Original
 *
- * @version $Id$
 * @package phpMyAdmin-theme
 * @subpackage Original
 */
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -3,7 +3,6 @@
 /**
 * main css file from theme Original
 *
- * @version $Id$
 * @package phpMyAdmin-theme
 * @subpackage Original
 */
@@ -406,6 +405,14 @@ div.success {
    border-color:       #00FF00;
    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
    background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_success.png);
+    background-repeat:  no-repeat;
+        <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
+    background-position: 5px 50%;
+    padding:            0.2em 0.2em 0.2em 25px;
+        <?php } else { ?>
+    background-position: 97% 50%;
+    padding:            0.2em 25px 0.2em 0.2em;
+        <?php } ?>
    <?php } ?>
 }
 .success h1 {
@@ -421,6 +428,14 @@ div.notice {
    border-color:       #FFD700;
    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
    background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
+    background-repeat:  no-repeat;
+        <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
+    background-position: 5px 50%;
+    padding:            0.2em 0.2em 0.2em 25px;
+        <?php } else { ?>
+    background-position: 97% 50%;
+    padding:            0.2em 25px 0.2em 0.2em;
+        <?php } ?>
    <?php } ?>
 }
 .notice h1 {
@@ -437,6 +452,14 @@ div.warning {
    border-color:       #CC0000;
    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
    background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png);
+    background-repeat:  no-repeat;
+        <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
+    background-position: 5px 50%;
+    padding:            0.2em 0.2em 0.2em 25px;
+        <?php } else { ?>
+    background-position: 97% 50%;
+    padding:            0.2em 25px 0.2em 0.2em;
+        <?php } ?>
    <?php } ?>
 }
 .warning h1 {
@@ -453,6 +476,14 @@ div.error {
    border-color:       #ff0000;
    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
    background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
+    background-repeat:  no-repeat;
+        <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
+    background-position: 5px 50%;
+    padding:            0.2em 0.2em 0.2em 25px;
+        <?php } else { ?>
+    background-position: 97% 50%;
+    padding:            0.2em 25px 0.2em 0.2em;
+        <?php } ?>
    <?php } ?>
 }
 div.error h1 {
@@ -627,6 +658,13 @@ a.tabcaution:hover {
    color: #FFFFFF;
    background-color:   #FF0000;
 }
+fieldset.caution a {
+    color:              #FF0000;
+}
+fieldset.caution a:hover {
+    color:              #ffffff;
+    background-color:   #FF0000;
+}

 <?php if ($GLOBALS['cfg']['LightTabs']) { ?>
 /* active tab */
@@ -1129,6 +1167,7 @@ li#li_flush_privileges {
 #div_table_copy,
 #div_partition_maintenance,
 #div_referential_integrity,
+#div_table_removal,
 #div_table_maintenance {
    min-width: 48%;
    float: <?php echo $left; ?>;
@@ -1153,7 +1192,7 @@ label.desc {
    float: <?php echo $left; ?>;
 }

-code.sql {
+code.sql, div.sqlvalidate {
    display:            block;
    padding:            0.3em;
    margin-top:         0;
--- a/themes/original/info.inc.php
+++ b/themes/original/info.inc.php
@@ -3,7 +3,6 @@
 /**
 * Theme information
 *
- * @version $Id$
 * @package phpMyAdmin-theme
 * @subpackage Original
 */
--- a/themes/original/layout.inc.php
+++ b/themes/original/layout.inc.php
@@ -4,7 +4,6 @@
 * configures general layout
 * for detailed layout configuration please refer to the css files
 *
- * @version $Id$
 * @package phpMyAdmin-theme
 * @subpackage Original
 */