February 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1589-gb1fe08f
by Michal Čihař 02 Feb '11

02 Feb '11

The branch, master has been updated via b1fe08fa9222df068fb471a69af65bc0fe46fe47 (commit) via 42c8e651398eb1267c616499c895f5a81e0f978a (commit) via 34546681a8d7af1f33b2d210e322d1b4545e608f (commit) via 5b28e356aa29f7f91c2cb884fe9e9f677e5526b5 (commit) from 775abf73929ba56c36d84d670839dd358cda1abc (commit) - Log ----------------------------------------------------------------- commit b1fe08fa9222df068fb471a69af65bc0fe46fe47 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 14:37:05 2011 +0100 Add version check to vendor configuration. This is something what most Linux distributions will want to disable, so give it to place where this customisation should happen. commit 42c8e651398eb1267c616499c895f5a81e0f978a Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 14:32:46 2011 +0100 Make version check configurable. commit 34546681a8d7af1f33b2d210e322d1b4545e608f Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 14:32:34 2011 +0100 Allow to specify class for list item. commit 5b28e356aa29f7f91c2cb884fe9e9f677e5526b5 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 11:43:21 2011 +0100 Display notification if newer version is available. This is done using asynchronous javascript so it should not block any actions. ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++ js/functions.js | 64 +++++++++++++++++++++++++ js/jquery/jquery.sprintf.js | 68 +++++++++++++++++++++++++++ js/messages.php | 9 ++++ libraries/config.default.php | 7 +++ libraries/config/messages.inc.php | 2 + libraries/config/setup.forms.php | 1 + libraries/config/user_preferences.forms.php | 1 + libraries/vendor_config.php | 5 ++ main.php | 15 +++++- 10 files changed, 173 insertions(+), 3 deletions(-) create mode 100644 js/jquery/jquery.sprintf.js diff --git a/Documentation.html b/Documentation.html index c8d1fc6..ac8692c 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1301,6 +1301,10 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> for example, the Designer feature is Ajax-only so this directive does not apply to it.</dd> + <dt id="cfg_VersionCheck">$cfg['VersionCheck'] boolean</dt> + <dd>Enables check for latest versions using javascript on main phpMyAdmin + page.</dd> + <dt id="cfg_MaxTableList">$cfg['MaxTableList'] integer</dt> <dd>The maximum number of table names to be displayed in the main panel's list (except on the Export page). This limit is also enforced in the navigation panel diff --git a/js/functions.js b/js/functions.js index bfbcca1..d8f75cf 100644 --- a/js/functions.js +++ b/js/functions.js @@ -45,6 +45,55 @@ function suggestPassword(passwd_form) { } /** + * Version string to integer conversion. + */ +function parseVersionString (str) { + if (typeof(str) != 'string') { return false; } + var add = 0; + // Parse possible alpha/beta/rc/ + var state = str.split('-'); + if (state.length >= 2) { + if (state[1].substr(0, 2) == 'rc') { + add = - 20 - parseInt(state[1].substr(2)); + } else if (state[1].substr(0, 4) == 'beta') { + add = - 40 - parseInt(state[1].substr(4)); + } else if (state[1].substr(0, 5) == 'alpha') { + add = - 60 - parseInt(state[1].substr(5)); + } else if (state[1].substr(0, 3) == 'dev') { + /* We don't handle dev, it's git snapshot */ + add = 0; + } + } + // Parse version + var x = str.split('.'); + // Use 0 for non existing parts + var maj = parseInt(x[0]) || 0; + var min = parseInt(x[1]) || 0; + var pat = parseInt(x[2]) || 0; + var hotfix = parseInt(x[3]) || 0; + return maj * 100000000 + min * 1000000 + pat * 10000 + hotfix * 100 + add; +} + +/** + * Indicates current available version on main page. + */ +function PMA_current_version() { + var current = parseVersionString('3.4.0'/*pmaversion*/); + var latest = parseVersionString(PMA_latest_version); + $('#li_pma_version').append(PMA_messages['strLatestAvailable'] + ' ' + PMA_latest_version); + if (latest > current) { + var message = $.sprintf(PMA_messages['strNewerVersion'], PMA_latest_version, PMA_latest_date); + if (Math.floor(latest / 10000) == Math.floor(current / 10000)) { + /* Security update */ + klass = 'warning'; + } else { + klass = 'notice'; + } + $('#maincontainer').after('<div class="' + klass + '">' + message + '</div>'); + } +} + +/** * for libraries/display_change_password.lib.php * libraries/user_password.php * @@ -2414,5 +2463,20 @@ $(document).ready(function() { $(this).closest("form").submit(); }); + /** + * Load version information asynchronously. + */ + if ($('.jsversioncheck').length > 0) { + (function() { + var s = document.createElement('script'); + s.type = 'text/javascript'; + s.async = true; + s.src = 'http://www.phpmyadmin.net/home_page/version.js'; + s.onload = PMA_current_version; + var x = document.getElementsByTagName('script')[0]; + x.parentNode.insertBefore(s, x); + })(); + } + }) // end of $(document).ready() diff --git a/js/jquery/jquery.sprintf.js b/js/jquery/jquery.sprintf.js new file mode 100644 index 0000000..3d39b76 --- /dev/null +++ b/js/jquery/jquery.sprintf.js @@ -0,0 +1,68 @@ +/** + * sprintf and vsprintf for jQuery + * somewhat based on http://jan.moesen.nu/code/javascript/sprintf-and-printf-in-javascript/ + * + * Copyright (c) 2008 Sabin Iacob (m0n5t3r) <iacobs(a)m0n5t3r.info> + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * @license http://www.gnu.org/licenses/gpl.html + * @project jquery.sprintf + */ +(function($){ + var formats = { + 'b': function(val) {return parseInt(val, 10).toString(2);}, + 'c': function(val) {return String.fromCharCode(parseInt(val, 10));}, + 'd': function(val) {return parseInt(val, 10);}, + 'u': function(val) {return Math.abs(val);}, + 'f': function(val, p) { + p = parseInt(p, 10); + val = parseFloat(val); + if(isNaN(p && val)) { + return NaN; + } + return p && val.toFixed(p) || val; + }, + 'o': function(val) {return parseInt(val, 10).toString(8);}, + 's': function(val) {return val;}, + 'x': function(val) {return ('' + parseInt(val, 10).toString(16)).toLowerCase();}, + 'X': function(val) {return ('' + parseInt(val, 10).toString(16)).toUpperCase();} + }; + + var re = /%(?:(\d+)?(?:\.(\d+))?|$([^)]+)$)([%bcdufosxX])/g; + + var dispatch = function(data){ + if(data.length == 1 && typeof data[0] == 'object') { //python-style printf + data = data[0]; + return function(match, w, p, lbl, fmt, off, str) { + return formats[fmt](data[lbl]); + }; + } else { // regular, somewhat incomplete, printf + var idx = 0; + return function(match, w, p, lbl, fmt, off, str) { + if(fmt == '%') { + return '%'; + } + return formats[fmt](data[idx++], p); + }; + } + }; + + $.extend({ + sprintf: function(format) { + var argv = Array.apply(null, arguments).slice(1); + return format.replace(re, dispatch(argv)); + }, + vsprintf: function(format, data) { + return format.replace(re, dispatch(data)); + } + }); +})(jQuery); + diff --git a/js/messages.php b/js/messages.php index f9f764e..ded9546 100644 --- a/js/messages.php +++ b/js/messages.php @@ -109,6 +109,11 @@ $js_messages['strChangePassword'] = __('Change Password'); /* navigation tabs */ $js_messages['strMore'] = __('More'); +/* update */ +$js_messages['strNewerVersion'] = __('A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.'); +/* l10n: Latest available phpMyAdmin version */ +$js_messages['strLatestAvailable'] = __(', latest available:'); + echo "var PMA_messages = new Array();\n"; foreach ($js_messages as $name => $js_message) { PMA_printJsValue("PMA_messages['" . $name . "']", $js_message); @@ -116,6 +121,10 @@ foreach ($js_messages as $name => $js_message) { /* Calendar */ echo "var themeCalendarImage = '" . $GLOBALS['pmaThemeImage'] . 'b_calendar.png' . "';\n"; + +/* Version */ +echo "var pmaversion = '" . PMA_VERSION . "';\n"; + echo "if ($.datepicker) {\n"; /* l10n: Display text for calendar close link */ PMA_printJsValue("$.datepicker.regional['']['closeText']", __('Done')); diff --git a/libraries/config.default.php b/libraries/config.default.php index d7df77e..9fece7a 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -495,6 +495,13 @@ $cfg['ServerDefault'] = 1; $cfg['AjaxEnable'] = true; /** + * whether version check is active + * + * @global boolean $cfg['VersionCheck'] + */ +$cfg['VersionCheck'] = VERSION_CHECK_DEFAULT; + +/** * maximum number of db's displayed in left frame and database list * * @global integer $cfg['MaxDbList'] diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 560b1e5..b2363c1 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -495,6 +495,8 @@ $strConfigUserprefsDeveloperTab_name = __('Enable the Developer tab in settings' $strConfigVerboseMultiSubmit_desc = __('Show affected rows of each statement on multiple-statement queries. See libraries/import.lib.php for defaults on how many queries a statement may contain.'); $strConfigVerboseMultiSubmit_name = __('Verbose multiple statements'); $strConfigVersionCheckLink = __('Check for latest version'); +$strConfigVersionCheck_desc = __('Enables check for latest version on main phpMyAdmin page'); +$strConfigVersionCheck_name = __('Version check'); $strConfigZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression for import and export operations'); $strConfigZipDump_name = __('ZIP'); diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index 7783065..5287aad 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -121,6 +121,7 @@ $forms['Features']['Developer'] = array( 'DBG/sql'); $forms['Features']['Other_core_settings'] = array( 'AjaxEnable', + 'VersionCheck', 'NaturalOrder', 'InitialSlidersState', 'ErrorIconic', diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index cfa78ae..ea5ac59 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -23,6 +23,7 @@ $forms = array(); $forms['Features']['General'] = array( 'AjaxEnable', + 'VersionCheck', 'NaturalOrder', 'InitialSlidersState', 'ErrorIconic', diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php index 5cea609..41f7c23 100644 --- a/libraries/vendor_config.php +++ b/libraries/vendor_config.php @@ -54,4 +54,9 @@ define('CUSTOM_HEADER_FILE', CONFIG_DIR . 'config.header.inc.php'); * Filename of custom footer file. */ define('CUSTOM_FOOTER_FILE', CONFIG_DIR . 'config.footer.inc.php'); + +/** + * Default value for check for version upgrades. + */ +define('VERSION_CHECK_DEFAULT', true); ?> diff --git a/main.php b/main.php index 1361391..62fbc04 100644 --- a/main.php +++ b/main.php @@ -14,6 +14,7 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'colorpicker/js/colorpicker.js'; $GLOBALS['js_include'][] = 'main_custom_color.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; +$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js'; // Handles some variables that may have been sent by the calling script $GLOBALS['db'] = ''; @@ -208,7 +209,11 @@ if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) { echo '<div class="group">'; echo '<h2>phpMyAdmin</h2>'; echo '<ul>'; -PMA_printListItem(__('Version information') . ': ' . PMA_VERSION, 'li_pma_version'); +$clas = null; +if ($GLOBALS['cfg']['VersionCheck']) { + $class = 'jsversioncheck'; +} +PMA_printListItem(__('Version information') . ': ' . PMA_VERSION, 'li_pma_version', null, null, null, null, $class); PMA_printListItem(__('Documentation'), 'li_pma_docs', 'Documentation.html', null, '_blank'); PMA_printListItem(__('Wiki'), 'li_pma_wiki', PMA_linkURL('http://wiki.phpmyadmin.net/'), null, '_blank'); @@ -356,9 +361,13 @@ if ($cfg['SuhosinDisableWarning'] == false && @ini_get('suhosin.request.max_valu * @param string $target special target for $url * @param string $a_id id for the anchor, used for jQuery to hook in functions */ -function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = null, $target = null, $a_id = null) +function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = null, $target = null, $a_id = null, $class = null) { - echo '<li id="' . $id . '">'; + echo '<li id="' . $id . '"'; + if (null !== $class) { + echo ' class="' . $class . '"'; + } + echo '>'; if (null !== $url) { echo '<a href="' . $url . '"'; if (null !== $target) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1585-g775abf7
by Michal Čihař 02 Feb '11

