PMA Icons to sprites part 1

db_operations.php

@@ -398,8 +398,7 @@ if ($db != 'mysql') {
         <legend>
     <?php
     if ($cfg['PropertiesIconic']) {
-        echo '<img class="icon" src="' . $pmaThemeImage . 'b_edit.png"'
-            .' alt="" width="16" height="16" />';
+        echo '<img class="icon ic_b_edit" src="themes/dot.gif" alt="" />';
     }
     echo __('Rename database to') . ':';
     ?>
@@ -434,8 +433,7 @@ if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) && ! $db_is_info
 <fieldset class="caution">
  <legend><?php
 if ($cfg['PropertiesIconic']) {
-    echo '<img class="icon" src="' . $pmaThemeImage . 'b_deltbl.png"'
-        .' alt="" width="16" height="16" />';
+    echo '<img class="icon ic-b_deltbl" src="themes/dot.gif" alt="" />';
 }
 echo __('Remove database');
 ?></legend>
@@ -481,8 +479,7 @@ echo __('Remove database');
         <legend>
     <?php
     if ($cfg['PropertiesIconic']) {
-        echo '<img class="icon" src="' . $pmaThemeImage . 'b_edit.png"'
-            .' alt="" width="16" height="16" />';
+        echo '<img class="icon ic-b_edit" src="themes/dot.gif" alt="" />';
     }
     echo __('Copy database to') . ':';
     $drop_clause = 'DROP TABLE / DROP VIEW';
@@ -546,8 +543,7 @@ echo __('Remove database');
        . '<fieldset>' . "\n"
        . '    <legend>';
     if ($cfg['PropertiesIconic']) {
-        echo '<img class="icon" src="' . $pmaThemeImage . 's_asci.png"'
-            .' alt="" width="16" height="16" />';
+        echo '<img class="icon ic_s_asci" src="themes/dot.gif" alt="" />';
     }
     echo '    <label for="select_db_collation">' . __('Collation') . ':</label>' . "\n"
        . '    </legend>' . "\n"
@@ -594,8 +590,7 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { ?>
      */
     echo '<div class="operations_full_width"><fieldset><a href="schema_edit.php?' . $url_query . '">';
     if ($cfg['PropertiesIconic']) {
-        echo '<img class="icon" src="' . $pmaThemeImage . 'b_edit.png"'
-            .' alt="" width="16" height="16" />';
+        echo '<img class="icon ic_b_edit" src="themes/dot.gif" alt="" />';
     }
     echo __('Edit or export relational schema') . '</a></fieldset></div>';
 } // end if

db_structure.php

