Git
Threads by month
- ----- 2025 -----
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 11 participants
- 38616 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8278-gf57faf6
by Piotr Przybylski 13 Jul '11
by Piotr Przybylski 13 Jul '11
13 Jul '11
The branch, master has been updated
via f57faf6b58702ad09e6c333fd927778fb6af1e41 (commit)
via df4c23f0c9fa5481558c890fed8ea9737dd74f1d (commit)
via b5d450ff3193258a95c4d1a6700edf74dd1a17dc (commit)
from ae780330e870052b1cd2ad84d0b7326074bef90a (commit)
- Log -----------------------------------------------------------------
commit f57faf6b58702ad09e6c333fd927778fb6af1e41
Author: Piotr Przybylski <piotrprz(a)gmail.com>
Date: Wed Jul 13 17:25:10 2011 +0200
Removed unused code
commit df4c23f0c9fa5481558c890fed8ea9737dd74f1d
Author: Piotr Przybylski <piotrprz(a)gmail.com>
Date: Wed Jul 13 17:22:07 2011 +0200
Comments and formatting in common.lib.php
commit b5d450ff3193258a95c4d1a6700edf74dd1a17dc
Author: Piotr Przybylski <piotrprz(a)gmail.com>
Date: Wed Jul 13 17:07:08 2011 +0200
PMA_MYSQL_INT_VERSION is at least 50015
-----------------------------------------------------------------------
Summary of changes:
libraries/common.lib.php | 100 ++++++++++++++++++++-----------------------
libraries/db_links.inc.php | 4 +-
libraries/tbl_links.inc.php | 2 +-
3 files changed, 49 insertions(+), 57 deletions(-)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 7d9564e..e64c751 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -140,10 +140,10 @@ function PMA_displayMaximumUploadSize($max_upload_size)
*
* @access public
*/
- function PMA_generateHiddenMaxFileSize($max_size)
- {
- return '<input type="hidden" name="MAX_FILE_SIZE" value="' .$max_size . '" />';
- }
+function PMA_generateHiddenMaxFileSize($max_size)
+{
+ return '<input type="hidden" name="MAX_FILE_SIZE" value="' .$max_size . '" />';
+}
/**
* Add slashes before "'" and "\" characters so a value containing them can
@@ -377,7 +377,7 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju
$mysql = '5.1';
/* l10n: Language to use for MySQL 5.1 documentation, please use only languages which do exist in official documentation. */
$lang = _pgettext('MySQL 5.1 documentation language', 'en');
- } elseif (PMA_MYSQL_INT_VERSION >= 50000) {
+ } else {
$mysql = '5.0';
/* l10n: Language to use for MySQL 5.0 documentation, please use only languages which do exist in official documentation. */
$lang = _pgettext('MySQL 5.0 documentation language', 'en');
@@ -707,7 +707,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
$group_name_full = '';
$parts_cnt = count($parts) - 1;
while ($i < $parts_cnt
- && $i < $GLOBALS['cfg']['LeftFrameTableLevel']) {
+ && $i < $GLOBALS['cfg']['LeftFrameTableLevel']) {
$group_name = $parts[$i] . $sep;
$group_name_full .= $group_name;
@@ -739,7 +739,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
if ($GLOBALS['cfg']['ShowTooltipAliasTB']
- && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') {
+ && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') {
// switch tooltip and name
$table['Comment'] = $table['Name'];
$table['disp_name'] = $table['Comment'];
@@ -807,8 +807,6 @@ function PMA_backquote($a_name, $do_it = true)
*/
function PMA_whichCrlf()
{
- $the_crlf = "\n";
-
// The 'PMA_USR_OS' constant is defined in "./libraries/Config.class.php"
// Win case
if (PMA_USR_OS == 'Win') {
@@ -825,15 +823,12 @@ function PMA_whichCrlf()
/**
* Reloads navigation if needed.
*
- * @param $jsonly prints out pure JavaScript
- * @global array configuration
+ * @param bool $jsonly prints out pure JavaScript
*
* @access public
*/
function PMA_reloadNavigation($jsonly=false)
{
- global $cfg;
-
// Reloads the navigation frame via JavaScript if required
if (isset($GLOBALS['reload']) && $GLOBALS['reload']) {
// one of the reasons for a reload is when a table is dropped
@@ -869,7 +864,7 @@ if (!$jsonly)
* @param string $sql_query the query to display
* @param string $type the type (level) of the message
* @param boolean $is_view is this a message after a VIEW operation?
- * @global array the configuration array
+ * @return string
* @access public
*/
function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view = false)
@@ -1218,6 +1213,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
ob_end_clean();
return $buffer_contents;
}
+ return null;
} // end of the 'PMA_showMessage()' function
/**
@@ -1225,7 +1221,6 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
*
* @access public
* @return boolean whether profiling is supported
- *
*/
function PMA_profilingSupported()
{
@@ -1250,7 +1245,6 @@ function PMA_profilingSupported()
*
* @param string $sql_query
* @access public
- *
*/
function PMA_profilingCheckbox($sql_query)
{
@@ -1350,8 +1344,6 @@ function PMA_localizeNumber($value)
* @return string the formatted value and its unit
*
* @access public
- *
- * @version 1.1.0 - 2005-10-27
*/
function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_down = false, $noTrailingZero = true)
{
@@ -1769,7 +1761,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
}
} // end if... else...
- return $ret;
+ return $ret;
} // end of the 'PMA_linkOrButton()' function
@@ -1843,7 +1835,6 @@ function PMA_flipstring($string, $Separator = "<br />\n")
return $format_string;
}
-
/**
* Function added to avoid path disclosures.
* Called by each script that needs parameters, it displays
@@ -1930,9 +1921,8 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force
$meta->orgname = $meta->name;
if (isset($GLOBALS['analyzed_sql'][0]['select_expr'])
- && is_array($GLOBALS['analyzed_sql'][0]['select_expr'])) {
- foreach ($GLOBALS['analyzed_sql'][0]['select_expr']
- as $select_expr) {
+ && is_array($GLOBALS['analyzed_sql'][0]['select_expr'])) {
+ foreach ($GLOBALS['analyzed_sql'][0]['select_expr'] as $select_expr) {
// need (string) === (string)
// '' !== 0 but '' == 0
if ((string) $select_expr['alias'] === (string) $meta->name) {
@@ -1980,18 +1970,18 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force
$condition .= '= ' . $row[$i] . ' AND';
} elseif (($meta->type == 'blob' || $meta->type == 'string')
// hexify only if this is a true not empty BLOB or a BINARY
- && stristr($field_flags, 'BINARY')
- && !empty($row[$i])) {
- // do not waste memory building a too big condition
- if (strlen($row[$i]) < 1000) {
- // use a CAST if possible, to avoid problems
- // if the field contains wildcard characters % or _
- $condition .= '= CAST(0x' . bin2hex($row[$i])
- . ' AS BINARY) AND';
- } else {
- // this blob won't be part of the final condition
- $condition = '';
- }
+ && stristr($field_flags, 'BINARY')
+ && !empty($row[$i])) {
+ // do not waste memory building a too big condition
+ if (strlen($row[$i]) < 1000) {
+ // use a CAST if possible, to avoid problems
+ // if the field contains wildcard characters % or _
+ $condition .= '= CAST(0x' . bin2hex($row[$i])
+ . ' AS BINARY) AND';
+ } else {
+ // this blob won't be part of the final condition
+ $condition = '';
+ }
} elseif ($meta->type == 'bit') {
$condition .= "= b'" . PMA_printable_bit_value($row[$i], $meta->length) . "' AND";
} else {
@@ -2167,12 +2157,12 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1,
* Generate navigation for a list
*
* @todo use $pos from $_url_params
- * @param integer number of elements in the list
- * @param integer current position in the list
- * @param array url parameters
- * @param string script name for form target
- * @param string target frame
- * @param integer maximum number of elements to display from the list
+ * @param int $count number of elements in the list
+ * @param int $pos current position in the list
+ * @param array $_url_params url parameters
+ * @param string $script script name for form target
+ * @param string $frame target frame
+ * @param int $max_count maximum number of elements to display from the list
*
* @access public
*/
@@ -2354,10 +2344,11 @@ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = ''
* Generates and returns an HTML dropdown
*
* @param string $select_name
- * @param array $choices the choices values
- * @param string $active_choice the choice to select by default
- * @param string $id the id of the select element; can be different in case
- * the dropdown is present more than once on the page
+ * @param array $choices choices values
+ * @param string $active_choice the choice to select by default
+ * @param string $id id of the select element; can be different in case
+ * the dropdown is present more than once on the page
+ * @return string
* @todo support titles
*/
function PMA_generate_html_dropdown($select_name, $choices, $active_choice, $id)
@@ -2492,8 +2483,8 @@ function PMA_clearUserCache() {
/**
* Verifies if something is cached in the session
*
- * @param string $var
- * @param scalar $server
+ * @param string $var
+ * @param int|true $server
* @return boolean
*/
function PMA_cacheExists($var, $server = 0)
@@ -2507,8 +2498,8 @@ function PMA_cacheExists($var, $server = 0)
/**
* Gets cached information from the session
*
- * @param string $var
- * @param scalar $server
+ * @param string $var
+ * @param int|true $server
* @return mixed
*/
function PMA_cacheGet($var, $server = 0)
@@ -2526,9 +2517,9 @@ function PMA_cacheGet($var, $server = 0)
/**
* Caches information in the session
*
- * @param string $var
- * @param mixed $val
- * @param integer $server
+ * @param string $var
+ * @param mixed $val
+ * @param int|true $server
* @return mixed
*/
function PMA_cacheSet($var, $val = null, $server = 0)
@@ -2542,8 +2533,8 @@ function PMA_cacheSet($var, $val = null, $server = 0)
/**
* Removes cached information from the session
*
- * @param string $var
- * @param scalar $server
+ * @param string $var
+ * @param int|true $server
*/
function PMA_cacheUnset($var, $server = 0)
{
@@ -3130,6 +3121,7 @@ function PMA_getFunctionsForField($field, $insert_mode)
* string, db name where to also check for privileges
* @param mixed $tbl null, to only check global privileges
* string, db name where to also check for privileges
+ * @return bool
*/
function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null)
{
diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php
index 87fb98c..604efde 100644
--- a/libraries/db_links.inc.php
+++ b/libraries/db_links.inc.php
@@ -121,7 +121,7 @@ if (! $db_is_information_schema) {
if ($is_superuser) {
$tabs[] =& $tab_privileges;
}
- if (PMA_MYSQL_INT_VERSION >= 50002 && ! PMA_DRIZZLE) {
+ if (!PMA_DRIZZLE) {
$tabs[] =& $tab_routines;
}
if (PMA_MYSQL_INT_VERSION >= 50106 && ! PMA_DRIZZLE) {
@@ -129,7 +129,7 @@ if (! $db_is_information_schema) {
$tabs[] =& $tab_events;
}
}
- if (PMA_MYSQL_INT_VERSION >= 50002 && ! PMA_DRIZZLE) {
+ if (!PMA_DRIZZLE) {
if (PMA_currentUserHasPrivilege('TRIGGER', $db)) {
$tabs[] =& $tab_triggers;
}
diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php
index 5f24800..4008fba 100644
--- a/libraries/tbl_links.inc.php
+++ b/libraries/tbl_links.inc.php
@@ -97,7 +97,7 @@ if(PMA_Tracker::isActive()) {
$tabs['tracking']['text'] = __('Tracking');
$tabs['tracking']['link'] = 'tbl_tracking.php';
}
-if (! $db_is_information_schema && PMA_MYSQL_INT_VERSION >= 50002 && ! PMA_DRIZZLE) {
+if (!$db_is_information_schema && !PMA_DRIZZLE) {
if (PMA_currentUserHasPrivilege('TRIGGER', $db, $table)) {
$tabs['triggers']['link'] = 'tbl_triggers.php';
$tabs['triggers']['text'] = __('Triggers');
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8275-gae78033
by Michal Čihař 13 Jul '11
by Michal Čihař 13 Jul '11
13 Jul '11
The branch, master has been updated
via ae780330e870052b1cd2ad84d0b7326074bef90a (commit)
from 8eaaa70f21f455b23c1e24acd5064a0c2a269940 (commit)
- Log -----------------------------------------------------------------
commit ae780330e870052b1cd2ad84d0b7326074bef90a
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Jul 13 17:05:13 2011 +0200
Add missing semicolon
-----------------------------------------------------------------------
Summary of changes:
libraries/export/sql.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index 625e716..efda8d7 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -964,7 +964,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = false,
switch($export_mode) {
case 'create_table':
- $dump .= PMA_exportComment(__('Table structure for table') . ' ' . $formatted_table_name)
+ $dump .= PMA_exportComment(__('Table structure for table') . ' ' . $formatted_table_name);
$dump .= PMA_exportComment();
$dump .= PMA_getTableDef($db, $table, $crlf, $error_url, $dates);
$dump .= PMA_getTableComments($db, $table, $crlf, $relation, $mime);
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8274-g8eaaa70
by Rouslan Placella 13 Jul '11
by Rouslan Placella 13 Jul '11
13 Jul '11
The branch, master has been updated
via 8eaaa70f21f455b23c1e24acd5064a0c2a269940 (commit)
from b2d8e0b60ffdda22bbbc165674088094d26f31f1 (commit)
- Log -----------------------------------------------------------------
commit 8eaaa70f21f455b23c1e24acd5064a0c2a269940
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Wed Jul 13 14:33:05 2011 +0100
Changelog entries for support for events and triggers
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a137c4a..0889f7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,8 @@ phpMyAdmin - ChangeLog
- bug #3354356 [interface] Timepicker does not work in AJAX dialogs
+ AJAX for table Structure Indexes Edit
+ AJAX for table Structure column Change
++ [interface] Improved support for events
++ [interface] Improved support for triggers
3.4.4.0 (not yet released)
- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8273-gb2d8e0b
by Marc Delisle 13 Jul '11
by Marc Delisle 13 Jul '11
13 Jul '11
The branch, master has been updated
via b2d8e0b60ffdda22bbbc165674088094d26f31f1 (commit)
from 0131d16548e5bc32d7619d43c97272a5a2c1474f (commit)
- Log -----------------------------------------------------------------
commit b2d8e0b60ffdda22bbbc165674088094d26f31f1
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 13 09:19:38 2011 -0400
Clarify directive name: ShowDisplayDir -> ShowDisplayDirection
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 2 +-
libraries/config.default.php | 2 +-
libraries/config/messages.inc.php | 10 +++++-----
libraries/config/setup.forms.php | 2 +-
libraries/config/user_preferences.forms.php | 2 +-
libraries/display_tbl.lib.php | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 0b3bd92..6a8d5dc 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2143,7 +2143,7 @@ setfacl -d -m "g:www-data:rwx" tmp
identify what they mean.
</dd>
- <dt id="cfg_ShowDisplayDir">$cfg['ShowDisplayDir'] boolean</dt>
+ <dt id="cfg_ShowDisplayDirection">$cfg['ShowDisplayDirection'] boolean</dt>
<dd>
Defines whether or not type display direction option is shown
when browsing a table.
diff --git a/libraries/config.default.php b/libraries/config.default.php
index d54dc5a..5762531 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2315,7 +2315,7 @@ $cfg['ShowPropertyComments']= true;
/**
* shows table display direction.
*/
-$cfg['ShowDisplayDir'] = false;
+$cfg['ShowDisplayDirection'] = false;
/**
* repeat header names every X cells? (0 = deactivate)
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 0602cae..5d42f89 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -3,9 +3,9 @@
/**
* Messages for phpMyAdmin.
*
- * This file is here for easy transition to Gettext. You should not add any
- * new messages here, use instead gettext directly in your template/PHP
- * file.
+ * This file defines variables in a special format suited for the
+ * configuration subsystem, with $strConfig as a prefix, _desc or _name
+ * as a suffix, and the directive name in between.
*
* @package phpMyAdmin
*/
@@ -450,8 +450,8 @@ $strConfigShowAll_name = __('Allow to display all the rows');
$strConfigShowChgPassword_desc = __('Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly');
$strConfigShowChgPassword_name = __('Show password change form');
$strConfigShowCreateDb_name = __('Show create database form');
-$strConfigShowDisplayDir_desc = __('Defines whether or not type display direction option is shown when browsing a table');
-$strConfigShowDisplayDir_name = __('Show display direction');
+$strConfigShowDisplayDirection_desc = __('Defines whether or not type display direction option is shown when browsing a table');
+$strConfigShowDisplayDirection_name = __('Show display direction');
$strConfigShowFieldTypesInDataEditView_desc = __('Defines whether or not type fields should be initially displayed in edit/insert mode');
$strConfigShowFieldTypesInDataEditView_name = __('Show field types');
$strConfigShowFunctionFields_desc = __('Display the function fields in edit/insert mode');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index e1865fa..5598b93 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -198,7 +198,7 @@ $forms['Main_frame']['Browse'] = array(
'Order',
'BrowsePointerEnable',
'BrowseMarkerEnable',
- 'ShowDisplayDir',
+ 'ShowDisplayDirection',
'RepeatCells',
'LimitChars',
'RowActionLinks',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index f1363b4..8dc78fe 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -108,7 +108,7 @@ $forms['Main_frame']['Browse'] = array(
'DisplayBinaryAsHex',
'BrowsePointerEnable',
'BrowseMarkerEnable',
- 'ShowDisplayDir',
+ 'ShowDisplayDirection',
'RepeatCells',
'LimitChars',
'RowActionLinks',
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index a120037..e231b84 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -438,7 +438,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di
<?php echo __('Number of rows') . ': ' . "\n"; ?>
<input type="text" name="session_max_rows" size="3" value="<?php echo (($_SESSION['tmp_user_values']['max_rows'] != 'all') ? $_SESSION['tmp_user_values']['max_rows'] : $GLOBALS['cfg']['MaxRows']); ?>" class="textfield" onfocus="this.select()" />
<?php
- if ($GLOBALS['cfg']['ShowDisplayDir']) {
+ if ($GLOBALS['cfg']['ShowDisplayDirection']) {
// Display mode (horizontal/vertical and repeat headers)
echo __('Mode') . ': ' . "\n";
$choices = array(
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8272-g0131d16
by Marc Delisle 13 Jul '11
by Marc Delisle 13 Jul '11
13 Jul '11
The branch, master has been updated
via 0131d16548e5bc32d7619d43c97272a5a2c1474f (commit)
via 010f19912460c8e3b925ff7b19f7e2f37361a339 (commit)
via 954d39b305e2b3e8082a2ff484b06a176052bf4f (commit)
via ecade8433a19f6600e7202494f7acc6584f913ce (commit)
via 991deb415ba369d87b2a816feb0180660329b332 (commit)
via 7c4e0114e9d88120b6446eef88b3b9ad2203622c (commit)
via 63c7cee5d96d8c25b2181192451790cc6f8103cd (commit)
via 9ec2daa4c61c701553dc49d2256730ce9f841e34 (commit)
via 705bdd73565d43ea40b7e9ed7259e867d7503b42 (commit)
via dbf06b6a1ba2ea901351718aad8c1f92de286daa (commit)
from d2d2c3c9959f865a6340474d3f9bdab03101f82c (commit)
- Log -----------------------------------------------------------------
commit 0131d16548e5bc32d7619d43c97272a5a2c1474f
Merge: d2d2c3c9959f865a6340474d3f9bdab03101f82c 010f19912460c8e3b925ff7b19f7e2f37361a339
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 13 09:04:51 2011 -0400
Merge commit '010f19912460c8e3b925ff7b19f7e2f37361a339'
commit 010f19912460c8e3b925ff7b19f7e2f37361a339
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Mon Jul 11 15:15:24 2011 +0800
Remove vertical support for inline edit
commit 954d39b305e2b3e8082a2ff484b06a176052bf4f
Merge: 991deb415ba369d87b2a816feb0180660329b332 ecade8433a19f6600e7202494f7acc6584f913ce
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Mon Jul 11 09:52:37 2011 +0800
Merge branch 'hidecol' into aris
commit ecade8433a19f6600e7202494f7acc6584f913ce
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Mon Jul 11 09:52:02 2011 +0800
Show/hide column: fix bug - use .text instead of .html to handle special column name
commit 991deb415ba369d87b2a816feb0180660329b332
Merge: 9ec2daa4c61c701553dc49d2256730ce9f841e34 7c4e0114e9d88120b6446eef88b3b9ad2203622c
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Sun Jul 10 10:06:33 2011 +0800
Fix merge conflict with bug fix for show/hide column feature
commit 7c4e0114e9d88120b6446eef88b3b9ad2203622c
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Sun Jul 10 10:04:06 2011 +0800
Show/hide column: fix bug - clickable area in column visibility checkbox list not span correctly if columns have short names
commit 63c7cee5d96d8c25b2181192451790cc6f8103cd
Merge: dbf06b6a1ba2ea901351718aad8c1f92de286daa c8ba421d379c15cd6bac620a77be50513e7da710
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Sun Jul 10 09:59:51 2011 +0800
Merge remote-tracking branch 'origin/master' into hidecol
commit 9ec2daa4c61c701553dc49d2256730ce9f841e34
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Fri Jul 8 15:41:09 2011 +0800
Remove vertical support for column resizing/reordering
commit 705bdd73565d43ea40b7e9ed7259e867d7503b42
Merge: c8ba421d379c15cd6bac620a77be50513e7da710 dbf06b6a1ba2ea901351718aad8c1f92de286daa
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Fri Jul 8 15:22:34 2011 +0800
Merge branch 'hidecol' into aris
commit dbf06b6a1ba2ea901351718aad8c1f92de286daa
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Fri Jul 8 15:22:27 2011 +0800
Show/hide column: fix bug - hint is still shown when we can't toggle column visibility (i.e., when there is only 1 column available)
-----------------------------------------------------------------------
Summary of changes:
js/functions.js | 2 +-
js/makegrid.js | 283 +++++++++++--------------------
js/sql.js | 249 ++++++----------------------
themes/original/css/theme_right.css.php | 16 +--
themes/original/img/col_pointer_ver.png | Bin 128 -> 0 bytes
themes/pmahomme/css/theme_right.css.php | 16 +--
themes/pmahomme/img/col_pointer_ver.png | Bin 138 -> 0 bytes
7 files changed, 154 insertions(+), 412 deletions(-)
delete mode 100644 themes/original/img/col_pointer_ver.png
delete mode 100644 themes/pmahomme/img/col_pointer_ver.png
diff --git a/js/functions.js b/js/functions.js
index 1b874ca..04fe9e3 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2389,7 +2389,7 @@ $(function() {
* Get the row number from the classlist (for example, row_1)
*/
function PMA_getRowNumber(classlist) {
- return parseInt(classlist.split(/row_/)[1]);
+ return parseInt(classlist.split(/\s+row_/)[1]);
}
/**
diff --git a/js/makegrid.js b/js/makegrid.js
index 11bfa09..970ed59 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -6,7 +6,6 @@
minColWidth: 15,
// variables, assigned with default value, changed later
- alignment: 'horizontal', // 3 possibilities: vertical, horizontal, horizontalflipped
actionSpan: 5,
colOrder: new Array(), // array of column order
colVisib: new Array(), // array of column visibility
@@ -32,9 +31,7 @@
n: n,
obj: obj,
objLeft: $(obj).position().left,
- objWidth: this.alignment != 'vertical' ?
- $(this.t).find('th.draggable:visible:eq(' + n + ') span').outerWidth() :
- $(this.t).find('tr:first td:eq(' + n + ') span').outerWidth()
+ objWidth: $(this.t).find('th.draggable:visible:eq(' + n + ') span').outerWidth()
};
$('body').css('cursor', 'col-resize');
$('body').noSelect();
@@ -44,27 +41,15 @@
// prepare the cCpy and cPointer from the dragged column
$(this.cCpy).text($(obj).text());
var objPos = $(obj).position();
- if (this.alignment != 'vertical') {
- $(this.cCpy).css({
- top: objPos.top + 20,
- left: objPos.left,
- height: $(obj).height(),
- width: $(obj).width()
- });
- $(this.cPointer).css({
- top: objPos.top
- });
- } else { // vertical alignment
- $(this.cCpy).css({
- top: objPos.top,
- left: objPos.left + 30,
- height: $(obj).height(),
- width: $(obj).width()
- });
- $(this.cPointer).css({
- top: objPos.top
- });
- }
+ $(this.cCpy).css({
+ top: objPos.top + 20,
+ left: objPos.left,
+ height: $(obj).height(),
+ width: $(obj).width()
+ });
+ $(this.cPointer).css({
+ top: objPos.top
+ });
// get the column index, zero-based
var n = this.getHeaderIdx(obj);
@@ -90,17 +75,10 @@
$(this.colRsz.obj).css('left', this.colRsz.objLeft + dx + 'px');
} else if (this.colMov) {
// dragged column animation
- if (this.alignment != 'vertical') {
- var dx = e.pageX - this.colMov.x0;
- $(this.cCpy)
- .css('left', this.colMov.objLeft + dx)
- .show();
- } else { // vertical alignment
- var dy = e.pageY - this.colMov.y0;
- $(this.cCpy)
- .css('top', this.colMov.objTop + dy)
- .show();
- }
+ var dx = e.pageX - this.colMov.x0;
+ $(this.cCpy)
+ .css('left', this.colMov.objLeft + dx)
+ .show();
// pointer animation
var hoveredCol = this.getHoveredCol(e);
@@ -110,25 +88,14 @@
if (newn != this.colMov.n) {
// show the column pointer in the right place
var colPos = $(hoveredCol).position();
- if (this.alignment != 'vertical') {
- var newleft = newn < this.colMov.n ?
- colPos.left :
- colPos.left + $(hoveredCol).outerWidth();
- $(this.cPointer)
- .css({
- left: newleft,
- visibility: 'visible'
- });
- } else { // vertical alignment
- var newtop = newn < this.colMov.n ?
- colPos.top :
- colPos.top + $(hoveredCol).outerHeight();
- $(this.cPointer)
- .css({
- top: newtop,
- visibility: 'visible'
- });
- }
+ var newleft = newn < this.colMov.n ?
+ colPos.left :
+ colPos.left + $(hoveredCol).outerWidth();
+ $(this.cPointer)
+ .css({
+ left: newleft,
+ visibility: 'visible'
+ });
} else {
// no movement to other column, hide the column pointer
$(this.cPointer).css('visibility', 'hidden');
@@ -187,18 +154,11 @@
* Resize column n to new width "nw"
*/
resize: function(n, nw) {
- if (this.alignment != 'vertical') {
- $(this.t).find('tr').each(function() {
- $(this).find('th.draggable:visible:eq(' + n + ') span,' +
- 'td:visible:eq(' + (g.actionSpan + n) + ') span')
- .css('width', nw);
- });
- } else { // vertical alignment
- $(this.t).find('tr').each(function() {
- $(this).find('td:eq(' + n + ') span')
- .css('width', nw);
- });
- }
+ $(this.t).find('tr').each(function() {
+ $(this).find('th.draggable:visible:eq(' + n + ') span,' +
+ 'td:visible:eq(' + (g.actionSpan + n) + ') span')
+ .css('width', nw);
+ });
},
/**
@@ -206,9 +166,7 @@
*/
reposRsz: function() {
$(this.cRsz).find('div').hide();
- $firstRowCols = this.alignment != 'vertical' ?
- $(this.t).find('tr:first th.draggable:visible') :
- $(this.t).find('tr:first td');
+ $firstRowCols = $(this.t).find('tr:first th.draggable:visible');
for (var n = 0; n < $firstRowCols.length; n++) {
$this = $($firstRowCols[n]);
$cb = $(g.cRsz).find('div:eq(' + n + ')'); // column border
@@ -222,40 +180,29 @@
* Shift column from index oldn to newn.
*/
shiftCol: function(oldn, newn) {
- if (this.alignment != 'vertical') {
- $(this.t).find('tr').each(function() {
- if (newn < oldn) {
- $(this).find('th.draggable:eq(' + newn + '),' +
- 'td:eq(' + (g.actionSpan + newn) + ')')
- .before($(this).find('th.draggable:eq(' + oldn + '),' +
- 'td:eq(' + (g.actionSpan + oldn) + ')'));
- } else {
- $(this).find('th.draggable:eq(' + newn + '),' +
- 'td:eq(' + (g.actionSpan + newn) + ')')
- .after($(this).find('th.draggable:eq(' + oldn + '),' +
- 'td:eq(' + (g.actionSpan + oldn) + ')'));
- }
- });
- // reposition the column resize bars
- this.reposRsz();
-
- } else { // vertical alignment
- // shift rows
+ $(this.t).find('tr').each(function() {
if (newn < oldn) {
- $(this.t).find('tr:eq(' + (g.actionSpan + newn) + ')')
- .before($(this.t).find('tr:eq(' + (g.actionSpan + oldn) + ')'));
+ $(this).find('th.draggable:eq(' + newn + '),' +
+ 'td:eq(' + (g.actionSpan + newn) + ')')
+ .before($(this).find('th.draggable:eq(' + oldn + '),' +
+ 'td:eq(' + (g.actionSpan + oldn) + ')'));
} else {
- $(this.t).find('tr:eq(' + (g.actionSpan + newn) + ')')
- .after($(this.t).find('tr:eq(' + (g.actionSpan + oldn) + ')'));
+ $(this).find('th.draggable:eq(' + newn + '),' +
+ 'td:eq(' + (g.actionSpan + newn) + ')')
+ .after($(this).find('th.draggable:eq(' + oldn + '),' +
+ 'td:eq(' + (g.actionSpan + oldn) + ')'));
}
- }
+ });
+ // reposition the column resize bars
+ this.reposRsz();
+
// adjust the column visibility list
if (newn < oldn) {
- $(g.cList).find('tr:eq(' + newn + ')')
- .before($(g.cList).find('tr:eq(' + oldn + ')'));
+ $(g.cList).find('.lDiv div:eq(' + newn + ')')
+ .before($(g.cList).find('.lDiv div:eq(' + oldn + ')'));
} else {
- $(g.cList).find('tr:eq(' + newn + ')')
- .after($(g.cList).find('tr:eq(' + oldn + ')'));
+ $(g.cList).find('.lDiv div:eq(' + newn + ')')
+ .after($(g.cList).find('.lDiv div:eq(' + oldn + ')'));
}
// adjust the colOrder
var tmp = this.colOrder[oldn];
@@ -274,23 +221,13 @@
getHoveredCol: function(e) {
var hoveredCol;
$headers = $(this.t).find('th.draggable:visible');
- if (this.alignment != 'vertical') {
- $headers.each(function() {
- var left = $(this).offset().left;
- var right = left + $(this).outerWidth();
- if (left <= e.pageX && e.pageX <= right) {
- hoveredCol = this;
- }
- });
- } else { // vertical alignment
- $headers.each(function() {
- var top = $(this).offset().top;
- var bottom = top + $(this).height();
- if (top <= e.pageY && e.pageY <= bottom) {
- hoveredCol = this;
- }
- });
- }
+ $headers.each(function() {
+ var left = $(this).offset().left;
+ var right = left + $(this).outerWidth();
+ if (left <= e.pageX && e.pageX <= right) {
+ hoveredCol = this;
+ }
+ });
return hoveredCol;
},
@@ -298,15 +235,7 @@
* Get a zero-based index from a <th class="draggable"> tag in a table.
*/
getHeaderIdx: function(obj) {
- var n;
- if (this.alignment != 'vertical') {
- n = $(obj).parents('tr').find('th.draggable').index(obj);
- } else {
- var column_idx = $(obj).index();
- var $th_in_same_column = $(this.t).find('th.draggable:nth-child(' + (column_idx + 1) + ')');
- n = $th_in_same_column.index(obj);
- }
- return n;
+ return $(obj).parents('tr').find('th.draggable').index(obj);
},
/**
@@ -453,36 +382,26 @@
if (this.colVisib[n]) {
// can hide if more than one column is visible
if (this.visibleHeadersCount > 1) {
- if (this.alignment != 'vertical') {
- $(this.t).find('tr').each(function() {
- $(this).find('th.draggable:eq(' + n + '),' +
- 'td:eq(' + (g.actionSpan + n) + ')')
- .hide();
- });
- } else { // vertical alignment
- $(this.t).find('tr:eq(' + (g.actionSpan + n) + ')')
- .hide();
- }
+ $(this.t).find('tr').each(function() {
+ $(this).find('th.draggable:eq(' + n + '),' +
+ 'td:eq(' + (g.actionSpan + n) + ')')
+ .hide();
+ });
this.colVisib[n] = 0;
- $(this.cList).find('tr:eq(' + n + ') input').removeAttr('checked');
+ $(this.cList).find('.lDiv div:eq(' + n + ') input').removeAttr('checked');
} else {
// cannot hide, force the checkbox to stay checked
- $(this.cList).find('tr:eq(' + n + ') input').attr('checked', 'checked');
+ $(this.cList).find('.lDiv div:eq(' + n + ') input').attr('checked', 'checked');
return false;
}
} else { // column n is not visible
- if (this.alignment != 'vertical') {
- $(this.t).find('tr').each(function() {
- $(this).find('th.draggable:eq(' + n + '),' +
- 'td:eq(' + (g.actionSpan + n) + ')')
- .show();
- });
- } else { // vertical alignment
- $(this.t).find('tr:eq(' + (g.actionSpan + n) + ')')
- .show();
- }
+ $(this.t).find('tr').each(function() {
+ $(this).find('th.draggable:eq(' + n + '),' +
+ 'td:eq(' + (g.actionSpan + n) + ')')
+ .show();
+ });
this.colVisib[n] = 1;
- $(this.cList).find('tr:eq(' + n + ') input').attr('checked', 'checked');
+ $(this.cList).find('.lDiv div:eq(' + n + ') input').attr('checked', 'checked');
}
return true;
},
@@ -500,9 +419,7 @@
this.sendColPrefs();
// check visible first row headers count
- this.visibleHeadersCount = this.alignment != 'vertical' ?
- $(this.t).find('tr:first th.draggable:visible').length :
- $(this.t).find('th.draggable:nth-child(1):visible').length;
+ this.visibleHeadersCount = $(this.t).find('tr:first th.draggable:visible').length;
this.refreshRestoreButton();
},
@@ -574,15 +491,12 @@
g.cDrop = document.createElement('div'); // column drop-down arrows
g.cList = document.createElement('div'); // column visibility list
- // assign the table alignment
- g.alignment = $("#top_direction_dropdown").val();
-
// adjust g.cCpy
g.cCpy.className = 'cCpy';
$(g.cCpy).hide();
// adjust g.cPoint
- g.cPointer.className = g.alignment != 'vertical' ? 'cPointer' : 'cPointerVer';
+ g.cPointer.className = 'cPointer';
$(g.cPointer).css('visibility', 'hidden');
// adjust g.dHint
@@ -601,23 +515,14 @@
g.t = t;
// get first row data columns
- var $firstRowCols = g.alignment != 'vertical' ?
- $(t).find('tr:first th.draggable') :
- $(t).find('tr:first td');
-
- // get first row of data headers (first column of data headers, in vertical mode)
- var $firstRowHeaders = g.alignment != 'vertical' ?
- $(t).find('tr:first th.draggable') :
- $(t).find('th.draggable:nth-child(1)');
+ var $firstRowCols = $(t).find('tr:first th.draggable');
// initialize g.visibleHeadersCount
- g.visibleHeadersCount = $firstRowHeaders.filter(':visible').length;
+ g.visibleHeadersCount = $firstRowCols.filter(':visible').length;
// assign first column (actions) span
if (! $(t).find('tr:first th:first').hasClass('draggable')) { // action header exist
- g.actionSpan = g.alignment != 'vertical' ?
- $(t).find('tr:first th:first').prop('colspan') :
- $(t).find('tr:first th:first').prop('rowspan');
+ g.actionSpan = $(t).find('tr:first th:first').prop('colspan');
} else {
g.actionSpan = 0;
}
@@ -642,7 +547,7 @@
}
} else {
g.colOrder = new Array();
- for (var i = 0; i < $firstRowHeaders.length; i++) {
+ for (var i = 0; i < $firstRowCols.length; i++) {
g.colOrder.push(i);
}
}
@@ -656,12 +561,12 @@
}
} else {
g.colVisib = new Array();
- for (var i = 0; i < $firstRowHeaders.length; i++) {
+ for (var i = 0; i < $firstRowCols.length; i++) {
g.colVisib.push(1);
}
}
- if ($firstRowHeaders.length > 1) {
+ if ($firstRowCols.length > 1) {
// create column drop-down arrow(s)
$(t).find('th:not(.draggable)').each(function() {
var cd = document.createElement('div'); // column drop-down arrow
@@ -682,16 +587,16 @@
});
// add column visibility control
- g.cList.innerHTML = '<table cellpadding="0" cellspacing="0"><tbody></tbody></table>';
- var $tbody = $(g.cList).find('tbody');
- for (var i = 0; i < $firstRowHeaders.length; i++) {
- var currHeader = $firstRowHeaders[i];
- var tr = document.createElement('tr');
- $(tr).html('<td><input type="checkbox" ' + (g.colVisib[i] ? 'checked="checked" ' : '') + '/></td>' +
- '<td>' + $(currHeader).text() + '</td>');
- $tbody.append(tr);
+ g.cList.innerHTML = '<div class="lDiv"></div>';
+ var $listDiv = $(g.cList).find('div');
+ for (var i = 0; i < $firstRowCols.length; i++) {
+ var currHeader = $firstRowCols[i];
+ var listElmt = document.createElement('div');
+ $(listElmt).text($(currHeader).text())
+ .prepend('<input type="checkbox" ' + (g.colVisib[i] ? 'checked="checked" ' : '') + '/>');
+ $listDiv.append(listElmt);
// add event on click
- $(tr).click(function() {
+ $(listElmt).click(function() {
if ( g.toggleCol($(this).index()) ) {
g.afterToggleCol();
}
@@ -706,7 +611,7 @@
g.showAllColumns();
});
// prepend "show all column" button at top if the list is too long
- if ($firstRowHeaders.length > 10) {
+ if ($firstRowCols.length > 10) {
var clone = showAll.cloneNode(true);
$(g.cList).prepend(clone);
$(clone).click(function() {
@@ -749,15 +654,17 @@
g.showHint(e);
});
}
- $(t).find('th:not(.draggable)')
- .mouseenter(function(e) {
- g.showColVisibHint = true;
- g.showHint(e);
- })
- .mouseleave(function(e) {
- g.showColVisibHint = false;
- g.showHint(e);
- });
+ if ($firstRowCols.length > 1) {
+ $(t).find('th:not(.draggable)')
+ .mouseenter(function(e) {
+ g.showColVisibHint = true;
+ g.showHint(e);
+ })
+ .mouseleave(function(e) {
+ g.showColVisibHint = false;
+ g.showHint(e);
+ });
+ }
$(t).find('th.draggable a')
.attr('title', '') // hide default tooltip for sorting
.mouseenter(function(e) {
diff --git a/js/sql.js b/js/sql.js
index 9b54bb9..ab38420 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -28,28 +28,18 @@ function PMA_urlencode(str) {
* for inline editing
*
* @param $this_field jQuery object that points to the current field's tr
- * @param disp_mode string
*/
-function getFieldName($this_field, disp_mode) {
-
- if(disp_mode == 'vertical') {
- var field_name = $this_field.siblings('th').find('a').text();
- // happens when just one row (headings contain no a)
- if ("" == field_name) {
- field_name = $this_field.siblings('th').text();
- }
- }
- else {
- var this_field_index = $this_field.index();
- // ltr or rtl direction does not impact how the DOM was generated
- // check if the action column in the left exist
- var leftActionExist = !$('#table_results').find('th:first').hasClass('draggable');
- // 5 columns to account for the checkbox, edit, appended inline edit, copy and delete anchors but index is zero-based so substract 4
- var field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index - (leftActionExist ? 4 : 0)) + ') a').text();
- // happens when just one row (headings contain no a)
- if ("" == field_name) {
- field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index - (leftActionExist ? 4 : 0)) + ')').text();
- }
+function getFieldName($this_field) {
+
+ var this_field_index = $this_field.index();
+ // ltr or rtl direction does not impact how the DOM was generated
+ // check if the action column in the left exist
+ var leftActionExist = !$('#table_results').find('th:first').hasClass('draggable');
+ // 5 columns to account for the checkbox, edit, appended inline edit, copy and delete anchors but index is zero-based so substract 4
+ var field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index - (leftActionExist ? 4 : 0)) + ') a').text();
+ // happens when just one row (headings contain no a)
+ if ("" == field_name) {
+ field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index - (leftActionExist ? 4 : 0)) + ')').text();
}
field_name = $.trim(field_name);
@@ -63,49 +53,9 @@ function getFieldName($this_field, disp_mode) {
*
*/
function appendInlineAnchor() {
+ // TODO: remove two lines below if vertical display mode has been completely removed
var disp_mode = $("#top_direction_dropdown").val();
-
- if (disp_mode == 'vertical') {
- // there can be one or two tr containing this class, depending
- // on the RowActionLinks cfg parameter
- $('#table_results tr')
- .find('.edit_row_anchor')
- .removeClass('edit_row_anchor')
- .parent().each(function() {
- var $this_tr = $(this);
- var $cloned_tr = $this_tr.clone();
-
- var $img_object = $cloned_tr.find('img:first').attr('title', PMA_messages['strInlineEdit']);
- if ($img_object.length != 0) {
- var img_src = $img_object.attr('src').replace(/b_edit/,'b_inline_edit');
- $img_object.attr('src', img_src);
- }
-
- $cloned_tr.find('td')
- .addClass('inline_edit_anchor')
- .find('a').attr('href', '#');
- var $edit_span = $cloned_tr.find('span:contains("' + PMA_messages['strEdit'] + '")');
- var $span = $cloned_tr.find('a').find('span');
- if ($edit_span.length > 0) {
- $span.text(' ' + PMA_messages['strInlineEdit']);
- $span.prepend($img_object);
- } else {
- $span.text('');
- $span.append($img_object);
- }
-
- $cloned_tr.insertAfter($this_tr);
- });
-
- $('#resultsForm').find('tbody').find('th').each(function() {
- var $this_th = $(this);
- if ($this_th.attr('rowspan') == 4) {
- $this_th.attr('rowspan', '5');
- }
- });
- }
- else {
- // horizontal mode
+ if (disp_mode != 'vertical') {
$('.edit_row_anchor').each(function() {
var $this_td = $(this);
@@ -195,23 +145,6 @@ $(document).ready(function() {
}).trigger('keyup');
/**
- * current value of the direction in which the table is displayed
- * @type String
- * @fieldOf jQuery
- * @name disp_mode
- */
- var disp_mode = $("#top_direction_dropdown").val();
-
- /**
- * Update value of {@link jQuery.disp_mode} everytime the direction dropdown changes value
- * @memberOf jQuery
- * @name direction_dropdown_change
- */
- $("#top_direction_dropdown, #bottom_direction_dropdown").live('change', function(event) {
- disp_mode = $(this).val();
- })
-
- /**
* Attach the {@link appendInlineAnchor} function to a custom event, which
* will be triggered manually everytime the table of results is reloaded
* @memberOf jQuery
@@ -536,95 +469,39 @@ $(document).ready(function() {
// Add hide icon and/or text.
$edit_td.children('span.nowrap').append($('<br /><br />')).append($hide_a);
- if (disp_mode != 'vertical') {
- $('#table_results tbody tr td span a#hide').click(function() {
- var $this_hide = $(this).parents('td');
-
- var $this_span = $this_hide.find('span');
- $this_span.find('a, br').remove();
- $this_span.append($data_a.clone());
-
- $this_hide.removeClass("inline_edit_active hover").addClass("inline_edit_anchor");
- $this_hide.parent().removeClass("hover noclick");
- $this_hide.siblings().removeClass("hover");
-
- var $input_siblings = $this_hide.parent('tr').find('.inline_edit');
- var txt = '';
- $input_siblings.each(function() {
- var $this_hide_siblings = $(this);
- txt = $this_hide_siblings.data('original_data');
- if($this_hide_siblings.children('span').children().length != 0) {
- $this_hide_siblings.children('span').empty();
- $this_hide_siblings.children('span').append(txt);
- }
- });
- $(this).prev().prev().remove();
- $(this).prev().remove();
- $(this).remove();
-
- // refresh the grid
- $("#sqlqueryresults").trigger('refreshgrid');
- });
- } else {
- var txt = '';
- var rows = $edit_td.parent().siblings().length;
-
- $('#table_results tbody tr td span a#hide').click(function() {
- var $hide_a = $(this);
- var $this_hide = $(this).parents('td');
- var pos = $this_hide.index();
-
- var $this_span = $hide_a.parent();
- $this_span.find('a, br').remove();
- $this_span.append($data_a.clone());
+ $('#table_results tbody tr td span a#hide').click(function() {
+ var $this_hide = $(this).parents('td');
- var $this_row = $this_span.parents('tr');
- // changing inline_edit_active to inline_edit_anchor
- $this_hide.removeClass("inline_edit_active").addClass("inline_edit_anchor");
+ var $this_span = $this_hide.find('span');
+ $this_span.find('a, br').remove();
+ $this_span.append($data_a.clone());
- // removing marked and hover classes.
- $this_row.parent('tbody').find('tr').find("td:eq(" + pos + ")").removeClass("marked hover");
+ $this_hide.removeClass("inline_edit_active hover").addClass("inline_edit_anchor");
+ $this_hide.parent().removeClass("hover noclick");
+ $this_hide.siblings().removeClass("hover");
- for( var i = 0; i <= rows + 2; i++){
- if( $this_row.siblings("tr:eq(" + i + ") td:eq(" + pos + ")").hasClass("inline_edit") == false) {
- continue;
- }
- $this_row_siblings = $this_row.siblings("tr:eq(" + i + ") td:eq(" + pos + ")");
- txt = $this_row_siblings.data('original_data');
- $this_row_siblings.children('span').empty();
- $this_row_siblings.children('span').append(txt);
+ var $input_siblings = $this_hide.parent('tr').find('.inline_edit');
+ var txt = '';
+ $input_siblings.each(function() {
+ var $this_hide_siblings = $(this);
+ txt = $this_hide_siblings.data('original_data');
+ if($this_hide_siblings.children('span').children().length != 0) {
+ $this_hide_siblings.children('span').empty();
+ $this_hide_siblings.children('span').append(txt);
}
- $(this).prev().remove();
- $(this).prev().remove();
- $(this).remove();
-
- // refresh the grid
- $("#sqlqueryresults").trigger('refreshgrid');
});
- }
+ $(this).prev().prev().remove();
+ $(this).prev().remove();
+ $(this).remove();
+
+ // refresh the grid
+ $("#sqlqueryresults").trigger('refreshgrid');
+ });
// Initialize some variables
- if(disp_mode == 'vertical') {
- /**
- * @var this_row_index Index of the current <td> in the parent <tr>
- * Current <td> is the inline edit anchor.
- */
- var this_row_index = $edit_td.index();
- /**
- * @var $input_siblings Object referring to all inline editable events from same row
- */
- var $input_siblings = $edit_td.parents('tbody').find('tr').find('.inline_edit:nth('+this_row_index+')');
- /**
- * @var where_clause String containing the WHERE clause to select this row
- */
- var where_clause = $edit_td.parents('tbody').find('tr').find('.where_clause:nth('+this_row_index+')').val();
- }
- // horizontal mode
- else {
- var this_row_index = $edit_td.parent().index();
- var $input_siblings = $edit_td.parent('tr').find('.inline_edit');
- var where_clause = $edit_td.parent('tr').find('.where_clause').val();
- }
+ var this_row_index = $edit_td.parent().index();
+ var $input_siblings = $edit_td.parent('tr').find('.inline_edit');
+ var where_clause = $edit_td.parent('tr').find('.where_clause').val();
$input_siblings.each(function() {
/** @lends jQuery */
@@ -648,7 +525,7 @@ $(document).ready(function() {
* @var field_name String containing the name of this field.
* @see getFieldName()
*/
- var field_name = getFieldName($this_field, disp_mode);
+ var field_name = getFieldName($this_field);
/**
* @var relation_curr_value String current value of the field (for fields that are foreign keyed).
*/
@@ -859,24 +736,8 @@ $(document).ready(function() {
var $test_element = ''; // to test the presence of a element
// Initialize variables
- if(disp_mode == 'vertical') {
- /**
- * @var this_td_index Index of the current <td> in the parent <tr>
- * Current <td> is the inline edit anchor.
- */
- var this_td_index = $this_td.index();
- /**
- * @var $input_siblings Object referring to all inline editable events from same row
- */
- var $input_siblings = $this_td.parents('tbody').find('tr').find('.inline_edit:nth('+this_td_index+')');
- /**
- * @var where_clause String containing the WHERE clause to select this row
- */
- var where_clause = $this_td.parents('tbody').find('tr').find('.where_clause:nth('+this_td_index+')').val();
- } else {
- var $input_siblings = $this_td.parent('tr').find('.inline_edit');
- var where_clause = $this_td.parent('tr').find('.where_clause').val();
- }
+ var $input_siblings = $this_td.parent('tr').find('.inline_edit');
+ var where_clause = $this_td.parent('tr').find('.where_clause').val();
/**
* @var nonunique Boolean, whether this row is unique or not
@@ -927,7 +788,7 @@ $(document).ready(function() {
* @var field_name String containing the name of this field.
* @see getFieldName()
*/
- var field_name = getFieldName($this_field, disp_mode);
+ var field_name = getFieldName($this_field);
/**
* @var this_field_params Array temporary storage for the name/value of current field
@@ -1027,7 +888,6 @@ $(document).ready(function() {
*/
var post_params = {'ajax_request' : true,
'sql_query' : sql_query,
- 'disp_direction' : disp_mode,
'token' : window.parent.token,
'db' : window.parent.db,
'table' : window.parent.table,
@@ -1044,19 +904,14 @@ $(document).ready(function() {
$.post('tbl_replace.php', post_params, function(data) {
if(data.success == true) {
PMA_ajaxShowMessage(data.message);
- if(disp_mode == 'vertical') {
- $this_td.parents('tbody').find('tr').find('.where_clause:nth(' + this_td_index + ')').attr('value', new_clause);
- }
- else {
- $this_td.parent('tr').find('.where_clause').attr('value', new_clause);
- }
+ $this_td.parent('tr').find('.where_clause').attr('value', new_clause);
// remove possible previous feedback message
$('#result_query').remove();
if (typeof data.sql_query != 'undefined') {
// display feedback
$('#sqlqueryresults').prepend(data.sql_query);
}
- PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings, data, disp_mode);
+ PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings, data);
} else {
PMA_ajaxShowMessage(data.error);
};
@@ -1064,7 +919,7 @@ $(document).ready(function() {
} else {
// no posting was done but still need to display the row
// in its previous format
- PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings, '', disp_mode);
+ PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings, '');
}
}) // End After editing, clicking again should post data
@@ -1229,7 +1084,7 @@ $(document).ready(function() {
* (when called in the situation where no posting was done, the data
* parameter is empty)
*/
-function PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings, data, disp_mode) {
+function PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings, data) {
// deleting the hide button. remove <br><br><a> tags
$del_hide.find('a, br').remove();
@@ -1241,11 +1096,7 @@ function PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings,
// removing hover, marked and noclick classes
$this_td.parent('tr').removeClass('noclick');
- if(disp_mode != 'vertical') {
- $this_td.parent('tr').removeClass('hover').find('td').removeClass('hover');
- } else {
- $this_td.parents('tbody').find('tr').find('td:eq(' + $this_td.index() + ')').removeClass('marked hover');
- }
+ $this_td.parent('tr').removeClass('hover').find('td').removeClass('hover');
$input_siblings.each(function() {
// Inline edit post has been successful.
@@ -1265,7 +1116,7 @@ function PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings,
var new_html = $this_sibling.find('textarea').val();
if($this_sibling.is('.transformed')) {
- var field_name = getFieldName($this_sibling, disp_mode);
+ var field_name = getFieldName($this_sibling);
if (typeof data.transformations != 'undefined') {
$.each(data.transformations, function(key, value) {
if(key == field_name) {
@@ -1294,7 +1145,7 @@ function PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings,
}
if($this_sibling.is('.relation')) {
- var field_name = getFieldName($this_sibling, disp_mode);
+ var field_name = getFieldName($this_sibling);
if (typeof data.relations != 'undefined') {
$.each(data.relations, function(key, value) {
if(key == field_name) {
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index c18e003..5445d88 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -2163,15 +2163,6 @@ span.mysql-number {
width: 10px;
}
-.cPointerVer { /* cPointer with vertical display mode */
- background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>col_pointer_ver.png);
- height: 10px;
- margin-left: -5px;
- margin-top: -5px; /* must be minus half of its height */
- position: absolute;
- width: 20px;
-}
-
.dHint {
background: #333;
border:1px solid #000;
@@ -2233,15 +2224,16 @@ span.mysql-number {
position: absolute;
}
-.cList table {
+.cList .lDiv div {
+ padding: 0.2em 0.5em 0.2em 0.2em;
}
-.cList table tr:hover {
+.cList .lDiv div:hover {
background: #DDD;
cursor: pointer;
}
-.cList table td input {
+.cList .lDiv div input {
cursor: pointer;
}
diff --git a/themes/original/img/col_pointer_ver.png b/themes/original/img/col_pointer_ver.png
deleted file mode 100644
index 4607912..0000000
Binary files a/themes/original/img/col_pointer_ver.png and /dev/null differ
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index f6d523c..a224e14 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -2534,15 +2534,6 @@ span.mysql-number {
width: 10px;
}
-.cPointerVer { /* cPointer with vertical display mode */
- background: url(./themes/pmahomme/img/col_pointer_ver.png);
- height: 10px;
- margin-left: -5px;
- margin-top: -5px; /* must be minus half of its height */
- position: absolute;
- width: 20px;
-}
-
.dHint {
background: #333;
border:1px solid #000;
@@ -2603,15 +2594,16 @@ span.mysql-number {
box-shadow: 0 0.2em 0.5em #333;
}
-.cList table {
+.cList .lDiv div {
+ padding: 0.2em 0.5em 0.2em 0.2em;
}
-.cList table tr:hover {
+.cList .lDiv div:hover {
background: #DDD;
cursor: pointer;
}
-.cList table td input {
+.cList .lDiv div input {
cursor: pointer;
}
diff --git a/themes/pmahomme/img/col_pointer_ver.png b/themes/pmahomme/img/col_pointer_ver.png
deleted file mode 100644
index 8964754..0000000
Binary files a/themes/pmahomme/img/col_pointer_ver.png and /dev/null differ
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8262-gd2d2c3c
by Michal Čihař 13 Jul '11
by Michal Čihař 13 Jul '11
13 Jul '11
The branch, master has been updated
via d2d2c3c9959f865a6340474d3f9bdab03101f82c (commit)
via 998bacf154db47c1d9d94b5685560fde38d41e2c (commit)
via f3b4ed1df8ce5a85200926ad3eba3eaacb5a0f8e (commit)
via 170e70ea48b943195d28325cc5ff928df69e63d0 (commit)
via 97b55502d1c8de58f10e48bc82b05eda07b3b887 (commit)
via fd26fbb937c4e44156af0080f5ebbdaed6604132 (commit)
via cf52c35114aeda349c4e8519958e8db940c9972c (commit)
via d0317ee58c900cc9876f5d4a44875929dd5975c9 (commit)
via 872450a756b5a6b9bb265484c61040698e76d112 (commit)
via b4dd25a5eafd1feb79da944449b719d6e514318b (commit)
via 2fc7348b814b1d5362ee8557d01b9ab478b88e2e (commit)
via 7e44a2457cf302eaf041d6bf8fb47cac68888f7d (commit)
via b9d75b8fbe2ba413dc4d9b327577c75176bf1582 (commit)
via 47ca413a6f6043cf01819e4e76c993b02bfb359a (commit)
via 5e5963ba0f37b8425e6822fbe23cda332a4e695a (commit)
via a1ee1b53d5739af4499309e3271b482c4a5de4f4 (commit)
via 96cb519b264f03e9ef09cc2022faac9d818a3966 (commit)
via 073d7efff897c84d6cd8c47677dc0678ea7784da (commit)
via 010b04dd753a3f95b7ecbaae25f88edb3a3ad4fc (commit)
via 09240a0b2cfd4c7c8719610d72ab9d493a1b647d (commit)
via 29aa4fefa99f30815ebe9294139b5fd90ffbe2f9 (commit)
via b3341fd0eaf28f6dc476496f410e691571cb43e1 (commit)
via 95afb177ac030106ade044407dffa0ffc76985e8 (commit)
via d43ed2fd6e4614baa24135f842ecf1111a620c7f (commit)
via c6682cd7f60872604da18d43deb990d540aa15d7 (commit)
via 9d7d5499cbf870ef3770272c6f6e53c7e1feec02 (commit)
via 6a4d688e9513bc5fb208479f4b0ac3c4586ca228 (commit)
via 2e4567a95f2f41ed3b35135b8e72f827d828df4e (commit)
via 2c11d94667bee5259dadc8cce8449e7618b7bbf0 (commit)
via 0c9e82f747fc353dfd6faf56e0320c70f41fd5ee (commit)
via e6b6dba254a4b4792221b72fb2980fc35e7c5377 (commit)
via d56d9f6b525b60f52db4a4876b123281704de775 (commit)
via 8707dc2979a2c90a06501b577e0b4bdf5d2ff26d (commit)
via 12d0eac335034c88b2b85144d03ec388600f3373 (commit)
via d2004980f68c303dd48e1acbe2f666b5710d56b7 (commit)
via 6248c8a06bfff49efa68fdf41ab11cc5b684004c (commit)
via 21a9bc8e4934373e22ffbced2ed23c8d6e1b79fb (commit)
via 072cc64f50130341be447ab0895d178d65cc588c (commit)
via caa40f5863db9fa9da3421dc6cdfaf7c16f3f649 (commit)
via 5c9f44ec5801cd0bc30abac9b369fd68454fac9a (commit)
via 89bdf2013062c8eb1e826409e64580da09daa6cf (commit)
via 24fa661996d4740568eb5511c497278fd7fa72dd (commit)
via d638409e36b3542a592d1f0badc8c45bc8af92a5 (commit)
from 08a64b378b87a34fab97bd1e2c0b8c61535111d9 (commit)
- Log -----------------------------------------------------------------
commit d2d2c3c9959f865a6340474d3f9bdab03101f82c
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:58:03 2011 +0200
Translation update done using Pootle.
commit 998bacf154db47c1d9d94b5685560fde38d41e2c
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:57:56 2011 +0200
Translation update done using Pootle.
commit f3b4ed1df8ce5a85200926ad3eba3eaacb5a0f8e
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:57:43 2011 +0200
Translation update done using Pootle.
commit 170e70ea48b943195d28325cc5ff928df69e63d0
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:57:24 2011 +0200
Translation update done using Pootle.
commit 97b55502d1c8de58f10e48bc82b05eda07b3b887
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:57:07 2011 +0200
Translation update done using Pootle.
commit fd26fbb937c4e44156af0080f5ebbdaed6604132
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:57:01 2011 +0200
Translation update done using Pootle.
commit cf52c35114aeda349c4e8519958e8db940c9972c
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:56:56 2011 +0200
Translation update done using Pootle.
commit d0317ee58c900cc9876f5d4a44875929dd5975c9
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:56:51 2011 +0200
Translation update done using Pootle.
commit 872450a756b5a6b9bb265484c61040698e76d112
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:56:46 2011 +0200
Translation update done using Pootle.
commit b4dd25a5eafd1feb79da944449b719d6e514318b
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:56:40 2011 +0200
Translation update done using Pootle.
commit 2fc7348b814b1d5362ee8557d01b9ab478b88e2e
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:56:32 2011 +0200
Translation update done using Pootle.
commit 7e44a2457cf302eaf041d6bf8fb47cac68888f7d
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:56:23 2011 +0200
Translation update done using Pootle.
commit b9d75b8fbe2ba413dc4d9b327577c75176bf1582
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:56:12 2011 +0200
Translation update done using Pootle.
commit 47ca413a6f6043cf01819e4e76c993b02bfb359a
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:55:05 2011 +0200
Translation update done using Pootle.
commit 5e5963ba0f37b8425e6822fbe23cda332a4e695a
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:55:00 2011 +0200
Translation update done using Pootle.
commit a1ee1b53d5739af4499309e3271b482c4a5de4f4
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:54:55 2011 +0200
Translation update done using Pootle.
commit 96cb519b264f03e9ef09cc2022faac9d818a3966
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:54:27 2011 +0200
Translation update done using Pootle.
commit 073d7efff897c84d6cd8c47677dc0678ea7784da
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:54:22 2011 +0200
Translation update done using Pootle.
commit 010b04dd753a3f95b7ecbaae25f88edb3a3ad4fc
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:54:14 2011 +0200
Translation update done using Pootle.
commit 09240a0b2cfd4c7c8719610d72ab9d493a1b647d
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:54:03 2011 +0200
Translation update done using Pootle.
commit 29aa4fefa99f30815ebe9294139b5fd90ffbe2f9
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:53:57 2011 +0200
Translation update done using Pootle.
commit b3341fd0eaf28f6dc476496f410e691571cb43e1
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:53:50 2011 +0200
Translation update done using Pootle.
commit 95afb177ac030106ade044407dffa0ffc76985e8
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:53:11 2011 +0200
Translation update done using Pootle.
commit d43ed2fd6e4614baa24135f842ecf1111a620c7f
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:53:05 2011 +0200
Translation update done using Pootle.
commit c6682cd7f60872604da18d43deb990d540aa15d7
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:52:46 2011 +0200
Translation update done using Pootle.
commit 9d7d5499cbf870ef3770272c6f6e53c7e1feec02
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:52:36 2011 +0200
Translation update done using Pootle.
commit 6a4d688e9513bc5fb208479f4b0ac3c4586ca228
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:52:08 2011 +0200
Translation update done using Pootle.
commit 2e4567a95f2f41ed3b35135b8e72f827d828df4e
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:52:02 2011 +0200
Translation update done using Pootle.
commit 2c11d94667bee5259dadc8cce8449e7618b7bbf0
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:51:42 2011 +0200
Translation update done using Pootle.
commit 0c9e82f747fc353dfd6faf56e0320c70f41fd5ee
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:51:28 2011 +0200
Translation update done using Pootle.
commit e6b6dba254a4b4792221b72fb2980fc35e7c5377
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:51:03 2011 +0200
Translation update done using Pootle.
commit d56d9f6b525b60f52db4a4876b123281704de775
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:50:53 2011 +0200
Translation update done using Pootle.
commit 8707dc2979a2c90a06501b577e0b4bdf5d2ff26d
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:50:29 2011 +0200
Translation update done using Pootle.
commit 12d0eac335034c88b2b85144d03ec388600f3373
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:50:22 2011 +0200
Translation update done using Pootle.
commit d2004980f68c303dd48e1acbe2f666b5710d56b7
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:50:18 2011 +0200
Translation update done using Pootle.
commit 6248c8a06bfff49efa68fdf41ab11cc5b684004c
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:50:11 2011 +0200
Translation update done using Pootle.
commit 21a9bc8e4934373e22ffbced2ed23c8d6e1b79fb
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:50:02 2011 +0200
Translation update done using Pootle.
commit 072cc64f50130341be447ab0895d178d65cc588c
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:49:55 2011 +0200
Translation update done using Pootle.
commit caa40f5863db9fa9da3421dc6cdfaf7c16f3f649
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:49:46 2011 +0200
Translation update done using Pootle.
commit 5c9f44ec5801cd0bc30abac9b369fd68454fac9a
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:49:33 2011 +0200
Translation update done using Pootle.
commit 89bdf2013062c8eb1e826409e64580da09daa6cf
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:49:25 2011 +0200
Translation update done using Pootle.
commit 24fa661996d4740568eb5511c497278fd7fa72dd
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:49:20 2011 +0200
Translation update done using Pootle.
commit d638409e36b3542a592d1f0badc8c45bc8af92a5
Author: Michal Čihař <michal(a)cihar.com>
Date: Wed Jul 13 14:49:12 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/cs.po | 127 +++++++++++++++++++++++---------------------------------------
1 files changed, 47 insertions(+), 80 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index 4d81544..3dbb2d5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-13 14:48+0200\n"
-"PO-Revision-Date: 2011-07-07 15:18+0200\n"
+"PO-Revision-Date: 2011-07-13 14:58+0200\n"
"Last-Translator: Michal Čihař <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
"Language: cs\n"
@@ -2219,10 +2219,9 @@ msgid "The %s functionality is affected by a known bug, see %s"
msgstr "Funkčnost %s je omezena známou chybou, viz %s"
#: libraries/common.lib.php:2456
-#, fuzzy
#| msgid "Click to select"
msgid "Click to toggle"
-msgstr "Klikněte pro vybrání"
+msgstr "Klikněte pro přepnutí"
#: libraries/common.lib.php:2727 libraries/common.lib.php:2734
#: libraries/common.lib.php:2921 libraries/config/setup.forms.php:296
@@ -6502,7 +6501,6 @@ msgid "Generate Password"
msgstr "Vytvořit heslo"
#: libraries/rte/rte_events.lib.php:24
-#, fuzzy
#| msgid "Add an event"
msgid "Add event"
msgstr "Přidat událost"
@@ -6513,19 +6511,17 @@ msgid "Export of event %s"
msgstr "Exportovat událost %s"
#: libraries/rte/rte_events.lib.php:27
-#, fuzzy
#| msgid "Event"
msgid "event"
-msgstr "Událost"
+msgstr "událost"
#: libraries/rte/rte_events.lib.php:28
-#, fuzzy
#| msgid "You do not have the necessary privileges to create a new routine"
msgid "You do not have the necessary privileges to create a new event"
-msgstr "Nemáte dostatečná práva pro vytvoření rutiny"
+msgstr "Nemáte dostatečná práva pro vytvoření události"
#: libraries/rte/rte_events.lib.php:29
-#, fuzzy, php-format
+#, php-format
#| msgid "No event with name %s found in database %s"
msgid "No event with name %1$s found in database %2$s"
msgstr "V databázi %2$s nebyla nalezen událost se jménem %1$s"
@@ -6546,10 +6542,9 @@ msgid "The following query has failed: \"%s\""
msgstr "Následující dotaz selhal: „%s“"
#: libraries/rte/rte_events.lib.php:105
-#, fuzzy
#| msgid "Sorry, we failed to restore the dropped routine."
msgid "Sorry, we failed to restore the dropped event."
-msgstr "Bohužel se nepodařilo obnovit odstraněnou rutinu."
+msgstr "Bohužel se nepodařilo obnovit odstraněnou událost."
#: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_routines.lib.php:274
#: libraries/rte/rte_triggers.lib.php:98
@@ -6557,16 +6552,16 @@ msgid "The backed up query was:"
msgstr "Záložní dotaz byl:"
#: libraries/rte/rte_events.lib.php:110
-#, fuzzy, php-format
+#, php-format
#| msgid "Routine %1$s has been modified."
msgid "Event %1$s has been modified."
-msgstr "Byla změněna rutina %1$s."
+msgstr "Byla změněna událost %1$s."
#: libraries/rte/rte_events.lib.php:122
-#, fuzzy, php-format
+#, php-format
#| msgid "Table %1$s has been created."
msgid "Event %1$s has been created."
-msgstr "Byla vytvořena tabulka %1$s."
+msgstr "Byla vytvořena událost %1$s."
#: libraries/rte/rte_events.lib.php:130 libraries/rte/rte_routines.lib.php:299
#: libraries/rte/rte_triggers.lib.php:122
@@ -6574,16 +6569,14 @@ msgid "<b>One or more errors have occured while processing your request:</b>"
msgstr "<b>Při zpracování požadavku došlo k několika chybám:</b>"
#: libraries/rte/rte_events.lib.php:170
-#, fuzzy
#| msgid "Create view"
msgid "Create event"
-msgstr "Vytvořit pohled"
+msgstr "Vytvořit událost"
#: libraries/rte/rte_events.lib.php:174
-#, fuzzy
#| msgid "Edit server"
msgid "Edit event"
-msgstr "Upravit server"
+msgstr "Upravit událost"
#: libraries/rte/rte_events.lib.php:201 libraries/rte/rte_routines.lib.php:375
#: libraries/rte/rte_routines.lib.php:1326
@@ -6598,10 +6591,9 @@ msgid "Details"
msgstr "Podrobnosti"
#: libraries/rte/rte_events.lib.php:363
-#, fuzzy
#| msgid "Event type"
msgid "Event name"
-msgstr "Typ události"
+msgstr "Název události"
#: libraries/rte/rte_events.lib.php:384 server_binlog.php:182
msgid "Event type"
@@ -6613,22 +6605,19 @@ msgid "Change to %s"
msgstr "Změnit na %s"
#: libraries/rte/rte_events.lib.php:411
-#, fuzzy
#| msgid "Execute"
msgid "Execute at"
-msgstr "Spustit"
+msgstr "Spustit v"
#: libraries/rte/rte_events.lib.php:419
-#, fuzzy
#| msgid "Execute"
msgid "Execute every"
-msgstr "Spustit"
+msgstr "Spustit každých"
#: libraries/rte/rte_events.lib.php:438
-#, fuzzy
#| msgid "Startup"
msgid "Start"
-msgstr "Úvodní stránka"
+msgstr "Počátek"
#: libraries/rte/rte_events.lib.php:454 libraries/rte/rte_routines.lib.php:952
#: libraries/rte/rte_triggers.lib.php:356
@@ -6636,10 +6625,9 @@ msgid "Definition"
msgstr "Definice"
#: libraries/rte/rte_events.lib.php:460
-#, fuzzy
#| msgid "complete inserts"
msgid "On completion preserve"
-msgstr "úplné inserty"
+msgstr "Při dokončení zachovat"
#: libraries/rte/rte_events.lib.php:464 libraries/rte/rte_routines.lib.php:962
#: libraries/rte/rte_triggers.lib.php:362
@@ -6650,61 +6638,54 @@ msgstr "Zadavatel"
#: libraries/rte/rte_routines.lib.php:1024
#: libraries/rte/rte_triggers.lib.php:400
msgid "The definer must be in the \"username@hostname\" format"
-msgstr ""
+msgstr "Zadavatel musí být ve tvaru \"uživatel@počítač\""
#: libraries/rte/rte_events.lib.php:514
-#, fuzzy
#| msgid "You must provide a routine name"
msgid "You must provide an event name"
-msgstr "Musíte zadat jméno rutiny"
+msgstr "Musíte zadat jméno události"
#: libraries/rte/rte_events.lib.php:526
-#, fuzzy
#| msgid "You must provide a name and a type for each routine parameter."
msgid "You must provide a valid interval value for the event."
-msgstr "Pro každý parametr musíte zadat jeho jméno a typ."
+msgstr "Musíte zadat platný interval pro událost."
#: libraries/rte/rte_events.lib.php:538
-#, fuzzy
#| msgid "You must provide a routine definition."
msgid "You must provide a valid execution time for the event."
-msgstr "Musíte zadat definici rutiny."
+msgstr "Musíte zadat platnou dobu spuštění události."
#: libraries/rte/rte_events.lib.php:542
-#, fuzzy
#| msgid "You must provide a name and a type for each routine parameter."
msgid "You must provide a valid type for the event."
-msgstr "Pro každý parametr musíte zadat jeho jméno a typ."
+msgstr "Musíte zadat správný typ události."
#: libraries/rte/rte_events.lib.php:561
-#, fuzzy
#| msgid "You must provide a routine definition."
msgid "You must provide an event definition."
-msgstr "Musíte zadat definici rutiny."
+msgstr "Musíte zadat definici události."
#: libraries/rte/rte_footer.lib.php:29
msgid "New"
-msgstr ""
+msgstr "Nová"
#: libraries/rte/rte_footer.lib.php:91
msgid "OFF"
-msgstr ""
+msgstr "Vypnuto"
#: libraries/rte/rte_footer.lib.php:96
msgid "ON"
-msgstr ""
+msgstr "Zapnuto"
#: libraries/rte/rte_footer.lib.php:108
-#, fuzzy
#| msgid "The event scheduler is enabled"
msgid "Event scheduler status"
-msgstr "Plánovač událostí je zapnutý"
+msgstr "Stav plánovače událostí"
#: libraries/rte/rte_list.lib.php:52
-#, fuzzy
#| msgid "Return type"
msgid "Returns"
-msgstr "Návratový typ"
+msgstr "Vrací"
#: libraries/rte/rte_list.lib.php:58 libraries/rte/rte_triggers.lib.php:328
#: server_status.php:800 sql.php:943
@@ -6725,10 +6706,9 @@ msgid "Export of routine %s"
msgstr "Export rutiny %s"
#: libraries/rte/rte_routines.lib.php:27
-#, fuzzy
#| msgid "Routines"
msgid "routine"
-msgstr "Rutiny"
+msgstr "rutina"
#: libraries/rte/rte_routines.lib.php:28
msgid "You do not have the necessary privileges to create a new routine"
@@ -6852,10 +6832,9 @@ msgid "You must provide a name and a type for each routine parameter."
msgstr "Pro každý parametr musíte zadat jeho jméno a typ."
#: libraries/rte/rte_routines.lib.php:1121
-#, fuzzy
#| msgid "You must provide a name and a type for each routine parameter."
msgid "You must provide a valid return type for the routine."
-msgstr "Pro každý parametr musíte zadat jeho jméno a typ."
+msgstr "Musíte zadat platný návratový typ rutiny."
#: libraries/rte/rte_routines.lib.php:1171
msgid "You must provide a routine definition."
@@ -6890,7 +6869,6 @@ msgid "Function"
msgstr "Funkce"
#: libraries/rte/rte_triggers.lib.php:24
-#, fuzzy
#| msgid "Add a trigger"
msgid "Add trigger"
msgstr "Přidat spoušť"
@@ -6901,92 +6879,81 @@ msgid "Export of trigger %s"
msgstr "Exportovat spoušť %s"
#: libraries/rte/rte_triggers.lib.php:27
-#, fuzzy
#| msgid "Triggers"
msgid "trigger"
-msgstr "Spouště"
+msgstr "spoušť"
#: libraries/rte/rte_triggers.lib.php:28
-#, fuzzy
#| msgid "You do not have the necessary privileges to create a new routine"
msgid "You do not have the necessary privileges to create a new trigger"
-msgstr "Nemáte dostatečná práva pro vytvoření rutiny"
+msgstr "Nemáte dostatečná práva pro vytvoření spouště."
#: libraries/rte/rte_triggers.lib.php:29
-#, fuzzy, php-format
+#, php-format
#| msgid "No routine with name %1$s found in database %2$s"
msgid "No trigger with name %1$s found in database %2$s"
-msgstr "V databázi %2$s není žádná rutina se jménem %1$s"
+msgstr "V databázi %2$s není žádná spoušť se jménem %1$s"
#: libraries/rte/rte_triggers.lib.php:30
msgid "There are no triggers to display."
msgstr "Nebyly nalezeny žádné spouště."
#: libraries/rte/rte_triggers.lib.php:97
-#, fuzzy
#| msgid "Sorry, we failed to restore the dropped routine."
msgid "Sorry, we failed to restore the dropped trigger."
-msgstr "Bohužel se nepodařilo obnovit odstraněnou rutinu."
+msgstr "Bohužel se nepodařilo obnovit odstraněnou spoušť."
#: libraries/rte/rte_triggers.lib.php:102
-#, fuzzy, php-format
+#, php-format
#| msgid "Routine %1$s has been modified."
msgid "Trigger %1$s has been modified."
-msgstr "Byla změněna rutina %1$s."
+msgstr "Byla změněna spoušť %1$s."
#: libraries/rte/rte_triggers.lib.php:114
-#, fuzzy, php-format
+#, php-format
#| msgid "Table %1$s has been created."
msgid "Trigger %1$s has been created."
-msgstr "Byla vytvořena tabulka %1$s."
+msgstr "Byla vytvořena spoušť %1$s."
#: libraries/rte/rte_triggers.lib.php:165
-#, fuzzy
#| msgid "Create view"
msgid "Create trigger"
-msgstr "Vytvořit pohled"
+msgstr "Vytvořit spoušť"
#: libraries/rte/rte_triggers.lib.php:169
-#, fuzzy
#| msgid "Add a trigger"
msgid "Edit trigger"
-msgstr "Přidat spoušť"
+msgstr "Upravit spoušť"
#: libraries/rte/rte_triggers.lib.php:309
-#, fuzzy
#| msgid "Triggers"
msgid "Trigger name"
-msgstr "Spouště"
+msgstr "Název spouště"
#: libraries/rte/rte_triggers.lib.php:407
-#, fuzzy
#| msgid "You must provide a routine name"
msgid "You must provide a trigger name"
-msgstr "Musíte zadat jméno rutiny"
+msgstr "Musíte zadat jméno spouště"
#: libraries/rte/rte_triggers.lib.php:412
-#, fuzzy
#| msgid "You must provide a routine name"
msgid "You must provide a valid timing for the trigger"
-msgstr "Musíte zadat jméno rutiny"
+msgstr "Musíte zadat platné časování spouště"
#: libraries/rte/rte_triggers.lib.php:417
-#, fuzzy
#| msgid "You must provide a name and a type for each routine parameter."
msgid "You must provide a valid event for the trigger"
-msgstr "Pro každý parametr musíte zadat jeho jméno a typ."
+msgstr "Musíte zadat platnou událost pro spoušť"
#: libraries/rte/rte_triggers.lib.php:423
-#, fuzzy
#| msgid "You must provide a routine name"
msgid "You must provide a valid table name"
-msgstr "Musíte zadat jméno rutiny"
+msgstr "Musíte zadat platné jméno tabulky"
#: libraries/rte/rte_triggers.lib.php:429
-#, fuzzy
#| msgid "You must provide a routine definition."
msgid "You must provide a trigger definition."
-msgstr "Musíte zadat definici rutiny."
+msgstr "Musíte zadat definici spouště."
#: libraries/schema/Dia_Relation_Schema.class.php:222
#: libraries/schema/Eps_Relation_Schema.class.php:395
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-8219-g08a64b3
by Michal Čihař 13 Jul '11
by Michal Čihař 13 Jul '11
13 Jul '11
The branch, master has been updated
via 08a64b378b87a34fab97bd1e2c0b8c61535111d9 (commit)
via 90410bd5395fd4481c203b4b0748df1cbe11532e (commit)
via f82ef9d68a6f86f9e8ae6d7ff4e7fcbf429e6efb (commit)
via d98f1c4c1c039ff1b04abef121dc592fad6fbeb5 (commit)
via 2266c22092d93a2ce8f87e5b4d454712d35d02a5 (commit)
via f555aaf2fb57980553738af7330bb185d64ec93d (commit)
via c5fe3df521eca27000de85f8f43ab8af036d4165 (commit)
via 306583422d976350d781bf70e3707f5cda47b097 (commit)
via a052edf99bf92e7fc7f3539679d327120ecd5cd5 (commit)
via 30859fc9e0893dffc54801835407b9a705488071 (commit)
via 98929bba07d607aba5e9490b5df64560e65d8a97 (commit)
via a2d687f3eab95d03e8ce1efe24a9f8755fcb501e (commit)
via 1647863a02f8fd11f9590b8c0d598760ed807185 (commit)
via 3527cd2f245134e9f31c37388521e6cb290de9aa (commit)
via d77a4432f7eac1837adc0ffb92587c3ffc592417 (commit)
via 8d182a30e0a9efe46530902099e1c1104674cb08 (commit)
via 5c8b52615777abac3034e6ec3f82764cd50a6d7e (commit)
via dfa39f66fda4b305813df317803f00cb264fd1cd (commit)
via b25aa77380040fbff7db0ebc7242ac511479ad63 (commit)
via 76e2db4c9f431429d8b3d3d4dae94448ba480c99 (commit)
via 7f7340c510d602a839bc68cc24bb0fc17f0a2bae (commit)
from e7a445340664a3a48bb56b86031e20ffad667dbf (commit)
- Log -----------------------------------------------------------------
commit 08a64b378b87a34fab97bd1e2c0b8c61535111d9
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Jul 13 14:49:26 2011 +0200
Update po files
commit 90410bd5395fd4481c203b4b0748df1cbe11532e
Merge: f82ef9d68a6f86f9e8ae6d7ff4e7fcbf429e6efb e7a445340664a3a48bb56b86031e20ffad667dbf
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Jul 13 14:48:34 2011 +0200
Merge remote-tracking branch 'origin/master'
commit f82ef9d68a6f86f9e8ae6d7ff4e7fcbf429e6efb
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Wed Jul 13 13:55:56 2011 +0200
Translation update done using Pootle.
commit d98f1c4c1c039ff1b04abef121dc592fad6fbeb5
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Wed Jul 13 13:54:28 2011 +0200
Translation update done using Pootle.
commit 2266c22092d93a2ce8f87e5b4d454712d35d02a5
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Wed Jul 13 13:53:21 2011 +0200
Translation update done using Pootle.
commit f555aaf2fb57980553738af7330bb185d64ec93d
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Wed Jul 13 13:50:54 2011 +0200
Translation update done using Pootle.
commit c5fe3df521eca27000de85f8f43ab8af036d4165
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Wed Jul 13 13:50:43 2011 +0200
Translation update done using Pootle.
commit 306583422d976350d781bf70e3707f5cda47b097
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Wed Jul 13 13:50:13 2011 +0200
Translation update done using Pootle.
commit a052edf99bf92e7fc7f3539679d327120ecd5cd5
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Wed Jul 13 13:47:03 2011 +0200
Translation update done using Pootle.
commit 30859fc9e0893dffc54801835407b9a705488071
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Wed Jul 13 13:42:56 2011 +0200
Translation update done using Pootle.
commit 98929bba07d607aba5e9490b5df64560e65d8a97
Author: Martin Lacina <martin(a)whistler.sk>
Date: Wed Jul 13 10:06:43 2011 +0200
Translation update done using Pootle.
commit a2d687f3eab95d03e8ce1efe24a9f8755fcb501e
Author: Martin Lacina <martin(a)whistler.sk>
Date: Wed Jul 13 10:04:41 2011 +0200
Translation update done using Pootle.
commit 1647863a02f8fd11f9590b8c0d598760ed807185
Author: Martin Lacina <martin(a)whistler.sk>
Date: Wed Jul 13 10:04:00 2011 +0200
Translation update done using Pootle.
commit 3527cd2f245134e9f31c37388521e6cb290de9aa
Author: Martin Lacina <martin(a)whistler.sk>
Date: Wed Jul 13 10:03:21 2011 +0200
Translation update done using Pootle.
commit d77a4432f7eac1837adc0ffb92587c3ffc592417
Author: Martin Lacina <martin(a)whistler.sk>
Date: Wed Jul 13 10:01:50 2011 +0200
Translation update done using Pootle.
commit 8d182a30e0a9efe46530902099e1c1104674cb08
Author: Martin Lacina <martin(a)whistler.sk>
Date: Wed Jul 13 09:58:53 2011 +0200
Translation update done using Pootle.
commit 5c8b52615777abac3034e6ec3f82764cd50a6d7e
Author: Martin Lacina <martin(a)whistler.sk>
Date: Wed Jul 13 09:58:11 2011 +0200
Translation update done using Pootle.
commit dfa39f66fda4b305813df317803f00cb264fd1cd
Author: Martin Lacina <martin(a)whistler.sk>
Date: Wed Jul 13 09:57:12 2011 +0200
Translation update done using Pootle.
commit b25aa77380040fbff7db0ebc7242ac511479ad63
Author: Martin Lacina <martin(a)whistler.sk>
Date: Wed Jul 13 09:55:47 2011 +0200
Translation update done using Pootle.
commit 76e2db4c9f431429d8b3d3d4dae94448ba480c99
Author: Martin Lacina <martin(a)whistler.sk>
Date: Wed Jul 13 09:53:41 2011 +0200
Translation update done using Pootle.
commit 7f7340c510d602a839bc68cc24bb0fc17f0a2bae
Author: Martin Lacina <martin(a)whistler.sk>
Date: Wed Jul 13 09:53:31 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/af.po | 42 +++++++++++++-------------
po/ar.po | 42 +++++++++++++-------------
po/az.po | 42 +++++++++++++-------------
po/be.po | 42 +++++++++++++-------------
po/be(a)latin.po | 42 +++++++++++++-------------
po/bg.po | 42 +++++++++++++-------------
po/bn.po | 42 +++++++++++++-------------
po/br.po | 42 +++++++++++++-------------
po/bs.po | 42 +++++++++++++-------------
po/ca.po | 42 +++++++++++++-------------
po/cs.po | 42 +++++++++++++-------------
po/cy.po | 42 +++++++++++++-------------
po/da.po | 42 +++++++++++++-------------
po/de.po | 42 +++++++++++++-------------
po/el.po | 42 +++++++++++++-------------
po/en_GB.po | 42 +++++++++++++-------------
po/es.po | 42 +++++++++++++-------------
po/et.po | 42 +++++++++++++-------------
po/eu.po | 42 +++++++++++++-------------
po/fa.po | 42 +++++++++++++-------------
po/fi.po | 42 +++++++++++++-------------
po/fr.po | 42 +++++++++++++-------------
po/gl.po | 42 +++++++++++++-------------
po/he.po | 42 +++++++++++++-------------
po/hi.po | 42 +++++++++++++-------------
po/hr.po | 42 +++++++++++++-------------
po/hu.po | 42 +++++++++++++-------------
po/id.po | 42 +++++++++++++-------------
po/it.po | 73 ++++++++++++++++++++++------------------------
po/ja.po | 42 +++++++++++++-------------
po/ka.po | 42 +++++++++++++-------------
po/ko.po | 42 +++++++++++++-------------
po/lt.po | 42 +++++++++++++-------------
po/lv.po | 42 +++++++++++++-------------
po/mk.po | 42 +++++++++++++-------------
po/ml.po | 42 +++++++++++++-------------
po/mn.po | 42 +++++++++++++-------------
po/ms.po | 42 +++++++++++++-------------
po/nb.po | 42 +++++++++++++-------------
po/nl.po | 42 +++++++++++++-------------
po/phpmyadmin.pot | 42 +++++++++++++-------------
po/pl.po | 42 +++++++++++++-------------
po/pt.po | 42 +++++++++++++-------------
po/pt_BR.po | 42 +++++++++++++-------------
po/ro.po | 42 +++++++++++++-------------
po/ru.po | 42 +++++++++++++-------------
po/si.po | 42 +++++++++++++-------------
po/sk.po | 84 ++++++++++++++++++++++------------------------------
po/sl.po | 42 +++++++++++++-------------
po/sq.po | 42 +++++++++++++-------------
po/sr.po | 42 +++++++++++++-------------
po/sr(a)latin.po | 42 +++++++++++++-------------
po/sv.po | 42 +++++++++++++-------------
po/ta.po | 42 +++++++++++++-------------
po/te.po | 42 +++++++++++++-------------
po/th.po | 42 +++++++++++++-------------
po/tr.po | 42 +++++++++++++-------------
po/tt.po | 42 +++++++++++++-------------
po/ug.po | 42 +++++++++++++-------------
po/uk.po | 42 +++++++++++++-------------
po/ur.po | 42 +++++++++++++-------------
po/uz.po | 42 +++++++++++++-------------
po/uz(a)latin.po | 42 +++++++++++++-------------
po/zh_CN.po | 42 +++++++++++++-------------
po/zh_TW.po | 42 +++++++++++++-------------
65 files changed, 1394 insertions(+), 1409 deletions(-)
diff --git a/po/af.po b/po/af.po
index f1c9228..1dc02cb 100644
--- a/po/af.po
+++ b/po/af.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-07-13 11:27+0100\n"
+"POT-Creation-Date: 2011-07-13 14:48+0200\n"
"PO-Revision-Date: 2010-03-30 23:04+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: afrikaans <af(a)li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Soek"
#: libraries/display_tbl.lib.php:566 libraries/display_tbl.lib.php:661
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:370
#: libraries/rte/rte_events.lib.php:482 libraries/rte/rte_routines.lib.php:999
-#: libraries/rte/rte_routines.lib.php:1482
+#: libraries/rte/rte_routines.lib.php:1497
#: libraries/rte/rte_triggers.lib.php:375
#: libraries/schema/User_Schema.class.php:120
#: libraries/schema/User_Schema.class.php:172
@@ -151,7 +151,7 @@ msgstr "Kolom name"
#: libraries/export/texytext.php:234 libraries/rte/rte_list.lib.php:51
#: libraries/rte/rte_list.lib.php:65 libraries/rte/rte_routines.lib.php:865
#: libraries/rte/rte_routines.lib.php:890
-#: libraries/rte/rte_routines.lib.php:1400
+#: libraries/rte/rte_routines.lib.php:1415
#: libraries/schema/Pdf_Relation_Schema.class.php:1231
#: libraries/schema/Pdf_Relation_Schema.class.php:1252
#: libraries/tbl_properties.inc.php:103 server_privileges.php:2151
@@ -954,7 +954,7 @@ msgid ""
msgstr ""
#: import.php:452 libraries/Message.class.php:175
-#: libraries/display_tbl.lib.php:2235 libraries/rte/rte_routines.lib.php:1240
+#: libraries/display_tbl.lib.php:2235 libraries/rte/rte_routines.lib.php:1255
#: libraries/sql_query_form.lib.php:113 tbl_operations.php:228
#: tbl_relation.php:289 tbl_row_action.php:126 view_operations.php:60
msgid "Your SQL query has been executed successfully"
@@ -2190,7 +2190,7 @@ msgstr "SQL-stelling"
#: libraries/rte/rte_routines.lib.php:265
#: libraries/rte/rte_routines.lib.php:275
#: libraries/rte/rte_routines.lib.php:289
-#: libraries/rte/rte_routines.lib.php:1290
+#: libraries/rte/rte_routines.lib.php:1305
#: libraries/rte/rte_triggers.lib.php:84 libraries/rte/rte_triggers.lib.php:89
#: libraries/rte/rte_triggers.lib.php:99
#: libraries/rte/rte_triggers.lib.php:112
@@ -4751,7 +4751,7 @@ msgstr "Skep 'n nuwe tabel op databasis %s"
#: libraries/display_create_table.lib.php:51 libraries/rte/rte_list.lib.php:49
#: libraries/rte/rte_list.lib.php:55 libraries/rte/rte_list.lib.php:62
#: libraries/rte/rte_routines.lib.php:889
-#: libraries/rte/rte_routines.lib.php:1399
+#: libraries/rte/rte_routines.lib.php:1414
#: libraries/tbl_properties.inc.php:102 setup/frames/index.inc.php:125
#: tbl_structure.php:204
msgid "Name"
@@ -5916,7 +5916,7 @@ msgstr "SQL resultaat"
msgid "Generated by"
msgstr "Voortgebring deur"
-#: libraries/import.lib.php:152 libraries/rte/rte_routines.lib.php:1284
+#: libraries/import.lib.php:152 libraries/rte/rte_routines.lib.php:1299
#: sql.php:685 tbl_change.php:183 tbl_get_field.php:34
msgid "MySQL returned an empty result set (i.e. zero rows)."
msgstr "MySQL het niks teruggegee nie (dus nul rye)."
@@ -6404,7 +6404,7 @@ msgid "Variable"
msgstr ""
#: libraries/replication_gui.lib.php:117
-#: libraries/rte/rte_routines.lib.php:1404 pmd_general.php:476
+#: libraries/rte/rte_routines.lib.php:1419 pmd_general.php:476
#: pmd_general.php:535 pmd_general.php:658 pmd_general.php:775
#: server_status.php:1029 tbl_change.php:329 tbl_printview.php:367
#: tbl_select.php:117 tbl_structure.php:862
@@ -6496,7 +6496,7 @@ msgstr ""
#: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_routines.lib.php:259
#: libraries/rte/rte_routines.lib.php:264
#: libraries/rte/rte_routines.lib.php:288
-#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1304
#: libraries/rte/rte_triggers.lib.php:83 libraries/rte/rte_triggers.lib.php:88
#: libraries/rte/rte_triggers.lib.php:111
#, php-format
@@ -6539,8 +6539,8 @@ msgid "Edit event"
msgstr "Voeg 'n nuwe gebruiker by"
#: libraries/rte/rte_events.lib.php:201 libraries/rte/rte_routines.lib.php:375
-#: libraries/rte/rte_routines.lib.php:1311
-#: libraries/rte/rte_routines.lib.php:1347
+#: libraries/rte/rte_routines.lib.php:1326
+#: libraries/rte/rte_routines.lib.php:1362
#: libraries/rte/rte_triggers.lib.php:195
msgid "Error in processing request"
msgstr ""
@@ -6786,7 +6786,7 @@ msgid "Invalid direction \"%s\" given for parameter."
msgstr ""
#: libraries/rte/rte_routines.lib.php:1072
-#: libraries/rte/rte_routines.lib.php:1116
+#: libraries/rte/rte_routines.lib.php:1131
msgid ""
"You must provide length/values for routine parameters of type ENUM, SET, "
"VARCHAR and VARBINARY."
@@ -6796,37 +6796,37 @@ msgstr ""
msgid "You must provide a name and a type for each routine parameter."
msgstr ""
-#: libraries/rte/rte_routines.lib.php:1106
+#: libraries/rte/rte_routines.lib.php:1121
msgid "You must provide a valid return type for the routine."
msgstr ""
-#: libraries/rte/rte_routines.lib.php:1156
+#: libraries/rte/rte_routines.lib.php:1171
msgid "You must provide a routine definition."
msgstr ""
-#: libraries/rte/rte_routines.lib.php:1245
+#: libraries/rte/rte_routines.lib.php:1260
#, php-format
msgid "%d row affected by the last statement inside the procedure"
msgid_plural "%d rows affected by the last statement inside the procedure"
msgstr[0] ""
msgstr[1] ""
-#: libraries/rte/rte_routines.lib.php:1261
+#: libraries/rte/rte_routines.lib.php:1276
#, php-format
msgid "Execution results of routine %s"
msgstr ""
-#: libraries/rte/rte_routines.lib.php:1335
-#: libraries/rte/rte_routines.lib.php:1341
+#: libraries/rte/rte_routines.lib.php:1350
+#: libraries/rte/rte_routines.lib.php:1356
msgid "Execute routine"
msgstr ""
-#: libraries/rte/rte_routines.lib.php:1392
-#: libraries/rte/rte_routines.lib.php:1395
+#: libraries/rte/rte_routines.lib.php:1407
+#: libraries/rte/rte_routines.lib.php:1410
msgid "Routine parameters"
msgstr ""
-#: libraries/rte/rte_routines.lib.php:1402 tbl_change.php:287
+#: libraries/rte/rte_routines.lib.php:1417 tbl_change.php:287
#: tbl_change.php:325
msgid "Function"
msgstr "Funksie"
diff --git a/po/ar.po b/po/ar.po
index e3229be..905da69 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-07-13 11:27+0100\n"
+"POT-Creation-Date: 2011-07-13 14:48+0200\n"
"PO-Revision-Date: 2011-07-09 03:43+0200\n"
"Last-Translator: Abdullah Al-Saedi <abdullah.10(a)windowslive.com>\n"
"Language-Team: arabic <ar(a)li.org>\n"
@@ -58,7 +58,7 @@ msgstr "بحث"
#: libraries/display_tbl.lib.php:566 libraries/display_tbl.lib.php:661
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:370
#: libraries/rte/rte_events.lib.php:482 libraries/rte/rte_routines.lib.php:999
-#: libraries/rte/rte_routines.lib.php:1482
+#: libraries/rte/rte_routines.lib.php:1497
#: libraries/rte/rte_triggers.lib.php:375
#: libraries/schema/User_Schema.class.php:120
#: libraries/schema/User_Schema.class.php:172
@@ -152,7 +152,7 @@ msgstr "عمود"
#: libraries/export/texytext.php:234 libraries/rte/rte_list.lib.php:51
#: libraries/rte/rte_list.lib.php:65 libraries/rte/rte_routines.lib.php:865
#: libraries/rte/rte_routines.lib.php:890
-#: libraries/rte/rte_routines.lib.php:1400
+#: libraries/rte/rte_routines.lib.php:1415
#: libraries/schema/Pdf_Relation_Schema.class.php:1231
#: libraries/schema/Pdf_Relation_Schema.class.php:1252
#: libraries/tbl_properties.inc.php:103 server_privileges.php:2151
@@ -938,7 +938,7 @@ msgstr ""
"إنهاء الإستيراد ,, يجب زيادة المدة المحددة لتنفيذ php"
#: import.php:452 libraries/Message.class.php:175
-#: libraries/display_tbl.lib.php:2235 libraries/rte/rte_routines.lib.php:1240
+#: libraries/display_tbl.lib.php:2235 libraries/rte/rte_routines.lib.php:1255
#: libraries/sql_query_form.lib.php:113 tbl_operations.php:228
#: tbl_relation.php:289 tbl_row_action.php:126 view_operations.php:60
msgid "Your SQL query has been executed successfully"
@@ -2099,7 +2099,7 @@ msgstr "استعلام SQL"
#: libraries/rte/rte_routines.lib.php:265
#: libraries/rte/rte_routines.lib.php:275
#: libraries/rte/rte_routines.lib.php:289
-#: libraries/rte/rte_routines.lib.php:1290
+#: libraries/rte/rte_routines.lib.php:1305
#: libraries/rte/rte_triggers.lib.php:84 libraries/rte/rte_triggers.lib.php:89
#: libraries/rte/rte_triggers.lib.php:99
#: libraries/rte/rte_triggers.lib.php:112
@@ -4621,7 +4621,7 @@ msgstr "تكوين جدول جديد في قاعدة البيانات %s"
#: libraries/display_create_table.lib.php:51 libraries/rte/rte_list.lib.php:49
#: libraries/rte/rte_list.lib.php:55 libraries/rte/rte_list.lib.php:62
#: libraries/rte/rte_routines.lib.php:889
-#: libraries/rte/rte_routines.lib.php:1399
+#: libraries/rte/rte_routines.lib.php:1414
#: libraries/tbl_properties.inc.php:102 setup/frames/index.inc.php:125
#: tbl_structure.php:204
msgid "Name"
@@ -5806,7 +5806,7 @@ msgstr "ناتج استعلام SQL"
msgid "Generated by"
msgstr "أنشئ بواسطة"
-#: libraries/import.lib.php:152 libraries/rte/rte_routines.lib.php:1284
+#: libraries/import.lib.php:152 libraries/rte/rte_routines.lib.php:1299
#: sql.php:685 tbl_change.php:183 tbl_get_field.php:34
msgid "MySQL returned an empty result set (i.e. zero rows)."
msgstr "قام MySQL بإرجاع نتيجة فارغة."
@@ -6297,7 +6297,7 @@ msgid "Variable"
msgstr "متغير"
#: libraries/replication_gui.lib.php:117
-#: libraries/rte/rte_routines.lib.php:1404 pmd_general.php:476
+#: libraries/rte/rte_routines.lib.php:1419 pmd_general.php:476
#: pmd_general.php:535 pmd_general.php:658 pmd_general.php:775
#: server_status.php:1029 tbl_change.php:329 tbl_printview.php:367
#: tbl_select.php:117 tbl_structure.php:862
@@ -6392,7 +6392,7 @@ msgstr ""
#: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_routines.lib.php:259
#: libraries/rte/rte_routines.lib.php:264
#: libraries/rte/rte_routines.lib.php:288
-#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1304
#: libraries/rte/rte_triggers.lib.php:83 libraries/rte/rte_triggers.lib.php:88
#: libraries/rte/rte_triggers.lib.php:111
#, fuzzy, php-format
@@ -6440,8 +6440,8 @@ msgid "Edit event"
msgstr "حدث"
#: libraries/rte/rte_events.lib.php:201 libraries/rte/rte_routines.lib.php:375
-#: libraries/rte/rte_routines.lib.php:1311
-#: libraries/rte/rte_routines.lib.php:1347
+#: libraries/rte/rte_routines.lib.php:1326
+#: libraries/rte/rte_routines.lib.php:1362
#: libraries/rte/rte_triggers.lib.php:195
msgid "Error in processing request"
msgstr "خطأ في معالجة الطلب"
@@ -6702,7 +6702,7 @@ msgid "Invalid direction \"%s\" given for parameter."
msgstr ""
#: libraries/rte/rte_routines.lib.php:1072
-#: libraries/rte/rte_routines.lib.php:1116
+#: libraries/rte/rte_routines.lib.php:1131
msgid ""
"You must provide length/values for routine parameters of type ENUM, SET, "
"VARCHAR and VARBINARY."
@@ -6712,15 +6712,15 @@ msgstr ""
msgid "You must provide a name and a type for each routine parameter."
msgstr ""
-#: libraries/rte/rte_routines.lib.php:1106
+#: libraries/rte/rte_routines.lib.php:1121
msgid "You must provide a valid return type for the routine."
msgstr ""
-#: libraries/rte/rte_routines.lib.php:1156
+#: libraries/rte/rte_routines.lib.php:1171
msgid "You must provide a routine definition."
msgstr ""
-#: libraries/rte/rte_routines.lib.php:1245
+#: libraries/rte/rte_routines.lib.php:1260
#, php-format
msgid "%d row affected by the last statement inside the procedure"
msgid_plural "%d rows affected by the last statement inside the procedure"
@@ -6731,22 +6731,22 @@ msgstr[3] "%d تأثر بالإجراء الأخير"
msgstr[4] "%d تأثر بالإجراء الأخير"
msgstr[5] "%d تأثر بالإجراء الأخير"
-#: libraries/rte/rte_routines.lib.php:1261
+#: libraries/rte/rte_routines.lib.php:1276
#, php-format
msgid "Execution results of routine %s"
msgstr "نتائج تنفيذ الإجراء %s"
-#: libraries/rte/rte_routines.lib.php:1335
-#: libraries/rte/rte_routines.lib.php:1341
+#: libraries/rte/rte_routines.lib.php:1350
+#: libraries/rte/rte_routines.lib.php:1356
msgid "Execute routine"
msgstr "تنفيذ"
-#: libraries/rte/rte_routines.lib.php:1392
-#: libraries/rte/rte_routines.lib.php:1395
+#: libraries/rte/rte_routines.lib.php:1407
+#: libraries/rte/rte_routines.lib.php:1410
msgid "Routine parameters"
msgstr ""
-#: libraries/rte/rte_routines.lib.php:1402 tbl_change.php:287
+#: libraries/rte/rte_routines.lib.php:1417 tbl_change.php:287
#: tbl_change.php:325
msgid "Function"
msgstr "دالة"
diff --git a/po/az.po b/po/az.po
index e213ab3..e84ba4d 100644
--- a/po/az.po
+++ b/po/az.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-07-13 11:27+0100\n"
+"POT-Creation-Date: 2011-07-13 14:48+0200\n"
"PO-Revision-Date: 2010-03-12 09:11+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: azerbaijani <az(a)li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Axtarış"
#: libraries/display_tbl.lib.php:566 libraries/display_tbl.lib.php:661
#: libraries/replication_gui.lib.php:75 libraries/replication_gui.lib.php:370
#: libraries/rte/rte_events.lib.php:482 libraries/rte/rte_routines.lib.php:999
-#: libraries/rte/rte_routines.lib.php:1482
+#: libraries/rte/rte_routines.lib.php:1497
#: libraries/rte/rte_triggers.lib.php:375
#: libraries/schema/User_Schema.class.php:120
#: libraries/schema/User_Schema.class.php:172
@@ -150,7 +150,7 @@ msgstr "Sütun adları"
#: libraries/export/texytext.php:234 libraries/rte/rte_list.lib.php:51
#: libraries/rte/rte_list.lib.php:65 libraries/rte/rte_routines.lib.php:865
#: libraries/rte/rte_routines.lib.php:890
-#: libraries/rte/rte_routines.lib.php:1400
+#: libraries/rte/rte_routines.lib.php:1415
#: libraries/schema/Pdf_Relation_Schema.class.php:1231
#: libraries/schema/Pdf_Relation_Schema.class.php:1252
#: libraries/tbl_properties.inc.php:103 server_privileges.php:2151
@@ -956,7 +956,7 @@ msgid ""
msgstr ""
#: import.php:452 libraries/Message.class.php:175
-#: libraries/display_tbl.lib.php:2235 libraries/rte/rte_routines.lib.php:1240
+#: libraries/display_tbl.lib.php:2235 libraries/rte/rte_routines.lib.php:1255
#: libraries/sql_query_form.lib.php:113 tbl_operations.php:228
#: tbl_relation.php:289 tbl_row_action.php:126 view_operations.php:60
msgid "Your SQL query has been executed successfully"
@@ -2211,7 +2211,7 @@ msgstr "SQL sorğusu"
#: libraries/rte/rte_routines.lib.php:265
#: libraries/rte/rte_routines.lib.php:275
#: libraries/rte/rte_routines.lib.php:289
-#: libraries/rte/rte_routines.lib.php:1290
+#: libraries/rte/rte_routines.lib.php:1305
#: libraries/rte/rte_triggers.lib.php:84 libraries/rte/rte_triggers.lib.php:89
#: libraries/rte/rte_triggers.lib.php:99
#: libraries/rte/rte_triggers.lib.php:112
@@ -4805,7 +4805,7 @@ msgstr "%s bazasında yeni cedvel qur"
#: libraries/display_create_table.lib.php:51 libraries/rte/rte_list.lib.php:49
#: libraries/rte/rte_list.lib.php:55 libraries/rte/rte_list.lib.php:62
#: libraries/rte/rte_routines.lib.php:889
-#: libraries/rte/rte_routines.lib.php:1399
+#: libraries/rte/rte_routines.lib.php:1414
#: libraries/tbl_properties.inc.php:102 setup/frames/index.inc.php:125
#: tbl_structure.php:204
msgid "Name"
@@ -5994,7 +5994,7 @@ msgstr "SQL result"
msgid "Generated by"
msgstr "Qurucu"
-#: libraries/import.lib.php:152 libraries/rte/rte_routines.lib.php:1284
+#: libraries/import.lib.php:152 libraries/rte/rte_routines.lib.php:1299
#: sql.php:685 tbl_change.php:183 tbl_get_field.php:34
msgid "MySQL returned an empty result set (i.e. zero rows)."
msgstr "MySQL boş netice çoxluğu gönderdi (ye'ni sıfır setir)."
@@ -6491,7 +6491,7 @@ msgid "Variable"
msgstr "Deyişen"
#: libraries/replication_gui.lib.php:117
-#: libraries/rte/rte_routines.lib.php:1404 pmd_general.php:476
+#: libraries/rte/rte_routines.lib.php:1419 pmd_general.php:476
#: pmd_general.php:535 pmd_general.php:658 pmd_general.php:775
#: server_status.php:1029 tbl_change.php:329 tbl_printview.php:367
#: tbl_select.php:117 tbl_structure.php:862
@@ -6585,7 +6585,7 @@ msgstr ""
#: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_routines.lib.php:259
#: libraries/rte/rte_routines.lib.php:264
#: libraries/rte/rte_routines.lib.php:288
-#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1304
#: libraries/rte/rte_triggers.lib.php:83 libraries/rte/rte_triggers.lib.php:88
#: libraries/ te/rte_triggers.lib.php:83 libraries/rte/rte_triggers.lib.php:88 يانات %s"