02 Feb '11

The branch, master has been updated via 775abf73929ba56c36d84d670839dd358cda1abc (commit) via 51da49153d910858ee20d6ef20d7f1ee7d4b9e97 (commit) from c484d10caa5f725fa5bcac3ba4261ee034a5a376 (commit) - Log ----------------------------------------------------------------- commit 775abf73929ba56c36d84d670839dd358cda1abc Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 13:14:01 2011 +0100 No longer used variable. As the database name from the navigation frame was dropped, this is useless. commit 51da49153d910858ee20d6ef20d7f1ee7d4b9e97 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 13:13:21 2011 +0100 No longer used CSS ----------------------------------------------------------------------- Summary of changes: Documentation.html | 5 ----- themes/darkblue_orange/layout.inc.php | 3 --- themes/original/css/theme_left.css.php | 5 ----- themes/original/layout.inc.php | 2 -- 4 files changed, 0 insertions(+), 15 deletions(-) diff --git a/Documentation.html b/Documentation.html index ca12d95..c8d1fc6 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1803,11 +1803,6 @@ $cfg['TrustedProxies'] = <dd>The style used for the pointer in the navi frame. See <tt>themes/themename/layout.inc.php</tt>.</dd> - <dt id="cfg_NaviDatabaseNameColor">$cfg['NaviDatabaseNameColor'] string [CSS color]<br /> - </dt> - <dd>The color used for the database name in the navi frame. - See <tt>themes/themename/layout.inc.php</tt>.</dd> - <dt id="cfg_LeftPointerEnable">$cfg['LeftPointerEnable'] boolean</dt> <dd>A value of <tt>TRUE</tt> activates the navi pointer (when LeftFrameLight is <tt>FALSE</tt>).</dd> diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php index 617ee96..6c389f1 100644 --- a/themes/darkblue_orange/layout.inc.php +++ b/themes/darkblue_orange/layout.inc.php @@ -31,9 +31,6 @@ $GLOBALS['cfg']['NaviPointerColor'] = '#000000'; // background of the pointer in navi frame $GLOBALS['cfg']['NaviPointerBackground'] = '#9999cc'; -// text color of the selected database name (when showing the table list) -$GLOBALS['cfg']['NaviDatabaseNameColor'] = '#ff9900'; - /** * main frame */ diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index ef0f53c..6bfd715 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -75,11 +75,6 @@ button { margin-left: 0.3em; } -.navi_dbName { - font-weight: bold; - color: <?php echo $GLOBALS['cfg']['NaviDatabaseNameColor']; ?>; -} - /******************************************************************************/ /* specific elements */ diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php index 604982a..73bd7b7 100644 --- a/themes/original/layout.inc.php +++ b/themes/original/layout.inc.php @@ -24,8 +24,6 @@ $GLOBALS['cfg']['NaviBackground'] = '#D0DCE0'; $GLOBALS['cfg']['NaviPointerColor'] = '#000000'; // background of the pointer in navi frame $GLOBALS['cfg']['NaviPointerBackground'] = '#9999CC'; -// text color of the selected database name (when showing the table list) -$GLOBALS['cfg']['NaviDatabaseNameColor'] = '#0000FF'; /** * main frame hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1583-gc484d10
by Michal Čihař 02 Feb '11

