Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

This commit is contained in:
lorilee
2010-07-28 15:03:28 -07:00
76 changed files with 8902 additions and 7286 deletions

View File

@@ -430,6 +430,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 +453,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 +477,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 +501,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 +684,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 +1217,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; ?>;
}

View File

@@ -406,6 +406,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 +429,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 +453,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 +477,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 +659,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 +1168,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; ?>;