July 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11286-gfd121f2
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via fd121f211a805e6cb83b51f5087ac79e7791dbba (commit) via 9730a6b3d78e28ef365010384556983f6864db02 (commit) via 97b1375605f241481a953e2c78eb42d43f84fa9d (commit) via 42d682e3405adf72eaeb4865d605a2e9c9d93319 (commit) via 67ec8263dbfd9f39c25bec5350f4618f5c14e001 (commit) via 5308a7b05d219fff7b96b55792e7737ce88ef837 (commit) via a4064cd8ab8a5126c5342d326b2449de3f6b7a34 (commit) via fb4b175586b76a721f539f4020cc5167e4f5aaca (commit) via 110b267a2987a2adcd88179e68b93b495883f616 (commit) via 4c8e6325f1d548cbc1d03919f0a2dd594bc1e7b1 (commit) via f12422457b3fdba017179ebfe2fb9624a11e2712 (commit) via 3b3a9fc7624f857b3ff5f599eee9473a42d71feb (commit) via bf2314342406ea56fc88d878be1072cb139e46d4 (commit) via da943ecbf7a2f604f6969564bee17aff52afd740 (commit) from ce3f3087414ebb87acf75346c17a69962e699e62 (commit) - Log ----------------------------------------------------------------- commit fd121f211a805e6cb83b51f5087ac79e7791dbba Merge: 9730a6b3d78e28ef365010384556983f6864db02 ce3f3087414ebb87acf75346c17a69962e699e62 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 15:53:04 2011 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 9730a6b3d78e28ef365010384556983f6864db02 Merge: bb3cb6d99cbba59caef8e91e621c282b192704c9 97b1375605f241481a953e2c78eb42d43f84fa9d Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 15:51:05 2011 +0200 Merge commit '97b1375605f241481a953e2c78eb42d43f84fa9d' Conflicts: js/functions.js libraries/common.lib.php libraries/header.inc.php server_status.php commit 97b1375605f241481a953e2c78eb42d43f84fa9d Author: Tyron Madlener <tyronx(a)gmail.com> Date: Tue Jul 19 21:44:53 2011 +0300 Remove duplicate intialization commit 42d682e3405adf72eaeb4865d605a2e9c9d93319 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Tue Jul 19 16:26:10 2011 +0300 CSS Sprites for original theme commit 67ec8263dbfd9f39c25bec5350f4618f5c14e001 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Tue Jul 19 12:59:13 2011 +0300 Fixes wrong z-index of timepicker commit 5308a7b05d219fff7b96b55792e7737ce88ef837 Merge: a5df22ced5067260b5edbb3d95b83cc8050d21a9 a4064cd8ab8a5126c5342d326b2449de3f6b7a34 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Mon Jul 18 13:16:28 2011 +0300 Merge branch 'sprites' Conflicts: ChangeLog po/af.po po/az.po po/be(a)latin.po po/bs.po po/ca.po po/cs.po po/el.po po/es.po po/fi.po po/fr.po po/gl.po po/he.po po/hi.po po/hr.po po/it.po po/ka.po po/ko.po po/lt.po po/lv.po po/mk.po po/mn.po po/ms.po po/nb.po po/nl.po po/phpmyadmin.pot po/pl.po po/ru.po po/si.po po/sk.po po/sl.po po/sv.po po/th.po po/uz.po themes/pmahomme/css/theme_right.css.php commit a4064cd8ab8a5126c5342d326b2449de3f6b7a34 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Mon Jul 18 13:13:40 2011 +0300 Monitor: Log table filtering and summation commit fb4b175586b76a721f539f4020cc5167e4f5aaca Author: Tyron Madlener <tyronx(a)gmail.com> Date: Mon Jul 18 13:10:08 2011 +0300 Fix merge conflicts of .po files attempt #2 commit 110b267a2987a2adcd88179e68b93b495883f616 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Sun Jul 17 22:44:32 2011 +0300 Fix merge conflicts with po files commit 4c8e6325f1d548cbc1d03919f0a2dd594bc1e7b1 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Fri Jul 15 10:28:24 2011 +0300 small help icon explained commit f12422457b3fdba017179ebfe2fb9624a11e2712 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Fri Jul 15 09:48:37 2011 +0300 PMA Spritify: Readded deleted icons commit 3b3a9fc7624f857b3ff5f599eee9473a42d71feb Author: Tyron Madlener <tyronx(a)gmail.com> Date: Fri Jul 15 09:42:16 2011 +0300 pma spritify part 2 commit bf2314342406ea56fc88d878be1072cb139e46d4 Merge: da943ecbf7a2f604f6969564bee17aff52afd740 f989d6f0cf61c861af0a37af12e3a24af7cdf4ee Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Jul 14 15:56:31 2011 +0300 Merge remote-tracking branch 'origin/master' Conflicts: ChangeLog Documentation.html db_events.php db_routines.php db_structure.php db_triggers.php js/db_structure.js js/functions.js js/indexes.js js/makegrid.js js/messages.php js/sql.js js/tbl_structure.js libraries/Table.class.php libraries/common.lib.php libraries/config.default.php libraries/config/messages.inc.php libraries/config/setup.forms.php libraries/config/user_preferences.forms.php libraries/database_interface.lib.php libraries/db_events.inc.php libraries/db_links.inc.php libraries/display_tbl.lib.php libraries/tbl_links.inc.php po/af.po po/ar.po po/az.po po/be.po po/be(a)latin.po po/bg.po po/bn.po po/br.po po/bs.po po/ca.po po/cs.po po/cy.po po/da.po po/de.po po/el.po po/en_GB.po po/es.po po/et.po po/eu.po po/fa.po po/fi.po po/fr.po po/gl.po po/he.po po/hi.po po/hr.po po/hu.po po/id.po po/it.po po/ja.po po/ka.po po/ko.po po/lt.po po/lv.po po/mk.po po/ml.po po/mn.po po/ms.po po/nb.po po/nl.po po/phpmyadmin.pot po/pl.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/si.po po/sk.po po/sl.po po/sq.po po/sr.po po/sr(a)latin.po po/sv.po po/ta.po po/te.po po/th.po po/tr.po po/tt.po po/ug.po po/uk.po po/ur.po po/uz.po po/uz(a)latin.po po/zh_CN.po po/zh_TW.po server_status.php tbl_triggers.php themes/original/css/theme_right.css.php themes/original/jquery/jquery-ui-1.8.override.css themes/pmahomme/css/theme_right.css.php themes/pmahomme/img/s_sortable.png themes/pmahomme/jquery/jquery-ui-1.8.override.css commit da943ecbf7a2f604f6969564bee17aff52afd740 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Jul 14 15:37:08 2011 +0300 PMA Icons to sprites part 1 ----------------------------------------------------------------------- Summary of changes: db_operations.php | 15 +- db_structure.php | 12 +- db_tracking.php | 4 +- js/db_search.js | 2 +- js/db_structure.js | 2 +- js/functions.js | 13 +- js/navigation.js | 4 +- js/server_status.js | 122 +++++++++-- js/server_synchronize.js | 3 +- js/server_variables.js | 6 +- js/sql.js | 16 +- libraries/auth/cookie.auth.lib.php | 4 +- libraries/common.lib.php | 25 +-- libraries/config/FormDisplay.tpl.php | 10 +- libraries/db_links.inc.php | 26 ++-- libraries/db_structure.lib.php | 12 +- libraries/display_create_database.lib.php | 2 +- libraries/display_create_table.lib.php | 2 +- libraries/display_export.lib.php | 2 +- libraries/display_import.lib.php | 2 +- libraries/display_tbl.lib.php | 12 +- libraries/footer.inc.php | 2 +- libraries/header.inc.php | 10 +- libraries/navigation_header.inc.php | 13 +- libraries/schema/User_Schema.class.php | 3 +- libraries/server_links.inc.php | 26 ++-- libraries/sql_query_form.lib.php | 3 +- libraries/tbl_links.inc.php | 20 +- libraries/user_preferences.inc.php | 12 +- navigation.php | 15 +- pmd/scripts/history.js | 6 +- querywindow.php | 10 +- server_binlog.php | 2 +- server_collations.php | 2 +- server_databases.php | 7 +- server_engines.php | 6 +- server_replication.php | 2 +- server_status.php | 42 +++-- server_synchronize.php | 3 +- server_variables.php | 2 +- sql.php | 2 +- tbl_create.php | 4 +- tbl_structure.php | 14 +- tbl_tracking.php | 2 +- test/theme.php | 74 +++---- themes/{pmahomme/img/cleardot.gif => dot.gif} | Bin 43 -> 43 bytes themes/original/css/theme_left.css.php | 28 ++- themes/original/css/theme_right.css.php | 245 ++++++++++++++++++---- themes/original/img/iconsprites.png | Bin 0 -> 32492 bytes themes/pmahomme/css/theme_left.css.php | 27 ++- themes/pmahomme/css/theme_right.css.php | 228 ++++++++++++++++---- themes/pmahomme/img/iconsprites.png | Bin 0 -> 35190 bytes themes/pmahomme/img/pause.png | Bin 329 -> 0 bytes themes/pmahomme/img/play.png | Bin 395 -> 0 bytes themes/pmahomme/img/{s_cog.png => s_process.png} | Bin 512 -> 512 bytes 55 files changed, 748 insertions(+), 358 deletions(-) rename themes/{pmahomme/img/cleardot.gif => dot.gif} (100%) create mode 100644 themes/original/img/iconsprites.png create mode 100644 themes/pmahomme/img/iconsprites.png delete mode 100644 themes/pmahomme/img/pause.png delete mode 100644 themes/pmahomme/img/play.png copy themes/pmahomme/img/{s_cog.png => s_process.png} (100%) diff --git a/db_operations.php b/db_operations.php index 0b4ab5f..16630e3 100644 --- a/db_operations.php +++ b/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 diff --git a/db_structure.php b/db_structure.php index 000ab6a..d1ffdc3 100644 --- a/db_structure.php +++ b/db_structure.php @@ -284,9 +284,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.'&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.'&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 . '&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 . '&table=' . $truename . '"><img class="icon ic_eye" src="themes/dot.gif" alt="' . __('Tracking is not active.') . '" title="' . __('Tracking is not active.') . '" /></a>'; } } @@ -341,7 +341,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; ?>"> @@ -548,15 +548,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>'; diff --git a/db_tracking.php b/db_tracking.php index 3a9b695..38a231d 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 .= '<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 . '&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>'; ?> diff --git a/js/db_search.js b/js/db_search.js index 0cb04b7..72b3046 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -87,7 +87,7 @@ $(document).ready(function() { }); /** Hide the table link in the initial search result */ - $("#table-info").prepend('<img id="table-image" src="./themes/original/img/s_tbl.png" />').hide(); + $("#table-info").prepend('<img id="table-image" class="icon ic_s_tbl" src="./themes/dot.gif" />').hide(); /** Hide the browse and deleted results in the new search criteria */ $('#buttonGo').click(function(){ diff --git a/js/db_structure.js b/js/db_structure.js index e7eb7ca..efc8f2a 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -218,7 +218,7 @@ $(document).ready(function() { PMA_ajaxShowMessage(data.message); //Fetch inner span of this anchor //and replace the icon with its disabled version - var span = $this_anchor.html().replace(/b_empty.png/, 'bd_empty.png'); + var span = $this_anchor.html().replace(/ic_b_empty/, 'ic_bd_empty'); PMA_adjustTotals($this_anchor); //To disable further attempts to truncate the table, diff --git a/js/functions.js b/js/functions.js index eff6759..dbb962d 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, @@ -164,7 +163,9 @@ function PMA_addDatepicker($this_element) { },0); }, constrainInput: false - }); + }; + + $this_element.datepicker($.extend(defaultOptions, options)); } /** @@ -2409,7 +2410,7 @@ $(function() { }); var img = topmenu.find('li:first-child img'); if (img.length) { - img.clone().attr('src', img.attr('src').replace(/\/[^\/]+$/, '/b_more.png')).prependTo(link); + img.clone().attr('class', 'icon ic_b_more').prependTo(link); } var submenu = $('<li />', {'class': 'submenu'}) .append(link) diff --git a/js/navigation.js b/js/navigation.js index 20aea18..167eb37 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -28,13 +28,13 @@ function toggle(id, only_open) { if (el.style.display == 'none' || only_open) { el.style.display = ''; if (img) { - img.src = image_minus; + img.className = 'icon ic_b_minus'; img.alt = '-'; } } else { el.style.display = 'none'; if (img) { - img.src = image_plus; + img.className = 'icon ic_b_plus'; img.alt = '+'; } } diff --git a/js/server_status.js b/js/server_status.js index 2fda29f..ac4071c 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -439,7 +439,7 @@ $(function() { }); $('#serverstatusqueriesdetails tr:first th') - .append('<img class="sortableIcon" src="' + pmaThemeImage + 'cleardot.gif" alt="">'); + .append('<img class="icon sortableIcon" src="themes/dot.gif" alt="">'); break; @@ -453,7 +453,7 @@ $(function() { }); $('#serverstatusvariables tr:first th') - .append('<img class="sortableIcon" src="' + pmaThemeImage + 'cleardot.gif" alt="">'); + .append('<img class="icon sortableIcon" src="themes/dot.gif" alt="">'); break; } @@ -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_pause" 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_error'; 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"); } @@ -1508,14 +1528,16 @@ $(function() { tableStr += '<td>' + formatValue(cols[j], rows[i][cols[j]]) + '</td>'; tableStr += '</tr>'; } - - tableStr+='</tbody></table>'; - + + tableStr += '</tbody><tfoot>'; + tableStr += '<tr><th colspan="' + (cols.length - 1) + '">Sum of grouped rows: '+ data.numRows +'<span style="float:right">Total:</span></th><th align="right">' + data.sum.TOTAL + '</th></tr>'; + tableStr += '</tfoot></table>'; + $('#logTable').html(tableStr); // Append a tooltip to the count column, if there exist one if($('#logTable th:last').html() == '#') { - $('#logTable th:last').append(' <img class="qroupedQueryInfoIcon" src="' + pmaThemeImage + 'b_docs.png" alt="" />'); + $('#logTable th:last').append(' <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>'; @@ -1533,13 +1555,15 @@ $(function() { }) } + + $('div#logTable table').tablesorter({ sortList: [[0,1]], widgets: ['zebra'] }); $('div#logTable table thead th') - .append('<img class="sortableIcon" src="' + pmaThemeImage + 'cleardot.gif" alt="">'); + .append('<img class="icon sortableIcon" src="themes/dot.gif" alt="">'); $('#loadingLogsDialog').html('<p>' + PMA_messages['strLogDataLoaded'] + '</p>'); @@ -1549,6 +1573,64 @@ $(function() { $('#loadingLogsDialog').append(key + ': ' + value + '<br/>'); }); + if(data.numRows > 12) { + $('div#logTable').prepend( + '<fieldset id="logDataFilter">' + + ' <legend>Filters</legend>' + + ' <div class="formelement">' + + ' <label for="filterQueryText">Filter queries by word/regexp:</label>' + + ' <input name="filterQueryText" type="text" id="filterQueryText" style="vertical-align: baseline;" />' + + ((data.numRows > 250) ? ' <button name="startFilterQueryText" id="startFilterQueryText">Filter</button>' : '') + + ' </div>' + + '</fieldset>' + ); + + if(data.numRows > 250) { + $('div#logTable button#startFilterQueryText').click(filterQueries); + } else { + $('div#logTable input#filterQueryText').keyup(filterQueries); + } + + function filterQueries() { + var odd_row=false, cell, textFilter; + var val = $('div#logTable input#filterQueryText').val(); + + if(val.length == 0) textFilter = null; + else textFilter = new RegExp(val, 'i'); + + var rowSum = 0, totalSum = 0; + + $('div#logTable table tbody tr').each(function() { + // We just assume the sql text is always in the second last column + cell = $(this).children(':nth-child(' + (cols.length - 1) + ')'); + + if(textFilter==null || textFilter.exec(cell.text())) { + // And that total count is right of the sql text + totalSum += parseInt(cell.next().text()); + rowSum ++; + + odd_row = !odd_row; + $(this).css('display',''); + if(odd_row) { + $(this).addClass('odd'); + $(this).removeClass('even'); + } else { + $(this).addClass('even'); + $(this).removeClass('odd'); + } + } else { + $(this).css('display','none'); + } + }); + + + $('div#logTable table tfoot tr') + .html('<th colspan="' + (cols.length - 1) + + '">Sum of grouped rows: '+ rowSum +'<span style="float:right">Total:</span></th><th align="right">' + + totalSum + '</th>'); + }; + } + var dlgBtns = {}; dlgBtns[PMA_messages['strJumpToTable']] = function() { $(this).dialog("close"); diff --git a/js/server_synchronize.js b/js/server_synchronize.js index e1645ae..1dfd3d2 100644 --- a/js/server_synchronize.js +++ b/js/server_synchronize.js @@ -96,7 +96,8 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem insert_rows.align = "center"; var tick_image = document.createElement("img"); - tick_image.src = pmaThemeImage + "s_success.png"; + tick_image.src = 'themes/dot.gif'; + tick_image.className = "icon ic_s_success"; if (update_size == '' && insert_size == '' && remove_size == '') { /** diff --git a/js/server_variables.js b/js/server_variables.js index e7e469c..e9bc1cf 100644 --- a/js/server_variables.js +++ b/js/server_variables.js @@ -54,9 +54,9 @@ $(function() { var charWidth; // Global vars - editLink = '<a href="#" class="editLink" onclick="return editVariable(this);"><img src="'+pmaThemeImage+'b_edit.png" alt="" width="16" height="16"> '+PMA_messages['strEdit']+'</a>'; - saveLink = '<a href="#" class="saveLink"><img src="'+pmaThemeImage+'b_save.png" alt="" width="16" height="16"> '+PMA_messages['strSave']+'</a> '; - cancelLink = '<a href="#" class="cancelLink"><img src="'+pmaThemeImage+'b_close.png" alt="" width="16" height="16"> '+PMA_messages['strCancel']+'</a> '; + editLink = '<a href="#" class="editLink" onclick="return editVariable(this);"><img class="icon ic_b_edit" src="themes/dot.gif" alt=""> '+PMA_messages['strEdit']+'</a>'; + saveLink = '<a href="#" class="saveLink"><img class="icon ic_b_save" src="themes/dot.gif" alt=""> '+PMA_messages['strSave']+'</a> '; + cancelLink = '<a href="#" class="cancelLink"><img class="icon ic_b_close" src="themes/dot.gif" alt=""> '+PMA_messages['strCancel']+'</a> '; $.ajaxSetup({ diff --git a/js/sql.js b/js/sql.js index 90f843d..0476795 100644 --- a/js/sql.js +++ b/js/sql.js @@ -65,8 +65,8 @@ function appendInlineAnchor() { var $img_object = $cloned_anchor.find('img').attr('title', PMA_messages['strInlineEdit']); if ($img_object.length != 0) { - var img_src = $img_object.attr('src').replace(/b_edit/,'b_inline_edit'); - $img_object.attr('src', img_src); + var img_class = $img_object.attr('class').replace(/b_edit/,'b_inline_edit'); + $img_object.attr('class', img_class); $cloned_anchor.find('a').attr('href', '#'); var $edit_span = $cloned_anchor.find('span:contains("' + PMA_messages['strEdit'] + '")'); var $span = $cloned_anchor.find('a').find('span'); @@ -85,8 +85,8 @@ function appendInlineAnchor() { // the link was too big so <input type="image"> is there $img_object = $cloned_anchor.find('input:image').attr('title', PMA_messages['strInlineEdit']); if ($img_object.length > 0) { - var img_src = $img_object.attr('src').replace(/b_edit/,'b_inline_edit'); - $img_object.attr('src', img_src); + var img_class = $img_object.attr('class').replace(/b_edit/,'b_inline_edit'); + $img_object.attr('class', img_class); } $cloned_anchor .find('.clickprevimage') @@ -444,8 +444,8 @@ $(document).ready(function() { // If icons are displayed. See $cfg['PropertiesIconic'] if ($img_object.length > 0) { $img_object.attr('title', PMA_messages['strSave']); - var img_src = $img_object.attr('src').replace(/b_inline_edit/,'b_save'); - $img_object.attr('src', img_src); + var img_class = $img_object.attr('class').replace(/b_inline_edit/,'b_save'); + $img_object.attr('class', img_class); $this_children.prepend($img_object); } @@ -464,8 +464,8 @@ $(document).ready(function() { // If icons are displayed. See $cfg['PropertiesIconic'] if ($img_object.length > 0) { $img_object.attr('title', PMA_messages['strHide']); - var img_src = $img_object.attr('src').replace(/b_save/,'b_close'); - $img_object.attr('src', img_src); + var img_class = $img_object.attr('class').replace(/b_save/,'b_close'); + $img_object.attr('class', img_class); $hide_span.prepend($img_object); } diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 2f3323e..9360b9a 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -131,7 +131,7 @@ function PMA_auth() // Defines the charset to be used header('Content-Type: text/html; charset=utf-8'); // Defines the "item" image depending on text direction - $item_img = $GLOBALS['pmaThemeImage'] . 'item_' . $GLOBALS['text_dir'] . '.png'; + $item_img = 'ic_item_' . $GLOBALS['text_dir']; /* HTML header; do not show here the PMA version to improve security */ $page_title = 'phpMyAdmin '; @@ -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 '(*)'; } diff --git a/libraries/common.lib.php b/libraries/common.lib.php index b7df61a..f710b80 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 .= '<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>]'; } @@ -474,8 +474,7 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice') // footnotemarker used in js/tooltip.js return '<sup class="footnotemarker">' . $nr . '</sup>' . - '<img class="footnotemarker footnote_' . $nr . '" src="' . - $GLOBALS['pmaThemeImage'] . 'b_help.png" alt="" />'; + '<img class="footnotemarker ic_b_help footnote_' . $nr . '" src="themes/dot.gif" alt="" />'; } /** @@ -1506,7 +1505,7 @@ function PMA_localisedDate($timestamp = -1, $format = '') * @return string html code for one tab, a link if valid otherwise a span * @access public */ -function PMA_generate_html_tab($tab, $url_params = array()) +function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='') { // default values $defaults = array( @@ -1568,8 +1567,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="' . $base_dir . '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 @@ -1604,7 +1603,7 @@ function PMA_generate_html_tab($tab, $url_params = array()) * @param string $url_params * @return string html-code for tab-navigation */ -function PMA_generate_html_tabs($tabs, $url_params) +function PMA_generate_html_tabs($tabs, $url_params, $base_dir='') { $tag_id = 'topmenu'; $tab_navigation = @@ -1612,7 +1611,7 @@ function PMA_generate_html_tabs($tabs, $url_params) .'<ul id="' . htmlentities($tag_id) . '">' . "\n"; foreach ($tabs as $tab) { - $tab_navigation .= PMA_generate_html_tab($tab, $url_params); + $tab_navigation .= PMA_generate_html_tab($tab, $url_params, $base_dir); } $tab_navigation .= diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php index c893654..be680d3 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 <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 diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php index 604efde..5a95622 100644 --- a/libraries/db_links.inc.php +++ b/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'; } /** diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index afb3ce5..68e4b9d 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -94,19 +94,19 @@ 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\'); }'; // 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\'); }'; } 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\'; }'; + $order_link_params['onmouseover'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }'; // on mouse out, show current sort order (DESC) - $order_link_params['onmouseout'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }'; + $order_link_params['onmouseout'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }'; } } diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php index e0031a4..1ec7931 100644 --- a/libraries/display_create_database.lib.php +++ b/libraries/display_create_database.lib.php @@ -39,7 +39,7 @@ if ($is_create_db_priv) { <strong><?php echo __('Create database') . ': ' . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></strong><br /> <?php echo '<span class="noPrivileges">' - . ($cfg['ErrorIconic'] ? '<img src="' . $pmaThemeImage . 's_error2.png" alt="" width="11" height="11" hspace="2" border="0" align="middle" />' : '') + . ($cfg['ErrorIconic'] ? '<img class="icon ic_s_error2" src="themes/dot.gif" alt="" hspace="2" border="0" align="middle" />' : '') . '' . __('No Privileges') .'</span>'; } // end create db form or message ?> diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php index 5ec2d9a..8341342 100644 --- a/libraries/display_create_table.lib.php +++ b/libraries/display_create_table.lib.php @@ -41,7 +41,7 @@ $is_create_table_priv = true; <legend> <?php if ($GLOBALS['cfg']['PropertiesIconic']) { - echo '<img class="icon" src="' . $pmaThemeImage . 'b_newtbl.png" width="16" height="16" alt="" />'; + echo '<img class="icon ic_b_newtbl" src="themes/dot.gif" alt="" />'; } echo sprintf(__('Create table on database %s'), PMA_getDbLink()); ?> diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index dd6c347..28e0bf2 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -74,7 +74,7 @@ if(isset($_GET['sql_query'])) { <div class="exportoptions" id="header"> <h2> - <img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_export.png" alt="export" /> + <img class="icon ic_b_export" src="themes/dot.gif" alt="export" /> <?php if($export_type == 'server') { echo __('Exporting databases from the current server'); diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 05df2d0..119ccd1 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -123,7 +123,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { <div class="exportoptions" id="header"> <h2> - <img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_import.png" alt="import" /> + <img class="icon ic_b_import" src="themes/dot.gif" alt="import" /> <?php if($import_type == 'server') { echo __('Importing into the current server'); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 0b3ef2f..8bf4f3c 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -889,10 +889,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $order_img = ''; } elseif ('DESC' == $sort_direction) { $sort_order .= ' ASC'; - $order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_desc.png" width="11" height="9" alt="'. __('Descending') . '" title="'. __('Descending') . '" id="soimg' . $i . '" />'; + $order_img = ' <img class="icon ic_s_desc" src="themes/dot.gif" alt="'. __('Descending') . '" title="'. __('Descending') . '" id="soimg' . $i . '" />'; } else { $sort_order .= ' DESC'; - $order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_asc.png" width="11" height="9" alt="'. __('Ascending') . '" title="'. __('Ascending') . '" id="soimg' . $i . '" />'; + $order_img = ' <img class="icon ic_s_asc" src="themes/dot.gif" alt="'. __('Ascending') . '" title="'. __('Ascending') . '" id="soimg' . $i . '" />'; } if (preg_match('@(.*)([[:space:]](LIMIT (.*)|PROCEDURE (.*)|FOR UPDATE|LOCK IN SHARE MODE))@is', $unsorted_sql_query, $regs3)) { @@ -913,11 +913,11 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $order_link_params = array(); if (isset($order_img) && $order_img!='') { if (strstr($order_img, 'asc')) { - $order_link_params['onmouseover'] = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }'; - $order_link_params['onmouseout'] = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }'; + $order_link_params['onmouseover'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }'; + $order_link_params['onmouseout'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }'; } elseif (strstr($order_img, 'desc')) { - $order_link_params['onmouseover'] = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }'; - $order_link_params['onmouseout'] = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }'; + $order_link_params['onmouseover'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }'; + $order_link_params['onmouseout'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }'; } } if ($GLOBALS['cfg']['HeaderFlipType'] == 'auto') { diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index c94c016..bbeb04b 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -162,7 +162,7 @@ setURLHash("<?php echo PMA_generate_common_url($url_params, 'text', ''); ?>"); echo '<a href="index.php' . PMA_generate_common_url($url_params) . '"' . ' title="' . __('Open new phpMyAdmin window') . '" target="_blank">'; if ($GLOBALS['cfg']['NavigationBarIconic']) { - echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 'window-new.png"' + echo '<img class="icon ic_window-new" src="themes/dot.gif"' . ' alt="' . __('Open new phpMyAdmin window') . '" />'; } if ($GLOBALS['cfg']['NavigationBarIconic'] !== true) { diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 270b421..5700047 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -110,8 +110,8 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { ); $item = '<a href="%1$s?%2$s" class="item">'; if ($GLOBALS['cfg']['NavigationBarIconic']) { - $separator = ' <span class="separator"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'item_' . $GLOBALS['text_dir'] . '.png" width="5" height="9" alt="-" /></span>' . "\n"; - $item .= ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . '%5$s" width="16" height="16" alt="" /> ' . "\n"; + $separator = ' <span class="separator"><img class="icon ic_item_' . $GLOBALS['text_dir'] . '" src="themes/dot.gif" alt="-" /></span>' . "\n"; + $item .= ' <img class="icon %5$s" src="themes/dot.gif" alt="" /> ' . "\n"; } else { $separator = ' <span class="separator"> - </span>' . "\n"; } @@ -127,7 +127,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { PMA_generate_common_url(), htmlspecialchars($server_info), __('Server'), - 's_host.png'); + 'ic_s_host'); if (strlen($GLOBALS['db'])) { @@ -137,7 +137,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { PMA_generate_common_url($GLOBALS['db']), htmlspecialchars($GLOBALS['db']), __('Database'), - 's_db.png'); + 'ic_s_db'); // if the table is being dropped, $_REQUEST['purge'] is set to '1' // so do not display the table name in upper div if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1')) { @@ -149,7 +149,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']), str_replace(' ', ' ', htmlspecialchars($GLOBALS['table'])), (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? __('View') : __('Table')), - (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'b_views' : 's_tbl') . '.png'); + (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'ic_b_views' : 'ic_s_tbl')); /** * Displays table comment diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index e8db6a2..7f7c530 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -56,8 +56,7 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) { echo '<a href="main.php?' . $query_url . '"' .' title="' . __('Home') . '">' .($GLOBALS['cfg']['MainPageIconic'] - ? '<img class="icon" src="' . $pmaThemeImage . 'b_home.png" width="16" ' - .' height="16" alt="' . __('Home') . '" />' + ? '<img class="icon ic_b_home" src="themes/dot.gif" alt="' . __('Home') . '" />' : __('Home')) .'</a>' . "\n"; // if we have chosen server @@ -69,8 +68,7 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) { .urlencode($PHP_AUTH_USER) . '" target="_parent"' .' title="' . __('Log out') . '" >' .($GLOBALS['cfg']['MainPageIconic'] - ? '<img class="icon" src="' . $pmaThemeImage . 's_loggoff.png" ' - .' width="16" height="16" alt="' . __('Log out') . '" />' + ? '<img class="icon ic_s_loggoff" src="themes/dot.gif" alt="' . __('Log out') . '" />' : __('Log out')) .'</a>' . "\n"; } // end if ($GLOBALS['cfg']['Server']['auth_type'] != 'config' @@ -79,8 +77,7 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) { if ($GLOBALS['cfg']['MainPageIconic']) { $query_frame_link_text = - '<img class="icon" src="' . $pmaThemeImage . 'b_selboard.png"' - .' width="16" height="16" alt="' . __('Query window') . '" />'; + '<img class="icon ic_b_selboard" src="themes/dot.gif" alt="' . __('Query window') . '" />'; } else { echo '<br />' . "\n"; $query_frame_link_text = __('Query window'); @@ -95,7 +92,7 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) { .' title="' . __('phpMyAdmin documentation') . '" >'; if ($GLOBALS['cfg']['MainPageIconic']) { - echo '<img class="icon" src="' . $pmaThemeImage . 'b_docs.png" width="16" height="16"' + echo '<img class="icon ic_b_docs" src="themes/dot.gif"' .' alt="' . __('phpMyAdmin documentation') . '" />'; } echo '</a>'; @@ -107,7 +104,7 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) { } echo '<a href="navigation.php?' . PMA_generate_common_url($params) . '" target="frame_navigation">'; if ($GLOBALS['cfg']['MainPageIconic']) { - echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_reload.png"' + echo '<img class="icon ic_s_reload" src="themes/dot.gif"' . ' title="' . __('Reload navigation frame') . '"' . ' alt="' . __('Reload navigation frame') . '" />'; } else { diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index d610ac0..eb96835 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -336,8 +336,7 @@ class PMA_User_Schema <?php echo PMA_generate_common_hidden_inputs($db); if ($cfg['PropertiesIconic']) { - echo '<img class="icon" src="' . $pmaThemeImage . 'b_view.png"' - .' alt="" width="16" height="16" />'; + echo '<img class="icon ic_b_views" src="themes/dot.gif" />'; } echo __('Display relational schema'); ?>: diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index e8e2fc9..4b7198e 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/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 13d866e..1a3fd92 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -383,8 +383,7 @@ function PMA_sqlQueryFormBookmark() if ($GLOBALS['cfg']['ReplaceHelpImg']) { echo ' <a href="./Documentation.html#faqbookmark"' .' target="documentation">' - .'<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png"' - .' border="0" width="11" height="11" align="middle"' + .'<img class="icon ic_b_help_s" src="themes/dot.gif"' .' alt="' . __('Documentation') . '" /></a> '; } else { echo ' (<a href="./Documentation.html#faqbookmark"' diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index 82c9784..ac5bfb3 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'; } @@ -109,7 +109,7 @@ if (!$db_is_information_schema && !PMA_DRIZZLE) { * 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 7d1a2d7..1b04217 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 '<ul id="topmenu2">'; echo PMA_generate_html_tab(array( 'link' => 'prefs_manage.php', diff --git a/navigation.php b/navigation.php index 8e42014..27859fe 100644 --- a/navigation.php +++ b/navigation.php @@ -113,9 +113,6 @@ require_once './libraries/header_http.inc.php'; ?> <script type="text/javascript"> // <![CDATA[ - var image_minus = '<?php echo $GLOBALS['pmaThemeImage']; ?>b_minus.png'; - var image_plus = '<?php echo $GLOBALS['pmaThemeImage']; ?>b_plus.png'; - // INIT PMA_setFrameSize var onloadCnt = 0; var onLoadHandler = window.onload; @@ -230,9 +227,9 @@ if (! $GLOBALS['server']) { // or $GLOBALS['cfg']['Servers']['only_db'] is defined and is not an array) // In this case, the database should not be collapsible/expandable -$img_plus = '<img class="icon" id="el%dImg" src="' . $pmaThemeImage . 'b_plus.png"' +$img_plus = '<img class="icon ic_b_plus" id="el%dImg" src="themes/dot.gif"' .' alt="+" />'; -$img_minus = '<img class="icon" id="el%dImg" src="' . $pmaThemeImage . 'b_minus.png"' +$img_minus = '<img class="icon ic_b_minus" id="el%dImg" src="themes/dot.gif"' .' alt="-" />'; $href_left = '<a onclick="if (toggle(\'%d\')) return false;"' @@ -303,7 +300,7 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { $class = ''; $GLOBALS['cfg']['AjaxEnable'] ? $class="ajax" : ''; echo '<ul id="newtable"><li><a target="frame_content" href="tbl_create.php' . PMA_generate_common_url(array('db' => $GLOBALS['db'])) . '" class="'.$class .'" >' - .'<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_snewtbl.png" id="icon_newtable" alt="' . _pgettext('short form', 'Create table') . '" />' + .'<img class="icon ic_b_snewtbl" src="themes/dot.gif" id="icon_newtable" alt="' . _pgettext('short form', 'Create table') . '" />' . _pgettext('short form', 'Create table') . '</a></li></ul>'; } } elseif ($GLOBALS['cfg']['LeftFrameLight']) { @@ -597,11 +594,11 @@ function PMA_displayTableList($tables, $visible = false, .'&table=' . urlencode($table['Name']) .'&goto=' . $GLOBALS['cfg']['LeftDefaultTabTable'] . '" >' - .'<img class="icon"'; + .'<img src="themes/dot.gif"'; if ('VIEW' === strtoupper($table['Comment'])) { - echo ' src="' . $GLOBALS['pmaThemeImage'] . 's_views.png"'; + echo ' class="icon ic_s_views"'; } else { - echo ' src="' . $GLOBALS['pmaThemeImage'] . 'b_sbrowse.png"'; + echo ' class="icon ic_b_sbrowse"'; } echo ' id="icon_' . htmlspecialchars($table_db . '.' . $table['Name']) . '"' .' alt="' . htmlspecialchars($link_title) . '" /></a>' . "\n"; diff --git a/pmd/scripts/history.js b/pmd/scripts/history.js index ace5bae..478bd82 100644 --- a/pmd/scripts/history.js +++ b/pmd/scripts/history.js @@ -71,12 +71,12 @@ function display(init,final) { else { str +='<img src="pmd/images/and_icon.png" onclick="and_or('+i+')" title="AND"/></td>'; } - str +='<td style="padding-left: 5px;" align="right"><img src="./themes/original/img/b_sbrowse.png" title="column name"/></td><td width="175" style="padding-left: 5px">' + history_array[i].get_column_name(); + str +='<td style="padding-left: 5px;" align="right"><img class="icon ic_b_sbrowse" src="themes/dot.gif" title="column name"/></td><td width="175" style="padding-left: 5px">' + history_array[i].get_column_name(); if (history_array[i].get_type() == "GroupBy" || history_array[i].get_type() == "OrderBy") { - str += '</td><td align="center"><img src="themes/original/img/b_info.png" title="'+detail(i)+'"/><td title="' + detail(i) +'">' + history_array[i].get_type() + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>'; + str += '</td><td align="center"><img class="icon ic_b_info" src="themes/dot.gif" title="'+detail(i)+'"/><td title="' + detail(i) +'">' + history_array[i].get_type() + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img class="icon ic_b_drop" src="themes/dot.gif" title="Delete"></td></tr></thead>'; } else { - str += '</td><td align="center"><img src="themes/original/img/b_info.png" title="'+detail(i)+'"/></td><td title="' + detail(i) +'">' + history_array[i]. get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')><img src="themes/original/img/b_edit.png" title="Edit"/></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>'; + str += '</td><td align="center"><img class="icon ic_b_info" src="themes/dot.gif" title="'+detail(i)+'"/></td><td title="' + detail(i) +'">' + history_array[i]. get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')><img class="icon ic_b_edit" src="themes/dot.gif" title="Edit"/></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>'; } i++; if(i >= history_array.length) { diff --git a/querywindow.php b/querywindow.php index 3e5207c..76e2a3b 100644 --- a/querywindow.php +++ b/querywindow.php @@ -60,17 +60,17 @@ if ($no_js) { $tabs = false; } else { $tabs = array(); - $tabs['sql']['icon'] = 'b_sql.png'; + $tabs['sql']['icon'] = 'ic_b_sql'; $tabs['sql']['text'] = __('SQL'); $tabs['sql']['fragment'] = '#'; $tabs['sql']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'sql\');return false;"'; $tabs['sql']['active'] = (bool) ($querydisplay_tab == 'sql'); - $tabs['import']['icon'] = 'b_import.png'; + $tabs['import']['icon'] = 'ic_b_import'; $tabs['import']['text'] = __('Import files'); $tabs['import']['fragment'] = '#'; $tabs['import']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'files\');return false;"'; $tabs['import']['active'] = (bool) ($querydisplay_tab == 'files'); - $tabs['history']['icon'] = 'b_bookmark.png'; + $tabs['history']['icon'] = 'ic_b_bookmark'; $tabs['history']['text'] = __('SQL history'); $tabs['history']['fragment'] = '#'; $tabs['history']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'history\');return false;"'; @@ -86,8 +86,8 @@ if ($no_js) { if ($GLOBALS['cfg']['PropertiesIconic']) { $titles['Change'] = - '<img class="icon" width="16" height="16" src="' . $pmaThemeImage - . 'b_edit.png" alt="' . __('Change') . '" title="' . __('Change') + '<img class="icon ic_b_edit" src="themes/dot.gif" alt="' + . __('Change') . '" title="' . __('Change') . '" />'; if ('both' === $GLOBALS['cfg']['PropertiesIconic']) { diff --git a/server_binlog.php b/server_binlog.php index 02b0800..1b55452 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -73,7 +73,7 @@ if (empty($_REQUEST['dontlimitchars'])) { * Displays the sub-page heading */ echo '<h2>' . "\n" - . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_tbl.png" width="16" height="16" border="0" hspace="2" align="middle" alt="" />' : '') + . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="themes/dot.gif" class="icon ic_s_tbl" alt="" />' : '') . ' ' . __('Binary log') . "\n" . '</h2>' . "\n"; diff --git a/server_collations.php b/server_collations.php index 44d5157..ccd41d4 100644 --- a/server_collations.php +++ b/server_collations.php @@ -34,7 +34,7 @@ require './libraries/server_links.inc.php'; */ echo '<h2>' . "\n" . ' ' . ($GLOBALS['cfg']['MainPageIconic'] - ? '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_asci.png" alt="" />' + ? '<img class="icon ic_s_asci" src="themes/dot.gif" alt="" />' : '') . '' . __('Character Sets and Collations') . "\n" . '</h2>' . "\n"; diff --git a/server_databases.php b/server_databases.php index 051345d..fb9d1d6 100644 --- a/server_databases.php +++ b/server_databases.php @@ -94,8 +94,7 @@ require './libraries/server_links.inc.php'; */ echo '<h2>' . "\n" . ($GLOBALS['cfg']['MainPageIconic'] - ? '<img class="icon" src="' . $pmaThemeImage . 's_db.png" width="16"' - .' height="16" alt="" />' + ? '<img class="icon ic_s_db" src="themes/dot.gif" alt="" />' : '') . ($dbstats ? __('Databases statistics') : __('Databases')) . "\n" .'</h2>' . "\n"; @@ -155,7 +154,7 @@ if ($databases_count > 0) { . ($is_superuser || $cfg['AllowUserDropDatabase'] ? ' <th></th>' . "\n" : '') . ' <th><a href="./server_databases.php' . PMA_generate_common_url($_url_params) . '">' . "\n" . ' ' . __('Database') . "\n" - . ($sort_by == 'SCHEMA_NAME' ? ' <img class="icon" src="' . $pmaThemeImage . 's_' . $sort_order . '.png" width="11" height="9" alt="' . ($sort_order == 'asc' ? __('Ascending') : __('Descending')) . '" />' . "\n" : '') + . ($sort_by == 'SCHEMA_NAME' ? ' <img class="icon ic_s_' . $sort_order . '" src="themes/dot.gif" alt="' . ($sort_order == 'asc' ? __('Ascending') : __('Descending')) . '" />' . "\n" : '') . ' </a></th>' . "\n"; $table_columns = 3; foreach ($column_order as $stat_name => $stat) { @@ -172,7 +171,7 @@ if ($databases_count > 0) { echo ' <th' . $colspan . '>' .'<a href="./server_databases.php' . PMA_generate_common_url($_url_params) . '">' . "\n" .' ' . $stat['disp_name'] . "\n" - .($sort_by == $stat_name ? ' <img class="icon" src="' . $pmaThemeImage . 's_' . $sort_order . '.png" width="11" height="9" alt="' . ($sort_order == 'asc' ? __('Ascending') : __('Descending')) . '" />' . "\n" : '') + .($sort_by == $stat_name ? ' <img class="icon ic_s_' . $sort_order . '" src="themes/dot.gif" alt="' . ($sort_order == 'asc' ? __('Ascending') : __('Descending')) . '" />' . "\n" : '') .' </a></th>' . "\n"; } } diff --git a/server_engines.php b/server_engines.php index 4eb5312..c668777 100644 --- a/server_engines.php +++ b/server_engines.php @@ -42,8 +42,7 @@ if (empty($_REQUEST['engine']) */ echo '<h2>' . "\n" . ($GLOBALS['cfg']['MainPageIconic'] - ? '<img class="icon" src="' . $pmaThemeImage . 'b_engine.png"' - .' width="16" height="16" alt="" />' : '') + ? '<img class="icon ic_b_engine" src="themes/dot.gif" alt="" />' : '') . "\n" . __('Storage Engines') . "\n" . '</h2>' . "\n"; @@ -107,8 +106,7 @@ if (empty($_REQUEST['engine']) $engine_plugin = PMA_StorageEngine::getEngine($_REQUEST['engine']); echo '<h2>' . "\n" . ($GLOBALS['cfg']['MainPageIconic'] - ? '<img class="icon" src="' . $pmaThemeImage . 'b_engine.png"' - .' width="16" height="16" alt="" />' : '') + ? '<img class="icon ic_b_engine" src="themes/dot.gif" alt="" />' : '') . ' ' . htmlspecialchars($engine_plugin->getTitle()) . "\n" . ' ' . PMA_showMySQLDocu('', $engine_plugin->getMysqlHelpPage()) . "\n" . '</h2>' . "\n\n"; diff --git a/server_replication.php b/server_replication.php index 5576914..c2fa555 100644 --- a/server_replication.php +++ b/server_replication.php @@ -158,7 +158,7 @@ require './libraries/server_links.inc.php'; echo '<div id="replication">'; echo ' <h2>'; -echo ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_replication.png" width="16" height="16" alt="" />'; +echo ' <img class="icon ic_s_replication" src="themes/dot.gif" alt="" />'; echo __('Replication'); echo ' </h2>'; diff --git a/server_status.php b/server_status.php index b1dea55..cf02da7 100644 --- a/server_status.php +++ b/server_status.php @@ -220,7 +220,8 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { preg_match('/^(\w+)\s/',$row['argument'],$match); $type = strtolower($match[1]); // Ignore undefined index warning, just increase counter by one - @$return['sum'][$type]++; + @$return['sum'][$type] += $row['#']; + if($type=='insert' || $type=='update') { // Group inserts if selected if($type=='insert' && isset($_REQUEST['groupInserts']) && $_REQUEST['groupInserts'] && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',$row['argument'],$matches)) { @@ -229,8 +230,8 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]]; // Add a ... to the end of this query to indicate that there's been other queries - $return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.'; - $return['rows'][$insertTablesFirst]['argument'] .= '<br/>...'; + if($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') + $return['rows'][$insertTablesFirst]['argument'] .= '<br/>...'; // Group this value, thus do not add to the result list continue; @@ -251,6 +252,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } $return['sum']['TOTAL'] = array_sum($return['sum']); + $return['numRows'] = count($return['rows']); PMA_DBI_free_result($result); @@ -277,6 +279,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 */ @@ -575,7 +578,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'); @@ -583,7 +586,7 @@ echo __('Runtime Information'); ?></h2> <div id="serverStatusTabs"> <ul> - <li><a href="#statustabs_traffic"><?php echo __('Server traffic'); ?></a></li> + <li><a href="#statustabs_traffic"><?php echo __('Server'); ?></a></li> <li><a href="#statustabs_queries"><?php echo __('Query statistics'); ?></a></li> <li><a href="#statustabs_allvars"><?php echo __('All status variables'); ?></a></li> <li><a href="#statustabs_charting"><?php echo __('Monitor'); ?></a></li> @@ -817,7 +820,7 @@ function printServerTraffic() { ?> </h3> - <p class="notice"> + <p> <?php echo sprintf(__('This MySQL server has been running for %1$s. It started up on %2$s.'), PMA_timespanFormat($server_status['Uptime']), @@ -1286,26 +1289,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> @@ -1332,7 +1335,8 @@ function printMonitor() { <div id="monitorInstructionsDialog" title="<?php echo __('Monitor Instructions'); ?>" style="display:none;"> <?php echo __('The phpMyAdmin Monitor can assist you in optimizing the server configuration and track down time intensive - queries. For the latter you will need to set log_output to \'TABLE\' and have either the slow_query_log or general_log enabled.'); ?> + queries. For the latter you will need to set log_output to \'TABLE\' and have either the slow_query_log or general_log enabled. Note however, that the + general_log produces a lot of data and increases server load by up to 15%'); ?> <p></p> <img class="ajaxIcon" src="<?php echo $GLOBALS['pmaThemeImage']; ?>ajax_clock_small.gif" alt="Loading"> <div class="ajaxContent"> @@ -1345,11 +1349,15 @@ function printMonitor() { using the cog icon on each respective chart. <p>When you get to see a sudden spike in activity, select the relevant time span on any chart by holding down the left mouse button and panning over the chart. This will load statistics from the logs helping you find what caused the - activity spike.</p> - <p><b>Please note:</b> - Enabling the general_log may increase the server load by up to 5-15%. Also be aware that generating statistics out of the logs is a - very load intensive task, thus it is advisable to select only a small time span. - </p>'); ?> + activity spike.</p>'); + ?> + <p> + <img class="icon ic_s_attention" src="themes/dot.gif" alt=""> + <?php echo __('<b>Please note:</b> + Enabling the general_log may increase the server load by 5-15%. Also be aware that generating statistics from the logs is a + load intensive task, so it is advisable to select only a small time span and to disable the general_log and empty its table once monitoring is not required any more. + '); ?> + </p> </div> </div> diff --git a/server_synchronize.php b/server_synchronize.php index 9ff9cd4..2cb6898 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -1081,8 +1081,7 @@ if (isset($_REQUEST['synchronize_db'])) { * Displays the sub-page heading */ echo '<h2>' . ($GLOBALS['cfg']['MainPageIconic'] - ? '<img class="icon" src="' . $pmaThemeImage . 's_sync.png" width="18"' - . ' height="18" alt="" />' + ? '<img class="icon ic_s_sync" src="themes/dot.gif" alt="" />' : '') . __('Synchronize') .'</h2>'; diff --git a/server_variables.php b/server_variables.php index 29abc1d..fbe7094 100644 --- a/server_variables.php +++ b/server_variables.php @@ -73,7 +73,7 @@ require './libraries/server_links.inc.php'; * Displays the sub-page heading */ echo '<h2>' . "\n" - . ($cfg['MainPageIconic'] ? '<img class="icon" src="' . $pmaThemeImage . 's_vars.png" width="16" height="16" alt="" />' : '') + . ($cfg['MainPageIconic'] ? '<img class="icon ic_s_vars" src="themes/dot.gif" alt="" />' : '') . '' . __('Server variables and settings') . "\n" . PMA_showMySQLDocu('server_system_variables','server_system_variables') . '</h2>' . "\n"; diff --git a/sql.php b/sql.php index c36ea1f..a954286 100644 --- a/sql.php +++ b/sql.php @@ -1013,7 +1013,7 @@ $(document).ready(createProfilingChart); <input type="hidden" name="fields[query]" value="<?php echo urlencode(isset($complete_query) ? $complete_query : $sql_query); ?>" /> <fieldset> <legend><?php - echo ($cfg['PropertiesIconic'] ? '<img class="icon" src="' . $pmaThemeImage . 'b_bookmark.png" width="16" height="16" alt="' . __('Bookmark this SQL query') . '" />' : '') + echo ($cfg['PropertiesIconic'] ? '<img class="icon ic_b_bookmark" src="themes/dot.gif" alt="' . __('Bookmark this SQL query') . '" />' : '') . __('Bookmark this SQL query'); ?> </legend> diff --git a/tbl_create.php b/tbl_create.php index e3e743b..5259374 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -266,9 +266,9 @@ if (isset($_REQUEST['do_save_data'])) { if (PMA_Tracker::isActive()) { $truename = str_replace(' ', ' ', htmlspecialchars($table)); if (PMA_Tracker::isTracked($db, $truename)) { - $new_table_string .= '<a href="tbl_tracking.php' . PMA_generate_common_url($tbl_url_params) . '"><img class="icon" width="14" height="14" src="' . $pmaThemeImage . 'eye.png" alt="' . __('Tracking is active.') . '" title="' . __('Tracking is active.') . '" /></a>'; + $new_table_string .= '<a href="tbl_tracking.php' . PMA_generate_common_url($tbl_url_params) . '"><img class="icon ic_eye" src="themes/dot.gif" alt="' . __('Tracking is active.') . '" title="' . __('Tracking is active.') . '" /></a>'; } elseif (PMA_Tracker::getVersion($db, $truename) > 0) { - $new_table_string .= '<a href="tbl_tracking.php' . PMA_generate_common_url($tbl_url_params) . '"><img class="icon" width="14" height="14" src="' . $pmaThemeImage . 'eye_grey.png" alt="' . __('Tracking is not active.') . '" title="' . __('Tracking is not active.') . '" /></a>'; + $new_table_string .= '<a href="tbl_tracking.php' . PMA_generate_common_url($tbl_url_params) . '"><img class="icon ic_eye_grey" src="themes/dot.gif" alt="' . __('Tracking is not active.') . '" title="' . __('Tracking is not active.') . '" /></a>'; } unset($truename); } diff --git a/tbl_structure.php b/tbl_structure.php index afca2ea..3cad9d8 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -494,7 +494,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { echo "\n"; ?> <td class="more_opts" id="more_opts<?php echo $rownum; ?>"> - <?php echo __('More'); ?> <img src="<?php echo $pmaThemeImage . 'more.png'; ?>" alt="<?php echo __('Show more actions'); ?>" /> + <?php echo __('More'); ?> <img class="icon ic_more" src="themes/dot.gif" alt="<?php echo __('Show more actions'); ?>" /> <div class="structure_actions_dropdown" id="row_<?php echo $rownum; ?>"> <div class="action_browse"> @@ -625,7 +625,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) { ?> <a href="tbl_printview.php?<?php echo $url_query; ?>"><?php if ($cfg['PropertiesIconic']) { - echo '<img class="icon" src="' . $pmaThemeImage . 'b_print.png" width="16" height="16" alt="' . __('Print view') . '"/>'; + echo '<img class="icon ic_b_print" src="themes/dot.gif" alt="' . __('Print view') . '"/>'; } echo __('Print view'); ?></a> @@ -639,7 +639,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) { ?> <a href="tbl_relation.php?<?php echo $url_query; ?>"><?php if ($cfg['PropertiesIconic']) { - echo '<img class="icon" src="' . $pmaThemeImage . 'b_relations.png" width="16" height="16" alt="' . __('Relation view') . '"/>'; + echo '<img class="icon ic_b_relations" src="themes/dot.gif" alt="' . __('Relation view') . '"/>'; } echo __('Relation view'); ?></a> @@ -648,7 +648,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) { ?> <a href="sql.php?<?php echo $url_query; ?>&session_max_rows=all&sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table) . ' PROCEDURE ANALYSE()'); ?>"><?php if ($cfg['PropertiesIconic']) { - echo '<img class="icon" src="' . $pmaThemeImage . 'b_tblanalyse.png" width="16" height="16" alt="' . __('Propose table structure') . '" />'; + echo '<img class="icon ic_b_tblanalyse" src="themes/dot.gif" alt="' . __('Propose table structure') . '" />'; } echo __('Propose table structure'); ?></a><?php @@ -661,7 +661,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) { if ($cfg['PropertiesIconic']) { - echo '<img class="icon" src="' . $pmaThemeImage . 'eye.png" width="16" height="16" alt="' . __('Track table') . '" /> '; + echo '<img class="icon ic_eye" src="themes/dot.gif" alt="' . __('Track table') . '" /> '; } echo __('Track table') . '</a>'; } @@ -673,7 +673,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) { <?php echo PMA_generate_common_hidden_inputs($db, $table); if ($cfg['PropertiesIconic']) { - echo '<img class="icon" src="' . $pmaThemeImage . 'b_insrow.png" width="16" height="16" alt="' . __('Add column') . '"/>'; + echo '<img class="icon ic_b_insrow" src="themes/dot.gif" alt="' . __('Add column') . '"/>'; } echo sprintf(__('Add %s column(s)'), '<input type="text" name="num_fields" size="2" maxlength="2" value="1" onfocus="this.select()" />'); @@ -839,7 +839,7 @@ if ($cfg['ShowStats']) { <td colspan="3" align="center"> <a href="sql.php?<?php echo $url_query; ?>&pos=0&sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>"><?php if ($cfg['PropertiesIconic']) { - echo '<img class="icon" src="' . $pmaThemeImage . 'b_tbloptimize.png" width="16" height="16" alt="' . __('Optimize table'). '" />'; + echo '<img class="icon ic_b_tbloptimize" src="themes/dot.gif" alt="' . __('Optimize table'). '" />'; } echo __('Optimize table'); ?></a> diff --git a/tbl_tracking.php b/tbl_tracking.php index 29cf83a..edfc237 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -429,7 +429,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { // Prepare delete link content here $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 row from report') . '" title="' . __('Delete tracking data row from report') . '" />'; + $drop_image_or_text .= '<img class="icon ic_b_drop" src="themes/dot.gif" alt="' . __('Delete tracking data row from report') . '" title="' . __('Delete tracking data row from report') . '" />'; } if ('both' === $GLOBALS['cfg']['PropertiesIconic'] || false === $GLOBALS['cfg']['PropertiesIconic']) { $drop_image_or_text .= __('Delete'); diff --git a/test/theme.php b/test/theme.php index 0242e09..1750b33 100644 --- a/test/theme.php +++ b/test/theme.php @@ -39,10 +39,10 @@ header('Content-Type: text/html; charset=utf-8'); $separator = '<span class="separator">' - .'<img class="icon" src=../"' . $GLOBALS['pmaThemeImage'] . 'item_ltr.png"' + .'<img class="icon ic_item_ltr" src="../themes/dot.gif"' .' width="5" height="9" alt="-" /></span>' . "\n"; $item = '<a href="%1$s?%2$s" class="item">' - .' <img class="icon" src="../' . $GLOBALS['pmaThemeImage'] . '%5$s"' + .' <img class="icon %5$s" src="../themes/dot.gif"' .' width="16" height="16" alt="" /> ' . "\n" .'%4$s: %3$s</a>' . "\n"; @@ -52,7 +52,7 @@ printf($item, PMA_generate_common_url(), 'Server', __('Server'), - 's_host.png'); + 'ic_s_host'); echo $separator; printf($item, @@ -60,7 +60,7 @@ printf($item, '', 'Database', __('Database'), - 's_db.png'); + 'ic_s_db'); echo $separator; printf($item, @@ -71,8 +71,8 @@ printf($item, ? __('View') : __('Table')), (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] - ? 'b_views' - : 's_tbl') . '.png'); + ? 'ic_b_views' + : 'ic_s_tbl')); echo '<span class="table_comment" id="span_table_comment">' .'"Table comment&quot</span>' . "\n"; @@ -85,56 +85,56 @@ echo '</div>'; */ $tabs = array(); -$tabs['databases']['icon'] = '../../../../' . $pmaThemeImage . 's_db.png'; +$tabs['databases']['icon'] = 'ic_s_db'; $tabs['databases']['link'] = 'server_databases.php'; $tabs['databases']['text'] = __('Databases'); -$tabs['sql']['icon'] = '../../../../' . $pmaThemeImage . 'b_sql.png'; +$tabs['sql']['icon'] = 'b_sql.png'; $tabs['sql']['link'] = 'server_sql.php'; $tabs['sql']['text'] = __('SQL'); -$tabs['status']['icon'] = '../../../../' . $pmaThemeImage . 's_status.png'; +$tabs['status']['icon'] = 'ic_s_status'; $tabs['status']['link'] = 'server_status.php'; $tabs['status']['text'] = __('Status'); -$tabs['vars']['icon'] = '../../../../' . $pmaThemeImage . 's_vars.png'; +$tabs['vars']['icon'] = 'ic_s_vars'; $tabs['vars']['link'] = 'server_variables.php'; $tabs['vars']['text'] = __('Variables'); -$tabs['charset']['icon'] = '../../../../' . $pmaThemeImage . 's_asci.png'; +$tabs['charset']['icon'] = 'ic_s_asci'; $tabs['charset']['link'] = 'server_collations.php'; $tabs['charset']['text'] = __('Charsets'); -$tabs['engine']['icon'] = '../../../../' . $pmaThemeImage . 'b_engine.png'; +$tabs['engine']['icon'] = 'ic_b_engine'; $tabs['engine']['link'] = 'server_engines.php'; $tabs['engine']['text'] = __('Engines'); -$tabs['rights']['icon'] = '../../../../' . $pmaThemeImage . 's_rights.png'; +$tabs['rights']['icon'] = 'ic_s_rights'; $tabs['rights']['link'] = 'server_privileges.php'; $tabs['rights']['text'] = __('Privileges'); -$tabs['binlog']['icon'] = '../../../../' . $pmaThemeImage . 's_tbl.png'; +$tabs['binlog']['icon'] = 'ic_s_tbl'; $tabs['binlog']['link'] = 'server_binlog.php'; $tabs['binlog']['text'] = __('Binary log'); -$tabs['process']['icon'] = '../../../../' . $pmaThemeImage . 's_process.png'; +$tabs['process']['icon'] = 'ic_s_process'; $tabs['process']['link'] = 'server_processlist.php'; $tabs['process']['text'] = 'caution'; $tabs['process']['class'] = 'caution'; -$tabs['export']['icon'] = '../../../../' . $pmaThemeImage . 'b_export.png'; +$tabs['export']['icon'] = 'ic_b_export'; $tabs['export']['text'] = 'disabled'; -$tabs['export2']['icon'] = '../../../../' . $pmaThemeImage . 'b_export.png'; +$tabs['export2']['icon'] = 'ic_b_export'; $tabs['export2']['text'] = 'disabled caution'; $tabs['export2']['class'] = 'caution'; -$tabs['import']['icon'] = '../../../../' . $pmaThemeImage . 'b_import.png'; +$tabs['import']['icon'] = 'ic_b_import'; $tabs['import']['link'] = 'server_import.php'; $tabs['import']['text'] = 'active'; $tabs['import']['class'] = 'active'; -echo PMA_generate_html_tabs($tabs, array()); +echo PMA_generate_html_tabs($tabs, array(), '../../../../'); unset($tabs); if (@file_exists($pmaThemeImage . 'logo_right.png')) { @@ -260,12 +260,9 @@ echo sprintf(__('Welcome to %s'), value="1" /></td> <th><label for="checkbox_1">th label</label></th> <td class="value">td.value</td> - <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png" - width="16" height="16" alt="drop" /></td> - <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png" - width="16" height="16" alt="drop" /></td> - <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png" - width="16" height="16" alt="drop" /></td> + <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td> + <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td> + <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td> <td>table.data tbody tr.odd td</td> </tr> <tr class="even"> @@ -273,12 +270,9 @@ echo sprintf(__('Welcome to %s'), value="1" /></td> <th><label for="checkbox_2">th label</label></th> <td class="value">td.value</td> - <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png" - width="16" height="16" alt="drop" /></td> - <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png" - width="16" height="16" alt="drop" /></td> - <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png" - width="16" height="16" alt="drop" /></td> + <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td> + <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td> + <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td> <td>table.data tbody tr.even td</td> </tr> <tr class="odd"> @@ -286,12 +280,9 @@ echo sprintf(__('Welcome to %s'), value="1" /></td> <th><label for="checkbox_3">th label</label></th> <td class="value">td.value</td> - <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png" - width="16" height="16" alt="drop" /></td> - <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png" - width="16" height="16" alt="drop" /></td> - <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png" - width="16" height="16" alt="drop" /></td> + <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td> + <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td> + <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td> <td>table.data tbody tr.odd td</td> </tr> <tr class="even"> @@ -299,12 +290,9 @@ echo sprintf(__('Welcome to %s'), value="1" /></td> <th><label for="checkbox_4">th label</label></th> <td class="value">td.value</td> - <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png" - width="16" height="16" alt="drop" /></td> - <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png" - width="16" height="16" alt="drop" /></td> - <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png" - width="16" height="16" alt="drop" /></td> + <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td> + <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td> + <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td> <td>table.data tbody tr.even td</td> </tr> </tbody> diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index 9901ed4..7ffbb69 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -64,17 +64,33 @@ button { display: inline; } +/* Icon sprites */ -/******************************************************************************/ -/* classes */ - -/* leave some space between icons and text */ .icon { + /* leave some space between icons and text */ vertical-align: middle; 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; } +/* 2 px more on the menu icons, for being centered */ +.ic_b_home { background-position: 2px -335px; } +.ic_b_selboard { background-position: 2px -688px; } +.ic_b_docs { background-position: 2px -142px; } +.ic_b_sqlhelp { background-position: 2px -772px; } +.ic_s_reload { background-position: 2px -1671px; } +.ic_s_loggoff { background-position: 2px -1604px; } + +.ic_b_browse { background-position: 0 -18px; } +.ic_b_sbrowse { background-position: 0 -660px; width: 10px; height: 10px; } +.ic_b_view { background-position: 0 -1044px; } + +/******************************************************************************/ +/* classes */ + /******************************************************************************/ /* specific elements */ @@ -141,12 +157,12 @@ div#leftframelinks .icon { div#leftframelinks a img.icon { margin: 0; - padding: 0.2em; border: 0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>; + padding: 2px; } div#leftframelinks a:hover img { - background: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>; + background-color: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>; color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>; } diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index c949262..1e1e2e5 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -147,6 +147,142 @@ button { vertical-align: middle; } +/* Icon sprites */ + +.icon, .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_b_bookmark { background-position: 0 0; } +.ic_b_browse { background-position: 0 -18px; } +.ic_b_calendar { background-position: 0 -36px; } +.ic_b_chart { background-position: 0 -54px; } +.ic_b_close { background-position: 0 -72px; } +.ic_b_comment { background-position: 0 -90px; } +.ic_b_dbstatistics { background-position: 0 -108px; } +.ic_b_deltbl { background-position: 0 -126px; } +.ic_b_docs { background-position: 0 -144px; } +.ic_b_drop { background-position: 0 -162px; } +.ic_b_edit { background-position: 0 -180px; } +.ic_b_empty { background-position: 0 -198px; } +.ic_b_engine { background-position: 0 -216px; } +.ic_b_event_add { background-position: 0 -234px; } +.ic_b_events { background-position: 0 -252px; } +.ic_b_export { background-position: 0 -270px; } +.ic_b_ftext { background-position: 0 -288px; } +.ic_b_globe { background-position: 0 -306px; } +.ic_b_help { background-position: 0 -324px; width: 11px; height: 11px; } +.ic_b_home { background-position: 0 -337px; } +.ic_b_import { background-position: 0 -355px; } +.ic_b_index { background-position: 0 -373px; } +.ic_b_info { background-position: 0 -391px; width: 11px; height: 11px; } +.ic_b_inline_edit { background-position: 0 -404px; } +.ic_b_insrow { background-position: 0 -422px; } +.ic_b_minus { background-position: 0 -440px; width: 9px; height: 9px; } +.ic_b_more { background-position: 0 -451px; } +.ic_b_newdb { background-position: 0 -469px; } +.ic_b_newtbl { background-position: 0 -487px; } +.ic_b_nextpage, .ic_play { background-position: 0 -505px; } +.ic_b_plus { background-position: 0 -523px; width: 9px; height: 9px; } +.ic_b_primary { background-position: 0 -534px; } +.ic_b_print { background-position: 0 -552px; } +.ic_b_props { background-position: 0 -570px; } +.ic_b_relations { background-position: 0 -588px; } +.ic_b_routine_add { background-position: 0 -606px; } +.ic_b_routines { background-position: 0 -624px; } +.ic_b_save { background-position: 0 -642px; } +.ic_b_sbrowse { background-position: 0 -660px; width: 10px; height: 10px; } +.ic_b_search { background-position: 0 -672px; } +.ic_b_selboard { background-position: 0 -690px; } +.ic_b_select { background-position: 0 -708px; } +.ic_b_snewtbl { background-position: 0 -726px; width: 10px; height: 10px; } +.ic_b_spatial { background-position: 0 -738px; } +.ic_b_sql { background-position: 0 -756px; } +.ic_b_sqlhelp { background-position: 0 -774px; } +.ic_b_tblanalyse { background-position: 0 -792px; } +.ic_b_tblexport { background-position: 0 -810px; } +.ic_b_tblimport { background-position: 0 -828px; } +.ic_b_tblops { background-position: 0 -846px; } +.ic_b_tbloptimize { background-position: 0 -864px; } +.ic_b_tipp { background-position: 0 -882px; } +.ic_b_trigger_add { background-position: 0 -900px; } +.ic_b_triggers { background-position: 0 -918px; } +.ic_b_unique { background-position: 0 -936px; } +.ic_b_usradd { background-position: 0 -954px; } +.ic_b_usrcheck { background-position: 0 -972px; } +.ic_b_usrdrop { background-position: 0 -990px; } +.ic_b_usredit { background-position: 0 -1008px; } +.ic_b_usrlist { background-position: 0 -1026px; } +.ic_b_view { background-position: 0 -1044px; } +.ic_b_views { background-position: 0 -1062px; } +.ic_bd_browse { background-position: 0 -1080px; } +.ic_bd_deltbl { background-position: 0 -1098px; } +.ic_bd_drop { background-position: 0 -1116px; } +.ic_bd_edit { background-position: 0 -1134px; } +.ic_bd_empty { background-position: 0 -1152px; } +.ic_bd_export { background-position: 0 -1170px; } +.ic_bd_ftext { background-position: 0 -1188px; } +.ic_bd_index { background-position: 0 -1206px; } +.ic_bd_insrow { background-position: 0 -1224px; } +.ic_bd_nextpage { background-position: 0 -1242px; width: 8px; height: 13px; } +.ic_bd_primary { background-position: 0 -1257px; } +.ic_bd_sbrowse { background-position: 0 -1275px; width: 10px; height: 10px; } +.ic_bd_select { background-position: 0 -1287px; } +.ic_bd_spatial { background-position: 0 -1305px; } +.ic_bd_unique { background-position: 0 -1323px; } +.ic_col_drop { background-position: 0 -1341px; } +.ic_eye { background-position: 0 -1359px; } +.ic_eye_grey { background-position: 0 -1377px; } +.ic_item_ltr { background-position: 0 -1395px; width: 5px; height: 9px; } +.ic_item_rtl { background-position: 0 -1406px; width: 5px; height: 9px; } +.ic_more { background-position: 0 -1417px; width: 13px; height: 8px; } +.ic_pause { background-position: 0 -1427px; } +.ic_s_asc { background-position: 0 -1445px; width: 11px; height: 9px; } +.ic_s_asci { background-position: 0 -1456px; } +.ic_s_cancel { background-position: 0 -1474px; } +.ic_s_cog { background-position: 0 -1492px; } +.ic_s_db { background-position: 0 -1510px; } +.ic_s_desc { background-position: 0 -1528px; width: 11px; height: 9px; } +.ic_s_error { background-position: 0 -1539px; } +.ic_s_error2 { background-position: 0 -1557px; width: 11px; height: 11px; } +.ic_s_host { background-position: 0 -1570px; } +.ic_s_lang { background-position: 0 -1588px; } +.ic_s_loggoff { background-position: 0 -1606px; } +.ic_s_notice { background-position: 0 -1624px; } +.ic_s_passwd { background-position: 0 -1642px; } +.ic_s_really { background-position: 0 -1660px; width: 11px; height: 11px; } +.ic_s_reload { background-position: 0 -1673px; } +.ic_s_replication { background-position: 0 -1691px; } +.ic_s_rights { background-position: 0 -1709px; } +.ic_s_sortable { background-position: 0 -1727px; } +.ic_s_status { background-position: 0 -1745px; } +.ic_s_success { background-position: 0 -1763px; } +.ic_s_sync { background-position: 0 -1781px; } +.ic_s_tbl { background-position: 0 -1799px; } +.ic_s_theme { background-position: 0 -1817px; } +.ic_s_vars { background-position: 0 -1835px; } +.ic_s_views { background-position: 0 -1853px; width: 10px; height: 10px; } +.ic_window-new { background-position: 0 -1865px; } + +/* Same as s_notice */ +.ic_s_attention { background-position: 0 -1624px; } + +/* Same as ic_b_help, but applied to place where width=11, height=11 attributes were used */ +.ic_b_help_s { background-position: -324px 0; width: 11px; height: 11px; } + +/* Same as ic_s_sortable */ +img.sortableIcon { background-position: -1727px 0; } + +/* Same as s_asc */ +th.headerSortUp img.sortableIcon { background-position: 0 -1445px; width: 11px; height: 9px; } + +/* Same as s_desc */ +th.headerSortDown img.sortableIcon { background-position: 0 -1528px; width: 11px; height: 9px; } /******************************************************************************/ /* classes */ @@ -957,28 +1093,21 @@ div#tablestatistics table { /* serverstatus */ -img.sortableIcon { - width:16px; - height:16px; - float:right; - background-repeat:no-repeat; -} - h3#serverstatusqueries span { font-size:60%; display:inline; } -th.headerSortUp img.sortableIcon, th.headerSortUp img.sortableIcon { - background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_desc.png); -} -th.headerSortDown img.sortableIcon, th.headerSortDown img.sortableIcon { - background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asc.png); +img.sortableIcon { + float:right; + background-repeat:no-repeat; + margin:0; } -.statuslinks { +.buttonlinks { float: <?php echo $right; ?>; white-space: nowrap; + display: none; /* Made visible with js */ } /* Also used for the variables page */ @@ -1013,37 +1142,30 @@ table#serverstatusconnections { margin-<?php echo $left; ?>: 30px; } - .clearfloat { clear: both; } -div#serverstatussection table { + +table#serverstatusvariables { width: 100%; margin-bottom: 1em; } -div#serverstatussection table .name { +table#serverstatusvariables .name { width: 18em; + white-space:nowrap; } -div#serverstatussection table .value { +table#serverstatusvariables .value { width: 6em; } +table#serverstatusconnections { + float: <?php echo $left; ?>; + margin-<?php echo $left; ?>: 30px; +} div#serverstatus table tbody td.descr a, div#serverstatus table .tblFooters a { white-space: nowrap; } -div#serverstatus div#statuslinks a:before, -div#serverstatus div#sectionlinks a:before, -div#serverstatus table tbody td.descr a:before, -div#serverstatus table .tblFooters a:before { - content: '['; -} -div#serverstatus div#statuslinks a:after, -div#serverstatus div#sectionlinks a:after, -div#serverstatus table tbody td.descr a:after, -div#serverstatus table .tblFooters a:after { - content: ']'; -} div.liveChart { clear:both; @@ -1052,6 +1174,51 @@ div.liveChart { padding-bottom:80px; } +#addChartDialog input[type="text"] { + margin:0px; + padding:3px; +} + +div#chartVariableSettings { + border:1px solid #ddd; + background-color:#E6E6E6; + margin-left:10px; +} + +table#chartGrid div.monitorChart { + background: #EBEBEB; +} + +div#statustabs_charting div.monitorLinks { + float:<?php echo $left; ?>; +} + +.popupContent { + display: none; + position: absolute; + border: 1px solid #CCC; + margin:0; + padding:3px; + -moz-box-shadow: 1px 1px 6px #ddd; + -webkit-box-shadow: 2px 2px 3px #666; + box-shadow: 2px 2px 3px #666; + background-color:white; + z-index: 2; +} + +div#logTable { + padding-top: 10px; + clear: both; +} + +div#logTable table { + width:100%; +} + +.smallIndent { + padding-left: 7px; +} + /* end serverstatus */ /* server variables */ @@ -1062,23 +1229,23 @@ a.editLink { } table.serverVariableEditTable { - border:0; - margin:0; - padding:0; - width:100%; + border:0; + margin:0; + padding:0; + width:100%; } table.serverVariableEditTable td { - border:0; - margin:0; - padding:0; + border:0; + margin:0; + padding:0; } table.serverVariableEditTable td:first-child { - white-space:nowrap; - vertical-align:middle; + white-space:nowrap; + vertical-align:middle; } table.serverVariableEditTable input { - width:95%; + width:95%; } table#serverVariables td { diff --git a/themes/original/img/iconsprites.png b/themes/original/img/iconsprites.png new file mode 100644 index 0000000..4c324ad Binary files /dev/null and b/themes/original/img/iconsprites.png differ diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php index e0a6393..cd1eadf 100644 --- a/themes/pmahomme/css/theme_left.css.php +++ b/themes/pmahomme/css/theme_left.css.php @@ -72,17 +72,30 @@ button { display: inline; } +/* Icon sprites */ -/******************************************************************************/ -/* classes */ - -/* leave some space between icons and text */ .icon { + /* leave some space between icons and text */ vertical-align: middle; 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_b_home { background-position: -357px 0; } +.ic_b_selboard { background-position: -754px 0; } +.ic_b_docs { background-position: -136px 0; } +.ic_b_sqlhelp { background-position: -856px 0; } +.ic_s_reload { background-position: -1761px 0; } +.ic_s_loggoff { background-position: -1698px 0; } +.ic_b_browse, .ic_b_sbrowse { background-position: -34px 0; } +.ic_b_view { background-position: -1077px 0; } + +/******************************************************************************/ +/* classes */ + .navi_dbName { font-weight: bold; color: <?php echo $GLOBALS['cfg']['NaviDatabaseNameColor']; ?>; @@ -157,9 +170,9 @@ div#leftframelinks .icon { div#reloadlink a img, div#leftframelinks a img.icon { - margin: 10px 2px 0 0; - padding: 0.2em; - border: 0px; + margin: 0.3em; + margin-top: 0.7em; + border: 0px; } div#leftframelinks a:hover img { diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 6c685c2..ac4f5d8 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/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,151 @@ select[multiple] { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#ffffff", endColorstr="#f2f2f2"); } +/* Icon sprites */ + +.icon, .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; } + +/* Same as ic_b_help, but applied to place where width=11, height=11 attributes were used */ +.ic_b_help_s { background-position: -340px 0; } + +/* Same as ic_s_sortable */ +img.sortableIcon { background-position: -1812px 0; } + +/* Same as s_asc */ +th.headerSortUp img.sortableIcon { background-position: -1516px 0; } + +/* Same as s_desc */ +th.headerSortDown img.sortableIcon { background-position: 0 0; } + + /******************************************************************************/ /* classes */ div.tools { @@ -555,12 +702,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 +763,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 +784,7 @@ div.success { color: #000; background-color: #e8eef1; } + h1.notice, div.notice, div.footnotes { @@ -657,6 +799,7 @@ div.footnotes { <?php } ?> <?php } ?> } + .notice h1 { border-color: #ffb10a; } @@ -680,24 +823,23 @@ div.error { <?php } ?> <?php } ?> } + div.error h1 { border-color: #ff0000; } - - .confirmation { color: #000000; background-color: pink; } -fieldset.confirmation { +fieldset.confirmation { } -fieldset.confirmation legend { +fieldset.confirmation legend { } -/* end messageboxes */ +/* end messageboxes */ .tblcomment { font-size: 70%; @@ -802,9 +944,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 +977,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 +1000,8 @@ ul#topmenu ul a { } ul#topmenu .submenu { - display: none; - position: relative; + display: none; + position: relative; } ul#topmenu .shown { @@ -878,7 +1027,6 @@ ul#topmenu li:hover ul, ul#topmenu .submenuhover ul { display: block; font-weight:3em; background:#fff; - } ul#topmenu ul li { @@ -947,12 +1095,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 +1194,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,26 +1308,15 @@ 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; } -th img.sortableIcon, th img.sortableIcon { - background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_sortable.png); -} -th.headerSortUp img.sortableIcon, th.headerSortUp img.sortableIcon { - background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_desc.png); -} -th.headerSortDown img.sortableIcon, th.headerSortDown img.sortableIcon { - background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asc.png); +img.sortableIcon { + float:right; + background-repeat:no-repeat; + margin:0; } .buttonlinks { @@ -1288,7 +1422,7 @@ div#logTable { } div#logTable table { - width:100%; + width:100%; } .smallIndent { diff --git a/themes/pmahomme/img/iconsprites.png b/themes/pmahomme/img/iconsprites.png new file mode 100644 index 0000000..339dd81 Binary files /dev/null and b/themes/pmahomme/img/iconsprites.png differ diff --git a/themes/pmahomme/img/pause.png b/themes/pmahomme/img/pause.png deleted file mode 100644 index a131617..0000000 Binary files a/themes/pmahomme/img/pause.png and /dev/null differ diff --git a/themes/pmahomme/img/play.png b/themes/pmahomme/img/play.png deleted file mode 100644 index e252606..0000000 Binary files a/themes/pmahomme/img/play.png and /dev/null differ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11272-gce3f308
by Marc Delisle 21 Jul '11

