From da943ecbf7a2f604f6969564bee17aff52afd740 Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 14 Jul 2011 15:37:08 +0300 Subject: [PATCH 01/22] PMA Icons to sprites part 1 --- db_operations.php | 15 +- db_structure.php | 12 +- db_tracking.php | 4 +- js/functions.js | 11 +- js/server_status.js | 48 +++-- libraries/auth/cookie.auth.lib.php | 2 +- libraries/common.lib.php | 19 +- libraries/config/FormDisplay.tpl.php | 10 +- libraries/db_links.inc.php | 26 +-- libraries/db_structure.lib.php | 8 +- libraries/server_links.inc.php | 26 +-- libraries/tbl_links.inc.php | 20 +-- libraries/user_preferences.inc.php | 12 +- server_status.php | 13 +- themes/pmahomme/css/theme_right.css.php | 212 ++++++++++++++++++----- themes/pmahomme/img/ajax_clock_small.gif | Bin 1849 -> 0 bytes themes/pmahomme/img/asc_order.png | Bin 201 -> 0 bytes themes/pmahomme/img/b_bookmark.png | Bin 714 -> 0 bytes themes/pmahomme/img/b_browse.png | Bin 566 -> 0 bytes themes/pmahomme/img/b_chart.png | Bin 541 -> 0 bytes themes/pmahomme/img/b_close.png | Bin 250 -> 0 bytes themes/pmahomme/img/b_comment.png | Bin 413 -> 0 bytes themes/pmahomme/img/b_dbstatistics.png | Bin 541 -> 0 bytes themes/pmahomme/img/b_deltbl.png | Bin 660 -> 0 bytes themes/pmahomme/img/b_docs.png | Bin 786 -> 0 bytes themes/pmahomme/img/b_docsql.png | Bin 231 -> 0 bytes themes/pmahomme/img/b_drop.png | Bin 715 -> 0 bytes themes/pmahomme/img/b_edit.png | Bin 444 -> 0 bytes themes/pmahomme/img/b_empty.png | Bin 363 -> 0 bytes themes/pmahomme/img/b_engine.png | Bin 468 -> 0 bytes themes/pmahomme/img/b_event_add.png | Bin 927 -> 0 bytes themes/pmahomme/img/b_events.png | Bin 969 -> 0 bytes themes/pmahomme/img/b_export.png | Bin 641 -> 0 bytes themes/pmahomme/img/b_firstpage.png | Bin 745 -> 0 bytes themes/pmahomme/img/b_ftext.png | Bin 1432 -> 0 bytes themes/pmahomme/img/b_globe.gif | Bin 1045 -> 0 bytes themes/pmahomme/img/b_help.png | Bin 1594 -> 0 bytes themes/pmahomme/img/b_home.png | Bin 806 -> 0 bytes themes/pmahomme/img/b_import.png | Bin 629 -> 0 bytes themes/pmahomme/img/b_index.png | Bin 736 -> 0 bytes themes/pmahomme/img/b_inline_edit.png | Bin 618 -> 0 bytes themes/pmahomme/img/b_insrow.png | Bin 228 -> 0 bytes themes/pmahomme/img/b_lastpage.png | Bin 736 -> 0 bytes themes/pmahomme/img/b_minus.png | Bin 207 -> 0 bytes themes/pmahomme/img/b_more.png | Bin 1002 -> 0 bytes themes/pmahomme/img/b_newdb.png | Bin 658 -> 0 bytes themes/pmahomme/img/b_newtbl.png | Bin 325 -> 0 bytes themes/pmahomme/img/b_nextpage.png | Bin 395 -> 0 bytes themes/pmahomme/img/b_pdfdoc.png | Bin 591 -> 0 bytes themes/pmahomme/img/b_plus.png | Bin 209 -> 0 bytes themes/pmahomme/img/b_prevpage.png | Bin 389 -> 0 bytes themes/pmahomme/img/b_primary.png | Bin 612 -> 0 bytes themes/pmahomme/img/b_print.png | Bin 731 -> 0 bytes themes/pmahomme/img/b_props.png | Bin 663 -> 0 bytes themes/pmahomme/img/b_relations.png | Bin 217 -> 0 bytes themes/pmahomme/img/b_routine_add.png | Bin 651 -> 0 bytes themes/pmahomme/img/b_routines.png | Bin 666 -> 0 bytes themes/pmahomme/img/b_save.png | Bin 620 -> 0 bytes themes/pmahomme/img/b_sbrowse.png | Bin 566 -> 0 bytes themes/pmahomme/img/b_search.png | Bin 615 -> 0 bytes themes/pmahomme/img/b_selboard.png | Bin 698 -> 0 bytes themes/pmahomme/img/b_select.png | Bin 680 -> 0 bytes themes/pmahomme/img/b_snewtbl.png | Bin 733 -> 0 bytes themes/pmahomme/img/b_spatial.png | Bin 4033 -> 0 bytes themes/pmahomme/img/b_sql.png | Bin 748 -> 0 bytes themes/pmahomme/img/b_sqldoc.png | Bin 235 -> 0 bytes themes/pmahomme/img/b_sqlhelp.png | Bin 579 -> 0 bytes themes/pmahomme/img/b_tblanalyse.png | Bin 234 -> 0 bytes themes/pmahomme/img/b_tblexport.png | Bin 641 -> 0 bytes themes/pmahomme/img/b_tblimport.png | Bin 629 -> 0 bytes themes/pmahomme/img/b_tblops.png | Bin 610 -> 0 bytes themes/pmahomme/img/b_tbloptimize.png | Bin 241 -> 0 bytes themes/pmahomme/img/b_tipp.png | Bin 782 -> 0 bytes themes/pmahomme/img/b_trigger_add.png | Bin 731 -> 0 bytes themes/pmahomme/img/b_triggers.png | Bin 707 -> 0 bytes themes/pmahomme/img/b_unique.png | Bin 1475 -> 0 bytes themes/pmahomme/img/b_usradd.png | Bin 746 -> 0 bytes themes/pmahomme/img/b_usrcheck.png | Bin 793 -> 0 bytes themes/pmahomme/img/b_usrdrop.png | Bin 767 -> 0 bytes themes/pmahomme/img/b_usredit.png | Bin 833 -> 0 bytes themes/pmahomme/img/b_usrlist.png | Bin 753 -> 0 bytes themes/pmahomme/img/b_view.png | Bin 820 -> 0 bytes themes/pmahomme/img/b_views.png | Bin 700 -> 0 bytes themes/pmahomme/img/bd_browse.png | Bin 200 -> 0 bytes themes/pmahomme/img/bd_deltbl.png | Bin 257 -> 0 bytes themes/pmahomme/img/bd_drop.png | Bin 261 -> 0 bytes themes/pmahomme/img/bd_edit.png | Bin 295 -> 0 bytes themes/pmahomme/img/bd_empty.png | Bin 231 -> 0 bytes themes/pmahomme/img/bd_export.png | Bin 353 -> 0 bytes themes/pmahomme/img/bd_firstpage.png | Bin 180 -> 0 bytes themes/pmahomme/img/bd_ftext.png | Bin 219 -> 0 bytes themes/pmahomme/img/bd_index.png | Bin 253 -> 0 bytes themes/pmahomme/img/bd_insrow.png | Bin 274 -> 0 bytes themes/pmahomme/img/bd_lastpage.png | Bin 180 -> 0 bytes themes/pmahomme/img/bd_primary.png | Bin 312 -> 0 bytes themes/pmahomme/img/bd_select.png | Bin 459 -> 0 bytes themes/pmahomme/img/bd_spatial.png | Bin 4006 -> 0 bytes themes/pmahomme/img/bd_unique.png | Bin 218 -> 0 bytes themes/pmahomme/img/col_drop.png | Bin 1002 -> 0 bytes themes/pmahomme/img/database.png | Bin 390 -> 0 bytes themes/pmahomme/img/error.ico | Bin 5430 -> 0 bytes themes/pmahomme/img/eye.png | Bin 750 -> 0 bytes themes/pmahomme/img/eye_grey.png | Bin 347 -> 0 bytes themes/pmahomme/img/pause.png | Bin 329 -> 0 bytes themes/pmahomme/img/php_sym.png | Bin 198 -> 0 bytes themes/pmahomme/img/play.png | Bin 395 -> 0 bytes themes/pmahomme/img/s_asc.png | Bin 201 -> 0 bytes themes/pmahomme/img/s_asci.png | Bin 209 -> 0 bytes themes/pmahomme/img/s_attention.png | Bin 666 -> 0 bytes themes/pmahomme/img/s_cancel.png | Bin 587 -> 0 bytes themes/pmahomme/img/s_cancel2.png | Bin 308 -> 0 bytes themes/pmahomme/img/s_db.png | Bin 390 -> 0 bytes themes/pmahomme/img/s_desc.png | Bin 201 -> 0 bytes themes/pmahomme/img/s_error.png | Bin 701 -> 0 bytes themes/pmahomme/img/s_host.png | Bin 667 -> 0 bytes themes/pmahomme/img/s_info.png | Bin 778 -> 0 bytes themes/pmahomme/img/s_lang.png | Bin 743 -> 0 bytes themes/pmahomme/img/s_loggoff.png | Bin 688 -> 0 bytes themes/pmahomme/img/s_notice.png | Bin 666 -> 0 bytes themes/pmahomme/img/s_okay.png | Bin 781 -> 0 bytes themes/pmahomme/img/s_passwd.png | Bin 435 -> 0 bytes themes/pmahomme/img/s_reload.png | Bin 608 -> 0 bytes themes/pmahomme/img/s_replication.png | Bin 447 -> 0 bytes themes/pmahomme/img/s_rights.png | Bin 533 -> 0 bytes themes/pmahomme/img/s_sortable.png | Bin 1107 -> 0 bytes themes/pmahomme/img/s_status.png | Bin 673 -> 0 bytes themes/pmahomme/img/s_success.png | Bin 537 -> 0 bytes themes/pmahomme/img/s_sync.png | Bin 551 -> 0 bytes themes/pmahomme/img/s_tbl.png | Bin 714 -> 0 bytes themes/pmahomme/img/s_theme.png | Bin 856 -> 0 bytes themes/pmahomme/img/s_vars.png | Bin 603 -> 0 bytes themes/pmahomme/img/s_views.png | Bin 700 -> 0 bytes themes/pmahomme/img/window-new.png | Bin 583 -> 0 bytes 133 files changed, 291 insertions(+), 147 deletions(-) delete mode 100644 themes/pmahomme/img/ajax_clock_small.gif delete mode 100644 themes/pmahomme/img/asc_order.png delete mode 100644 themes/pmahomme/img/b_bookmark.png delete mode 100644 themes/pmahomme/img/b_browse.png delete mode 100644 themes/pmahomme/img/b_chart.png delete mode 100644 themes/pmahomme/img/b_close.png delete mode 100644 themes/pmahomme/img/b_comment.png delete mode 100644 themes/pmahomme/img/b_dbstatistics.png delete mode 100644 themes/pmahomme/img/b_deltbl.png delete mode 100644 themes/pmahomme/img/b_docs.png delete mode 100644 themes/pmahomme/img/b_docsql.png delete mode 100644 themes/pmahomme/img/b_drop.png delete mode 100644 themes/pmahomme/img/b_edit.png delete mode 100644 themes/pmahomme/img/b_empty.png delete mode 100644 themes/pmahomme/img/b_engine.png delete mode 100644 themes/pmahomme/img/b_event_add.png delete mode 100644 themes/pmahomme/img/b_events.png delete mode 100644 themes/pmahomme/img/b_export.png delete mode 100644 themes/pmahomme/img/b_firstpage.png delete mode 100644 themes/pmahomme/img/b_ftext.png delete mode 100644 themes/pmahomme/img/b_globe.gif delete mode 100644 themes/pmahomme/img/b_help.png delete mode 100644 themes/pmahomme/img/b_home.png delete mode 100644 themes/pmahomme/img/b_import.png delete mode 100644 themes/pmahomme/img/b_index.png delete mode 100644 themes/pmahomme/img/b_inline_edit.png delete mode 100644 themes/pmahomme/img/b_insrow.png delete mode 100644 themes/pmahomme/img/b_lastpage.png delete mode 100644 themes/pmahomme/img/b_minus.png delete mode 100644 themes/pmahomme/img/b_more.png delete mode 100644 themes/pmahomme/img/b_newdb.png delete mode 100644 themes/pmahomme/img/b_newtbl.png delete mode 100644 themes/pmahomme/img/b_nextpage.png delete mode 100644 themes/pmahomme/img/b_pdfdoc.png delete mode 100644 themes/pmahomme/img/b_plus.png delete mode 100644 themes/pmahomme/img/b_prevpage.png delete mode 100644 themes/pmahomme/img/b_primary.png delete mode 100644 themes/pmahomme/img/b_print.png delete mode 100644 themes/pmahomme/img/b_props.png delete mode 100644 themes/pmahomme/img/b_relations.png delete mode 100644 themes/pmahomme/img/b_routine_add.png delete mode 100644 themes/pmahomme/img/b_routines.png delete mode 100644 themes/pmahomme/img/b_save.png delete mode 100644 themes/pmahomme/img/b_sbrowse.png delete mode 100644 themes/pmahomme/img/b_search.png delete mode 100644 themes/pmahomme/img/b_selboard.png delete mode 100644 themes/pmahomme/img/b_select.png delete mode 100644 themes/pmahomme/img/b_snewtbl.png delete mode 100644 themes/pmahomme/img/b_spatial.png delete mode 100644 themes/pmahomme/img/b_sql.png delete mode 100644 themes/pmahomme/img/b_sqldoc.png delete mode 100644 themes/pmahomme/img/b_sqlhelp.png delete mode 100644 themes/pmahomme/img/b_tblanalyse.png delete mode 100644 themes/pmahomme/img/b_tblexport.png delete mode 100644 themes/pmahomme/img/b_tblimport.png delete mode 100644 themes/pmahomme/img/b_tblops.png delete mode 100644 themes/pmahomme/img/b_tbloptimize.png delete mode 100644 themes/pmahomme/img/b_tipp.png delete mode 100644 themes/pmahomme/img/b_trigger_add.png delete mode 100644 themes/pmahomme/img/b_triggers.png delete mode 100644 themes/pmahomme/img/b_unique.png delete mode 100644 themes/pmahomme/img/b_usradd.png delete mode 100644 themes/pmahomme/img/b_usrcheck.png delete mode 100644 themes/pmahomme/img/b_usrdrop.png delete mode 100644 themes/pmahomme/img/b_usredit.png delete mode 100644 themes/pmahomme/img/b_usrlist.png delete mode 100644 themes/pmahomme/img/b_view.png delete mode 100644 themes/pmahomme/img/b_views.png delete mode 100644 themes/pmahomme/img/bd_browse.png delete mode 100644 themes/pmahomme/img/bd_deltbl.png delete mode 100644 themes/pmahomme/img/bd_drop.png delete mode 100644 themes/pmahomme/img/bd_edit.png delete mode 100644 themes/pmahomme/img/bd_empty.png delete mode 100644 themes/pmahomme/img/bd_export.png delete mode 100644 themes/pmahomme/img/bd_firstpage.png delete mode 100644 themes/pmahomme/img/bd_ftext.png delete mode 100644 themes/pmahomme/img/bd_index.png delete mode 100644 themes/pmahomme/img/bd_insrow.png delete mode 100644 themes/pmahomme/img/bd_lastpage.png delete mode 100644 themes/pmahomme/img/bd_primary.png delete mode 100644 themes/pmahomme/img/bd_select.png delete mode 100644 themes/pmahomme/img/bd_spatial.png delete mode 100644 themes/pmahomme/img/bd_unique.png delete mode 100644 themes/pmahomme/img/col_drop.png delete mode 100644 themes/pmahomme/img/database.png delete mode 100644 themes/pmahomme/img/error.ico delete mode 100644 themes/pmahomme/img/eye.png delete mode 100644 themes/pmahomme/img/eye_grey.png delete mode 100644 themes/pmahomme/img/pause.png delete mode 100644 themes/pmahomme/img/php_sym.png delete mode 100644 themes/pmahomme/img/play.png delete mode 100644 themes/pmahomme/img/s_asc.png delete mode 100644 themes/pmahomme/img/s_asci.png delete mode 100644 themes/pmahomme/img/s_attention.png delete mode 100644 themes/pmahomme/img/s_cancel.png delete mode 100644 themes/pmahomme/img/s_cancel2.png delete mode 100644 themes/pmahomme/img/s_db.png delete mode 100644 themes/pmahomme/img/s_desc.png delete mode 100644 themes/pmahomme/img/s_error.png delete mode 100644 themes/pmahomme/img/s_host.png delete mode 100644 themes/pmahomme/img/s_info.png delete mode 100644 themes/pmahomme/img/s_lang.png delete mode 100644 themes/pmahomme/img/s_loggoff.png delete mode 100644 themes/pmahomme/img/s_notice.png delete mode 100644 themes/pmahomme/img/s_okay.png delete mode 100644 themes/pmahomme/img/s_passwd.png delete mode 100644 themes/pmahomme/img/s_reload.png delete mode 100644 themes/pmahomme/img/s_replication.png delete mode 100644 themes/pmahomme/img/s_rights.png delete mode 100644 themes/pmahomme/img/s_sortable.png delete mode 100644 themes/pmahomme/img/s_status.png delete mode 100644 themes/pmahomme/img/s_success.png delete mode 100644 themes/pmahomme/img/s_sync.png delete mode 100644 themes/pmahomme/img/s_tbl.png delete mode 100644 themes/pmahomme/img/s_theme.png delete mode 100644 themes/pmahomme/img/s_vars.png delete mode 100644 themes/pmahomme/img/s_views.png delete mode 100644 themes/pmahomme/img/window-new.png diff --git a/db_operations.php b/db_operations.php index 190f9b649b..872811bc07 100644 --- a/db_operations.php +++ b/db_operations.php @@ -398,8 +398,7 @@ if ($db != 'mysql') { '; + echo ''; } echo __('Rename database to') . ':'; ?> @@ -434,8 +433,7 @@ if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) && ! $db_is_info
'; + echo ''; } echo __('Remove database'); ?> @@ -481,8 +479,7 @@ echo __('Remove database'); '; + echo ''; } echo __('Copy database to') . ':'; $drop_clause = 'DROP TABLE / DROP VIEW'; @@ -546,8 +543,7 @@ echo __('Remove database'); . '
' . "\n" . ' '; if ($cfg['PropertiesIconic']) { - echo ''; + echo ''; } echo ' ' . "\n" . ' ' . "\n" @@ -594,8 +590,7 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { ?> */ echo ''; } // end if diff --git a/db_structure.php b/db_structure.php index 0054585bb4..c50cd77daf 100644 --- a/db_structure.php +++ b/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 = '' . __('Tracking is active.') . ''; + $tracking_icon = '' . __('Tracking is active.') . ''; } elseif (PMA_Tracker::getVersion($GLOBALS["db"], $truename) > 0) { - $tracking_icon = '' . __('Tracking is not active.') . ''; + $tracking_icon = '' . __('Tracking is not active.') . ''; } } @@ -340,7 +340,7 @@ foreach ($tables as $keyname => $each_table) { - ' : ''. $do ? ' REPLICATED' : ''; ?> + ' : ''. $do ? ' REPLICATED' : ''; ?> @@ -547,15 +547,13 @@ PMA_listNavigator($total_num_tables, $pos, $_url_params, 'db_structure.php', 'fr echo '

