Replace .caution and .success CSS classes

Replaces with .text-danger and .text-success. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Dec 23, 2020 · 2625e0e · 2625e0e
1 parent aa3dc8a
commit 2625e0e
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 135 deletions.
diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php
@@ -239,7 +239,7 @@ public static function getIcon(
     public static function getServerSSL(): string
     {
         $server = $GLOBALS['cfg']['Server'];
-        $class = 'caution';
+        $class = 'text-danger';
         if (! $server['ssl']) {
             $message = __('SSL is not being used');
             if (! empty($server['socket']) || in_array($server['host'], $GLOBALS['cfg']['MysqlSslWarningSafeHosts'])) {

diff --git a/libraries/classes/Query/Utilities.php b/libraries/classes/Query/Utilities.php
@@ -185,7 +185,7 @@ public static function debugLogQueryIntoSession(string $query, ?string $errorMes
 
         if ($result === false && $errorMessage !== null) {
             $dbgInfo['error']
-                = '<span class="color_red">'
+                = '<span class="text-danger">'
                 . htmlspecialchars($errorMessage) . '</span>';
         }
         $dbgInfo['query'] = htmlspecialchars($query);

diff --git a/libraries/classes/Relation.php b/libraries/classes/Relation.php
@@ -138,16 +138,16 @@ public function getRelationsParamDiagnostic(array $cfgRelation)
         $retval = '<br>';
 
         $messages = [];
-        $messages['error'] = '<span class="caution"><strong>'
+        $messages['error'] = '<span class="text-danger"><strong>'
             . __('not OK')
             . '</strong></span>';
 
-        $messages['ok'] = '<span class="success"><strong>'
+        $messages['ok'] = '<span class="text-success"><strong>'
             . _pgettext('Correctly working', 'OK')
             . '</strong></span>';
 
-        $messages['enabled']  = '<span class="success">' . __('Enabled') . '</span>';
-        $messages['disabled'] = '<span class="caution">' . __('Disabled') . '</span>';
+        $messages['enabled']  = '<span class="text-success">' . __('Enabled') . '</span>';
+        $messages['disabled'] = '<span class="text-danger">' . __('Disabled') . '</span>';
 
         if (strlen((string) $cfgRelation['db']) == 0) {
             $retval .= __('Configuration of pmadb…') . ' '

diff --git a/test/classes/Html/GeneratorTest.php b/test/classes/Html/GeneratorTest.php
@@ -295,7 +295,7 @@ public function testGetServerSSL(): void
         . ' target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation"'
         . ' class="icon ic_b_help"></a>';
 
-        $sslNotUsedCaution = '<span class="caution">SSL is not being used</span>'
+        $sslNotUsedCaution = '<span class="text-danger">SSL is not being used</span>'
         . ' <a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fsetup.html%23ssl"'
         . ' target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation"'
         . ' class="icon ic_b_help"></a>';
@@ -349,7 +349,7 @@ public function testGetServerSSL(): void
         ];
 
         $this->assertEquals(
-            '<span class="caution">SSL is used with disabled verification</span>'
+            '<span class="text-danger">SSL is used with disabled verification</span>'
             . ' <a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fsetup.html%23ssl"'
             . ' target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation"'
             . ' class="icon ic_b_help"></a>',
@@ -363,7 +363,7 @@ public function testGetServerSSL(): void
         ];
 
         $this->assertEquals(
-            '<span class="caution">SSL is used without certification authority</span>'
+            '<span class="text-danger">SSL is used without certification authority</span>'
             . ' <a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fsetup.html%23ssl"'
             . ' target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation"'
             . ' class="icon ic_b_help"></a>',

diff --git a/test/classes/RelationTest.php b/test/classes/RelationTest.php
@@ -105,34 +105,34 @@ public function testPMAGetRelationsParam(): void
 
         //$cfg['Servers'][$i]['relation']
         $result = "\$cfg['Servers'][\$i]['pmadb']  ... </th><td class=\"text-end\">"
-            . '<span class="success"><strong>OK</strong></span>';
+            . '<span class="text-success"><strong>OK</strong></span>';
         $this->assertStringContainsString(
             $result,
             $retval
         );
         // $cfg['Servers'][$i]['relation']
         $result = "\$cfg['Servers'][\$i]['relation']  ... </th><td class=\"text-end\">"
-            . '<span class="caution"><strong>not OK</strong></span>';
+            . '<span class="text-danger"><strong>not OK</strong></span>';
         $this->assertStringContainsString(
             $result,
             $retval
         );
         // General relation features
-        $result = 'General relation features: <span class="caution">Disabled</span>';
+        $result = 'General relation features: <span class="text-danger">Disabled</span>';
         $this->assertStringContainsString(
             $result,
             $retval
         );
         // $cfg['Servers'][$i]['table_info']
         $result = "\$cfg['Servers'][\$i]['table_info']  ... </th>"
             . '<td class="text-end">'
-            . '<span class="caution"><strong>not OK</strong></span>';
+            . '<span class="text-danger"><strong>not OK</strong></span>';
         $this->assertStringContainsString(
             $result,
             $retval
         );
         // Display Features:
-        $result = 'Display Features: <span class="caution">Disabled</span>';
+        $result = 'Display Features: <span class="text-danger">Disabled</span>';
         $this->assertStringContainsString(
             $result,
             $retval

diff --git a/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss
@@ -814,10 +814,6 @@ label.col-3.d-flex.align-items-center {
   max-height: 400px;
 }
 
-.color_red {
-  color: red;
-}
-
 .pma_sliding_message {
   display: inline-block;
 }
@@ -833,25 +829,6 @@ ul.tabs {
   padding: 0;
 }
 
-span {
-  &.caution {
-    color: #f00;
-  }
-
-  &.success {
-    color: green;
-  }
-}
-
-fieldset.caution a {
-  color: #f00;
-
-  &:hover {
-    color: #fff;
-    background-color: #f00;
-  }
-}
-
 // zoom search
 div#dataDisplay {
   input,

diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss
@@ -862,65 +862,13 @@ td.disabled {
   font-weight: bold;
 }
 
-.color_red {
-  color: red;
-}
-
 /* specific elements */
 
 ul.tabs {
   list-style-type: none;
   margin: 0;
 }
 
-span {
-  &.caution {
-    color: #f00;
-  }
-
-  &.success {
-    color: green;
-  }
-}
-
-fieldset.caution {
-  background: $browse-warning-color;
-  border: 1px solid $browse-warning-color;
-
-  legend {
-    background-color: #fff;
-  }
-
-  a {
-    font-family: $font-family-bold;
-    text-transform: uppercase;
-    color: $button-color;
-    font-weight: normal;
-  }
-
-  ul {
-    padding: 0;
-  }
-}
-
-fieldset.caution li {
-  display: block;
-}
-
-fieldset.caution li {
-  &::before {
-    /* stylelint-disable-next-line font-family-no-missing-generic-family-keyword */
-    font-family: "IcoMoon";
-    content: "";
-    color: $button-color;
-    margin-right: 10px;
-  }
-
-  a:nth-child(2) img {
-    background: url('../img/s_info.png') !important;
-  }
-}
-
 /* zoom search */
 div#dataDisplay {
   input,

diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss
@@ -655,10 +655,6 @@ form.login label {
   max-height: 400px;
 }
 
-.color_red {
-  color: red;
-}
-
 .pma_sliding_message {
   display: inline-block;
 }
@@ -676,25 +672,6 @@ ul.tabs {
   padding: 0;
 }
 
-span {
-  &.caution {
-    color: #f00;
-  }
-
-  &.success {
-    color: green;
-  }
-}
-
-fieldset.caution a {
-  color: #f00;
-
-  &:hover {
-    color: #fff;
-    background-color: #f00;
-  }
-}
-
 /* zoom search */
 div#dataDisplay {
   input,

diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss
@@ -883,10 +883,6 @@ label.col-3.d-flex.align-items-center {
   max-height: 400px;
 }
 
-.color_red {
-  color: red;
-}
-
 .pma_sliding_message {
   display: inline-block;
 }
@@ -909,25 +905,6 @@ ul.tabs {
   background: #fff !important;
 }
 
-span {
-  &.caution {
-    color: #f00;
-  }
-
-  &.success {
-    color: green;
-  }
-}
-
-fieldset.caution a {
-  color: #f00;
-
-  &:hover {
-    color: #fff;
-    background-color: #f00;
-  }
-}
-
 // zoom search
 div#dataDisplay {
   input,