@@ -283,9 +283,9 @@ foreach ($tables as $keyname => $each_table) {
     $tracking_icon = '';
     if (PMA_Tracker::isActive()) {
         if (PMA_Tracker::isTracked($GLOBALS["db"], $truename)) {
-            $tracking_icon = '<a href="tbl_tracking.php?' . $url_query.'&amp;table=' . $truename . '"><img class="icon" width="14" height="14" src="' . $pmaThemeImage . 'eye.png" alt="' . __('Tracking is active.') . '" title="' . __('Tracking is active.') . '" /></a>';
+            $tracking_icon = '<a href="tbl_tracking.php?' . $url_query.'&amp;table=' . $truename . '"><img class="icon ic_eye" src="themes/dot.gif" alt="' . __('Tracking is active.') . '" title="' . __('Tracking is active.') . '" /></a>';
         } elseif (PMA_Tracker::getVersion($GLOBALS["db"], $truename) > 0) {
-            $tracking_icon = '<a href="tbl_tracking.php?' . $url_query . '&amp;table=' . $truename . '"><img class="icon" width="14" height="14" src="' . $pmaThemeImage . 'eye_grey.png" alt="' . __('Tracking is not active.') . '" title="' . __('Tracking is not active.') . '" /></a>';
+            $tracking_icon = '<a href="tbl_tracking.php?' . $url_query . '&amp;table=' . $truename . '"><img class="icon ic_eye" src="themes/dot.gif" alt="' . __('Tracking is not active.') . '" title="' . __('Tracking is not active.') . '" /></a>';
         }
     }
 
@@ -340,7 +340,7 @@ foreach ($tables as $keyname => $each_table) {
     <th><?php echo $browse_table_label; ?>
         <?php echo (! empty($tracking_icon) ? $tracking_icon : ''); ?>
     </th>
-   <?php if ($server_slave_status) { ?><td align="center"><?php echo $ignored ? ' <img class="icon" src="' . $pmaThemeImage . 's_cancel.png" width="16" height="16"  alt="NOT REPLICATED" />' : ''. $do ? ' <img class="icon" src="' . $pmaThemeImage . 's_success.png" width="16" height="16"  alt="REPLICATED" />' : ''; ?></td><?php } ?>
+   <?php if ($server_slave_status) { ?><td align="center"><?php echo $ignored ? ' <img class="icon ic_s_cancel" src="themes/dot.gif" alt="NOT REPLICATED" />' : ''. $do ? ' <img class="icon ic_s_success" src="themes/dot.gif" alt="REPLICATED" />' : ''; ?></td><?php } ?>
     <td align="center"><?php echo $browse_table; ?></td>
     <td align="center">
         <a href="tbl_structure.php?<?php echo $tbl_url_query; ?>">
@@ -547,15 +547,13 @@ PMA_listNavigator($total_num_tables, $pos, $_url_params, 'db_structure.php', 'fr
 echo '<p>';
 echo '<a href="db_printview.php?' . $url_query . '">';
 if ($cfg['PropertiesIconic']) {
-     echo '<img class="icon" src="' . $pmaThemeImage
-        .'b_print.png" width="16" height="16" alt="" />';
+     echo '<img class="icon ic_b_print" src="themes/dot.gif" alt="" />';
 }
 echo __('Print view') . '</a> ';
 
 echo '<a href="./db_datadict.php?' . $url_query . '">';
 if ($cfg['PropertiesIconic']) {
-    echo '<img class="icon" src="' . $pmaThemeImage
-        .'b_tblanalyse.png" width="16" height="16" alt="" />';
+    echo '<img class="icon ic_b_tblanalyse" src="themes/dot.gif" alt="" />';
 }
 echo __('Data Dictionary') . '</a>';
 echo '</p>';

db_tracking.php

@@ -98,7 +98,7 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) {
 
     $drop_image_or_text = '';
     if (true == $GLOBALS['cfg']['PropertiesIconic']) {
-        $drop_image_or_text .= '<img class="icon" width="16" height="16" src="' . $pmaThemeImage . 'b_drop.png" alt="' . __('Delete tracking data for this table') . '" title="' . __('Delete tracking data for this table') . '" />';
+        $drop_image_or_text .= '<img class="icon ic_b_drop" src="themes/dot.gif" alt="' . __('Delete tracking data for this table') . '" title="' . __('Delete tracking data for this table') . '" />';
     }
     if ('both' === $GLOBALS['cfg']['PropertiesIconic'] || false === $GLOBALS['cfg']['PropertiesIconic']) {
         $drop_image_or_text .= __('Drop');
@@ -198,7 +198,7 @@ if (isset($my_tables)) {
             $my_link = '<a href="tbl_tracking.php?' . $url_query . '&amp;table=' . htmlspecialchars($tablename) .'">';
 
             if ($cfg['PropertiesIconic']) {
-                $my_link .= '<img class="icon" src="' . $pmaThemeImage . 'eye.png" width="16" height="16" alt="' . __('Track table') . '" /> ';
+                $my_link .= '<img class="icon ic_eye" src="themes/dot.gif" alt="' . __('Track table') . '" /> ';
             }
             $my_link .= __('Track table') . '</a>';
         ?>

js/functions.js

@@ -135,14 +135,13 @@ function displayPasswordGenerateButton() {
  *
  * @param   object  $this_element   a jQuery object pointing to the element
  */
-function PMA_addDatepicker($this_element) {
+function PMA_addDatepicker($this_element, options) {
     var showTimeOption = false;
     if ($this_element.is('.datetimefield')) {
         showTimeOption = true;
     }
-
-    $this_element
-        .datepicker({
+	
+	var defaultOptions = {
         showOn: 'button',
         buttonImage: themeCalendarImage, // defined in js/messages.php
         buttonImageOnly: true,
@@ -159,7 +158,9 @@ function PMA_addDatepicker($this_element) {
             $this_element.data('comes_from', 'datepicker');
         },
         constrainInput: false
-     });
+	};
+
+    $this_element.datepicker($.extend(defaultOptions, options));
 }
 
 /**

js/server_status.js

@@ -942,9 +942,9 @@ $(function() {
     $('a[href="#pauseCharts"]').click(function() {
         runtime.redrawCharts = ! runtime.redrawCharts;
         if(! runtime.redrawCharts)
-            $(this).html('<img src="' + pmaThemeImage + 'play.png" alt="" /> ' + PMA_messages['strResumeMonitor']);
+            $(this).html('<img src="themes/dot.gif" class="icon ic_play" alt="" /> ' + PMA_messages['strResumeMonitor']);
         else {
-            $(this).html('<img src="' + pmaThemeImage + 'pause.png" alt="" /> ' + PMA_messages['strPauseMonitor']);
+            $(this).html('<img src="themes/dot.gif" class="icon ic_play" alt="" /> ' + PMA_messages['strPauseMonitor']);
             if(runtime.charts == null) {
                 initGrid();
                 $('a[href="#settingsPopup"]').show();
@@ -968,7 +968,7 @@ $(function() {
             $.get('server_status.php?' + url_query, vars,
                 function(data) {
                     var logVars = $.parseJSON(data),
-                        icon = 's_success.png', msg='', str='';
+                        icon = 'ic_s_success', msg='', str='';
                     
                     if(logVars['general_log'] == 'ON') {
                         if(logVars['slow_query_log'] == 'ON') 
@@ -982,26 +982,26 @@ $(function() {
                     }
                     
                     if(msg.length == 0) {
-                        icon = 's_error.png';
+                        icon = 'ic_s_success';
                         msg = PMA_messages['strBothLogOff'];
                     }
                     
                     str = '<b>' + PMA_messages['strCurrentSettings'] + '</b><br><div class="smallIndent">';
-                    str += '<img src="' + pmaThemeImage + icon + '" alt=""/> ' + msg + '<br />';
+                    str += '<img src="themes/dot.gif" class="icon ' + icon + '" alt=""/> ' + msg + '<br />';
                     
                     if(logVars['log_output'] != 'TABLE')
-                        str += '<img src="' + pmaThemeImage + 's_error.png" alt=""/> ' + PMA_messages['strLogOutNotTable'] + '<br />';
+                        str += '<img src="themes/dot.gif" class="icon ic_s_error" alt=""/> ' + PMA_messages['strLogOutNotTable'] + '<br />';
                     else 
-                        str += '<img src="' + pmaThemeImage + 's_success.png" alt=""/> ' + PMA_messages['strLogOutIsTable'] + '<br />';
+                        str += '<img src="themes/dot.gif" class="icon ic_s_success" alt=""/> ' + PMA_messages['strLogOutIsTable'] + '<br />';
                     
                     if(logVars['slow_query_log'] == 'ON') {
                         if(logVars['long_query_time'] > 2)
-                            str += '<img src="' + pmaThemeImage + 's_attention.png" alt=""/> '
+                            str += '<img src="themes/dot.gif" class="icon ic_s_attention" alt=""/> '
                                 + $.sprintf(PMA_messages['strSmallerLongQueryTimeAdvice'], logVars['long_query_time'])
                                 + '<br />';
                         
                         if(logVars['long_query_time'] < 2)
-                            str += '<img src="' + pmaThemeImage + 's_success.png" alt=""/> '
+                            str += '<img src="themes/dot.gif" class="icon ic_s_success" alt=""/> '
                                 + $.sprintf(PMA_messages['strLongQueryTimeSet'], logVars['long_query_time'])
                                 + '<br />';
                     }
@@ -1261,27 +1261,47 @@ $(function() {
                         
                         $('#logAnalyseDialog').html(
                             '<p>' + PMA_messages['strSelectedTimeRange']
-                            + Highcharts.dateFormat('%H:%M:%S',new Date(min)) + ' - ' 
-                            + Highcharts.dateFormat('%H:%M:%S',new Date(max)) + '</p>'
+                            + '<input type="text" name="dateStart" class="datetimefield" value="' + Highcharts.dateFormat('%Y-%m-%d %H:%M:%S',new Date(min)) + '" /> - ' 
+                            + '<input type="text" name="dateEnd" class="datetimefield" value="' + Highcharts.dateFormat('%Y-%m-%d %H:%M:%S',new Date(max)) + '" /></p>'
                             + '<input type="checkbox" id="groupInserts" value="1" checked="checked" />'
                             + '<label for="groupData">' + PMA_messages['strGroupInserts'] + '</label>'
                             + PMA_messages['strLogAnalyseInfo']
                         );
                         
+                        PMA_addDatepicker($('#logAnalyseDialog').find('input[name="dateStart"],input[name="dateEnd"]'), { 
+                            showOn: 'focus',
+                            beforeShow: function() {
+                                // Fix wrong timepicker z-index, doesn't work without timeout
+                                setTimeout(function() {
+                                    $('#ui-timepicker-div').css('z-index',$('#ui-datepicker-div').css('z-index')) 
+                                },0);
+                            }
+                        });
+                        
                         var dlgBtns = { };
                         
                         dlgBtns[PMA_messages['strFromSlowLog']] = function() {
+                            var dateStart = Date.parse($('#logAnalyseDialog input[name="dateStart"]').attr('value')) || min;
+                            var dateEnd = Date.parse($('#logAnalyseDialog input[name="dateEnd"]').attr('value')) || max;
+                            
                             loadLogStatistics(
-                                { src: 'slow', start: min, end: max, groupInserts: $('input#groupInserts').attr('checked') } 
+                                { src: 'slow', start: dateStart, end: dateEnd, groupInserts: $('input#groupInserts').attr('checked') } 
                             );
+                                
+                            $('#logAnalyseDialog').find('dateStart,dateEnd').datepicker('destroy');
                             
                             $(this).dialog("close");
                         }
                         
                         dlgBtns[PMA_messages['strFromGeneralLog']] = function() {
+                            var dateStart = Date.parse($('#logAnalyseDialog input[name="dateStart"]').attr('value')) || min;
+                            var dateEnd = Date.parse($('#logAnalyseDialog input[name="dateEnd"]').attr('value')) || max;
+                            
                             loadLogStatistics(
-                                { src: 'general', start: min, end: max, groupInserts: $('input#groupInserts').attr('checked') }
+                                { src: 'general', start: dateStart, end: dateEnd, groupInserts: $('input#groupInserts').attr('checked') }
                             );
+                                
+                            $('#logAnalyseDialog').find('dateStart,dateEnd').datepicker('destroy');
                             
                             $(this).dialog("close");
                         }
@@ -1515,7 +1535,7 @@ $(function() {
                     
                     // Append a tooltip to the count column, if there exist one
                     if($('#logTable th:last').html() == '#') {
-                        $('#logTable th:last').append('&nbsp;<img class="qroupedQueryInfoIcon" src="' + pmaThemeImage + 'b_docs.png" alt="" />');
+                        $('#logTable th:last').append('&nbsp;<img class="qroupedQueryInfoIcon icon ic_b_docs" src="themes/dot.gif" alt="" />');
                     
                         var qtipContent = PMA_messages['strCountColumnExplanation'];
                         if(groupInserts) qtipContent += '<p>' + PMA_messages['strMoreCountColumnExplanation'] + '</p>';

libraries/auth/cookie.auth.lib.php

@@ -198,7 +198,7 @@ if (top != self) {
     echo '<a href="./Documentation.html" target="documentation" ' .
         'title="' . __('phpMyAdmin documentation') . '">';
     if ($GLOBALS['cfg']['ReplaceHelpImg']) {
-        echo '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . __('phpMyAdmin documentation') . '" />';
+        echo '<img class="icon ic_b_help_s" src="themes/dot.gif" alt="' . __('phpMyAdmin documentation') . '" />';
     } else {
         echo '(*)';
     }

libraries/common.lib.php

@@ -97,9 +97,9 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f
     $button .= '<span class="nowrap">';
 
     if ($include_icon) {
-        $button .= '<img src="' . $GLOBALS['pmaThemeImage'] . $icon . '"'
+        $button .= '<img src="themes/dot.gif"'
             . ' title="' . $alternate . '" alt="' . $alternate . '"'
-            . ' class="icon" width="16" height="16" />';
+            . ' class="icon ic_' . str_replace('.png','',$icon) . '" />';
     }
 
     if ($include_icon && $include_text) {
@@ -393,9 +393,9 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju
     if ($just_open) {
         return '<a href="' . PMA_linkURL($url) . '" target="mysql_doc">';
     } elseif ($big_icon) {
-        return '<a href="' . PMA_linkURL($url) . '" target="mysql_doc"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_sqlhelp.png" width="16" height="16" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
+        return '<a href="' . PMA_linkURL($url) . '" target="mysql_doc"><img class="icon ic_b_sqlhelp" src="themes/dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
     } elseif ($GLOBALS['cfg']['ReplaceHelpImg']) {
-        return '<a href="' . PMA_linkURL($url) . '" target="mysql_doc"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
+        return '<a href="' . PMA_linkURL($url) . '" target="mysql_doc"><img class="icon ic_b_help_s" src="themes/dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
     } else {
         return '[<a href="' . PMA_linkURL($url) . '" target="mysql_doc">' . __('Documentation') . '</a>]';
     }
@@ -412,7 +412,7 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju
  */
 function PMA_showDocu($anchor) {
     if ($GLOBALS['cfg']['ReplaceHelpImg']) {
-        return '<a href="Documentation.html#' . $anchor . '" target="documentation"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
+        return '<a href="Documentation.html#' . $anchor . '" target="documentation"><img class="icon ic_b_help_s" src="themes/dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
     } else {
         return '[<a href="Documentation.html#' . $anchor . '" target="documentation">' . __('Documentation') . '</a>]';
     }
@@ -430,7 +430,7 @@ function PMA_showPHPDocu($target) {
     $url = PMA_getPHPDocLink($target);
 
     if ($GLOBALS['cfg']['ReplaceHelpImg']) {
-        return '<a href="' . $url . '" target="documentation"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
+        return '<a href="' . $url . '" target="documentation"><img class="icon ic_b_help_s" src="themes/dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
     } else {
         return '[<a href="' . $url . '" target="documentation">' . __('Documentation') . '</a>]';
     }
@@ -479,8 +479,7 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice')
 
     // footnotemarker used in js/tooltip.js
     return '<sup class="footnotemarker">' . $nr . '</sup>' .
-    '<img class="footnotemarker" id="footnote_' . $nr . '_' . $instance . '" src="' .
-    $GLOBALS['pmaThemeImage'] . 'b_help.png" alt="" />';
+    '<img class="footnotemarker ic_b_help" id="footnote_' . $nr . '_' . $instance . '" src="themes/dot.gif" alt="" />';
 }
 
 /**
@@ -1581,8 +1580,8 @@ function PMA_generate_html_tab($tab, $url_params = array())
         // avoid generating an alt tag, because it only illustrates
         // the text that follows and if browser does not display
         // images, the text is duplicated
-        $image = '<img class="icon" src="' . htmlentities($GLOBALS['pmaThemeImage'])
-            .'%1$s" width="16" height="16" alt="" />%2$s';
+        $image = '<img class="icon %1$s" src="themes/dot.gif"'
+            .' width="16" height="16" alt="" />%2$s';
         $tab['text'] = sprintf($image, htmlentities($tab['icon']), $tab['text']);
     }
     // check to not display an empty link-text

libraries/config/FormDisplay.tpl.php

@@ -159,8 +159,8 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
         <label for="<?php echo htmlspecialchars($path) ?>"><?php echo $name ?></label>
         <?php if (!empty($opts['doc']) || !empty($opts['wiki'])) { ?>
         <span class="doc">
-            <?php if (!empty($opts['doc'])) { ?><a href="<?php echo $base_dir . $opts['doc']  ?>" target="documentation"><img class="icon" src="<?php echo $img_path ?>b_help.png" width="11" height="11" alt="Doc" title="<?php echo __('Documentation') ?>" /></a><?php } ?>
-            <?php if (!empty($opts['wiki'])){ ?><a href="<?php echo $opts['wiki'] ?>" target="wiki"><img class="icon" src="<?php echo $img_path ?>b_info.png" width="11" height="11" alt="Wiki" title="Wiki" /></a><?php } ?>
+            <?php if (!empty($opts['doc'])) { ?><a href="<?php echo $base_dir . $opts['doc']  ?>" target="documentation"><img class="icon ic_b_help_s" src="<?php echo $base_dir; ?>themes/dot.gif" alt="Doc" title="<?php echo __('Documentation') ?>" /></a><?php } ?>
+            <?php if (!empty($opts['wiki'])){ ?><a href="<?php echo $opts['wiki'] ?>" target="wiki"><img class="icon ic_b_info" src="<?php echo $base_dir; ?>themes/dot.gif" alt="Wiki" title="Wiki" /></a><?php } ?>
         </span>
         <?php } ?>
         <?php if ($option_is_disabled) { ?>
@@ -234,17 +234,17 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
     }
     if ($is_setup_script && isset($opts['userprefs_comment']) && $opts['userprefs_comment']) {
         ?>
-        <a class="userprefs-comment" title="<?php echo htmlspecialchars($opts['userprefs_comment']) ?>"><img alt="comment" src="<?php echo $img_path ?>b_tblops.png" width="16" height="16" /></a>
+        <a class="userprefs-comment" title="<?php echo htmlspecialchars($opts['userprefs_comment']) ?>"><img alt="comment" class="icon ic-b_tblops" src="<?php echo $base_dir; ?>themes/dot.gif" /></a>
         <?php
     }
     if (isset($opts['setvalue']) && $opts['setvalue']) {
         ?>
-        <a class="set-value" href="#<?php echo htmlspecialchars("$path={$opts['setvalue']}") ?>" title="<?php echo sprintf(__('Set value: %s'), htmlspecialchars($opts['setvalue'])) ?>" style="display:none"><img alt="set-value" src="<?php echo $img_path ?>b_edit.png" width="16" height="16" /></a>
+        <a class="set-value" href="#<?php echo htmlspecialchars("$path={$opts['setvalue']}") ?>" title="<?php echo sprintf(__('Set value: %s'), htmlspecialchars($opts['setvalue'])) ?>" style="display:none"><img alt="set-value" class="icon ic_b_edit" src="<?php echo $base_dir; ?>themes/dot.gif" /></a>
         <?php
     }
     if (isset($opts['show_restore_default']) && $opts['show_restore_default']) {
         ?>
-        <a class="restore-default" href="#<?php echo $path ?>" title="<?php echo __('Restore default value') ?>" style="display:none"><img alt="restore-default" src="<?php echo $img_path ?>s_reload.png" width="16" height="16" /></a>
+        <a class="restore-default" href="#<?php echo $path ?>" title="<?php echo __('Restore default value') ?>" style="display:none"><img alt="restore-default" class="icon ic_s_reload" src="<?php echo $base_dir; ?>themes/dot.gif" /></a>
         <?php
     }
     // this must match with displayErrors() in scripts/config.js

libraries/db_links.inc.php

@@ -46,64 +46,64 @@ if ($num_tables == 0) {
 
 $tab_structure['link']  = 'db_structure.php';
 $tab_structure['text']  = __('Structure');
-$tab_structure['icon']  = 'b_props.png';
+$tab_structure['icon']  = 'ic_b_props';
 
 $tab_sql['link']        = 'db_sql.php';
 $tab_sql['args']['db_query_force'] = 1;
 $tab_sql['text']        = __('SQL');
-$tab_sql['icon']        = 'b_sql.png';
+$tab_sql['icon']        = 'ic_b_sql';
 
 $tab_export['text']     = __('Export');
-$tab_export['icon']     = 'b_export.png';
+$tab_export['icon']     = 'ic_b_export';
 $tab_export['link']     = 'db_export.php';
 
 $tab_search['text']     = __('Search');
-$tab_search['icon']     = 'b_search.png';
+$tab_search['icon']     = 'ic_b_search';
 $tab_search['link']     = 'db_search.php';
 
 if(PMA_Tracker::isActive())
 {
     $tab_tracking['text'] = __('Tracking');
-    $tab_tracking['icon'] = 'eye.png';
+    $tab_tracking['icon'] = 'ic_eye';
     $tab_tracking['link'] = 'db_tracking.php';
 }
 
 $tab_qbe['text']        = __('Query');
-$tab_qbe['icon']        = 's_db.png';
+$tab_qbe['icon']        = 'ic_s_db';
 $tab_qbe['link']        = 'db_qbe.php';
 
 if ($cfgRelation['designerwork']) {
     $tab_designer['text']   = __('Designer');
-    $tab_designer['icon']   = 'b_relations.png';
+    $tab_designer['icon']   = 'ic_b_relations';
     $tab_designer['link']   = 'pmd_general.php';
 }
 
 if (! $db_is_information_schema) {
     $tab_import['link']     = 'db_import.php';
     $tab_import['text']     = __('Import');
-    $tab_import['icon']     = 'b_import.png';
+    $tab_import['icon']     = 'ic_b_import';
     $tab_operation['link']  = 'db_operations.php';
     $tab_operation['text']  = __('Operations');
-    $tab_operation['icon']  = 'b_tblops.png';
+    $tab_operation['icon']  = 'ic_b_tblops';
     if ($is_superuser) {
         $tab_privileges['link'] = 'server_privileges.php';
         $tab_privileges['args']['checkprivs']       = $db;
         // stay on database view
         $tab_privileges['args']['viewing_mode'] = 'db';
         $tab_privileges['text'] = __('Privileges');
-        $tab_privileges['icon'] = 's_rights.png';
+        $tab_privileges['icon'] = 'ic_s_rights';
     }
     $tab_routines['link']   = 'db_routines.php';
     $tab_routines['text']   = __('Routines');
-    $tab_routines['icon']   = 'b_routines.png';
+    $tab_routines['icon']   = 'ic_b_routines';
 
     $tab_events['link']     = 'db_events.php';
     $tab_events['text']     = __('Events');
-    $tab_events['icon']     = 'b_events.png';
+    $tab_events['icon']     = 'ic_b_events';
 
     $tab_triggers['link']   = 'db_triggers.php';
     $tab_triggers['text']   = __('Triggers');
-    $tab_triggers['icon']   = 'b_triggers.png';
+    $tab_triggers['icon']   = 'ic_b_triggers';
 }
 
 /**

libraries/db_structure.lib.php

@@ -94,15 +94,15 @@ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
         if ($requested_sort_order == 'ASC') {
             $future_sort_order = 'DESC';
             // current sort order is ASC
-            $order_img  = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_asc.png" width="11" height="9" alt="'. __('Ascending') . '" title="'. __('Ascending') . '" id="sort_arrow" />';
+            $order_img  = ' <img class="icon ic_s_asc" src="themes/dot.gif" alt="'. __('Ascending') . '" title="'. __('Ascending') . '" id="sort_arrow" />';
             // but on mouse over, show the reverse order (DESC)
-            $order_link_params['onmouseover'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }';
+            $order_link_params['onmouseover'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc.png\'); }';
             // on mouse out, show current sort order (ASC)
-            $order_link_params['onmouseout']  = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }';
+            $order_link_params['onmouseout']  = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc.png\'); }';
         } else {
             $future_sort_order = 'ASC';
             // current sort order is DESC
-            $order_img  = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_desc.png" width="11" height="9" alt="'. __('Descending') . '" title="'. __('Descending') . '" id="sort_arrow" />';
+            $order_img  = ' <img class="icon ic_s_desc" src="themes/dot.gif" alt="'. __('Descending') . '" title="'. __('Descending') . '" id="sort_arrow" />';
             // but on mouse over, show the reverse order (ASC)
             $order_link_params['onmouseover'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }';
             // on mouse out, show current sort order (DESC)

libraries/server_links.inc.php

@@ -38,15 +38,15 @@ if (!$GLOBALS['is_ajax_request']) {
      */
     $tabs = array();
 
-    $tabs['databases']['icon'] = 's_db.png';
+    $tabs['databases']['icon'] = 'ic_s_db';
     $tabs['databases']['link'] = 'server_databases.php';
     $tabs['databases']['text'] = __('Databases');
 
-    $tabs['sql']['icon'] = 'b_sql.png';
+    $tabs['sql']['icon'] = 'ic_b_sql';
     $tabs['sql']['link'] = 'server_sql.php';
     $tabs['sql']['text'] = __('SQL');
 
-    $tabs['status']['icon'] = 's_status.png';
+    $tabs['status']['icon'] = 'ic_s_status';
     $tabs['status']['link'] = 'server_status.php';
     $tabs['status']['text'] = __('Status');
 
@@ -55,50 +55,50 @@ if (!$GLOBALS['is_ajax_request']) {
     $tabs['process']['text'] = __('Processes');*/
 
     if ($is_superuser) {
-        $tabs['rights']['icon'] = 's_rights.png';
+        $tabs['rights']['icon'] = 'ic_s_rights';
         $tabs['rights']['link'] = 'server_privileges.php';
         $tabs['rights']['text'] = __('Privileges');
     }
 
-    $tabs['export']['icon'] = 'b_export.png';
+    $tabs['export']['icon'] = 'ic_b_export';
     $tabs['export']['link'] = 'server_export.php';
     $tabs['export']['text'] = __('Export');
 
-    $tabs['import']['icon'] = 'b_import.png';
+    $tabs['import']['icon'] = 'ic_b_import';
     $tabs['import']['link'] = 'server_import.php';
     $tabs['import']['text'] = __('Import');
 
-    $tabs['settings']['icon'] = 'b_tblops.png';
+    $tabs['settings']['icon'] = 'ic_b_tblops';
     $tabs['settings']['link'] = 'prefs_manage.php';
     $tabs['settings']['text'] = __('Settings');
     $tabs['settings']['active'] = in_array(basename($GLOBALS['PMA_PHP_SELF']),
         array('prefs_forms.php', 'prefs_manage.php'));
 
-    $tabs['synchronize']['icon'] = 's_sync.png';
+    $tabs['synchronize']['icon'] = 'ic_s_sync';
     $tabs['synchronize']['link'] = 'server_synchronize.php';
     $tabs['synchronize']['text'] = __('Synchronize');
 
     if (! empty($binary_logs)) {
-        $tabs['binlog']['icon'] = 's_tbl.png';
+        $tabs['binlog']['icon'] = 'ic_s_tbl';
         $tabs['binlog']['link'] = 'server_binlog.php';
         $tabs['binlog']['text'] = __('Binary log');
     }
 
     if ($is_superuser) {
-        $tabs['replication']['icon'] = 's_replication.png';
+        $tabs['replication']['icon'] = 'ic_s_replication';
         $tabs['replication']['link'] = 'server_replication.php';
         $tabs['replication']['text'] = __('Replication');
     }
 
-    $tabs['vars']['icon'] = 's_vars.png';
+    $tabs['vars']['icon'] = 'ic_s_vars';
     $tabs['vars']['link'] = 'server_variables.php';
     $tabs['vars']['text'] = __('Variables');
 
-    $tabs['charset']['icon'] = 's_asci.png';
+    $tabs['charset']['icon'] = 'ic_s_asci';
     $tabs['charset']['link'] = 'server_collations.php';
     $tabs['charset']['text'] = __('Charsets');
 
-    $tabs['engine']['icon'] = 'b_engine.png';
+    $tabs['engine']['icon'] = 'ic_b_engine';
     $tabs['engine']['link'] = 'server_engines.php';
     $tabs['engine']['text'] = __('Engines');
 

libraries/tbl_links.inc.php

@@ -51,30 +51,30 @@ if (! isset($db_is_information_schema)) {
  */
 $tabs = array();
 
-$tabs['browse']['icon'] = 'b_browse.png';
+$tabs['browse']['icon'] = 'ic_b_browse';
 $tabs['browse']['text'] = __('Browse');
 $tabs['browse']['link'] = 'sql.php';
 $tabs['browse']['args']['pos'] = 0;
 
-$tabs['structure']['icon'] = 'b_props.png';
+$tabs['structure']['icon'] = 'ic_b_props';
 $tabs['structure']['link'] = 'tbl_structure.php';
 $tabs['structure']['text'] = __('Structure');
 
-$tabs['sql']['icon'] = 'b_sql.png';
+$tabs['sql']['icon'] = 'ic_b_sql';
 $tabs['sql']['link'] = 'tbl_sql.php';
 $tabs['sql']['text'] = __('SQL');
 
-$tabs['search']['icon'] = 'b_search.png';
+$tabs['search']['icon'] = 'ic_b_search';
 $tabs['search']['text'] = __('Search');
 $tabs['search']['link'] = 'tbl_select.php';
 
 if (!$db_is_information_schema) {
-    $tabs['insert']['icon'] = 'b_insrow.png';
+    $tabs['insert']['icon'] = 'ic_b_insrow';
     $tabs['insert']['link'] = 'tbl_change.php';
     $tabs['insert']['text'] = __('Insert');
 }
 
-$tabs['export']['icon'] = 'b_tblexport.png';
+$tabs['export']['icon'] = 'ic_b_tblexport';
 $tabs['export']['link'] = 'tbl_export.php';
 $tabs['export']['args']['single_table'] = 'true';
 $tabs['export']['text'] = __('Export');
@@ -84,16 +84,16 @@ $tabs['export']['text'] = __('Export');
  * for views and information_schema
  */
 if (! $tbl_is_view && !$db_is_information_schema) {
-    $tabs['import']['icon'] = 'b_tblimport.png';
+    $tabs['import']['icon'] = 'ic_b_tblimport';
     $tabs['import']['link'] = 'tbl_import.php';
     $tabs['import']['text'] = __('Import');
 
-    $tabs['operation']['icon'] = 'b_tblops.png';
+    $tabs['operation']['icon'] = 'ic_b_tblops';
     $tabs['operation']['link'] = 'tbl_operations.php';
     $tabs['operation']['text'] = __('Operations');
 }
 if(PMA_Tracker::isActive()) {
-    $tabs['tracking']['icon'] = 'eye.png';
+    $tabs['tracking']['icon'] = 'ic_eye';
     $tabs['tracking']['text'] = __('Tracking');
     $tabs['tracking']['link'] = 'tbl_tracking.php';
 }
@@ -108,7 +108,7 @@ if (! $db_is_information_schema && PMA_MYSQL_INT_VERSION >= 50002 && ! PMA_DRIZZ
  * Views support a limited number of operations
  */
 if ($tbl_is_view && !$db_is_information_schema) {
-    $tabs['operation']['icon'] = 'b_tblops.png';
+    $tabs['operation']['icon'] = 'ic_b_tblops';
     $tabs['operation']['link'] = 'view_operations.php';
     $tabs['operation']['text'] = __('Operations');
 }

libraries/user_preferences.inc.php

@@ -20,12 +20,12 @@ if (! isset($forms[$form_param])) {
     $form_param = array_shift($forms_keys);
 }
 $tabs_icons = array(
-    'Features'    => 'b_tblops.png',
-    'Sql_queries' => 'b_sql.png',
-    'Left_frame'  => 'b_select.png',
-    'Main_frame'  => 'b_props.png',
-    'Import'      => 'b_import.png',
-    'Export'      => 'b_export.png');
+    'Features'    => 'ic_b_tblops',
+    'Sql_queries' => 'ic_b_sql',
+    'Left_frame'  => 'ic_b_select',
+    'Main_frame'  => 'ic_b_props',
+    'Import'      => 'ic_b_import',
+    'Export'      => 'ic_b_export');
 echo '<ul id="topmenu2">';
 echo PMA_generate_html_tab(array(
     'link' => 'prefs_manage.php',

server_status.php

@@ -266,6 +266,7 @@ $GLOBALS['js_include'][] = 'jquery/jquery.cookie.js'; // For tab persistence
 $GLOBALS['js_include'][] = 'jquery/jquery.json-2.2.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.sortableTable.js';
+$GLOBALS['js_include'][] = 'jquery/timepicker.js';
 // Charting
 $GLOBALS['js_include'][] = 'highcharts/highcharts.js';
 /* Files required for chart exporting */
@@ -562,7 +563,7 @@ server_db_isLocal = <?php echo ($server_db_isLocal)?'true':'false'; ?>;
  * Displays the sub-page heading
  */
 if ($GLOBALS['cfg']['MainPageIconic']) {
-    echo '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_status.png" width="16" height="16" alt="" />';
+    echo '<img class="icon ic_s_status" src="themes/dot.gif" width="16" height="16" alt="" />';
 }
 
 echo __('Runtime Information');
@@ -1273,26 +1274,26 @@ function printMonitor() {
 ?>
     <div class="monitorLinks">
         <a href="#pauseCharts">
-            <img src="<?php echo $GLOBALS['pmaThemeImage'];?>play.png" alt="" /> 
+            <img src="themes/dot.gif" class="icon ic_play" alt="" /> 
             <?php echo __('Start Monitor'); ?>
         </a>
         <a href="#settingsPopup" rel="popupLink" style="display:none;">
-            <img src="<?php echo $GLOBALS['pmaThemeImage'];?>s_cog.png" alt="" /> 
+            <img src="themes/dot.gif" class="icon ic_s_cog" alt="" /> 
             <?php echo __('Settings'); ?>
         </a>
         <a href="#monitorInstructionsDialog">
-            <img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_help.png" alt="" /> 
+            <img src="themes/dot.gif" class="icon ic_b_help" alt="" /> 
             <?php echo __('Instructions/Setup'); ?>
         </a>
         <a href="#endChartEditMode" style="display:none;">
-            <img src="<?php echo $GLOBALS['pmaThemeImage'];?>s_okay.png" alt="" /> 
+            <img src="themes/dot.gif" class="icon ic_s_okay" alt="" /> 
             <?php echo __('Done rearranging/editing charts'); ?>
         </a>
     </div>
     
     <div class="popupContent settingsPopup">
         <a href="#addNewChart">
-            <img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_chart.png" alt="" /> 
+            <img src="themes/dot.gif" class="icon ic_b_chart" alt="" /> 
             <?php echo __('Add chart'); ?>
         </a> | 
         <a href="#rearrangeCharts"> <?php echo __('Rearrange/edit charts'); ?></a><br>

themes/pmahomme/css/theme_right.css.php

@@ -20,6 +20,7 @@ function PMA_ieFilter($start_color, $end_color)
 }
 ?>
 /******************************************************************************/
+
 /* general tags */
 html {
     font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : (
@@ -58,14 +59,15 @@ h2 {
     padding:			10px 0 10px 3px;
     color:				#777;
 }
+
 /* Hiding icons in the page titles */
 h2 img{display:none;}
 h2 a img{display:inline;}
 
 
 .data{
-margin: 0 0 12px 0;
-position: relative;
+    margin: 0 0 12px 0;
+    position: relative;
 }
 
 h3 {
@@ -317,6 +319,138 @@ select[multiple] {
     filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr="#ffffff", endColorstr="#f2f2f2");
 }
 
+/* Icon sprites */
+
+.icon, img.footnotemarker {
+    vertical-align: -3px;
+    margin-right:       0.3em;
+    margin-left:        0.3em;
+    width:16px;
+    height:16px;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>iconsprites.png) no-repeat top left;
+}
+
+.ic_asc_order, .ic_s_desc { background-position: 0 0; } 
+.ic_b_bookmark { background-position: -17px 0; } 
+.ic_b_browse, .ic_b_sbrowse { background-position: -34px 0; } 
+.ic_b_calendar { background-position: -51px 0; } 
+.ic_b_chart, .ic_b_dbstatistics { background-position: -68px 0; } 
+.ic_b_close { background-position: -85px 0; } 
+.ic_b_comment { background-position: -102px 0; } 
+.ic_b_deltbl { background-position: -119px 0; } 
+.ic_b_docs { background-position: -136px 0; } 
+.ic_b_docsql { background-position: -153px 0; } 
+.ic_b_drop { background-position: -170px 0; } 
+.ic_b_edit { background-position: -187px 0; } 
+.ic_b_empty { background-position: -204px 0; } 
+.ic_b_engine { background-position: -221px 0; } 
+.ic_b_event_add { background-position: -238px 0; } 
+.ic_b_events { background-position: -255px 0; } 
+.ic_b_export, .ic_b_tblexport { background-position: -272px 0; } 
+.ic_b_firstpage { background-position: -289px 0; } 
+.ic_b_ftext { background-position: -306px 0; } 
+.ic_b_globe { background-position: -323px 0; } 
+.ic_b_help { background-position: -340px 0; } 
+.ic_b_help_s { background-position: -340px 0; } 
+.ic_b_home { background-position: -357px 0; } 
+.ic_b_import, .ic_b_tblimport { background-position: -374px 0; } 
+.ic_b_index { background-position: -391px 0; } 
+.ic_b_info { background-position: -408px 0; width: 11px; height: 11px; } 
+.ic_b_inline_edit { background-position: -420px 0; } 
+.ic_b_insrow { background-position: -437px 0; } 
+.ic_b_lastpage { background-position: -454px 0; } 
+.ic_b_minus { background-position: -471px 0; } 
+.ic_b_more, .ic_col_drop { background-position: -488px 0; } 
+.ic_b_newdb { background-position: -505px 0; } 
+.ic_b_newtbl { background-position: -522px 0; } 
+.ic_b_nextpage, .ic_play { background-position: -539px 0; } 
+.ic_b_pdfdoc { background-position: -556px 0; } 
+.ic_b_plus { background-position: -573px 0; } 
+.ic_b_prevpage { background-position: -590px 0; } 
+.ic_b_primary { background-position: -607px 0; } 
+.ic_b_print { background-position: -624px 0; } 
+.ic_b_props { background-position: -641px 0; } 
+.ic_b_relations { background-position: -658px 0; } 
+.ic_b_routine_add { background-position: -675px 0; } 
+.ic_b_routines { background-position: -692px 0; } 
+.ic_b_save { background-position: -709px 0; } 
+.ic_b_sdb { background-position: -726px 0; width: 10px; height: 10px; } 
+.ic_b_search { background-position: -737px 0; } 
+.ic_b_selboard { background-position: -754px 0; } 
+.ic_b_select { background-position: -771px 0; } 
+.ic_b_snewtbl { background-position: -788px 0; } 
+.ic_b_spatial { background-position: -805px 0; } 
+.ic_b_sql { background-position: -822px 0; } 
+.ic_b_sqldoc { background-position: -839px 0; } 
+.ic_b_sqlhelp { background-position: -856px 0; } 
+.ic_b_tblanalyse { background-position: -873px 0; } 
+.ic_b_tblops { background-position: -890px 0; } 
+.ic_b_tbloptimize { background-position: -907px 0; } 
+.ic_b_tipp { background-position: -924px 0; } 
+.ic_b_trigger_add { background-position: -941px 0; } 
+.ic_b_triggers { background-position: -958px 0; } 
+.ic_b_unique { background-position: -975px 0; } 
+.ic_b_usradd { background-position: -992px 0; } 
+.ic_b_usrcheck { background-position: -1009px 0; } 
+.ic_b_usrdrop { background-position: -1026px 0; } 
+.ic_b_usredit { background-position: -1043px 0; } 
+.ic_b_usrlist { background-position: -1060px 0; } 
+.ic_b_view { background-position: -1077px 0; } 
+.ic_b_views, .ic_s_views { background-position: -1094px 0; } 
+.ic_bd_browse { background-position: -1111px 0; } 
+.ic_bd_deltbl { background-position: -1128px 0; } 
+.ic_bd_drop { background-position: -1145px 0; } 
+.ic_bd_edit { background-position: -1162px 0; } 
+.ic_bd_empty { background-position: -1179px 0; } 
+.ic_bd_export { background-position: -1196px 0; } 
+.ic_bd_firstpage { background-position: -1213px 0; width: 16px; height: 13px; } 
+.ic_bd_ftext { background-position: -1230px 0; } 
+.ic_bd_index { background-position: -1247px 0; } 
+.ic_bd_insrow { background-position: -1264px 0; } 
+.ic_bd_lastpage { background-position: -1281px 0; width: 16px; height: 13px; } 
+.ic_bd_nextpage { background-position: -1298px 0; width: 8px; height: 13px; } 
+.ic_bd_prevpage { background-position: -1307px 0; width: 8px; height: 13px; } 
+.ic_bd_primary { background-position: -1316px 0; } 
+.ic_bd_sbrowse { background-position: -1333px 0; width: 10px; height: 10px; } 
+.ic_bd_select { background-position: -1344px 0; } 
+.ic_bd_spatial { background-position: -1361px 0; } 
+.ic_bd_unique { background-position: -1378px 0; } 
+.ic_database, .ic_s_db { background-position: -1395px 0; } 
+.ic_eye { background-position: -1412px 0; } 
+.ic_eye_grey { background-position: -1429px 0; } 
+.ic_item { background-position: -1446px 0; width: 9px; height: 9px; } 
+.ic_item_ltr { background-position: -1456px 0; width: 5px; height: 9px; } 
+.ic_item_rtl { background-position: -1462px 0; width: 5px; height: 9px; } 
+.ic_more { background-position: -1468px 0; width: 13px; height: 8px; } 
+.ic_pause { background-position: -1482px 0; } 
+.ic_php_sym { background-position: -1499px 0; } 
+.ic_s_asc { background-position: -1516px 0; } 
+.ic_s_asci { background-position: -1533px 0; } 
+.ic_s_attention, .ic_s_notice { background-position: -1550px 0; } 
+.ic_s_cancel { background-position: -1567px 0; } 
+.ic_s_cancel2 { background-position: -1584px 0; } 
+.ic_s_cog { background-position: -1601px 0; } 
+.ic_s_error { background-position: -1618px 0; } 
+.ic_s_error2 { background-position: -1635px 0; width: 11px; height: 11px; } 
+.ic_s_host { background-position: -1647px 0; } 
+.ic_s_info { background-position: -1664px 0; } 
+.ic_s_lang { background-position: -1681px 0; } 
+.ic_s_loggoff { background-position: -1698px 0; } 
+.ic_s_okay { background-position: -1715px 0; } 
+.ic_s_passwd { background-position: -1732px 0; } 
+.ic_s_really { background-position: -1749px 0; width: 11px; height: 11px; } 
+.ic_s_reload { background-position: -1761px 0; } 
+.ic_s_replication { background-position: -1778px 0; } 
+.ic_s_rights { background-position: -1795px 0; } 
+.ic_s_sortable { background-position: -1812px 0; } 
+.ic_s_status { background-position: -1829px 0; } 
+.ic_s_success { background-position: -1846px 0; } 
+.ic_s_sync { background-position: -1863px 0; } 
+.ic_s_tbl { background-position: -1880px 0; } 
+.ic_s_theme { background-position: -1897px 0; } 
+.ic_s_vars { background-position: -1914px 0; } 
+.ic_window-new { background-position: -1931px 0; } 
+
 /******************************************************************************/
 /* classes */
 div.tools {
@@ -555,12 +689,6 @@ img.lightbulb {
 }
 
 /* leave some space between icons and text */
-.icon, img.footnotemarker {
-    vertical-align: -3px;
-    margin-right:       0.3em;
-    margin-left:        0.3em;
-}
-
 img.footnotemarker {
     display: none;
 }
@@ -622,8 +750,8 @@ div.footnotes {
     color:              #000000;
     background-color:   #ebf8a4;
 }
-h1.success,
-div.success {
+
+h1.success, div.success {
     border-color:       #a2d246;
     <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
     background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_success.png);
@@ -643,6 +771,7 @@ div.success {
     color:              #000;
     background-color:   #e8eef1;
 }
+
 h1.notice,
 div.notice,
 div.footnotes {
@@ -657,6 +786,7 @@ div.footnotes {
         <?php } ?>
     <?php } ?>
 }
+
 .notice h1 {
     border-color:       #ffb10a;
 }
@@ -680,24 +810,23 @@ div.error {
         <?php } ?>
     <?php } ?>
 }
+
 div.error h1 {
     border-color:       #ff0000;
 }
 
-
-
 .confirmation {
     color:              #000000;
     background-color:   pink;
 }
+
 fieldset.confirmation {
-
 }
+
 fieldset.confirmation legend {
-
 }
-/* end messageboxes */
 
+/* end messageboxes */
 
 .tblcomment {
     font-size:          70%;
@@ -802,9 +931,13 @@ form.login label {
 /* specific elements */
 
 /* topmenu */
-#topmenu a {text-shadow:0px 1px 0px #fff;}
+#topmenu a { 
+    text-shadow:0px 1px 0px #fff; 
+}
 
-#topmenu .error{background:#eee;border:0px !important;color:#aaa;}
+#topmenu .error { 
+    background:#eee;border:0px !important;color:#aaa; 
+}
 
 ul#topmenu, ul#topmenu2, ul.tabs {
     font-weight:        bold;
@@ -831,7 +964,10 @@ ul#topmenu li, ul#topmenu2 li {
     vertical-align:-3px;
 }
 
-#topmenucontainer{background:url(./themes/pmahomme/img/tab_bg.png) repeat-x;    border-top:1px solid #aaa;}
+#topmenucontainer{ 
+    background:url(./themes/pmahomme/img/tab_bg.png) repeat-x;
+    border-top:1px solid #aaa;
+}
 
 /* default tab styles */
 .tabactive {
@@ -851,8 +987,8 @@ ul#topmenu ul a {
 }
 
 ul#topmenu .submenu {
-    display:	        none;
-    position:	        relative;
+    display:           none;
+    position:          relative;
 }
 
 ul#topmenu .shown {
@@ -878,7 +1014,6 @@ ul#topmenu li:hover ul, ul#topmenu .submenuhover ul {
     display:            block;
     font-weight:3em;
     background:#fff;
-
 }
 
 ul#topmenu ul li {
@@ -947,12 +1082,10 @@ ul#topmenu ul a {
     -moz-border-radius: 0;
     -webkit-border-radius: 0;
     border-radius:      0;
-
 }
 
 ul#topmenu ul li:first-child a {
     border-width:       0;
-
 }
 
 /* enabled hover/active tabs */
@@ -1048,16 +1181,15 @@ div#tablestatistics table {
 /* END server privileges */
 
 
-
 /* Heading */
 #serverinfo {
-border-bottom:1px solid #fff;
--moz-border-radius: 4px 4px 0 0;
--webkit-border-radius: 4px 4px 0 0;
-border-radius:4px 4px 0 0;
-background:#888;
-padding:10px;
-text-shadow:0 1px 0 #000000;
+    border-bottom:1px solid #fff;
+    -moz-border-radius: 4px 4px 0 0;
+    -webkit-border-radius: 4px 4px 0 0;
+    border-radius:4px 4px 0 0;
+    background:#888;
+    padding:10px;
+    text-shadow:0 1px 0 #000000;
 }
 
 #serverinfo .item {
@@ -1163,24 +1295,22 @@ text-shadow:0 1px 0 #000000;
 
 /* serverstatus */
 
-img.sortableIcon {
-    width:16px;
-    height:16px;
-    float:right;
-    background-repeat:no-repeat;
-}
-
 h3#serverstatusqueries span {
     font-size:60%;    
     display:inline;
 }
 
+img.sortableIcon {
+    float:right;
+    background-repeat:no-repeat;
+}
+
 th.headerSortUp img.sortableIcon {
-    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asc.png);
+	background-position: -1516px 0;
 }
 
 th.headerSortDown img.sortableIcon {
-    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_desc.png);
+    background-position: 0 0;
 }
 
 .buttonlinks {
@@ -1286,7 +1416,7 @@ div#logTable {
 }
 
 div#logTable table {
-	width:100%;
+    width:100%;
 }
 
 .smallIndent {