'; echo ''; if ($cfg['PropertiesIconic']) { - echo ''; + echo ''; } echo __('Print view') . ' '; echo ''; if ($cfg['PropertiesIconic']) { - echo ''; + echo ''; } echo __('Data Dictionary') . ''; echo '

'; diff --git a/db_tracking.php b/db_tracking.php index 3a9b6954b7..38a231d4e0 100644 --- a/db_tracking.php +++ b/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 .= '' . __('Delete tracking data for this table') . ''; + $drop_image_or_text .= '' . __('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 = ''; if ($cfg['PropertiesIconic']) { - $my_link .= '' . __('Track table') . ' '; + $my_link .= '' . __('Track table') . ' '; } $my_link .= __('Track table') . ''; ?> diff --git a/js/functions.js b/js/functions.js index 1841caf0ad..c873aa93b4 100644 --- a/js/functions.js +++ b/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)); } /** diff --git a/js/server_status.js b/js/server_status.js index 2fda29f784..6cb77d2faa 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -942,9 +942,9 @@ $(function() { $('a[href="#pauseCharts"]').click(function() { runtime.redrawCharts = ! runtime.redrawCharts; if(! runtime.redrawCharts) - $(this).html(' ' + PMA_messages['strResumeMonitor']); + $(this).html(' ' + PMA_messages['strResumeMonitor']); else { - $(this).html(' ' + PMA_messages['strPauseMonitor']); + $(this).html(' ' + 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 = '' + PMA_messages['strCurrentSettings'] + '
'; - str += ' ' + msg + '
'; + str += ' ' + msg + '
'; if(logVars['log_output'] != 'TABLE') - str += ' ' + PMA_messages['strLogOutNotTable'] + '
'; + str += ' ' + PMA_messages['strLogOutNotTable'] + '
'; else - str += ' ' + PMA_messages['strLogOutIsTable'] + '
'; + str += ' ' + PMA_messages['strLogOutIsTable'] + '
'; if(logVars['slow_query_log'] == 'ON') { if(logVars['long_query_time'] > 2) - str += ' ' + str += ' ' + $.sprintf(PMA_messages['strSmallerLongQueryTimeAdvice'], logVars['long_query_time']) + '
'; if(logVars['long_query_time'] < 2) - str += ' ' + str += ' ' + $.sprintf(PMA_messages['strLongQueryTimeSet'], logVars['long_query_time']) + '
'; } @@ -1261,27 +1261,47 @@ $(function() { $('#logAnalyseDialog').html( '

' + PMA_messages['strSelectedTimeRange'] - + Highcharts.dateFormat('%H:%M:%S',new Date(min)) + ' - ' - + Highcharts.dateFormat('%H:%M:%S',new Date(max)) + '

' + + ' - ' + + '

' + '' + '' + 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(' '); + $('#logTable th:last').append(' '); var qtipContent = PMA_messages['strCountColumnExplanation']; if(groupInserts) qtipContent += '

' + PMA_messages['strMoreCountColumnExplanation'] + '

'; diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index ff758b8c97..1b7b82739b 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -198,7 +198,7 @@ if (top != self) { echo ''; if ($GLOBALS['cfg']['ReplaceHelpImg']) { - echo '' . __('phpMyAdmin documentation') . ''; + echo '' . __('phpMyAdmin documentation') . ''; } else { echo '(*)'; } diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 61f3102f66..2a75dcaa8d 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -97,9 +97,9 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f $button .= ''; if ($include_icon) { - $button .= '' . $alternate . ''; + . ' 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 ''; } elseif ($big_icon) { - return '' . __('Documentation') . ''; + return '' . __('Documentation') . ''; } elseif ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '' . __('Documentation') . ''; + return '' . __('Documentation') . ''; } else { return '[' . __('Documentation') . ']'; } @@ -412,7 +412,7 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju */ function PMA_showDocu($anchor) { if ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '' . __('Documentation') . ''; + return '' . __('Documentation') . ''; } else { return '[' . __('Documentation') . ']'; } @@ -430,7 +430,7 @@ function PMA_showPHPDocu($target) { $url = PMA_getPHPDocLink($target); if ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '' . __('Documentation') . ''; + return '' . __('Documentation') . ''; } else { return '[' . __('Documentation') . ']'; } @@ -479,8 +479,7 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice') // footnotemarker used in js/tooltip.js return '' . $nr . '' . - ''; + ''; } /** @@ -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 = '%2$s'; + $image = '%2$s'; $tab['text'] = sprintf($image, htmlentities($tab['icon']), $tab['text']); } // check to not display an empty link-text diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php index c89365461f..b7e0fde862 100644 --- a/libraries/config/FormDisplay.tpl.php +++ b/libraries/config/FormDisplay.tpl.php @@ -159,8 +159,8 @@ function display_input($path, $name, $description = '', $type, $value, $value_is - Doc - Wiki + Doc + Wiki @@ -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']) { ?> - comment + comment - " title="" style="display:none">set-value + " title="" style="display:none">set-value - + '; + $order_img = ' '. __('Ascending') . ''; // 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 = ' '. __('Descending') . ''; + $order_img = ' '. __('Descending') . ''; // 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) diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index e8e2fc9b3f..4b7198eae2 100644 --- a/libraries/server_links.inc.php +++ b/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'); diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index 6282097507..b066caf0ee 100644 --- a/libraries/tbl_links.inc.php +++ b/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'); } diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php index 7d1a2d7e12..1b042171cf 100644 --- a/libraries/user_preferences.inc.php +++ b/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 '