02 Feb '11

The branch, master has been updated via c484d10caa5f725fa5bcac3ba4261ee034a5a376 (commit) from 599492943d0415c40f2db3e7274f18d3c269544a (commit) - Log ----------------------------------------------------------------- commit c484d10caa5f725fa5bcac3ba4261ee034a5a376 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 14:17:26 2011 +0100 Add links to table alter page ----------------------------------------------------------------------- Summary of changes: tbl_alter.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tbl_alter.php b/tbl_alter.php index b7ab440..f60523f 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -24,6 +24,7 @@ PMA_checkParameters(array('db', 'table')); */ require_once './libraries/tbl_common.php'; require_once './libraries/tbl_info.inc.php'; +require_once './libraries/tbl_links.inc.php'; $active_page = 'tbl_structure.php'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1582-g5994929
by Michal Čihař 02 Feb '11

02 Feb '11

The branch, master has been updated via 599492943d0415c40f2db3e7274f18d3c269544a (commit) from c0c5723b2038d30ab4f19d4a291770edf1c3779b (commit) - Log ----------------------------------------------------------------- commit 599492943d0415c40f2db3e7274f18d3c269544a Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 14:12:54 2011 +0100 This should clear possible floats ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 32652de..61f5ffb 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1244,7 +1244,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view echo $edit_link . $explain_link . $php_link . $refresh_link . $validate_link; echo '</div>'; } - echo '</div><br />' . "\n"; + echo '</div><br class="clearfloat" />' . "\n"; // If we are in an Ajax request, we have most probably been called in // PMA_ajaxResponse(). Hence, collect the buffer contents and return it hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1581-gc0c5723
by Michal Čihař 02 Feb '11

