August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13364-gb57e186
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via b57e186331d2f1abeff9febbf8f9933d906eb029 (commit) from 8f618e6f013262963c279b71c1f2fff1d1d74e3d (commit) - Log ----------------------------------------------------------------- commit b57e186331d2f1abeff9febbf8f9933d906eb029 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 13:53:41 2011 +0200 Drop another ocurence of inline js ----------------------------------------------------------------------- Summary of changes: js/functions.js | 16 ++++++++++++++++ libraries/Theme.class.php | 13 +++++++------ themes.php | 16 +--------------- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/js/functions.js b/js/functions.js index 9b80619..008dcf2 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3127,4 +3127,20 @@ $(document).ready(function() { $('.autosubmit').change(function(e) { e.target.form.submit(); }); + + /** + * Theme changer. + */ + $('.take_theme').live('click', function(e) { + alert(e.target.nodeName); + var evt = $(e); + var what = evt.target.id; + if (window.opener && window.opener.document.forms['setTheme'].elements['set_theme']) { + window.opener.document.forms['setTheme'].elements['set_theme'].value = what; + window.opener.document.forms['setTheme'].submit(); + window.close(); + return false; + } + return true; + }); }); diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index 0347ac8..252d554 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -321,12 +321,13 @@ class PMA_Theme { echo '<div class="theme_preview">'; echo '<h2>' . htmlspecialchars($this->getName()) - .' (' . htmlspecialchars($this->getVersion()) . ')</h2>' - .'<p>' - .'<a target="_top" href="index.php' - .PMA_generate_common_url(array('set_theme' => $this->getId())) . '"' - .' onclick="takeThis(\'' . addslashes($this->getId()) . '\');' - .' return false;">'; + .' (' . htmlspecialchars($this->getVersion()) . ')</h2>'; + echo '<p>'; + echo '<a target="_top" class="take_theme" ' + .'id="' . htmlspecialchars($this->getId()) . '" ' + . 'href="index.php'.PMA_generate_common_url(array( + 'set_theme' => $this->getId() + )) . '">'; if (@file_exists($this->getPath() . '/screen.png')) { // if screen exists then output diff --git a/themes.php b/themes.php index 732f1e3..1663334 100644 --- a/themes.php +++ b/themes.php @@ -19,22 +19,8 @@ require './libraries/header_http.inc.php'; /* HTML header */ $page_title = 'phpMyAdmin - ' . __('Theme'); require './libraries/header_meta_style.inc.php'; +require './libraries/header_scripts.inc.php'; ?> -<script type="text/javascript" language="javascript"> -// <![CDATA[ -function takeThis(what) -{ - if (window.opener && window.opener.document.forms['setTheme'].elements['set_theme']) { - window.opener.document.forms['setTheme'].elements['set_theme'].value = what; - window.opener.document.forms['setTheme'].submit(); - self.close(); - } else { - alert('<?php echo sprintf(__('No themes support; please check your configuration and/or your themes in directory %s.'), $cfg['ThemePath']); ?>'); - self.close(); - } -} -// ]]> -</script> </head> <body id="bodythemes"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13363-g8f618e6
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 8f618e6f013262963c279b71c1f2fff1d1d74e3d (commit) via 84fda7ff95a1a53ede47d6b6b9b6b7fe3660a947 (commit) from 51b54c954c900058a141a7444f3ec53ce9fbfce8 (commit) - Log ----------------------------------------------------------------- commit 8f618e6f013262963c279b71c1f2fff1d1d74e3d Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 13:29:20 2011 +0200 Convert more occurences of inline autosubmit code to external js commit 84fda7ff95a1a53ede47d6b6b9b6b7fe3660a947 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 13:24:53 2011 +0200 Automatic form submission on change. ----------------------------------------------------------------------- Summary of changes: db_structure.php | 2 +- js/functions.js | 13 ++++++++++--- libraries/Config.class.php | 2 +- libraries/Theme_Manager.class.php | 3 +-- libraries/common.lib.php | 2 +- libraries/display_select_lang.lib.php | 2 +- libraries/display_tbl.lib.php | 2 +- libraries/mysql_charsets.lib.php | 2 +- libraries/schema/User_Schema.class.php | 2 +- libraries/select_server.lib.php | 3 +-- server_privileges.php | 4 ++-- setup/frames/index.inc.php | 2 +- .../common/PMA_display_html_checkbox_test.php | 8 ++++---- 13 files changed, 26 insertions(+), 21 deletions(-) diff --git a/db_structure.php b/db_structure.php index 01c2156..d76bcca 100644 --- a/db_structure.php +++ b/db_structure.php @@ -489,7 +489,7 @@ $checkall_url = 'db_structure.php?' . PMA_generate_common_url($db); <?php echo __('Check tables having overhead'); ?></a> <?php } ?> -<select name="submit_mult" onchange="this.form.submit();" style="margin: 0 3em 0 3em;"> +<select name="submit_mult" class="autosubmit" style="margin: 0 3em 0 3em;"> <?php echo ' <option value="' . __('With selected:') . '" selected="selected">' . __('With selected:') . '</option>' . "\n"; diff --git a/js/functions.js b/js/functions.js index d531c24..9b80619 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3112,12 +3112,19 @@ function PMA_createqTip($elements, content, options) $elements.qtip($.extend(true, o, options)); } -/** - * Theme selector. - */ $(document).ready(function() { + /** + * Theme selector. + */ $('a.themeselect').live('click',function(e) { window.open(e.target + '?foo=bar', 'themes','left=10,top=20,width=510,height=350,scrollbars=yes,status=yes,resizable=yes'); return false; }); + + /** + * Automatic form submission on change. + */ + $('.autosubmit').change(function(e) { + e.target.form.submit(); + }); }); diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 0130252..9822807 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -1152,7 +1152,7 @@ class PMA_Config $options = PMA_Config::_getFontsizeOptions($current_size); $return = '<label for="select_fontsize">' . __('Font size') . ':</label>' . "\n"; - $return .= '<select name="set_fontsize" id="select_fontsize" onchange="this.form.submit();">' . "\n"; + $return .= '<select name="set_fontsize" id="select_fontsize" class="autosubmit">' . "\n"; foreach ($options as $option) { $return .= '<option value="' . $option . '"'; if ($option == $current_size) { diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index 8b60ef5..d6c4ea0 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -283,8 +283,7 @@ class PMA_Theme_Manager $theme_preview_href = '<a href="' . $theme_preview_path . '" target="themes" class="themeselect">'; $select_box .= $theme_preview_href . __('Theme') . '</a>:' . "\n"; - $select_box .= '<select name="set_theme" xml:lang="en" dir="ltr"' - .' onchange="this.form.submit();" >'; + $select_box .= '<select name="set_theme" xml:lang="en" dir="ltr" class="autosubmit">'; foreach ($this->themes as $each_theme_id => $each_theme) { $select_box .= '<option value="' . $each_theme_id . '"'; if ($this->active_theme === $each_theme_id) { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index e491adb..5de802b 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2316,7 +2316,7 @@ function PMA_externalBug($functionality, $component, $minimum_version, $bugref) function PMA_display_html_checkbox($html_field_name, $label, $checked, $onclick) { - echo '<input type="checkbox" name="' . $html_field_name . '" id="' . $html_field_name . '"' . ($checked ? ' checked="checked"' : '') . ($onclick ? ' onclick="this.form.submit();"' : '') . ' /><label for="' . $html_field_name . '">' . $label . '</label>'; + echo '<input type="checkbox" name="' . $html_field_name . '" id="' . $html_field_name . '"' . ($checked ? ' checked="checked"' : '') . ($onclick ? ' class="autosubmit"' : '') . ' /><label for="' . $html_field_name . '">' . $label . '</label>'; } /** diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php index 202378d..fcc2b72 100644 --- a/libraries/display_select_lang.lib.php +++ b/libraries/display_select_lang.lib.php @@ -55,7 +55,7 @@ function PMA_select_language($use_fieldset = false, $show_doc = true) } ?> - <select name="lang" onchange="this.form.submit();" xml:lang="en" dir="ltr"> + <select name="lang" class="autosubmit" xml:lang="en" dir="ltr"> <?php uasort($GLOBALS['available_languages'], 'PMA_language_cmp'); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 19a1749..2f95f11 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -552,7 +552,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ echo '<form action="sql.php" method="post">' . "\n"; echo PMA_generate_common_hidden_inputs($db, $table); - echo __('Sort by key') . ': <select name="sql_query" onchange="this.form.submit();">' . "\n"; + echo __('Sort by key') . ': <select name="sql_query" class="autosubmit">' . "\n"; $used_index = false; $local_order = (isset($sort_expression) ? $sort_expression : ''); foreach ($indexes as $index) { diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 4eec97e..45f9255 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -104,7 +104,7 @@ function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION, $return_str = '<select xml:lang="en" dir="ltr" name="' . htmlspecialchars($name) . '"' . (empty($id) ? '' : ' id="' . htmlspecialchars($id) . '"') - . ($submitOnChange ? ' onchange="this.form.submit();"' : '') . '>' . "\n"; + . ($submitOnChange ? ' class="autosubmit"' : '') . '>' . "\n"; if ($label) { $return_str .= '<option value="">' . ($type == PMA_CSDROPDOWN_COLLATION ? __('Collation') : __('Charset')) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index aa39ec5..2ea0a2b 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -145,7 +145,7 @@ class PMA_User_Schema </legend> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <input type="hidden" name="do" value="selectpage" /> - <select name="chpage" id="chpage" onchange="this.form.submit()"> + <select name="chpage" id="chpage" class="autosubmit"> <option value="0"><?php echo __('Select page'); ?></option> <?php while ($curr_page = PMA_DBI_fetch_assoc($page_rs)) { diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php index 6d230ea..4d7b8f8 100644 --- a/libraries/select_server.lib.php +++ b/libraries/select_server.lib.php @@ -31,8 +31,7 @@ function PMA_select_server($not_only_options, $ommit_fieldset) } echo '<label for="select_server">' . __('Current Server') . ':</label> '; - echo '<select name="server" id="select_server"' - . ' onchange="if (this.value != \'\') this.form.submit();">'; + echo '<select name="server" id="select_server" class="autosubmit">'; echo '<option value="">(' . __('Servers') . ') ...</option>' . "\n"; } elseif ($list) { echo __('Current Server') . ':<br />'; diff --git a/server_privileges.php b/server_privileges.php index 2d7732c..64a5975 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2091,7 +2091,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs echo ' <label for="text_dbname">' . __('Add privileges on the following database') . ':</label>' . "\n"; if (!empty($pred_db_array)) { - echo ' <select name="pred_dbname" onchange="this.form.submit();">' . "\n" + echo ' <select name="pred_dbname" class="autosubmit">' . "\n" . ' <option value="" selected="selected">' . __('Use text field') . ':</option>' . "\n"; foreach ($pred_db_array as $current_db) { $current_db = PMA_escape_mysql_wildcards($current_db); @@ -2121,7 +2121,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs PMA_DBI_free_result($res); unset($res, $row); if (!empty($pred_tbl_array)) { - echo ' <select name="pred_tablename" onchange="this.form.submit();">' . "\n" + echo ' <select name="pred_tablename" class="autosubmit">' . "\n" . ' <option value="" selected="selected">' . __('Use text field') . ':</option>' . "\n"; foreach ($pred_tbl_array as $current_table) { echo ' <option value="' . htmlspecialchars($current_table) . '">' . htmlspecialchars($current_table) . '</option>' . "\n"; diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index 6b170f0..3ad1cfc 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -71,7 +71,7 @@ if (!$is_https) { <bdo xml:lang="en" dir="ltr"><label for="lang"> <?php echo __('Language') . (__('Language') != 'Language' ? ' - Language' : '') ?> </label></bdo><br /> - <select id="lang" name="lang" onchange="this.form.submit();" xml:lang="en" dir="ltr"> + <select id="lang" name="lang" class="autosubmit" xml:lang="en" dir="ltr"> <?php // create language list $lang_list = array(); diff --git a/test/libraries/common/PMA_display_html_checkbox_test.php b/test/libraries/common/PMA_display_html_checkbox_test.php index c779d72..b33a5fe 100644 --- a/test/libraries/common/PMA_display_html_checkbox_test.php +++ b/test/libraries/common/PMA_display_html_checkbox_test.php @@ -38,7 +38,7 @@ class PMA_display_html_checkbox_test extends PHPUnit_Extensions_OutputTestCase $name = "test_display_html_checkbox"; $label = "text_label_for_checkbox"; - $this->expectOutputString('<input type="checkbox" name="' . $name . '" id="' . $name . '" onclick="this.form.submit();" /><label for="' . $name . '">' . $label . '</label>'); + $this->expectOutputString('<input type="checkbox" name="' . $name . '" id="' . $name . '" class="autosubmit" /><label for="' . $name . '">' . $label . '</label>'); PMA_display_html_checkbox($name,$label,false,true); } @@ -47,9 +47,9 @@ class PMA_display_html_checkbox_test extends PHPUnit_Extensions_OutputTestCase $name = "test_display_html_checkbox"; $label = "text_label_for_checkbox"; - $this->expectOutputString('<input type="checkbox" name="' . $name . '" id="' . $name . '" checked="checked" onclick="this.form.submit();" /><label for="' . $name . '">' . $label . '</label>'); + $this->expectOutputString('<input type="checkbox" name="' . $name . '" id="' . $name . '" checked="checked" class="autosubmit" /><label for="' . $name . '">' . $label . '</label>'); PMA_display_html_checkbox($name,$label,true,true); } } - -//PMA_display_html_checkbox \ No newline at end of file + +//PMA_display_html_checkbox hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13361-g51b54c9
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 51b54c954c900058a141a7444f3ec53ce9fbfce8 (commit) from 44f007a87912cb1a1078ce0ec6820d67b43138bf (commit) - Log ----------------------------------------------------------------- commit 51b54c954c900058a141a7444f3ec53ce9fbfce8 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 12:04:23 2011 +0200 Replace inline javascript ----------------------------------------------------------------------- Summary of changes: js/functions.js | 9 +++++++++ libraries/Theme_Manager.class.php | 4 +--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/js/functions.js b/js/functions.js index bb976ce..d531c24 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3112,3 +3112,12 @@ function PMA_createqTip($elements, content, options) $elements.qtip($.extend(true, o, options)); } +/** + * Theme selector. + */ +$(document).ready(function() { + $('a.themeselect').live('click',function(e) { + window.open(e.target + '?foo=bar', 'themes','left=10,top=20,width=510,height=350,scrollbars=yes,status=yes,resizable=yes'); + return false; + }); +}); diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index 86ddc8d..8b60ef5 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -280,9 +280,7 @@ class PMA_Theme_Manager $theme_selected = false; $theme_preview_path= './themes.php'; - $theme_preview_href = '<a href="' . $theme_preview_path . '" target="themes" onclick="' - . "window.open('" . $theme_preview_path . "','themes','left=10,top=20,width=510,height=350,scrollbars=yes,status=yes,resizable=yes');" - . '">'; + $theme_preview_href = '<a href="' . $theme_preview_path . '" target="themes" class="themeselect">'; $select_box .= $theme_preview_href . __('Theme') . '</a>:' . "\n"; $select_box .= '<select name="set_theme" xml:lang="en" dir="ltr"' hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13360-g44f007a
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 44f007a87912cb1a1078ce0ec6820d67b43138bf (commit) from 3c425a16bcf5aca667f88e95375afefefcdd7d59 (commit) - Log ----------------------------------------------------------------- commit 44f007a87912cb1a1078ce0ec6820d67b43138bf Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 11:54:23 2011 +0200 Add tests for theme manager ----------------------------------------------------------------------- Summary of changes: test/libraries/PMA_Theme_Manager_test.php | 51 +++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) create mode 100644 test/libraries/PMA_Theme_Manager_test.php diff --git a/test/libraries/PMA_Theme_Manager_test.php b/test/libraries/PMA_Theme_Manager_test.php new file mode 100644 index 0000000..361417b --- /dev/null +++ b/test/libraries/PMA_Theme_Manager_test.php @@ -0,0 +1,51 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * tests for PMA_Theme_Manager class + * + * @package phpMyAdmin-test + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; +require_once 'libraries/url_generating.lib.php'; +require_once 'libraries/php-gettext/gettext.inc'; +require_once 'libraries/Theme.class.php'; +require_once 'libraries/Theme_Manager.class.php'; + +class PMA_Theme_Manager_test extends PHPUnit_Framework_TestCase +{ + public function setup() + { + $GLOBALS['cfg']['ThemePath'] = './themes'; + $GLOBALS['cfg']['ThemePerServer'] = false; + $GLOBALS['cfg']['ThemeDefault'] = 'pmahomme'; + $GLOBALS['cfg']['ServerDefault'] = 0; + $GLOBALS['server'] = 99; + $_SESSION[' PMA_token '] = 'token'; + } + + public function testCookieName() + { + $tm = new PMA_Theme_Manager(); + $this->assertEquals('pma_theme', $tm->getThemeCookieName()); + } + + public function testPerServerCookieName() + { + $tm = new PMA_Theme_Manager(); + $tm->setThemePerServer(true); + $this->assertEquals('pma_theme-99', $tm->getThemeCookieName()); + } + + public function testHtmlSelectBox() + { + $tm = new PMA_Theme_Manager(); + $this->assertContains('<option value="pmahomme" selected="selected">', $tm->getHtmlSelectBox()); + } + +} +?> + hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13359-g3c425a1
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 3c425a16bcf5aca667f88e95375afefefcdd7d59 (commit) from 56f29962cee8fd240bbc766bd1e64f9865a298bb (commit) - Log ----------------------------------------------------------------- commit 3c425a16bcf5aca667f88e95375afefefcdd7d59 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 10:38:54 2011 +0200 Add test for PMA_List_Database for functions not requiring DB connection ----------------------------------------------------------------------- Summary of changes: test/libraries/PMA_List_Database_test.php | 58 +++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) create mode 100644 test/libraries/PMA_List_Database_test.php diff --git a/test/libraries/PMA_List_Database_test.php b/test/libraries/PMA_List_Database_test.php new file mode 100644 index 0000000..00691e8 --- /dev/null +++ b/test/libraries/PMA_List_Database_test.php @@ -0,0 +1,58 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * tests for PMA_List class + * + * @package phpMyAdmin-test + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; +require_once 'libraries/List_Database.class.php'; + +class PMA_List_Database_test extends PHPUnit_Framework_TestCase +{ + public function setup() + { + $GLOBALS['cfg']['Server']['only_db'] = array('single\\_db'); + } + + public function testEmpty() + { + $arr = new PMA_List_Database; + $this->assertEquals('', $arr->getEmpty()); + } + + public function testSingle() + { + $arr = new PMA_List_Database; + $this->assertEquals(true, $arr->getSingleItem()); + } + + public function testExists() + { + $arr = new PMA_List_Database; + $this->assertEquals(true, $arr->exists('single_db')); + } + + public function testLimitedItems() + { + $arr = new PMA_List_Database; + $this->assertEquals(array('single_db'), $arr->getLimitedItems(0, 1)); + } + + public function testLimitedItems_empty() + { + $arr = new PMA_List_Database; + $this->assertEquals(array(), $arr->getLimitedItems(1, 1)); + } + + public function testHtmlOptions() + { + $arr = new PMA_List_Database; + $this->assertEquals('<option value="single_db">single_db</option>' . "\n", $arr->getHtmlOptions()); + } +} +?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13357-g3499d8f
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 3499d8f79b1bcfbc00b8e1218b16069cde20cacd (commit) via 9a04278d17e6fdfeb75caa7093a21c135d2a8061 (commit) via 59faf06b39db39d25e715401b23cb0f4bd2d127a (commit) via 5f2a6ed8653727000a4e32964f1ba256d3381aec (commit) via 7eb7c00186ff1d352190229303443ba2497e23ca (commit) via 25f727f41e6a4836a89cebc96b8514f21042b2dc (commit) via 08076158859a01e6f8f57750b3b04f41ba726695 (commit) via b46f0f1e20903f76ed63b2399babca2ef22a97ec (commit) from 38d99b4e17a5c0cee966ddb4de13a9987c5ae6fa (commit) - Log ----------------------------------------------------------------- commit 3499d8f79b1bcfbc00b8e1218b16069cde20cacd Merge: 9a04278d17e6fdfeb75caa7093a21c135d2a8061 38d99b4e17a5c0cee966ddb4de13a9987c5ae6fa Author: Pootle server <pootle(a)cihar.com> Date: Mon Aug 8 10:06:23 2011 +0200 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 9a04278d17e6fdfeb75caa7093a21c135d2a8061 Merge: 59faf06b39db39d25e715401b23cb0f4bd2d127a 21c3988cbf2ab7272e5b9acf65f37e649001c6b7 Author: Pootle server <pootle(a)cihar.com> Date: Mon Aug 8 08:40:10 2011 +0200 Merge remote-tracking branch 'origin/master' commit 59faf06b39db39d25e715401b23cb0f4bd2d127a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Mon Aug 8 08:33:16 2011 +0200 Translation update done using Pootle. commit 5f2a6ed8653727000a4e32964f1ba256d3381aec Author: Sven Strickroth <email(a)cs-ware.de> Date: Sun Aug 7 22:28:04 2011 +0200 Translation update done using Pootle. commit 7eb7c00186ff1d352190229303443ba2497e23ca Author: Sven Strickroth <email(a)cs-ware.de> Date: Sun Aug 7 22:26:57 2011 +0200 Translation update done using Pootle. commit 25f727f41e6a4836a89cebc96b8514f21042b2dc Author: Sven Strickroth <email(a)cs-ware.de> Date: Sun Aug 7 22:26:37 2011 +0200 Translation update done using Pootle. commit 08076158859a01e6f8f57750b3b04f41ba726695 Author: Sven Strickroth <email(a)cs-ware.de> Date: Sun Aug 7 22:26:08 2011 +0200 Translation update done using Pootle. commit b46f0f1e20903f76ed63b2399babca2ef22a97ec Author: Sven Strickroth <email(a)cs-ware.de> Date: Sun Aug 7 22:25:39 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/de.po | 10 ++++------ po/zh_CN.po | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/po/de.po b/po/de.po index 6653ff9..eaa2038 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-08-05 10:53+0200\n" -"PO-Revision-Date: 2011-08-06 23:06+0200\n" +"PO-Revision-Date: 2011-08-07 22:28+0200\n" "Last-Translator: Sven Strickroth <email(a)cs-ware.de>\n" "Language-Team: german <de(a)li.org>\n" "Language: de\n" @@ -418,7 +418,7 @@ msgstr "Bitte wählen Sie mindestens eine anzuzeigende Spalte" #, fuzzy, php-format #| msgid "visual builder" msgid "Switch to %svisual builder%s" -msgstr "visueller Builder" +msgstr "Wechseln zu %s visual builder %s" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:939 @@ -1442,7 +1442,6 @@ msgid "Loading logs" msgstr "Lade Protokolle" #: js/messages.php:176 -#, fuzzy msgid "Monitor refresh failed" msgstr "Aktualisierung der Überwachung fehlgeschlagen" @@ -2312,10 +2311,9 @@ msgid "PBMS get BLOB info failed:" msgstr "PBMS: Infos über BLOB nicht erhalten:" #: libraries/blobstreaming.lib.php:332 -#, fuzzy #| msgid "get BLOB Content-Type failed" msgid "PBMS get BLOB Content-Type failed" -msgstr "PBMS konnte den BLOB Content-Typs nicht bestimmen" +msgstr "PBMS konnte den Content-Typ des BLOBs nicht bestimmen" #: libraries/blobstreaming.lib.php:358 msgid "View image" @@ -6402,7 +6400,7 @@ msgid "Go to table" msgstr "Gehe zur Tabelle" #: libraries/import.lib.php:1099 -#, fuzzy, php-format +#, php-format #| msgid "Structure only" msgid "Structure of %s" msgstr "Struktur von %s" diff --git a/po/zh_CN.po b/po/zh_CN.po index 45f296e..c416905 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.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-08-05 10:53+0200\n" -"PO-Revision-Date: 2011-06-08 05:00+0200\n" +"PO-Revision-Date: 2011-08-08 08:33+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" "Language: zh_CN\n" @@ -409,10 +409,10 @@ msgid "You have to choose at least one column to display" msgstr "您最少要选择显示一列" #: db_qbe.php:186 -#, fuzzy, php-format +#, php-format #| msgid "visual builder" msgid "Switch to %svisual builder%s" -msgstr "可视化查询生成器" +msgstr "切换到 %s可视化查询生成器%s" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:939 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13349-g38d99b4
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 38d99b4e17a5c0cee966ddb4de13a9987c5ae6fa (commit) from 51dc70d35a1167431b031e88180a4bf3691af729 (commit) - Log ----------------------------------------------------------------- commit 38d99b4e17a5c0cee966ddb4de13a9987c5ae6fa Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 10:00:21 2011 +0200 Use PMA_getIcon instead of duplicating logic ----------------------------------------------------------------------- Summary of changes: sql.php | 3 +-- tbl_structure.php | 33 +++++++-------------------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/sql.php b/sql.php index 07d54de..2ce10ea 100644 --- a/sql.php +++ b/sql.php @@ -1013,8 +1013,7 @@ $(document).ready(makeProfilingChart); <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 ic_b_bookmark" src="themes/dot.gif" alt="' . __('Bookmark this SQL query') . '" />' : '') - . __('Bookmark this SQL query'); + echo PMA_getIcon('b_bookmark.png', __('Bookmark this SQL query')); ?> </legend> diff --git a/tbl_structure.php b/tbl_structure.php index 9aaeb12..25787e3 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -600,19 +600,13 @@ if ($tbl_is_view) { 'show_query' => '1', ) ), - sprintf( - '<img class="icon ic_b_edit" src="themes/dot.gif" alt="%1$s"/> %1$s', - __('Edit view') - ) + PMA_getIcon('b_edit.png', __('Edit view')) ); } ?> <a href="tbl_printview.php?<?php echo $url_query; ?>"><?php -if ($cfg['PropertiesIconic']) { - echo '<img class="icon ic_b_print" src="themes/dot.gif" alt="' . __('Print view') . '"/>'; -} -echo __('Print view'); +echo PMA_getIcon('b_print.png', __('Print view')); ?></a> <?php @@ -623,19 +617,13 @@ if (! $tbl_is_view && ! $db_is_information_schema) { if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) { ?> <a href="tbl_relation.php?<?php echo $url_query; ?>"><?php - if ($cfg['PropertiesIconic']) { - echo '<img class="icon ic_b_relations" src="themes/dot.gif" alt="' . __('Relation view') . '"/>'; - } - echo __('Relation view'); + echo PMA_getIcon('b_relations.png', __('Relation view')); ?></a> <?php } ?> <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 ic_b_tblanalyse" src="themes/dot.gif" alt="' . __('Propose table structure') . '" />'; - } - echo __('Propose table structure'); + echo PMA_getIcon('b_tblanalyse.png', __('Propose table structure')); ?></a><?php echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n"; @@ -643,12 +631,8 @@ if (! $tbl_is_view && ! $db_is_information_schema) { if (PMA_Tracker::isActive()) { echo '<a href="tbl_tracking.php?' . $url_query . '">'; - - if ($cfg['PropertiesIconic']) - { - echo '<img class="icon ic_eye" src="themes/dot.gif" alt="' . __('Track table') . '" /> '; - } - echo __('Track table') . '</a>'; + echo PMA_getIcon('eye.png', __('Track table')); + echo '</a>'; } ?> @@ -823,10 +807,7 @@ if ($cfg['ShowStats']) { <tr class="tblFooters"> <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 ic_b_tbloptimize" src="themes/dot.gif" alt="' . __('Optimize table'). '" />'; - } - echo __('Optimize table'); + echo PMA_getIcon('b_tbloptimize.png', __('Optimize table')); ?></a> </td> </tr> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13348-g51dc70d
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 51dc70d35a1167431b031e88180a4bf3691af729 (commit) from f9a713dea195f8b9dc0cac9bedfd5e490fd7a440 (commit) - Log ----------------------------------------------------------------- commit 51dc70d35a1167431b031e88180a4bf3691af729 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 09:57:47 2011 +0200 Wrap long line ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index cab5484..9aaeb12 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -600,7 +600,10 @@ if ($tbl_is_view) { 'show_query' => '1', ) ), - sprintf('<img class="icon ic_b_edit" src="themes/dot.gif" alt="%1$s"/> %1$s', __('Edit view')) + sprintf( + '<img class="icon ic_b_edit" src="themes/dot.gif" alt="%1$s"/> %1$s', + __('Edit view') + ) ); } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13347-gf9a713d
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via f9a713dea195f8b9dc0cac9bedfd5e490fd7a440 (commit) via 2f9ca4de9998d6686d259d8a4a0db7ca6bf59247 (commit) via c9434d11c79d3a9047127e6b6e98829d009159e0 (commit) via 6ec8bb013b8f36b8b8cbcba539616dc6146c2727 (commit) from 21c3988cbf2ab7272e5b9acf65f37e649001c6b7 (commit) - Log ----------------------------------------------------------------- commit f9a713dea195f8b9dc0cac9bedfd5e490fd7a440 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 09:56:43 2011 +0200 Use PMA_linkOrButton here as the query can be quite long commit 2f9ca4de9998d6686d259d8a4a0db7ca6bf59247 Merge: 21c3988cbf2ab7272e5b9acf65f37e649001c6b7 c9434d11c79d3a9047127e6b6e98829d009159e0 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 09:44:19 2011 +0200 Merge branch 'edit-view' of git://github.com/csware/phpmyadmin into int commit c9434d11c79d3a9047127e6b6e98829d009159e0 Author: Sven Strickroth <email(a)cs-ware.de> Date: Mon Aug 1 15:38:41 2011 +0200 add "edit view" link to table structure view Signed-off-by: Sven Strickroth <email(a)cs-ware.de> commit 6ec8bb013b8f36b8b8cbcba539616dc6146c2727 Author: Sven Strickroth <email(a)cs-ware.de> Date: Mon Aug 1 15:38:10 2011 +0200 extend PMA_DBI_get_definition to support views Signed-off-by: Sven Strickroth <email(a)cs-ware.de> ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 9 +++++---- tbl_structure.php | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 8877dad..1873ef1 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1271,11 +1271,11 @@ function PMA_DBI_get_procedures_or_functions($db, $which, $link = null) } /** - * returns the definition of a specific PROCEDURE, FUNCTION or EVENT + * returns the definition of a specific PROCEDURE, FUNCTION, EVENT or VIEW * * @param string $db db name - * @param string $which PROCEDURE | FUNCTION | EVENT - * @param string $name the procedure|function|event name + * @param string $which PROCEDURE | FUNCTION | EVENT | VIEW + * @param string $name the procedure|function|event|view name * @param resource $link mysql link * * @return string the definition @@ -1285,7 +1285,8 @@ function PMA_DBI_get_definition($db, $which, $name, $link = null) $returned_field = array( 'PROCEDURE' => 'Create Procedure', 'FUNCTION' => 'Create Function', - 'EVENT' => 'Create Event' + 'EVENT' => 'Create Event', + 'VIEW' => 'Create View' ); $query = 'SHOW CREATE ' . $which . ' ' . PMA_backquote($db) . '.' . PMA_backquote($name); return(PMA_DBI_fetch_value($query, 0, $returned_field[$which])); diff --git a/tbl_structure.php b/tbl_structure.php index 1b39340..cab5484 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -589,7 +589,22 @@ if (! $tbl_is_view && ! $db_is_information_schema) { /** * Work on the table */ + +if ($tbl_is_view) { + $create_view = PMA_DBI_get_definition($db, 'VIEW', $table); + echo PMA_linkOrButton( + 'tbl_sql.php' . PMA_generate_common_url( + $url_params + + array( + 'sql_query' => $create_view, + 'show_query' => '1', + ) + ), + sprintf('<img class="icon ic_b_edit" src="themes/dot.gif" alt="%1$s"/> %1$s', __('Edit view')) + ); +} ?> + <a href="tbl_printview.php?<?php echo $url_query; ?>"><?php if ($cfg['PropertiesIconic']) { echo '<img class="icon ic_b_print" src="themes/dot.gif" alt="' . __('Print view') . '"/>'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13343-g21c3988
by Madhura Jayaratne 08 Aug '11

08 Aug '11

The branch, master has been updated via 21c3988cbf2ab7272e5b9acf65f37e649001c6b7 (commit) via 7aef3ec75601dc2bdae24fd6ec095bd699e67f75 (commit) via da9d10a3ef54b8a67a8be9e4edb504d714bc25fc (commit) from c00b1e54a132b294d2c5675c27fb4e4908fc349d (commit) - Log ----------------------------------------------------------------- commit 21c3988cbf2ab7272e5b9acf65f37e649001c6b7 Merge: 7aef3ec c00b1e5 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon Aug 8 10:35:05 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 7aef3ec75601dc2bdae24fd6ec095bd699e67f75 Merge: ff6b491 da9d10a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon Aug 8 10:25:45 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0