Merge branch 'QA_4_8'

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Sep 26, 2018 · a81b5a2 · a81b5a2
2 parents 9b54078 + b4503e3
commit a81b5a2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/libraries/classes/Server/Status/Processes.php b/libraries/classes/Server/Status/Processes.php
@@ -180,9 +180,11 @@ public static function getHtmlForServerProcesslist()
             if (0 === --$sortableColCount) {
                 $retval .= '<a href="' . $full_text_link . '">';
                 if ($show_full_sql) {
-                    $retval .= Util::getImage('s_partialtext', __('Truncate Shown Queries'));
+                    $retval .= Util::getImage('s_partialtext',
+                        __('Truncate Shown Queries'), ['class' => 'icon_fulltext']);
                 } else {
-                    $retval .= Util::getImage('s_fulltext', __('Show Full Queries'));
+                    $retval .= Util::getImage('s_fulltext',
+                        __('Show Full Queries'), ['class' => 'icon_fulltext']);
                 }
                 $retval .= '</a>';
             }

diff --git a/themes/pmahomme/css/icons.css.php b/themes/pmahomme/css/icons.css.php
@@ -22,6 +22,10 @@
     width: 16px;
     height: 16px;
 }
+.icon_fulltext {
+    width: 50px;
+    height: 19px;
+}
 .ic_asc_order { background-image: url('<?= $theme->getImgPath('asc_order.png'); ?>'); }
 .ic_b_bookmark { background-image: url('<?= $theme->getImgPath('b_bookmark.png'); ?>'); }
 .ic_b_browse { background-image: url('<?= $theme->getImgPath('b_browse.png'); ?>'); }
@@ -185,3 +189,5 @@
 .ic_show { background-image: url('<?= $theme->getImgPath('show.png'); ?>'); }
 .ic_window-new { background-image: url('<?= $theme->getImgPath('window-new.png'); ?>'); }
 .ic_ajax_clock_small { background-image: url('<?= $theme->getImgPath('ajax_clock_small.gif'); ?>'); }
+.ic_s_partialtext { background-image: url('<?= $theme->getImgPath('s_partialtext.png'); ?>'); }
+.ic_s_fulltext { background-image: url('<?= $theme->getImgPath('s_fulltext.png'); ?>'); }