02 Feb '11

The branch, master has been updated via c0c5723b2038d30ab4f19d4a291770edf1c3779b (commit) from 30954728f30a9e8171d799dbd6de0abc87e1f563 (commit) - Log ----------------------------------------------------------------- commit c0c5723b2038d30ab4f19d4a291770edf1c3779b Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 13:44:33 2011 +0100 Do not show 'Please select a database' when it is obvious. This makes sense when there is select box, but for list it is not needed. ----------------------------------------------------------------------- Summary of changes: navigation.php | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/navigation.php b/navigation.php index 8c2b65c..c162aa2 100644 --- a/navigation.php +++ b/navigation.php @@ -308,7 +308,10 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { .'<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_snewtbl.png" id="icon_newtable" width="10" height="10" alt="' . _pgettext('short form', 'Create table') . '" />' . _pgettext('short form', 'Create table') . '</a></li></ul>'; } elseif ($GLOBALS['cfg']['LeftFrameLight']) { - echo '<p>' . __('Please select a database') . '</p>'; + /* No need to tell user to select database if we're showing complete list */ + if (!$list) { + echo '<p>' . __('Please select a database') . '</p>'; + } } else { echo '<div id="databaseList">' . "\n"; $_url_params = array('pos' => $pos); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1580-g3095472
by Marc Delisle 02 Feb '11

02 Feb '11

The branch, master has been updated via 30954728f30a9e8171d799dbd6de0abc87e1f563 (commit) via 2d9ffe0fa24cfe13ae31c41198ebf6604c1c5d80 (commit) via 1674e0c6c329cff191dda7eb56f10e37e39002d0 (commit) from 75366e37e7a449000e36ad67c46d282133b67236 (commit) - Log ----------------------------------------------------------------- commit 30954728f30a9e8171d799dbd6de0abc87e1f563 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Feb 2 07:43:28 2011 -0500 Workaround for Chrome problem on db search commit 2d9ffe0fa24cfe13ae31c41198ebf6604c1c5d80 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Feb 2 07:40:05 2011 -0500 Remove tab characters commit 1674e0c6c329cff191dda7eb56f10e37e39002d0 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Wed Feb 2 07:32:55 2011 -0500 Patch #3169798 Show/hide criteria on db Search ----------------------------------------------------------------------- Summary of changes: js/db_search.js | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 45 insertions(+), 5 deletions(-) diff --git a/js/db_search.js b/js/db_search.js index ea7280b..41ea5e6 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -25,6 +25,28 @@ $(document).ready(function() { }); /** + * Prepare a div containing a link, otherwise it's incorrectly displayed + * after a couple of clicks + */ + $('<div id="togglesearchformdiv"><a id="togglesearchformlink"></a></div>') + .insertAfter('#db_search_form') + // don't show it until we have results on-screen + .hide(); + + $('#togglesearchformlink') + .html(PMA_messages['strShowSearchCriteria']) + .bind('click', function() { + var $link = $(this); + $('#db_search_form').slideToggle(); + if ($link.text() == PMA_messages['strHideSearchCriteria']) { + $link.text(PMA_messages['strShowSearchCriteria']); + } else { + $link.text(PMA_messages['strHideSearchCriteria']); + } + // avoid default click action + return false; + }); + /** * Ajax Event handler for retrieving the result of an SQL Query * (see $GLOBALS['cfg']['AjaxEnable']) * @@ -34,15 +56,33 @@ $(document).ready(function() { event.preventDefault(); PMA_ajaxShowMessage(PMA_messages['strSearching']); - + // jQuery object to reuse $form = $(this); - + + // add this hidden field just once if (! $form.find('input:hidden').is('#ajax_request_hidden')) { $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); } - $.get($form.attr('action'), $form.serialize() + "&submit_search=" + $("#buttonGo").val(), function(data) { - $("#searchresults").html(data); - }) // end $.get() + $.post($form.attr('action'), $form.serialize() + "&submit_search=" + $("#buttonGo").val(), function(response) { + if (typeof response == 'string') { + // found results + $("#searchresults").html(response); + $("#sqlqueryresults").trigger('appendAnchor'); + $('#db_search_form') + // workaround for Chrome problem (bug #3168569) + .slideToggle() + .hide(); + $('#togglesearchformlink') + // always start with the Show message + .text(PMA_messages['strShowSearchCriteria']) + $('#togglesearchformdiv') + // now it's time to show the div containing the link + .show(); + } else { + // error message (zero rows) + $("#sqlqueryresults").html(response['message']); + } + }) }) }, 'top.frame_content'); // end $(document).ready() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1577-g75366e3
by Michal Čihař 02 Feb '11

02 Feb '11

The branch, master has been updated via 75366e37e7a449000e36ad67c46d282133b67236 (commit) via 5a2835ec86ee96e3190aacfac711b1051624922f (commit) from 728d5a15583edb9319574054a32063b955763686 (commit) - Log ----------------------------------------------------------------- commit 75366e37e7a449000e36ad67c46d282133b67236 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 11:42:35 2011 +0100 Whitespace cleanup commit 5a2835ec86ee96e3190aacfac711b1051624922f Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 10:09:37 2011 +0100 Readd redirect login to top frame ----------------------------------------------------------------------- Summary of changes: js/functions.js | 34 +++++++++++++++++----------------- libraries/auth/cookie.auth.lib.php | 8 ++++++++ 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/js/functions.js b/js/functions.js index 0a9624e..bfbcca1 100644 --- a/js/functions.js +++ b/js/functions.js @@ -45,7 +45,7 @@ function suggestPassword(passwd_form) { } /** - * for libraries/display_change_password.lib.php + * for libraries/display_change_password.lib.php * libraries/user_password.php * */ @@ -58,7 +58,7 @@ function displayPasswordGenerateButton() { /* * Adds a date/time picker to an element * - * @param object $this_element a jQuery object pointing to the element + * @param object $this_element a jQuery object pointing to the element */ function PMA_addDatepicker($this_element) { var showTimeOption = false; @@ -75,7 +75,7 @@ function PMA_addDatepicker($this_element) { time24h: true, stepMinutes: 1, stepHours: 1, - showTime: showTimeOption, + showTime: showTimeOption, dateFormat: 'yy-mm-dd', // yy means year with four digits altTimeField: '', beforeShow: function(input, inst) { @@ -853,7 +853,7 @@ function checkTransmitDump(theForm, theAction) $(document).ready(function() { /** - * Row marking in horizontal mode (use "live" so that it works also for + * Row marking in horizontal mode (use "live" so that it works also for * next pages reached via AJAX); a tr may have the class noclick to remove * this behavior. */ @@ -864,7 +864,7 @@ $(document).ready(function() { }); /** - * Add a date/time picker to each element that needs it + * Add a date/time picker to each element that needs it */ $('.datefield, .datetimefield').each(function() { PMA_addDatepicker($(this)); @@ -1689,7 +1689,7 @@ $(document).ready(function() { } }) // end $.get() - // empty table name and number of columns from the minimal form + // empty table name and number of columns from the minimal form $form.find('input[name=table],input[name=num_fields]').val(''); }); @@ -1770,7 +1770,7 @@ $(document).ready(function() { PMA_ajaxShowMessage(data.error); } }) // end $.post() - }) // end create table form (save) + }) // end create table form (save) /** * Attach event handler for create table form (add fields) @@ -1799,7 +1799,7 @@ $(document).ready(function() { $("#create_table_dialog").html(data); }) //end $.post() - }) // end create table form (add fields) + }) // end create table form (add fields) }, 'top.frame_content'); //end $(document).ready for 'Create Table' @@ -1907,7 +1907,7 @@ $(document).ready(function() { .removeClass('odd even'); var $databases_count_object = $('#databases_count'); - var databases_count = parseInt($databases_count_object.text()); + var databases_count = parseInt($databases_count_object.text()); $databases_count_object.text(++databases_count); //Refresh navigation frame as a new database has been added if (window.parent && window.parent.frame_navigation) { @@ -2310,7 +2310,7 @@ $(document).ready(function() { var right_checkbox_id = current_checkbox_id.replace('_left', '_right'); var other_checkbox_id = ''; if (current_checkbox_id == left_checkbox_id) { - other_checkbox_id = right_checkbox_id; + other_checkbox_id = right_checkbox_id; } else { other_checkbox_id = left_checkbox_id; } @@ -2326,7 +2326,7 @@ $(document).ready(function() { .filter(function(index) { // the first clicked row can be on a row above or below the // shift-clicked row - return (index_of_current_checkbox > index_of_last_click && index > index_of_last_click && index < index_of_current_checkbox) + return (index_of_current_checkbox > index_of_last_click && index > index_of_last_click && index < index_of_current_checkbox) || (index_of_last_click > index_of_current_checkbox && index < index_of_last_click && index > index_of_current_checkbox); }) .each(function(index) { @@ -2341,8 +2341,8 @@ $(document).ready(function() { $('.multi_checkbox').removeClass('last_clicked'); $current_checkbox.addClass('last_clicked'); - - // When there is a checkbox on both ends of the row, propagate the + + // When there is a checkbox on both ends of the row, propagate the // click on one of them to the other one. // (the default action has not been prevented so if we have // just clicked, this "if" is true) @@ -2371,20 +2371,20 @@ $(document).ready(function() { var $this_td = $(this); var row_num = PMA_getRowNumber($this_td.attr('class')); // for all td of the same vertical row, toggle hover - $('.vpointer').filter('.row_' + row_num).toggleClass('hover'); + $('.vpointer').filter('.row_' + row_num).toggleClass('hover'); } ); }) // end of $(document).ready() for vertical pointer $(document).ready(function() { /** - * Vertical marker + * Vertical marker */ $('.vmarker').live('click', function(e) { var $this_td = $(this); var row_num = PMA_getRowNumber($this_td.attr('class')); - // for all td of the same vertical row, toggle the marked class - $('.vmarker').filter('.row_' + row_num).toggleClass('marked'); + // for all td of the same vertical row, toggle the marked class + $('.vmarker').filter('.row_' + row_num).toggleClass('marked'); }); /** diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 4f4b261..cb0daa6 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -171,6 +171,14 @@ function PMA_auth() require './libraries/header_meta_style.inc.php'; require './libraries/header_scripts.inc.php'; ?> +<script type="text/javascript"> +//<![CDATA[ +// show login form in top frame +if (top != self) { + window.top.location.href=location; +} +//]]> +</script> </head> <body class="loginform"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 52db64888f692aba36c707dd34365009d4280ed4
by Michal Čihař 02 Feb '11

02 Feb '11

The branch, master has been updated via 52db64888f692aba36c707dd34365009d4280ed4 (commit) from dc5d770b8de7d7c86bb8d3e9de89e2fff5636827 (commit) - Log ----------------------------------------------------------------- commit 52db64888f692aba36c707dd34365009d4280ed4 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 11:39:57 2011 +0100 Export latest version in javascript as well. ----------------------------------------------------------------------- Summary of changes: render.py | 1 + static/_version.js | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) create mode 100644 static/_version.js diff --git a/render.py b/render.py index 187341d..e18aca8 100755 --- a/render.py +++ b/render.py @@ -1005,6 +1005,7 @@ class SFGenerator: helper.log.dbg('Generating static pages:') self.render_static('_version.php', 'version.php') self.render_static('_version.txt', 'version.txt') + self.render_static('_version.js', 'version.js') self.render_static('_security.php', 'security.php') self.render_static('_robots.txt', 'robots.txt') for redir in data.redirects.REDIRECTS: diff --git a/static/_version.js b/static/_version.js new file mode 100644 index 0000000..97866c6 --- /dev/null +++ b/static/_version.js @@ -0,0 +1,4 @@ +{% for release in releases_featured %} +var PMA_latest_version = '${release.version}'; +var PMA_latest_date = '${release.date.datestring()}'; +{% end %} hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1575-g728d5a1
by Marc Delisle 01 Feb '11

01 Feb '11

The branch, master has been updated via 728d5a15583edb9319574054a32063b955763686 (commit) from b8f7b831ef3429877ffe51527963b13fe852354b (commit) - Log ----------------------------------------------------------------- commit 728d5a15583edb9319574054a32063b955763686 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Feb 1 13:02:51 2011 -0500 Conditional Ajax for DROP DATABASE Remove duplicate logic for confirmations ----------------------------------------------------------------------- Summary of changes: db_operations.php | 2 +- js/functions.js | 25 ------------------------- 2 files changed, 1 insertions(+), 26 deletions(-) diff --git a/db_operations.php b/db_operations.php index 9280467..3e674cb 100644 --- a/db_operations.php +++ b/db_operations.php @@ -446,7 +446,7 @@ echo __('Remove database'); 'db' => NULL, ); ?> - <li><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>" onclick="return confirmLinkDropDB(this, '<?php echo PMA_jsFormat($this_sql_query); ?>')"> + <li><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'id="drop_db_anchor"' : ''); ?>> <?php echo __('Drop the database (DROP)'); ?></a> <?php echo PMA_showMySQLDocu('SQL-Syntax', 'DROP_DATABASE'); ?> </li> diff --git a/js/functions.js b/js/functions.js index 74a4fb8..0a9624e 100644 --- a/js/functions.js +++ b/js/functions.js @@ -111,31 +111,6 @@ function selectContent( element, lock, only_once ) { } /** - * Displays a confirmation box before submitting a "DROP DATABASE" query. - * This function is called while clicking links - * - * @param object the link - * @param object the sql query to submit - * - * @return boolean whether to run the query or not - */ -function confirmLinkDropDB(theLink, theSqlQuery) -{ - // Confirmation is not required in the configuration file - // or browser is Opera (crappy js implementation) - if (PMA_messages['strDoYouReally'] == '' || typeof(window.opera) != 'undefined') { - return true; - } - - var is_confirmed = confirm(PMA_messages['strDropDatabaseStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + ' :\n' + theSqlQuery); - if (is_confirmed) { - theLink.href += '&is_js_confirmed=1'; - } - - return is_confirmed; -} // end of the 'confirmLinkDropDB()' function - -/** * Displays a confirmation box before to submit a "DROP/DELETE/ALTER" query. * This function is called while clicking links * hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1571-gc172669
by Michal Čihař 01 Feb '11

01 Feb '11

The branch, master has been updated via c17266919d4faede52baa9e533471404029553db (commit) via 685e199c16cbdf66d97d5293a001f5c0b62c9850 (commit) via 290d448b9ae16d09770e27ac9e32c65df6009337 (commit) from fbf296f70f8ebe4b70ab8adbae2b257edb028195 (commit) - Log ----------------------------------------------------------------- commit c17266919d4faede52baa9e533471404029553db Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Feb 1 18:16:34 2011 +0100 Another not used image commit 685e199c16cbdf66d97d5293a001f5c0b62c9850 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Feb 1 17:52:14 2011 +0100 Use standard javascript loading on login page. commit 290d448b9ae16d09770e27ac9e32c65df6009337 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Feb 1 17:50:14 2011 +0100 No need to explicitely add jquery ----------------------------------------------------------------------- Summary of changes: db_search.php | 1 - libraries/auth/cookie.auth.lib.php | 12 +----------- themes/darkblue_orange/img/item.png | Bin 179 -> 0 bytes themes/original/img/item.png | Bin 179 -> 0 bytes 4 files changed, 1 insertions(+), 12 deletions(-) delete mode 100644 themes/darkblue_orange/img/item.png delete mode 100644 themes/original/img/item.png diff --git a/db_search.php b/db_search.php index 0185879..4275399 100644 --- a/db_search.php +++ b/db_search.php @@ -37,7 +37,6 @@ */ require_once './libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'jquery/jquery-1.4.4.js'; $GLOBALS['js_include'][] = 'db_search.js'; /** diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 7e04819..4f4b261 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -169,18 +169,8 @@ function PMA_auth() /* HTML header; do not show here the PMA version to improve security */ $page_title = 'phpMyAdmin '; require './libraries/header_meta_style.inc.php'; + require './libraries/header_scripts.inc.php'; ?> -<script src="./js/jquery/jquery-1.4.4.js" type="text/javascript"></script> -<script src="./js/update-location.js" type="text/javascript"></script> -<script type="text/javascript"> -//<![CDATA[ -// show login form in top frame -if (top != self) { - window.top.location.href=location; -} -//]]> -</script> -<script src="./js/functions.js" type="text/javascript"></script> </head> <body class="loginform"> diff --git a/themes/darkblue_orange/img/item.png b/themes/darkblue_orange/img/item.png deleted file mode 100644 index 1c51d39..0000000 Binary files a/themes/darkblue_orange/img/item.png and /dev/null differ diff --git a/themes/original/img/item.png b/themes/original/img/item.png deleted file mode 100644 index 1c51d39..0000000 Binary files a/themes/original/img/item.png and /dev/null differ hooks/post-receive -- phpMyAdmin

1 0