- Git - lists.phpmyadmin.net

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

02 Feb '11

The branch, master has been updated via 08f2042a2dc1350b0d35b1941f98faba0dd9928d (commit) from 9c0aedd744f609718907a46ae78937daceea9e34 (commit) - Log ----------------------------------------------------------------- commit 08f2042a2dc1350b0d35b1941f98faba0dd9928d Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 15:31:02 2011 +0100 Do not hardcode image size This allows better theming. ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index a0da8c0..dd5d8e2 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -573,7 +573,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $url_params['display_text'] = 'F'; } - $tmp_image = '<img class="fulltext" width="50" height="20" src="' . $tmp_image_file . '" alt="' . $tmp_txt . '" title="' . $tmp_txt . '" />'; + $tmp_image = '<img class="fulltext" src="' . $tmp_image_file . '" alt="' . $tmp_txt . '" title="' . $tmp_txt . '" />'; $tmp_url = 'sql.php' . PMA_generate_common_url($url_params); $full_or_partial_text_link = PMA_linkOrButton($tmp_url, $tmp_image, array(), false); unset($tmp_image_file, $tmp_txt, $tmp_url, $tmp_image); hooks/post-receive -- phpMyAdmin

1 0

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

02 Feb '11

The branch, master has been updated via 9c0aedd744f609718907a46ae78937daceea9e34 (commit) via 2b451c279b119bcc30e268297ecd17906afdfc55 (commit) from f11509d5b577d30a7776600c0e9c47b5433b50f2 (commit) - Log ----------------------------------------------------------------- commit 9c0aedd744f609718907a46ae78937daceea9e34 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 15:17:32 2011 +0100 Whitespace cleanup commit 2b451c279b119bcc30e268297ecd17906afdfc55 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 15:17:22 2011 +0100 Allow separate styling of navigtaion bar ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index c2c8518..a0da8c0 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -280,7 +280,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di ?>  -<table border="0" cellpadding="2" cellspacing="0"> +<table border="0" cellpadding="2" cellspacing="0" class="navigation"> <tr> <?php // Move to the beginning or to the previous page @@ -864,7 +864,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal' || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') { echo '<th'; - $th_class = array(); + $th_class = array(); if ($condition_field) { $th_class[] = 'condition'; } @@ -964,25 +964,25 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ /** - * Prepares the display for a value + * Prepares the display for a value * * @param string $class * @param string $condition_field * @param string $value * - * @return string the td + * @return string the td */ function PMA_buildValueDisplay($class, $condition_field, $value) { return '<td align="left"' . ' class="' . $class . ($condition_field ? ' condition' : '') . '">' . $value . '</td>'; } /** - * Prepares the display for a null value + * Prepares the display for a null value * * @param string $class * @param string $condition_field * - * @return string the td + * @return string the td */ function PMA_buildNullDisplay($class, $condition_field) { // the null class is needed for inline editing @@ -990,13 +990,13 @@ function PMA_buildNullDisplay($class, $condition_field) { } /** - * Prepares the display for an empty value + * Prepares the display for an empty value * * @param string $class * @param string $condition_field * @param string $align * - * @return string the td + * @return string the td */ function PMA_buildEmptyDisplay($class, $condition_field, $align = '') { return '<td ' . $align . ' class="' . $class . ' nowrap' . ($condition_field ? ' condition' : '') . '"> </td>'; @@ -1312,7 +1312,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // TEXT fields type so we have to ensure it's really a BLOB $field_flags = PMA_DBI_field_flags($dt_result, $i); - // reset $class from $inline_edit_class to just 'data' + // reset $class from $inline_edit_class to just 'data' // as we can't edit binary data $class = 'data'; @@ -1353,13 +1353,13 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // g e o m e t r y } elseif ($meta->type == 'geometry') { $geometry_text = PMA_handle_non_printable_contents('GEOMETRY', (isset($row[$i]) ? $row[$i] : ''), $transform_function, $transform_options, $default_function, $meta); - // reset $class from $inline_edit_class to 'data' + // reset $class from $inline_edit_class to 'data' // as we can't edit geometry data $class = 'data'; $vertical_display['data'][$row_no][$i] = PMA_buildValueDisplay($class, $condition_field, $geometry_text); unset($geometry_text); - // n o t n u m e r i c a n d n o t B L O B + // n o t n u m e r i c a n d n o t B L O B } else { if (!isset($row[$i]) || is_null($row[$i])) { $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); @@ -2441,7 +2441,7 @@ function PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $m /** * Generates a checkbox for multi-row submits * - * @uses htmlspecialchars + * @uses htmlspecialchars * @param string $del_url * @param array $is_display * @param string $row_no @@ -2469,9 +2469,9 @@ function PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_cla } /** - * Generates an Edit link + * Generates an Edit link * - * @uses PMA_linkOrButton() + * @uses PMA_linkOrButton() * @param string $edit_url * @param string $class * @param string $edit_str @@ -2485,7 +2485,7 @@ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $wher $ret .= '<td class="' . $class . '" align="center" ' . ' >' . PMA_linkOrButton($edit_url, $edit_str, array(), FALSE); /* - * Where clause for selecting this row uniquely is provided as + * Where clause for selecting this row uniquely is provided as * a hidden input. Used by jQuery scripts for handling inline editing */ if(! empty($where_clause)) { @@ -2497,9 +2497,9 @@ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $wher } /** - * Generates a Delete link + * Generates a Delete link * - * @uses PMA_linkOrButton() + * @uses PMA_linkOrButton() * @param string $del_url * @param string $del_str * @param string $js_conf @@ -2521,9 +2521,9 @@ function PMA_generateDeleteLink($del_url, $del_str, $js_conf, $class) { } /** - * Generates checkbox and links at some position (left or right) + * Generates checkbox and links at some position (left or right) * - * @uses PMA_generateCheckboxForMulti() + * @uses PMA_generateCheckboxForMulti() * @uses PMA_generateEditLink() * @uses PMA_generateDeleteLink() * @param string $position hooks/post-receive -- phpMyAdmin

