Drop $cfg['ErrorIconic']

2 files changed, 2 insertions, 28 deletions

diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index d7c4d382e9..e83d33bd75 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -460,7 +460,6 @@ div.error,
 div.footnotes {
     margin:             0.3em 0 0 0;
     border:             2px solid;
-    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
     background-repeat:  no-repeat;
         <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
     background-position: 10px 50%;
@@ -469,9 +468,6 @@ div.footnotes {
     background-position: 99% 50%;
     padding:            0.1em 46px 0.1em 0.1em;
         <?php } ?>
-    <?php } else { ?>
-    padding:            0.3em;
-    <?php } ?>
 }
 
 .success {
@@ -481,7 +477,6 @@ div.footnotes {
 h1.success,
 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') { ?>
@@ -491,7 +486,6 @@ div.success {
     background-position: 99% 50%;
     padding:            0.2em 35px 0.2em 0.2em;
         <?php } ?>
-    <?php } ?>
 }
 .success h1 {
     border-color:       #00FF00;
@@ -505,7 +499,6 @@ h1.notice,
 div.notice,
 div.footnotes {
     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') { ?>
@@ -515,7 +508,6 @@ div.footnotes {
     background-position: 99% 50%;
     padding:            0.2em 35px 0.2em 0.2em;
         <?php } ?>
-    <?php } ?>
 }
 .notice h1 {
     border-color:       #FFD700;
@@ -529,7 +521,6 @@ div.footnotes {
 h1.error,
 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') { ?>
@@ -539,7 +530,6 @@ div.error {
     background-position: 99% 50%;
     padding:            0.2em 35px 0.2em 0.2em;
         <?php } ?>
-    <?php } ?>
 }
 div.error h1 {
     border-color:       #ff0000;
@@ -555,7 +545,6 @@ fieldset.confirmation legend {
     border-left:        0.1em solid #FF0000;
     border-right:       0.1em solid #FF0000;
     font-weight:        bold;
-    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
     background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_really.png);
     background-repeat:  no-repeat;
         <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
@@ -565,7 +554,6 @@ fieldset.confirmation legend {
     background-position: 97% 50%;
     padding:            0.2em 25px 0.2em 0.2em;
         <?php } ?>
-    <?php } ?>
 }
 /* end messageboxes */
 
@@ -3112,7 +3100,7 @@ h2.active {
     color: black;
     font-weight: normal;
 }
- 
+
 #foreignkeychk {
     align:left;
     position:absolute;
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 604c4faef5..d32fbc3e89 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -684,7 +684,6 @@ div.error,
 div.footnotes {
     margin: .5em 0 1.3em 0;
     border: 1px solid;
-    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
     background-repeat: no-repeat;
         <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
     background-position: 10px 50%;
@@ -693,9 +692,6 @@ div.footnotes {
     background-position: 99% 50%;
     padding: 10px 35px 10px 10px;
         <?php } ?>
-    <?php } else { ?>
-    padding: .3em;
-    <?php } ?>
 
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
@@ -721,7 +717,6 @@ div.footnotes {
 h1.success,
 div.success {
     border-color: #a2d246;
-    <?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') { ?>
@@ -729,7 +724,6 @@ div.success {
         <?php } else { ?>
     background-position: 99% 50%;
         <?php } ?>
-    <?php } ?>
 }
 .success h1 {
     border-color: #00FF00;
@@ -745,7 +739,6 @@ h1.notice,
 div.notice,
 div.footnotes {
     border-color: #3a6c7e;
-    <?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') { ?>
@@ -753,7 +746,6 @@ div.footnotes {
         <?php } else { ?>
     background-position: 99% 50%;
         <?php } ?>
-    <?php } ?>
 }
 
 .notice h1 {
@@ -769,7 +761,6 @@ div.footnotes {
 h1.error,
 div.error {
     border-color: #333;
-    <?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') { ?>
@@ -777,7 +768,6 @@ div.error {
         <?php } else { ?>
     background-position: 99% 50%;
         <?php } ?>
-    <?php } ?>
 }
 
 div.error h1 {
@@ -1485,7 +1475,6 @@ table#serverVariables td {
 p.notice {
     margin: 1.5em 0;
     border: 1px solid #000;
-    <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
     background-repeat: no-repeat;
         <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
     background-position: 10px 50%;
@@ -1494,9 +1483,6 @@ p.notice {
     background-position: 99% 50%;
     padding: 25px 10px 10px 10px
         <?php } ?>
-    <?php } else { ?>
-    padding: .3em;
-    <?php } ?>
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
     border-radius: 5px;
@@ -3648,7 +3634,7 @@ h2.active {
     color: black;
     font-weight: normal;
 }
- 
+
 #foreignkeychk {
     align:left;
     position:absolute;