21 Jul '11

The branch, master has been updated via ce3f3087414ebb87acf75346c17a69962e699e62 (commit) from bb3cb6d99cbba59caef8e91e621c282b192704c9 (commit) - Log ----------------------------------------------------------------- commit ce3f3087414ebb87acf75346c17a69962e699e62 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jul 21 09:41:49 2011 -0400 Typo in variable name ----------------------------------------------------------------------- Summary of changes: js/db_structure.js | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/js/db_structure.js b/js/db_structure.js index 1f2d0e6..e7eb7ca 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -57,10 +57,10 @@ $(document).ready(function() { * @uses PMA_ajaxShowMessage() * @see $cfg['AjaxEnable'] */ - var currrent_insert_table; + var current_insert_table; $("td.insert_table a.ajax").live('click', function(event){ event.preventDefault(); - currrent_insert_table = $(this); + current_insert_table = $(this); var $url = $(this).attr("href"); if ($url.substring(0, 15) == "tbl_change.php?") { $url = $url.substring(15); @@ -144,7 +144,7 @@ $(document).ready(function() { $("#insert_table_dialog").dialog("close").remove(); } /**Update the row count at the tableForm*/ - currrent_insert_table.closest('tr').find('.value.tbl_rows').html(data.row_count); + current_insert_table.closest('tr').find('.value.tbl_rows').html(data.row_count); }) // end $.post() }) // end insert table button "Go" @@ -170,7 +170,7 @@ $(document).ready(function() { } if (selected_after_insert == "new_insert") { /**Trigger the insert dialog for new_insert option*/ - currrent_insert_table.trigger('click'); + current_insert_table.trigger('click'); } } else { @@ -180,7 +180,7 @@ $(document).ready(function() { $("#insert_table_dialog").dialog("close").remove(); } /**Update the row count at the tableForm*/ - currrent_insert_table.closest('tr').find('.value.tbl_rows').html(data.row_count); + current_insert_table.closest('tr').find('.value.tbl_rows').html(data.row_count); }) // end $.post() }); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11271-gbb3cb6d
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via bb3cb6d99cbba59caef8e91e621c282b192704c9 (commit) via aa459619652ae510b04f99abaa6965acc898ae57 (commit) from 810d1a21c88d9756ddad030adb7dceaead1c0098 (commit) - Log ----------------------------------------------------------------- commit bb3cb6d99cbba59caef8e91e621c282b192704c9 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 15:32:11 2011 +0200 Fix docblocks commit aa459619652ae510b04f99abaa6965acc898ae57 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 15:28:39 2011 +0200 Add missing docs ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 62 +++++++++++++++++++++++----------------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index cb85c10..b7df61a 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -9,10 +9,10 @@ /** * Exponential expression / raise number into power * - * @param string $base - * @param string $exp - * @param mixed $use_function pow function to use, or false for auto-detect - * @return mixed string or float + * @param string $base base to raise + * @param string $exp exponent to use + * @param mixed $use_function pow function to use, or false for auto-detect + * @return mixed string or float */ function PMA_pow($base, $exp, $use_function = false) { @@ -62,10 +62,10 @@ function PMA_pow($base, $exp, $use_function = false) /** * string PMA_getIcon(string $icon) * - * @param string $icon name of icon file - * @param string $alternate alternate text - * @param boolean $container include in container - * @param boolean $force_text whether to force alternate text to be displayed + * @param string $icon name of icon file + * @param string $alternate alternate text + * @param boolean $container include in container + * @param boolean $force_text whether to force alternate text to be displayed * @return html img tag */ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = false) @@ -118,8 +118,8 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f /** * Displays the maximum size for an upload * - * @param integer $max_upload_size the size - * @return string the message + * @param integer $max_upload_size the size + * @return string the message * * @access public */ @@ -135,8 +135,8 @@ function PMA_displayMaximumUploadSize($max_upload_size) * Generates a hidden field which should indicate to the browser * the maximum size for upload * - * @param integer $max_size the size - * @return string the INPUT field + * @param integer $max_size the size + * @return string the INPUT field * * @access public */ @@ -149,13 +149,13 @@ function PMA_generateHiddenMaxFileSize($max_size) * Add slashes before "'" and "\" characters so a value containing them can * be used in a sql comparison. * - * @param string $a_string the string to slash - * @param bool $is_like whether the string will be used in a 'LIKE' clause - * (it then requires two more escaped sequences) or not - * @param bool $crlf whether to treat cr/lfs as escape-worthy entities - * (converts \n to \\n, \r to \\r) - * @param bool $php_code whether this function is used as part of the - * "Create PHP code" dialog + * @param string $a_string the string to slash + * @param bool $is_like whether the string will be used in a 'LIKE' clause + * (it then requires two more escaped sequences) or not + * @param bool $crlf whether to treat cr/lfs as escape-worthy entities + * (converts \n to \\n, \r to \\r) + * @param bool $php_code whether this function is used as part of the + * "Create PHP code" dialog * * @return string the slashed string * @@ -190,8 +190,8 @@ function PMA_sqlAddSlashes($a_string = '', $is_like = false, $crlf = false, $php * database, table and field names. * Note: This function does not escape backslashes! * - * @param string $name the string to escape - * @return string the escaped string + * @param string $name the string to escape + * @return string the escaped string * * @access public */ @@ -224,9 +224,9 @@ function PMA_unescape_mysql_wildcards($name) * * checks if the sting is quoted and removes this quotes * - * @param string $quoted_string string to remove quotes from - * @param string $quote type of quote to remove - * @return string unqoted string + * @param string $quoted_string string to remove quotes from + * @param string $quote type of quote to remove + * @return string unqoted string */ function PMA_unQuote($quoted_string, $quote = null) { @@ -257,8 +257,8 @@ function PMA_unQuote($quoted_string, $quote = null) * format sql strings * * @todo move into PMA_Sql - * @param mixed $parsed_sql pre-parsed SQL structure - * @param string $unparsed_sql + * @param mixed $parsed_sql pre-parsed SQL structure + * @param string $unparsed_sql raw SQL string * @return string the formatted sql * * @global array the configuration array @@ -314,11 +314,11 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '') /** * Displays a link to the official MySQL documentation * - * @param string $chapter chapter of "HTML, one page per chapter" documentation - * @param string $link contains name of page/anchor that is being linked - * @param bool $big_icon whether to use big icon (like in left frame) - * @param string $anchor anchor to page part - * @param bool $just_open whether only the opening <a> tag should be returned + * @param string $chapter chapter of "HTML, one page per chapter" documentation + * @param string $link contains name of page/anchor that is being linked + * @param bool $big_icon whether to use big icon (like in left frame) + * @param string $anchor anchor to page part + * @param bool $just_open whether only the opening <a> tag should be returned * * @return string the html link * hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11269-g810d1a2
by Marc Delisle 21 Jul '11

21 Jul '11

The branch, master has been updated via 810d1a21c88d9756ddad030adb7dceaead1c0098 (commit) from 938e807173a997b4ce69095d7189262cd3b8273a (commit) - Log ----------------------------------------------------------------- commit 810d1a21c88d9756ddad030adb7dceaead1c0098 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jul 21 09:24:03 2011 -0400 Typos ----------------------------------------------------------------------- Summary of changes: js/functions.js | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/js/functions.js b/js/functions.js index 5dac084..eff6759 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2283,10 +2283,10 @@ function checkIndexName(form_id) /** * function to convert the footnotes to tooltips * - * @param jquery-Object $div a div jquery object which crries the domain - * for searching footnootes. If we ommit this - * parameter the function searches the footnotes - * in the whole body + * @param jquery-Object $div a div jquery object which specifies the + * domain for searching footnootes. If we + * ommit this parameter the function searches + * the footnotes in the whole body **/ function PMA_convertFootnotesToTooltips($div) { // Hide the footnotes from the footer (which are displayed for @@ -2312,8 +2312,8 @@ function PMA_convertFootnotesToTooltips($div) { $div.find("img.footnotemarker").each(function() { var img_class = $(this).attr("class"); - /** img contains two classes, as example "footnotemarker footnote_1_1". - * We spit it by second classs and take it for the id of span + /** img contains two classes, as example "footnotemarker footnote_1". + * We split it by second class and take it for the id of span */ img_class = img_class.split(" "); for (i = 0; i < img_class.length; i++) { @@ -2323,7 +2323,7 @@ function PMA_convertFootnotesToTooltips($div) { } /** * Now we get the #id of the span with span_id variable. As an example if we - * initially get the img class as "footnotemarker footnote_2_3", now we get + * initially get the img class as "footnotemarker footnote_2", now we get * #2 as the span_id. Using that we can find footnote_2 in footnotes. * */ var tooltip_text = $footnotes.find("span[id='footnote_" + span_id + "']").html(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11268-g938e807
by Marc Delisle 21 Jul '11

21 Jul '11

The branch, master has been updated via 938e807173a997b4ce69095d7189262cd3b8273a (commit) via 33627e953385e67cdf531ce1a560df2cfd00fc5e (commit) via 788fb45a1d6c70d52e8b627023bf01de34a22a4d (commit) via d00cf18325c07a0e23265eb83ab51b0fc3c567af (commit) via 7c3dfb454c3d0788e26e08415970577e720954c0 (commit) via 1c333e0a0828381d6afbed50a0d2c0f0e3a3433b (commit) via 379b0723bb4de8d9dee45863ee2a6f051dc36ac4 (commit) via 2111910a0777c432571e5ad8399ab26e7fd1c0b6 (commit) via f2ff3c3dc0aea2e7711d8490a8c7316d819e6e1b (commit) via 4e19ef1cbf42decb8ef5e4ea6041915af24239cb (commit) from 63c162d615db9d4275b287aed7bd9471ab0e6b8e (commit) - Log ----------------------------------------------------------------- commit 938e807173a997b4ce69095d7189262cd3b8273a Merge: 33627e953385e67cdf531ce1a560df2cfd00fc5e 63c162d615db9d4275b287aed7bd9471ab0e6b8e Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jul 21 09:19:46 2011 -0400 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 33627e953385e67cdf531ce1a560df2cfd00fc5e Merge: 2ece3cda3dbc7b9e8c0fb4696cc2281997936b11 788fb45a1d6c70d52e8b627023bf01de34a22a4d Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jul 21 09:18:44 2011 -0400 Merge commit '788fb45a1d6c70d52e8b627023bf01de34a22a4d' commit 788fb45a1d6c70d52e8b627023bf01de34a22a4d Merge: d00cf18325c07a0e23265eb83ab51b0fc3c567af 167d10385d610ec235d791d9b76da7bfdb008363 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Thu Jul 21 10:01:58 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit d00cf18325c07a0e23265eb83ab51b0fc3c567af Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Thu Jul 21 10:01:21 2011 +0530 Fixed bugs in convert foot notes to tooltips logic commit 7c3dfb454c3d0788e26e08415970577e720954c0 Merge: 1c333e0a0828381d6afbed50a0d2c0f0e3a3433b 964664525cd657ba52e82dd47c4314143ccd2516 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Tue Jul 19 23:00:12 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 1c333e0a0828381d6afbed50a0d2c0f0e3a3433b Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Tue Jul 19 22:59:22 2011 +0530 Fixed iid dulplication issue in footnote convertion using classes commit 379b0723bb4de8d9dee45863ee2a6f051dc36ac4 Merge: 2111910a0777c432571e5ad8399ab26e7fd1c0b6 8a2d7fbc22bdc58aa4f4bb488b724c1bab6a3c52 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jul 17 07:18:30 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 2111910a0777c432571e5ad8399ab26e7fd1c0b6 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jul 17 07:18:07 2011 +0530 Fixed bugs in modified initTooltips function in functions.js file commit f2ff3c3dc0aea2e7711d8490a8c7316d819e6e1b Merge: 4e19ef1cbf42decb8ef5e4ea6041915af24239cb 10fa6c5e255f3b631c7d64950baa5005236e45e3 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jul 16 20:42:32 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 4e19ef1cbf42decb8ef5e4ea6041915af24239cb Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jul 16 20:36:31 2011 +0530 MOdified init tooltips function ----------------------------------------------------------------------- Summary of changes: js/db_structure.js | 9 +++++- js/functions.js | 58 ++++++++++++++++++++++++++++++++++------------ libraries/common.lib.php | 7 +---- 3 files changed, 51 insertions(+), 23 deletions(-) diff --git a/js/db_structure.js b/js/db_structure.js index b1c2ff0..1f2d0e6 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -63,9 +63,12 @@ $(document).ready(function() { currrent_insert_table = $(this); var $url = $(this).attr("href"); if ($url.substring(0, 15) == "tbl_change.php?") { - $url = $url.substring(15); + $url = $url.substring(15); } + if ($("#insert_table_dialog").length > 0) { + $("#insert_table_dialog").remove(); + } var $div = $('<div id="insert_table_dialog"></div>'); var target = "tbl_change.php"; @@ -110,10 +113,12 @@ $(document).ready(function() { $dialog.find("#topmenucontainer").hide(); //Adding the datetime pikers for the dialog $dialog.find('.datefield, .datetimefield').each(function () { - PMA_addDatepicker($(this)); + PMA_addDatepicker($(this)); }); $(".insertRowTable").addClass("ajax"); $("#buttonYes").addClass("ajax"); + $div = $("#insert_table_dialog"); + PMA_convertFootnotesToTooltips($div); } PMA_ajaxRemoveMessage($msgbox); }) // end $.get() diff --git a/js/functions.js b/js/functions.js index 7f0c90f..5dac084 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2242,7 +2242,9 @@ function displayMoreTableOpts() { } } -$(document).ready(initTooltips); +$(document).ready(function(){ + PMA_convertFootnotesToTooltips(); +}); /** * Ensures indexes names are valid according to their type and, for a primary @@ -2278,27 +2280,53 @@ function checkIndexName(form_id) return true; } // end of the 'checkIndexName()' function - -/* Displays tooltips */ -function initTooltips() { +/** + * function to convert the footnotes to tooltips + * + * @param jquery-Object $div a div jquery object which crries the domain + * for searching footnootes. If we ommit this + * parameter the function searches the footnotes + * in the whole body + **/ +function PMA_convertFootnotesToTooltips($div) { // Hide the footnotes from the footer (which are displayed for // JavaScript-disabled browsers) since the tooltip is sufficient - $(".footnotes").hide(); - $(".footnotes span").each(function() { + + if ($div == undefined || ! $div instanceof jQuery || $div.length == 0) { + $div = $("#serverinfo").parent(); + } + + $footnotes = $div.find(".footnotes"); + + $footnotes.hide(); + $footnotes.find('span').each(function() { $(this).children("sup").remove(); }); // The border and padding must be removed otherwise a thin yellow box remains visible - $(".footnotes").css("border", "none"); - $(".footnotes").css("padding", "0px"); + $footnotes.css("border", "none"); + $footnotes.css("padding", "0px"); // Replace the superscripts with the help icon - $("sup[class='footnotemarker']").hide(); - $("img[class='footnotemarker']").show(); - - $("img[class='footnotemarker']").each(function() { - var span_id = $(this).attr("id"); - span_id = span_id.split("_")[1]; - var tooltip_text = $(".footnotes span[id='footnote_" + span_id + "']").html(); + $div.find("sup.footnotemarker").hide(); + $div.find("img.footnotemarker").show(); + + $div.find("img.footnotemarker").each(function() { + var img_class = $(this).attr("class"); + /** img contains two classes, as example "footnotemarker footnote_1_1". + * We spit it by second classs and take it for the id of span + */ + img_class = img_class.split(" "); + for (i = 0; i < img_class.length; i++) { + if (img_class[i].split("_")[0] == "footnote") { + var span_id = img_class[i].split("_")[1]; + } + } + /** + * Now we get the #id of the span with span_id variable. As an example if we + * initially get the img class as "footnotemarker footnote_2_3", now we get + * #2 as the span_id. Using that we can find footnote_2 in footnotes. + * */ + var tooltip_text = $footnotes.find("span[id='footnote_" + span_id + "']").html(); $(this).qtip({ content: tooltip_text, show: { delay: 0 }, diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 9e27e6c..cb85c10 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -459,18 +459,13 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice') $GLOBALS['footnotes'] = array(); } $nr = count($GLOBALS['footnotes']) + 1; - // this is the first instance of this message - $instance = 1; $GLOBALS['footnotes'][$key] = array( 'note' => $message, 'type' => $type, 'nr' => $nr, - 'instance' => $instance ); } else { $nr = $GLOBALS['footnotes'][$key]['nr']; - // another instance of this message (to ensure ids are unique) - $instance = ++$GLOBALS['footnotes'][$key]['instance']; } if ($bbcode) { @@ -479,7 +474,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="' . + '<img class="footnotemarker footnote_' . $nr . '" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" alt="" />'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11258-g63c162d
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 63c162d615db9d4275b287aed7bd9471ab0e6b8e (commit) via 00c1d8881cf724f03827b5ca337a647d5fa41d13 (commit) via 29dbb1506f4f766b9469bca18663b6c85b055680 (commit) via b25aff1d3519edf5f37b48e9b834190595bae01a (commit) via 519802fa3fdb46c87bb5e2eec5984ec83900b45d (commit) via 293c5c49aae0dc7ba47e08e93d457b3dbffa5540 (commit) via 347f490e96baf744aed4cbd549dd26689589aa14 (commit) via 146396adec0c49a3e5de5e35b62d0a0beaf7458f (commit) via 4b3d468a21cf2af01748089d1dee20f519eddfb1 (commit) via 667065e4233807046b17f5c4aacdf93393b34cce (commit) via df6aba87f3afe616ca1439354c7efc1f473bf8d6 (commit) via 66fe0c9d7cf98839c8193d01e31f44cd1d9b8ca7 (commit) via 9c924d0a47ed14ee0c63ac41e7a293e97a01a39f (commit) via 4d102b2fe410bae9ce29b716b944098e5dbe7159 (commit) via a256fe685512349232f1f8c615ed946d4e6d1863 (commit) via df3aec325b77901644bbc6f0f07e6fd24cc120f6 (commit) via 8f56013823d692b7bcd8a9ec4b8d61518a6d9adc (commit) via 2b24140ffaafe1da82f4a985a3fcb554a9d51811 (commit) via f160d2184814e17f768f20f86a8945c7d1168259 (commit) via 44c1af1494d56f3e9011a3f8e7e396858b1dca68 (commit) via 024bb4de1a4b08c27407054ce3313825c0a80a15 (commit) via 6fb8887fe29f0497a9bf16803f2a284079106701 (commit) via c58e9fa849623a4a04d4e54e860f80e903aa82ff (commit) via 622ef2cb4f82fb078d866b1724b6e2a8aa99dcdf (commit) via a961064bf1f891cce56589243f53bf321929dc68 (commit) via e81e9a0aebe12f07456cf1add9f5384f2f5e76cc (commit) via 218c39a606bc4454053a26dd052e6ce0377f29e6 (commit) via 815dc39bcecabfd69819af4946ecd77a854b5690 (commit) via 153492869e25b342d2c78d10641c9d4638e57098 (commit) via 9aa37fa4d8cff3fae903afdf4b541362ce27242b (commit) via 2242f7243f62f81ad8caad756f769f1dea564fae (commit) via ffdb23bdf12dc667f60acaa9c8fa0aea47f80538 (commit) via d86c935f8e3d793df9c2120f3552130b03f7ff6e (commit) via e750e9257b695b4989c7173196209e01dd887ea6 (commit) from 2ece3cda3dbc7b9e8c0fb4696cc2281997936b11 (commit) - Log ----------------------------------------------------------------- commit 63c162d615db9d4275b287aed7bd9471ab0e6b8e Merge: 2ece3cda3dbc7b9e8c0fb4696cc2281997936b11 00c1d8881cf724f03827b5ca337a647d5fa41d13 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 15:19:48 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 00c1d8881cf724f03827b5ca337a647d5fa41d13 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:18:33 2011 +0200 Translation update done using Pootle. commit 29dbb1506f4f766b9469bca18663b6c85b055680 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:18:02 2011 +0200 Translation update done using Pootle. commit b25aff1d3519edf5f37b48e9b834190595bae01a Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:17:29 2011 +0200 Translation update done using Pootle. commit 519802fa3fdb46c87bb5e2eec5984ec83900b45d Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:16:50 2011 +0200 Translation update done using Pootle. commit 293c5c49aae0dc7ba47e08e93d457b3dbffa5540 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:16:39 2011 +0200 Translation update done using Pootle. commit 347f490e96baf744aed4cbd549dd26689589aa14 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:16:34 2011 +0200 Translation update done using Pootle. commit 146396adec0c49a3e5de5e35b62d0a0beaf7458f Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:16:22 2011 +0200 Translation update done using Pootle. commit 4b3d468a21cf2af01748089d1dee20f519eddfb1 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:15:59 2011 +0200 Translation update done using Pootle. commit 667065e4233807046b17f5c4aacdf93393b34cce Author: mrbendig <mrbendig(a)mrbendig.com> Date: Thu Jul 21 15:15:39 2011 +0200 Translation update done using Pootle. commit df6aba87f3afe616ca1439354c7efc1f473bf8d6 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:15:22 2011 +0200 Translation update done using Pootle. commit 66fe0c9d7cf98839c8193d01e31f44cd1d9b8ca7 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:14:46 2011 +0200 Translation update done using Pootle. commit 9c924d0a47ed14ee0c63ac41e7a293e97a01a39f Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:14:19 2011 +0200 Translation update done using Pootle. commit 4d102b2fe410bae9ce29b716b944098e5dbe7159 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:14:09 2011 +0200 Translation update done using Pootle. commit a256fe685512349232f1f8c615ed946d4e6d1863 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:13:52 2011 +0200 Translation update done using Pootle. commit df3aec325b77901644bbc6f0f07e6fd24cc120f6 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:13:40 2011 +0200 Translation update done using Pootle. commit 8f56013823d692b7bcd8a9ec4b8d61518a6d9adc Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:13:16 2011 +0200 Translation update done using Pootle. commit 2b24140ffaafe1da82f4a985a3fcb554a9d51811 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:12:31 2011 +0200 Translation update done using Pootle. commit f160d2184814e17f768f20f86a8945c7d1168259 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:12:16 2011 +0200 Translation update done using Pootle. commit 44c1af1494d56f3e9011a3f8e7e396858b1dca68 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:12:05 2011 +0200 Translation update done using Pootle. commit 024bb4de1a4b08c27407054ce3313825c0a80a15 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:11:59 2011 +0200 Translation update done using Pootle. commit 6fb8887fe29f0497a9bf16803f2a284079106701 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:11:50 2011 +0200 Translation update done using Pootle. commit c58e9fa849623a4a04d4e54e860f80e903aa82ff Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:11:35 2011 +0200 Translation update done using Pootle. commit 622ef2cb4f82fb078d866b1724b6e2a8aa99dcdf Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:11:25 2011 +0200 Translation update done using Pootle. commit a961064bf1f891cce56589243f53bf321929dc68 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:11:18 2011 +0200 Translation update done using Pootle. commit e81e9a0aebe12f07456cf1add9f5384f2f5e76cc Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:11:00 2011 +0200 Translation update done using Pootle. commit 218c39a606bc4454053a26dd052e6ce0377f29e6 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:10:53 2011 +0200 Translation update done using Pootle. commit 815dc39bcecabfd69819af4946ecd77a854b5690 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:10:41 2011 +0200 Translation update done using Pootle. commit 153492869e25b342d2c78d10641c9d4638e57098 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:10:34 2011 +0200 Translation update done using Pootle. commit 9aa37fa4d8cff3fae903afdf4b541362ce27242b Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:10:16 2011 +0200 Translation update done using Pootle. commit 2242f7243f62f81ad8caad756f769f1dea564fae Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:10:06 2011 +0200 Translation update done using Pootle. commit ffdb23bdf12dc667f60acaa9c8fa0aea47f80538 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:09:49 2011 +0200 Translation update done using Pootle. commit d86c935f8e3d793df9c2120f3552130b03f7ff6e Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:09:35 2011 +0200 Translation update done using Pootle. commit e750e9257b695b4989c7173196209e01dd887ea6 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:09:19 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 79 ++++++++++++++++++++++++++++--------------------------------- po/de.po | 8 ++---- 2 files changed, 39 insertions(+), 48 deletions(-) diff --git a/po/cs.po b/po/cs.po index 3973f51..589dcb0 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-21 14:00+0200\n" -"PO-Revision-Date: 2011-07-21 15:08+0200\n" +"PO-Revision-Date: 2011-07-21 15:18+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -1246,13 +1246,14 @@ msgstr "" #: js/messages.php:121 #, php-format msgid "long_query_time is set to %d second(s)." -msgstr "" +msgstr "long_query_time je nastaven na %d sekund." #: js/messages.php:122 msgid "" "Following settings will be applied globally and reset to default on server " "restart:" msgstr "" +"Budou provedeny následující změny, které budou platné do restartu serveru:" #. l10n: %s is FILE or TABLE #: js/messages.php:124 @@ -1279,13 +1280,15 @@ msgstr "Vypnout %s" #: js/messages.php:130 #, php-format msgid "Set long_query_time to %ds" -msgstr "" +msgstr "Nastavit long_query_time na %ds" #: js/messages.php:131 msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." msgstr "" +"Nemůžete změnit uvedené proměnné. Prosím přihlašte se jako root nebo " +"kontaktujte vašeho správce databáze." #: js/messages.php:132 #| msgid "Manage your settings" @@ -1311,7 +1314,7 @@ msgstr "Rozdíly" #: js/messages.php:138 #, php-format msgid "Divided by %s:" -msgstr "" +msgstr "Vyděleno %s:" #: js/messages.php:140 #| msgid "Select page" @@ -1320,7 +1323,7 @@ msgstr "Zvolený časový rozsah:" #: js/messages.php:141 msgid "Group together INSERTs into same table" -msgstr "" +msgstr "Sloučit dotazy INSERT pro stejné tabulky" #: js/messages.php:142 msgid "" @@ -1330,15 +1333,15 @@ msgstr "" #: js/messages.php:143 msgid "From slow log" -msgstr "" +msgstr "Ze zánamu pomalých dotazů" #: js/messages.php:144 msgid "From general log" -msgstr "" +msgstr "Z obecného zánamu dotazů" #: js/messages.php:145 msgid "Analysing & loading logs. This may take a while." -msgstr "" +msgstr "Načítám a analyzuji záznamy. To může chvíli trvat." #: js/messages.php:146 msgid "" @@ -1357,6 +1360,8 @@ msgstr "" #: js/messages.php:148 msgid "Log data loaded. Queries executed in this time span:" msgstr "" +"Záznamy byly načteny. V tomto časovém rozmezí byly spuštěny následující " +"dotazy:" #: js/messages.php:150 #| msgid "Jump to database" @@ -1366,6 +1371,8 @@ msgstr "Přejít na tabulku se záznamem" #: js/messages.php:151 msgid "Log analysed, but not data found in this time span." msgstr "" +"Záznamy byly načteny, ale v tomto časovém rozmezí nebyly nalezeny žádné " +"dotazy." #: js/messages.php:155 libraries/tbl_properties.inc.php:780 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545 @@ -9799,39 +9806,35 @@ msgstr "Návod/Nastavení" #: server_status.php:1302 msgid "Done rearranging/editing charts" -msgstr "" +msgstr "Ukončit upravování grafů" #: server_status.php:1309 -#, fuzzy #| msgid "Add parameter" msgid "Add chart" -msgstr "Přidat parametr" +msgstr "Přidat graf" #: server_status.php:1311 msgid "Rearrange/edit charts" -msgstr "" +msgstr "Upravit/Uspořádat grafy" #: server_status.php:1313 msgid "Refresh rate:" msgstr "Obnovovací frekvence:" #: server_status.php:1316 -#, fuzzy #| msgid "Textarea columns" msgid "Chart columns:" -msgstr "Sloupců v textové oblasti" +msgstr "Sloupců grafů:" #: server_status.php:1330 -#, fuzzy #| msgid "User for config auth" msgid "Clear monitor config" -msgstr "Uživatel pro přihlašování config" +msgstr "Odstranit nastavení monitoru" #: server_status.php:1333 -#, fuzzy #| msgid "1. Introduction" msgid "Monitor Instructions" -msgstr "1. Úvod" +msgstr "Instrukce monitoru" #: server_status.php:1334 msgid "" @@ -9863,84 +9866,74 @@ msgid "" msgstr "" #: server_status.php:1361 -#, fuzzy #| msgid "Usage" msgid "CPU Usage" -msgstr "Používá" +msgstr "Využití procesoru" #: server_status.php:1364 -#, fuzzy #| msgid "2. Usage" msgid "Memory Usage" -msgstr "2. Použití" +msgstr "Využití paměti" #: server_status.php:1367 -#, fuzzy #| msgid "Usage" msgid "Swap Usage" -msgstr "Používá" +msgstr "Využití odkládacího prostoru" #: server_status.php:1370 -#, fuzzy #| msgid "All status variables" msgid "Status variable(s)" -msgstr "Všechny stavové proměnné" +msgstr "Stavové proměnné" #: server_status.php:1372 -#, fuzzy #| msgid "Select Tables" msgid "Select series:" -msgstr "Vybrat tabulky" +msgstr "Vyberte série:" #: server_status.php:1374 msgid "Commonly monitored" -msgstr "" +msgstr "Obvykle monitorované" #: server_status.php:1389 -#, fuzzy #| msgid "You must provide a valid table name" msgid "or type variable name:" -msgstr "Musíte zadat platné jméno tabulky" +msgstr "nebo zadejte jméno proměnné:" #: server_status.php:1393 msgid "Display as differential value" -msgstr "" +msgstr "Zobrazit jako rozdíl" #: server_status.php:1395 msgid "Apply a divisor" -msgstr "" +msgstr "Vynásobit" #: server_status.php:1402 msgid "Append unit to data values" -msgstr "" +msgstr "Přidat jednoty" #: server_status.php:1408 -#, fuzzy #| msgid "Add trigger" msgid "Add this series" -msgstr "Přidat spoušť" +msgstr "Přidat tuto sérii" #: server_status.php:1410 msgid "Clear series" -msgstr "" +msgstr "Odstranit série" #: server_status.php:1413 -#, fuzzy #| msgid "Series:" msgid "Series in Chart:" -msgstr "Série:" +msgstr "Série v grafu::" #: server_status.php:1421 -#, fuzzy #| msgid "Loading" msgid "Loading logs" -msgstr "Nahrávám" +msgstr "Nahrávám záznamy" #: server_status.php:1424 -#, fuzzy #| msgid "Show statistics" msgid "Log statistics" -msgstr "Zobrazit statistiky" +msgstr "Statistiky záznamů" #: server_synchronize.php:92 msgid "Could not connect to the source" diff --git a/po/de.po b/po/de.po index 60297d2..4f5c04e 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-21 14:00+0200\n" -"PO-Revision-Date: 2011-07-20 00:23+0200\n" +"PO-Revision-Date: 2011-07-21 15:15+0200\n" "Last-Translator: <mrbendig(a)mrbendig.com>\n" "Language-Team: german <de(a)li.org>\n" "Language: de\n" @@ -1285,7 +1285,6 @@ msgid "Set long_query_time to %ds" msgstr "Setze long_query_time auf %ds" #: js/messages.php:131 -#, fuzzy #| msgid "" #| "You don't have super user rights to change this variables. Please log in " #| "as root account or contact your database administrator." @@ -1293,9 +1292,8 @@ msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." msgstr "" -"Sie haben keine super user Rechte um diese Variable zu ändern. Bitte melden " -"Sie sich mit einem Root-Benutzer ein, oder kontaktieren Sie Ihren Datenbank-" -"Administrator." +"Sie können diese Variablen nicht ändern. Bitte melden Sie sich mit einem " +"Root-Benutzer ein, oder kontaktieren Sie Ihren Datenbank-Administrator." #: js/messages.php:132 msgid "Change settings" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11224-g2ece3cd
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 2ece3cda3dbc7b9e8c0fb4696cc2281997936b11 (commit) via 2e872bbfd4d2b561ae28ceda4157c6bfb4533a32 (commit) via fd8e1538671c4a78f320d07b333e3663958efed3 (commit) via 941c157b01bd0da8f0187f4e85771b328c740f60 (commit) via c9bbbc4f4b6287d2998728083800b02501cd879a (commit) via f1fd722c5496217938eeb4d043885c9b6224e956 (commit) via 506e8030d524c0da6fe39fe6f99291d36ac979e4 (commit) via 7992a8901576d8a4d7006c0b3dcf73f8ac8693e8 (commit) via 27c45cd499b8116aba1d6e970a4be992ad14e560 (commit) via a8e9fa1d1a27f021c5f953ccecdcfd881931c29b (commit) via ecadea809a75a91f442eeceec16511993381a4bb (commit) via c6cc6bdfa2447c3b9377c37d2f96e619f586ffc6 (commit) via bb43346c066eced2dec4adda341d12b91f970233 (commit) via ea734959aa29b9a3bc95808a3fcbc917133c3c8a (commit) via a9007694cf9c52b515e172f7ec113b26d6819f6f (commit) via 2b90b163c963887dfb6ead5b2534cd585769f283 (commit) via 6ce2f6e794346436f519cb2e13c058fd568edfb1 (commit) via f6ab1191f5a61a754f678e6b81707157fc996892 (commit) via 06cbcc1019931cdbed9d215ec965a6287ea58775 (commit) via 5d2760313bff0b1822ca91bb391b2ad1c5d3bc9a (commit) via 86fc7e0259a528e60863db0e90e921b4f739e42f (commit) via fce78ba8e9805fb05620b1a830dee1cabc679cbe (commit) via c247c32f7fa0f026119331a9c2d715da6698b0f4 (commit) via 9bfcb5a704b09d87105ff28988f96a3bcd183bbd (commit) via c60d1d184034b73f9a5533219da24122181dde72 (commit) via 3f87ae9cc271b2144ba7f3d3156671430193f905 (commit) via 7b02bfc9cda81d76317ce026a5af3d951ed258e3 (commit) via 387ce9840f626bc070790616ddf7dc3440f252d4 (commit) via da0a6861876b1d8ca70ba270fbc62c17c9454e32 (commit) via 78022141105f89848ec9e8fa833ae66f703a6f8d (commit) via 80b1335d992d700468b6b2424d796bf7a1ae5323 (commit) via 5058b30fe702bcbac056e7dc47e6665dd4ac581a (commit) via 4e26314fd5b50ef5a7296ab384c3c65428649812 (commit) via 1519a56e26cae0111bf878bf7597afedd6bc3dc8 (commit) via 28f59c58c88fa622153090107aa06c0e24dcfbd1 (commit) via cfc4d7b893af4fe4f31c7bae7efa5c73e4eb8340 (commit) via 0748980d8037ef1443af9f16b22ed22e61dbde77 (commit) via a73b8c46b4279cd48f2fe1244ea7fb7682604c0f (commit) via 829ae4302fc943e7bc2adf6c3ca00d53ab812f3d (commit) via e7bc03273c57109aa4e14e3edcf14945822382d7 (commit) via db887bc04b82e3750b0b83760c8a23a22bcf8959 (commit) from 06655a8a96a98de1c8ce4b136a10e7c4b285f398 (commit) - Log ----------------------------------------------------------------- commit 2ece3cda3dbc7b9e8c0fb4696cc2281997936b11 Merge: 06655a8a96a98de1c8ce4b136a10e7c4b285f398 2e872bbfd4d2b561ae28ceda4157c6bfb4533a32 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 15:09:53 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 2e872bbfd4d2b561ae28ceda4157c6bfb4533a32 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:08:49 2011 +0200 Translation update done using Pootle. commit fd8e1538671c4a78f320d07b333e3663958efed3 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:08:38 2011 +0200 Translation update done using Pootle. commit 941c157b01bd0da8f0187f4e85771b328c740f60 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:08:27 2011 +0200 Translation update done using Pootle. commit c9bbbc4f4b6287d2998728083800b02501cd879a Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:08:12 2011 +0200 Translation update done using Pootle. commit f1fd722c5496217938eeb4d043885c9b6224e956 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:08:02 2011 +0200 Translation update done using Pootle. commit 506e8030d524c0da6fe39fe6f99291d36ac979e4 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:07:58 2011 +0200 Translation update done using Pootle. commit 7992a8901576d8a4d7006c0b3dcf73f8ac8693e8 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:07:53 2011 +0200 Translation update done using Pootle. commit 27c45cd499b8116aba1d6e970a4be992ad14e560 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:07:39 2011 +0200 Translation update done using Pootle. commit a8e9fa1d1a27f021c5f953ccecdcfd881931c29b Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:07:19 2011 +0200 Translation update done using Pootle. commit ecadea809a75a91f442eeceec16511993381a4bb Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:07:05 2011 +0200 Translation update done using Pootle. commit c6cc6bdfa2447c3b9377c37d2f96e619f586ffc6 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:06:59 2011 +0200 Translation update done using Pootle. commit bb43346c066eced2dec4adda341d12b91f970233 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:06:43 2011 +0200 Translation update done using Pootle. commit ea734959aa29b9a3bc95808a3fcbc917133c3c8a Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:06:12 2011 +0200 Translation update done using Pootle. commit a9007694cf9c52b515e172f7ec113b26d6819f6f Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:05:56 2011 +0200 Translation update done using Pootle. commit 2b90b163c963887dfb6ead5b2534cd585769f283 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:05:51 2011 +0200 Translation update done using Pootle. commit 6ce2f6e794346436f519cb2e13c058fd568edfb1 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:05:47 2011 +0200 Translation update done using Pootle. commit f6ab1191f5a61a754f678e6b81707157fc996892 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:05:42 2011 +0200 Translation update done using Pootle. commit 06cbcc1019931cdbed9d215ec965a6287ea58775 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:05:28 2011 +0200 Translation update done using Pootle. commit 5d2760313bff0b1822ca91bb391b2ad1c5d3bc9a Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:05:23 2011 +0200 Translation update done using Pootle. commit 86fc7e0259a528e60863db0e90e921b4f739e42f Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:05:05 2011 +0200 Translation update done using Pootle. commit fce78ba8e9805fb05620b1a830dee1cabc679cbe Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:04:51 2011 +0200 Translation update done using Pootle. commit c247c32f7fa0f026119331a9c2d715da6698b0f4 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:04:27 2011 +0200 Translation update done using Pootle. commit 9bfcb5a704b09d87105ff28988f96a3bcd183bbd Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:04:23 2011 +0200 Translation update done using Pootle. commit c60d1d184034b73f9a5533219da24122181dde72 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:04:16 2011 +0200 Translation update done using Pootle. commit 3f87ae9cc271b2144ba7f3d3156671430193f905 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:04:03 2011 +0200 Translation update done using Pootle. commit 7b02bfc9cda81d76317ce026a5af3d951ed258e3 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:03:55 2011 +0200 Translation update done using Pootle. commit 387ce9840f626bc070790616ddf7dc3440f252d4 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:03:48 2011 +0200 Translation update done using Pootle. commit da0a6861876b1d8ca70ba270fbc62c17c9454e32 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:03:34 2011 +0200 Translation update done using Pootle. commit 78022141105f89848ec9e8fa833ae66f703a6f8d Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:03:24 2011 +0200 Translation update done using Pootle. commit 80b1335d992d700468b6b2424d796bf7a1ae5323 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:03:14 2011 +0200 Translation update done using Pootle. commit 5058b30fe702bcbac056e7dc47e6665dd4ac581a Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:03:03 2011 +0200 Translation update done using Pootle. commit 4e26314fd5b50ef5a7296ab384c3c65428649812 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:02:57 2011 +0200 Translation update done using Pootle. commit 1519a56e26cae0111bf878bf7597afedd6bc3dc8 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:02:36 2011 +0200 Translation update done using Pootle. commit 28f59c58c88fa622153090107aa06c0e24dcfbd1 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:02:26 2011 +0200 Translation update done using Pootle. commit cfc4d7b893af4fe4f31c7bae7efa5c73e4eb8340 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:02:17 2011 +0200 Translation update done using Pootle. commit 0748980d8037ef1443af9f16b22ed22e61dbde77 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:02:12 2011 +0200 Translation update done using Pootle. commit a73b8c46b4279cd48f2fe1244ea7fb7682604c0f Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:02:06 2011 +0200 Translation update done using Pootle. commit 829ae4302fc943e7bc2adf6c3ca00d53ab812f3d Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:01:56 2011 +0200 Translation update done using Pootle. commit e7bc03273c57109aa4e14e3edcf14945822382d7 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:01:46 2011 +0200 Translation update done using Pootle. commit db887bc04b82e3750b0b83760c8a23a22bcf8959 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:01:30 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 94 ++++++++++++++++++++++++++----------------------------------- 1 files changed, 40 insertions(+), 54 deletions(-) diff --git a/po/cs.po b/po/cs.po index 0478db7..3973f51 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-21 14:00+0200\n" -"PO-Revision-Date: 2011-07-21 09:33+0200\n" +"PO-Revision-Date: 2011-07-21 15:08+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -1133,7 +1133,7 @@ msgstr "Dotazů od poslední aktualizace" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:89 msgid "Questions (executed statements by the server)" -msgstr "" +msgstr "Dotazy (příkazy spuštěné na serveru)" #: js/messages.php:91 server_status.php:587 msgid "Query statistics" @@ -1145,11 +1145,11 @@ msgstr "Využití CPU" #: js/messages.php:95 msgid "System memory" -msgstr "" +msgstr "Operační paměť" #: js/messages.php:96 msgid "System swap" -msgstr "" +msgstr "Odkládací oblast" #: js/messages.php:97 libraries/common.lib.php:1276 server_status.php:1398 msgid "MiB" @@ -1161,14 +1161,13 @@ msgstr "KiB" #: js/messages.php:100 msgid "Average load" -msgstr "" +msgstr "Průměrné zatížení" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:102 -#, fuzzy #| msgid "Versions" msgid "Questions" -msgstr "Verze" +msgstr "Dotazy" #: js/messages.php:103 server_status.php:864 msgid "Traffic" @@ -1180,24 +1179,22 @@ msgid "Settings" msgstr "Nastavení" #: js/messages.php:105 -#, fuzzy #| msgid "Remove database" msgid "Remove chart" -msgstr "Odstranit databázi" +msgstr "Odstranit graf" #: js/messages.php:106 msgid "Edit labels and series" -msgstr "" +msgstr "Upravit popisky a série" #: js/messages.php:107 -#, fuzzy #| msgid "Snap to grid" msgid "Add chart to grid" -msgstr "Zachytávat na mřížku" +msgstr "Přidat graf do mřížky" #: js/messages.php:109 msgid "Please add at least one variable to the series" -msgstr "" +msgstr "Prosím přidejte do série alespoň jednu hodnotu" #: js/messages.php:110 libraries/display_export.lib.php:306 #: libraries/display_tbl.lib.php:561 libraries/export/sql.php:1039 @@ -1208,35 +1205,35 @@ msgstr "Žádná" #: js/messages.php:111 msgid "Resume monitor" -msgstr "" +msgstr "Obnovit monitor" #: js/messages.php:112 msgid "Pause monitor" -msgstr "" +msgstr "Přerušit monitor" #: js/messages.php:114 msgid "general_log and slow_query_log is enabled." -msgstr "" +msgstr "general_log a slow_query_log jsou povoleny." #: js/messages.php:115 msgid "general_log is enabled." -msgstr "" +msgstr "general_log je povolen." #: js/messages.php:116 msgid "slow_query_log is enabled." -msgstr "" +msgstr "slow_query_log je povolen." #: js/messages.php:117 msgid "slow_query_log and general_log is disabled." -msgstr "" +msgstr "slow_query_log a general_log jsou zakázány." #: js/messages.php:118 msgid "log_output is not set to TABLE." -msgstr "" +msgstr "log_output není nastaven na tabulku." #: js/messages.php:119 msgid "log_output is set to TABLE." -msgstr "" +msgstr "log_output je nastaven na tabulku." #: js/messages.php:120 #, php-format @@ -1259,24 +1256,24 @@ msgstr "" #. l10n: %s is FILE or TABLE #: js/messages.php:124 -#, fuzzy, php-format +#, php-format #| msgid "Save output to a file" msgid "Set log_output to %s" -msgstr "Uložit do souboru" +msgstr "Nastavit log_output na %s" #. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:126 -#, fuzzy, php-format +#, php-format #| msgid "Enabled" msgid "Enable %s" -msgstr "Zapnuto" +msgstr "Zapnout %s" #. l10n: Disable in this context means setting a status variable to OFF #: js/messages.php:128 -#, fuzzy, php-format +#, php-format #| msgid "Disabled" msgid "Disable %s" -msgstr "Vypnuto" +msgstr "Vypnout %s" #. l10n: %d seconds #: js/messages.php:130 @@ -1291,26 +1288,22 @@ msgid "" msgstr "" #: js/messages.php:132 -#, fuzzy #| msgid "Manage your settings" msgid "Change settings" -msgstr "Spravujte svoje nastavení" +msgstr "Změnit nastavení" #: js/messages.php:133 -#, fuzzy #| msgid "More settings" msgid "Current settings" -msgstr "Více nastavení" +msgstr "Aktuální nastavení" #: js/messages.php:135 server_status.php:1358 -#, fuzzy #| msgid "Chart title" msgid "Chart Title" msgstr "Název grafu" #. l10n: As in differential values #: js/messages.php:137 -#, fuzzy #| msgid "Difference" msgid "Differential" msgstr "Rozdíly" @@ -1321,10 +1314,9 @@ msgid "Divided by %s:" msgstr "" #: js/messages.php:140 -#, fuzzy #| msgid "Select page" msgid "Selected time range:" -msgstr "Zvolte stránku" +msgstr "Zvolený časový rozsah:" #: js/messages.php:141 msgid "Group together INSERTs into same table" @@ -1367,10 +1359,9 @@ msgid "Log data loaded. Queries executed in this time span:" msgstr "" #: js/messages.php:150 -#, fuzzy #| msgid "Jump to database" msgid "Jump to Log table" -msgstr "Přejít na databázi" +msgstr "Přejít na tabulku se záznamem" #: js/messages.php:151 msgid "Log analysed, but not data found in this time span." @@ -1838,10 +1829,9 @@ msgstr "Velikost písma" #: libraries/File.class.php:220 msgid "File was not an uploaded file." -msgstr "" +msgstr "Soubor nebyl nahrán." #: libraries/File.class.php:259 libraries/File.class.php:388 -#, fuzzy #| msgid "Unknown error in file upload." msgid "Unknown error while uploading." msgstr "Neznámá chyba při nahrávání souboru." @@ -1889,11 +1879,11 @@ msgstr "" #: libraries/File.class.php:507 msgid "Error while moving uploaded file." -msgstr "" +msgstr "Chyba při přesouvání nahraného souboru." #: libraries/File.class.php:515 msgid "Cannot read (moved) upload file." -msgstr "" +msgstr "Nahraný soubor nelze přečíst (přesunout)." #: libraries/Index.class.php:418 tbl_relation.php:526 msgid "No index defined!" @@ -2443,10 +2433,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dnů, %s hodin, %s minut a %s sekund" #: libraries/common.lib.php:1876 -#, fuzzy #| msgid "Routine parameters" msgid "Missing parameter:" -msgstr "Parametry rutiny" +msgstr "Chybějící parametr:" #: libraries/common.lib.php:2182 libraries/common.lib.php:2185 #: libraries/display_tbl.lib.php:299 @@ -9022,13 +9011,12 @@ msgstr "Všechny stavové proměnné" #: server_status.php:589 msgid "Monitor" -msgstr "" +msgstr "Monitor" #: server_status.php:599 server_status.php:621 -#, fuzzy #| msgid "Refresh rate:" msgid "Refresh rate: " -msgstr "Obnovovací frekvence:" +msgstr "Obnovovací frekvence: " #: server_status.php:642 msgid "Containing the word:" @@ -9048,10 +9036,10 @@ msgstr "Související odkazy:" #. l10n: Questions is the name of a MySQL Status variable #: server_status.php:708 -#, fuzzy, php-format +#, php-format #| msgid "Network traffic since startup: %s" msgid "Questions since startup: %s" -msgstr "Síťový provoz od spuštění: %s" +msgstr "Dotazů od spuštění: %s" #: server_status.php:714 server_status.php:749 server_status.php:865 #: server_status.php:910 @@ -9081,10 +9069,10 @@ msgid "Network traffic since startup: %s" msgstr "Síťový provoz od spuštění: %s" #: server_status.php:822 -#, fuzzy, php-format +#, php-format #| msgid "This MySQL server has been running for %s. It started up on %s." msgid "This MySQL server has been running for %1$s. It started up on %2$s." -msgstr "Tento MySQL server běží %s. Čas spuštění: %s." +msgstr "Tento MySQL server běží %1$s. Čas spuštění: %2$s." #: server_status.php:832 msgid "" @@ -9800,16 +9788,14 @@ msgid "The number of threads that are not sleeping." msgstr "Počet vláken, která nespí." #: server_status.php:1290 -#, fuzzy #| msgid "Start row" msgid "Start Monitor" -msgstr "Počáteční řádek" +msgstr "Spustit monitor" #: server_status.php:1298 -#, fuzzy #| msgid "Introduction" msgid "Instructions/Setup" -msgstr "Úvod" +msgstr "Návod/Nastavení" #: server_status.php:1302 msgid "Done rearranging/editing charts" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11183-g06655a8
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 06655a8a96a98de1c8ce4b136a10e7c4b285f398 (commit) from dd641ef16437e9c3c232889fd2181833ef8a4e2c (commit) - Log ----------------------------------------------------------------- commit 06655a8a96a98de1c8ce4b136a10e7c4b285f398 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:58:47 2011 +0200 Document that functions do not return anything ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 3b929d3..c32ac4d 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -19,6 +19,7 @@ * @param array &$uncommon_source_tables empty array passed by reference to save * names of tables present in source database * but absent from target database + * @return nothing */ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$uncommon_source_tables) { @@ -45,6 +46,7 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$un * @param array &$uncommon_target_tables empty array passed by reference to save * names of tables presnet in target database * but absent from source database + * @return nothing */ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommon_target_tables) { @@ -85,6 +87,7 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo * contain number of fields for each matching table * @param array $matching_table_index Index of a table from $matching_table array * @param array &$matching_tables_keys A two dimensional array passed by reference to contain names of keys for each matching table + * @return nothing */ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching_table, &$matching_tables_fields, &$update_array, &$insert_array, &$delete_array, &$fields_num, $matching_table_index, &$matching_tables_keys) @@ -302,6 +305,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching * @param db_link $trg_link connection established with target server * @param string $src_db name of source database * @param db_link $src_link connection established with source server + * @return nothing */ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link, $src_db, $src_link) { @@ -373,6 +377,7 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma * @param $src_link connection established with source server * @param $index index of a table from $matching_table array * @param $row_count number of rows + * @return nothing */ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $index, &$row_count) { @@ -394,6 +399,7 @@ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_lin * @param $matching_table_index index of matching table in matching_table_array * @param $matching_table_keys * @param $display true/false value + * @return nothing */ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_link, $matching_table_index, $matching_table_keys, $display) { @@ -465,6 +471,7 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li * @param $delete_array array containing rows that are to be deleted * @param $update_array array containing rows that are to be updated in target * @param $display true/false value + * @return nothing */ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, $trg_link, $table_fields, &$array_insert, $matching_table_index, $matching_tables_keys, $source_columns, &$add_column_array, $criteria, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields,$uncommon_cols, @@ -588,6 +595,7 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, * @param $table_index index of table in $uncommon_tables array * @param $uncommon_tables_fields field names of the uncommon table * @param $display true/false value + * @return nothing */ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncommon_tables, $table_index, &$uncommon_tables_fields, $display) { @@ -641,7 +649,9 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm * @param $uncommon_tables_fields field names of the uncommon table * @param $display true/false value * - * FIXME: This turns NULL values into '' (empty string) + * @return nothing + * + * @todo This turns NULL values into '' (empty string) */ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $table_index, $uncommon_tables_fields, $display) { @@ -679,6 +689,7 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom * @param $target_tables_keys primary key names of the target tables * @param $delete_array array containing the key values of rows that are to be deleted * @param $display true/false value + * @return nothing */ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index, $target_tables_keys, $delete_array, $display) { @@ -743,6 +754,7 @@ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_ * @param $criteria array containing the criterias which are to be checked for field that is present in source table and target table * @param $target_tables_keys array containing the field names which is key in the target table * @param $matching_table_index integer number of the matching table + * @return nothing */ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_columns, &$target_columns, &$alter_str_array, &$add_column_array, &$uncommon_columns, $criteria, &$target_tables_keys, $matching_table_index) @@ -806,6 +818,7 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matc * @param $table_counter integer number of the matching table * @param $uncommon_cols * @param $display true/false value + * @return nothing */ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, &$add_column_array, $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields, $table_counter, $uncommon_cols, $display) @@ -896,6 +909,7 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma * @param $uncommon_tables array containing names that are uncommon * @param $uncommon_tables_fields field names of the uncommon table * @param $display true/false value + * @return nothing */ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$referenced_table, &$uncommon_tables, &$uncommon_tables_fields, $display) { @@ -929,6 +943,7 @@ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$reference * @param $target_tables_keys array containing the field names which is key in the target table * @param $matching_table_index integer number of the matching table * @param $display true/false value + * @return nothing */ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$source_columns, &$alter_str_array, $matching_tables_fields, $criteria, &$matching_tables_keys, &$target_tables_keys, $matching_table_index, $display) @@ -1058,6 +1073,7 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s * @param $uncommon_columns array containing the names of the column which are to be dropped from the target table * @param $table_counter index of the matching table as in $matchiing_tables array * @param $display true/false value + * @return nothing */ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $table_counter, $display) { @@ -1118,6 +1134,7 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, * @param $alter_indexes_array array containing the key name which needs to be altered * @param $remove_indexes_array array containing the key name of the index which is to be removed from the target table * @param $table_counter number of the matching table + * @return nothing */ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$remove_indexes_array, $table_counter) @@ -1181,6 +1198,7 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi * @param $remove_indexes_array array containing the key name of the indexes which are to be removed from the target table * @param $table_counter number of the matching table * @param $display true/false value + * @return nothing */ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, $remove_indexes_array, $table_counter, $display) @@ -1259,6 +1277,7 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind * into account * * @param $query the query to display + * @return nothing */ function PMA_displayQuery($query) { if (strlen($query) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { @@ -1271,6 +1290,7 @@ function PMA_displayQuery($query) { * PMA_syncDisplayHeaderSource() shows the header for source database * * @param string $src_db source db name + * @return nothing */ function PMA_syncDisplayHeaderSource($src_db) { echo '<div id="serverstatus" style = "overflow: auto; width: 1020px; height: 220px; border-left: 1px gray solid; border-bottom: 1px gray solid; padding:0; margin-bottom: 1em "> '; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11182-gdd641ef
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via dd641ef16437e9c3c232889fd2181833ef8a4e2c (commit) from 85e680c39689f60a913cfa15c5392f0aafd79fc8 (commit) - Log ----------------------------------------------------------------- commit dd641ef16437e9c3c232889fd2181833ef8a4e2c Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:49:25 2011 +0200 Wrap some long lines ----------------------------------------------------------------------- Summary of changes: libraries/export/sql.php | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index c87f926..81058a8 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -27,7 +27,9 @@ if (isset($plugin_list)) { 'mime_type' => 'text/x-sql', 'options' => array()); - $plugin_list['sql']['options'][] = array('type' => 'begin_group', 'name' => 'general_opts'); + $plugin_list['sql']['options'][] = array( + 'type' => 'begin_group', + 'name' => 'general_opts'); /* comments */ $plugin_list['sql']['options'][] = array( @@ -77,7 +79,10 @@ if (isset($plugin_list)) { 'type' => 'bool', 'name' => 'disable_fk', 'text' => __('Disable foreign key checks'), - 'doc' => array('manual_MySQL_Database_Administration', 'server-system-variables', 'sysvar_foreign_key_checks') + 'doc' => array( + 'manual_MySQL_Database_Administration', + 'server-system-variables', + 'sysvar_foreign_key_checks') ); $plugin_list['sql']['options_text'] = __('Options'); @@ -94,7 +99,9 @@ if (isset($plugin_list)) { 'name' => 'compatibility', 'text' => __('Database system or older MySQL server to maximize output compatibility with:'), 'values' => $values, - 'doc' => array('manual_MySQL_Database_Administration', 'Server_SQL_mode') + 'doc' => array( + 'manual_MySQL_Database_Administration', + 'Server_SQL_mode') ); unset($values); } @@ -324,9 +331,12 @@ function PMA_exportRoutines($db) { foreach ($procedure_names as $procedure_name) { if (! empty($GLOBALS['sql_drop_table'])) { - $text .= 'DROP PROCEDURE IF EXISTS ' . PMA_backquote($procedure_name) . $delimiter . $crlf; + $text .= 'DROP PROCEDURE IF EXISTS ' + . PMA_backquote($procedure_name) + . $delimiter . $crlf; } - $text .= PMA_DBI_get_definition($db, 'PROCEDURE', $procedure_name) . $delimiter . $crlf . $crlf; + $text .= PMA_DBI_get_definition($db, 'PROCEDURE', $procedure_name) + . $delimiter . $crlf . $crlf; } } @@ -338,9 +348,12 @@ function PMA_exportRoutines($db) { foreach ($function_names as $function_name) { if (! empty($GLOBALS['sql_drop_table'])) { - $text .= 'DROP FUNCTION IF EXISTS ' . PMA_backquote($function_name) . $delimiter . $crlf; + $text .= 'DROP FUNCTION IF EXISTS ' + . PMA_backquote($function_name) + . $delimiter . $crlf; } - $text .= PMA_DBI_get_definition($db, 'FUNCTION', $function_name) . $delimiter . $crlf . $crlf; + $text .= PMA_DBI_get_definition($db, 'FUNCTION', $function_name) + . $delimiter . $crlf . $crlf; } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11181-g85e680c
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 85e680c39689f60a913cfa15c5392f0aafd79fc8 (commit) from 0d2c07306507cf10b75ebb5ee369e82c77bfa00b (commit) - Log ----------------------------------------------------------------- commit 85e680c39689f60a913cfa15c5392f0aafd79fc8 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:45:43 2011 +0200 Remove function names used as first word in docblock ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 52232b8..3b929d3 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -7,11 +7,10 @@ */ /** - * PMA_getMatchingTables places matching tables in source - * and target databases in $matching_tables array whereas - * $uncommon_source_tables array gets the tables present in - * source database but are absent from target database. - * Criterion for matching tables is just comparing their names. + * Places matching tables in source and target databases in $matching_tables + * array whereas $uncommon_source_tables array gets the tables present in + * source database but are absent from target database. Criterion for + * matching tables is just comparing their names. * * @param array $trg_tables array of target database table names, * @param array $src_tables array of source database table names, @@ -38,8 +37,7 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$un } /** - * PMA_getNonMatchingTargetTables() places tables present - * in target database but are absent from source database + * Places tables present in target database but are absent from source database * * @param array $trg_tables array of target database table names, * @param array $matching_tables matching tables array containing names @@ -64,7 +62,7 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo } /** - * PMA_dataDiffInTables() finds the difference in source and target matching tables by + * Finds the difference in source and target matching tables by * first comparing source table's primary key entries with target table enteries. * It gets the field names for the matching table also for comparisons. * If the entry is found in target table also then it is checked for the remaining @@ -72,7 +70,6 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo * If update is required, it is placed in $update_array * Otherwise that entry is placed in the $insert_array. * - * * @param string $src_db name of source database * @param string $trg_db name of target database * @param db_link $src_link connection established with source server @@ -294,7 +291,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching } /** - * PMA_findDeleteRowsFromTargetTables finds the rows which are to be deleted from target table. + * Finds the rows which are to be deleted from target table. * * @param array &$delete_array array containing rows that are to be deleted * @param array $matching_table array containing matching table names @@ -306,7 +303,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching * @param string $src_db name of source database * @param db_link $src_link connection established with source server */ -function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link,$src_db, $src_link) +function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link, $src_db, $src_link) { if (isset($trg_keys[$matching_table_index])) { $target_key_values = PMA_get_column_values($trg_db, $matching_table[$matching_table_index], $trg_keys[$matching_table_index], $trg_link); hooks/post-receive -- phpMyAdmin

1 0