1 0

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

02 Feb '11

The branch, master has been updated via f11509d5b577d30a7776600c0e9c47b5433b50f2 (commit) from f2ebfe1bd53abc3962256e3c574cc26aa70cd36e (commit) - Log ----------------------------------------------------------------- commit f11509d5b577d30a7776600c0e9c47b5433b50f2 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 14:52:56 2011 +0100 Add table caption and move documentation link there. Otherwise the separate documentation link looks little strange. ----------------------------------------------------------------------- Summary of changes: libraries/tbl_properties.inc.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index c6446ea..4bc1029 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -631,6 +631,8 @@ if (is_array($content_cells) && is_array($header_cells)) { //$empty_row = array_pop($content_cells); echo '<table id="table_columns">'; + echo '<caption class="tblHeaders">' . __('Structure') . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_TABLE') . '</caption>'; + if ($display_type == 'horizontal') { ?> <tr> @@ -787,8 +789,6 @@ if ($action == 'tbl_create.php') { </form> -<center><?php echo PMA_showMySQLDocu('SQL-Syntax', 'CREATE_TABLE'); ?></center> - <div id="enum_editor"> <a class="close_enum_editor"><?php echo __('Close'); ?></a> <h3><?php printf(__('Values for the column "%s"'), isset($row['Field']) ? htmlspecialchars($row['Field']) : ""); ?></h3> hooks/post-receive -- phpMyAdmin

1 0

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

02 Feb '11

The branch, master has been updated via f2ebfe1bd53abc3962256e3c574cc26aa70cd36e (commit) from a6e1212d12e40d0037c5dd989c5aa3815a2b3b73 (commit) - Log ----------------------------------------------------------------- commit f2ebfe1bd53abc3962256e3c574cc26aa70cd36e Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 14:48:36 2011 +0100 Show links only when editing ----------------------------------------------------------------------- Summary of changes: tbl_alter.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tbl_alter.php b/tbl_alter.php index f60523f..fa82d7c 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -24,7 +24,6 @@ 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'; @@ -156,6 +155,8 @@ if (isset($_REQUEST['do_save_data'])) { * $selected comes from multi_submits.inc.php */ if ($abort == false) { + require_once './libraries/tbl_links.inc.php'; + if (! isset($selected)) { PMA_checkParameters(array('field')); $selected[] = $_REQUEST['field']; hooks/post-receive -- phpMyAdmin

1 0

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

02 Feb '11

The branch, master has been updated via a6e1212d12e40d0037c5dd989c5aa3815a2b3b73 (commit) from 0280fdcb0865a5114695415b84cb89ed34980810 (commit) - Log ----------------------------------------------------------------- commit a6e1212d12e40d0037c5dd989c5aa3815a2b3b73 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 14:43:24 2011 +0100 Czech translation update ----------------------------------------------------------------------- Summary of changes: po/cs.po | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/po/cs.po b/po/cs.po index 368d0d4..c0b84be 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-02-02 14:41+0100\n" -"PO-Revision-Date: 2011-02-01 18:25+0100\n" +"PO-Revision-Date: 2011-02-02 14:42+0100\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -1163,10 +1163,9 @@ msgstr "" #. l10n: Latest available phpMyAdmin version #: js/messages.php:115 -#, fuzzy #| msgid "Check for latest version" msgid ", latest stable version:" -msgstr "Zkontrolovat nejnovější verzi" +msgstr ", poslední stabilní verze:" #. l10n: Display text for calendar close link #: js/messages.php:130 @@ -4246,7 +4245,7 @@ msgstr "Zkontrolovat nejnovější verzi" #: libraries/config/messages.inc.php:498 msgid "Enables check for latest version on main phpMyAdmin page" -msgstr "" +msgstr "Povolí kontrolu poslední verze phpMyAdmina na hlavní stránce" #: libraries/config/messages.inc.php:499 setup/lib/index.lib.php:118 #: setup/lib/index.lib.php:125 setup/lib/index.lib.php:142 hooks/post-receive -- phpMyAdmin

1 0

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

02 Feb '11

The branch, master has been updated via 011d87f39abc6b30ca83334fe06e19ae1ece09db (commit) from b1fe08fa9222df068fb471a69af65bc0fe46fe47 (commit) - Log ----------------------------------------------------------------- commit 011d87f39abc6b30ca83334fe06e19ae1ece09db Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 2 14:39:55 2011 +0100 Better message. We will announce only stable versions this way. ----------------------------------------------------------------------- Summary of changes: js/messages.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/messages.php b/js/messages.php index ded9546..fa28771 100644 --- a/js/messages.php +++ b/js/messages.php @@ -112,7 +112,7 @@ $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:'); +$js_messages['strLatestAvailable'] = __(', latest stable version:'); echo "var PMA_messages = new Array();\n"; foreach ($js_messages as $name => $js_message) { hooks/post-receive -- phpMyAdmin

1 0

[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