The branch, master has been updated
via 87d19393b321f363a4857e9b3518dd9e7c1b5e3b (commit)
via 84d25c0c00410383f8169fd7830316d401771b41 (commit)
via 956c2fadcac585de87481c5f1baf15403c2852ba (commit)
from 90d862ca779dff4035a71c94b137b4a93f2ac1a4 (commit)
- Log -----------------------------------------------------------------
commit 87d19393b321f363a4857e9b3518dd9e7c1b5e3b
Author: Michal Čihař <mcihar(a)novell.com>
Date: Fri Apr 16 15:41:13 2010 +0200
rfe #2972969 [interface] Fix flipping of headers in non-IE browsers.
commit 84d25c0c00410383f8169fd7830316d401771b41
Author: Michal Čihař <mcihar(a)novell.com>
Date: Fri Apr 16 15:13:43 2010 +0200
rfe #2981999 [interface] Default sort order is now SMART.
commit 956c2fadcac585de87481c5f1baf15403c2852ba
Author: Michal Čihař <mcihar(a)novell.com>
Date: Fri Apr 16 15:13:13 2010 +0200
Fix author name.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++-
Documentation.html | 21 ++++++++++------
libraries/config.default.php | 6 ++--
libraries/display_tbl.lib.php | 51 +++++++++++++++++++++++-----------------
4 files changed, 48 insertions(+), 34 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8814169..18032ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,7 +70,9 @@ $Id$
- patch #2986073 [interface] Convert upload progress bar to jQuery, thanks to
Philip Frank.
- patch #2983960 [interface] Add javascript validation of datetime input,
- thanks to
+ thanks to Sutharshan Balachandren.
+- rfe #2981999 [interface] Default sort order is now SMART.
+- rfe #2972969 [interface] Fix flipping of headers in non-IE browsers.
3.3.3.0 (not yet released)
- patch #2982480 [navi] Do not group if there would be one table in group,
diff --git a/Documentation.html b/Documentation.html
index 6805a48..c6ee94f 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1875,20 +1875,25 @@ $cfg['TrustedProxies'] =
"Left" and "right" are parsed as "top"
and "bottom" with vertical display mode.</dd>
- <dt id="cfg_DefaultDisplay">$cfg['DefaultDisplay'] string
- <span id="cfg_HeaderFlipType">$cfg['HeaderFlipType'] </span>string
- </dt>
+ <dt id="cfg_DefaultDisplay">$cfg['DefaultDisplay'] string</dt>
<dd>There are 3 display modes: horizontal, horizontalflipped and vertical.
Define which one is displayed by default. The first mode displays each
row on a horizontal line, the second rotates the headers by 90
degrees, so you can use descriptive headers even though fields only
contain small values and still print them out. The vertical mode sorts
- each row on a vertical lineup.<br /><br />
+ each row on a vertical lineup.
+ </dd>
- The HeaderFlipType can be set to 'css' or 'fake'. When using 'css'
- the rotation of the header for horizontalflipped is done via CSS. If
- set to 'fake' PHP does the transformation for you, but of course this
- does not look as good as CSS.</dd>
+ <dt id="cfg_HeaderFlipType">$cfg['HeaderFlipType'] </span>string</dt>
+ <dd>
+ The HeaderFlipType can be set to 'auto', 'css' or 'fake'. When using
+ 'css' the rotation of the header for horizontalflipped is done via
+ CSS. The CSS transformation currently works only in Internet
+ Explorer.If set to 'fake' PHP does the transformation for you, but of
+ course this does not look as good as CSS. The 'auto' option enables
+ CSS transformation when browser supports it and use PHP based one
+ otherwise.
+ </dd>
<dt id="DefaultPropDisplay">
<span id="cfg_DefaultPropDisplay">$cfg['DefaultPropDisplay']</span>
diff --git a/libraries/config.default.php b/libraries/config.default.php
index d1426d5..64628bb 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -887,7 +887,7 @@ $cfg['MaxRows'] = 30;
*
* @global string $cfg['Order']
*/
-$cfg['Order'] = 'ASC';
+$cfg['Order'] = 'SMART';
/**
* default for 'Show binary contents as HEX'
@@ -2179,12 +2179,12 @@ $cfg['DefaultDisplay'] = 'horizontal';
$cfg['DefaultPropDisplay'] = 3;
/**
- * table-header rotation via faking or CSS? (css|fake)
+ * table-header rotation via faking or CSS? (css|fake|auto)
* NOTE: CSS only works in IE browsers!
*
* @global string $cfg['HeaderFlipType']
*/
-$cfg['HeaderFlipType'] = 'css';
+$cfg['HeaderFlipType'] = 'auto';
/**
* shows stored relation-comments in 'browse' mode.
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 4e2ccc5..e99b97c 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -187,16 +187,16 @@ function PMA_setDisplayMode(&$the_disp_mode, &$the_total)
/**
- * Displays a navigation button
+ * Displays a navigation button
*
* @uses $GLOBALS['cfg']['NavigationBarIconic']
- * @uses PMA_generate_common_hidden_inputs()
+ * @uses PMA_generate_common_hidden_inputs()
*
* @param string iconic caption for button
- * @param string text for button
- * @param integer position for next query
- * @param string query ready for display
- * @param string optional onsubmit clause
+ * @param string text for button
+ * @param integer position for next query
+ * @param string query ready for display
+ * @param string optional onsubmit clause
* @param string optional hidden field for special treatment
* @param string optional onclick clause
*
@@ -246,7 +246,7 @@ function PMA_displayTableNavigationOneButton($caption, $title, $pos, $html_sql_q
* @param integer the offset for the "next" page
* @param integer the offset for the "previous" page
* @param string the URL-encoded query
- * @param string the id for the direction dropdown
+ * @param string the id for the direction dropdown
*
* @global string $db the database name
* @global string $table the table name
@@ -334,9 +334,9 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo
&& $_SESSION['tmp_user_values']['max_rows'] != 'all') {
// display the Next button
- PMA_displayTableNavigationOneButton('>',
- $GLOBALS['strNext'],
- $pos_next,
+ PMA_displayTableNavigationOneButton('>',
+ $GLOBALS['strNext'],
+ $pos_next,
$html_sql_query);
// prepare some options for the End button
@@ -349,9 +349,9 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo
}
// display the End button
- PMA_displayTableNavigationOneButton('>>',
- $GLOBALS['strEnd'],
- @((ceil($unlim_num_rows / $_SESSION['tmp_user_values']['max_rows'])- 1) * $_SESSION['tmp_user_values']['max_rows']),
+ PMA_displayTableNavigationOneButton('>>',
+ $GLOBALS['strEnd'],
+ @((ceil($unlim_num_rows / $_SESSION['tmp_user_values']['max_rows'])- 1) * $_SESSION['tmp_user_values']['max_rows']),
$html_sql_query,
'onsubmit="return ' . (($_SESSION['tmp_user_values']['pos'] + $_SESSION['tmp_user_values']['max_rows'] < $unlim_num_rows && $num_rows >= $_SESSION['tmp_user_values']['max_rows']) ? 'true' : 'false') . '"',
$input_for_real_end,
@@ -442,7 +442,7 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo
* @param integer the total number of fields returned by the SQL query
* @param array the analyzed query
*
- * @return boolean $clause_is_unique
+ * @return boolean $clause_is_unique
*
* @global string $db the database name
* @global string $table the table name
@@ -564,7 +564,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
echo '</div>';
// prepare full/partial text button or link
- if ($_SESSION['tmp_user_values']['display_text']=='F') {
+ if ($_SESSION['tmp_user_values']['display_text']=='F') {
// currently in fulltext mode so show the opposite link
$tmp_image_file = $GLOBALS['pmaThemeImage'] . 's_partialtext.png';
$tmp_txt = $GLOBALS['strPartialText'];
@@ -789,7 +789,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// Field name may be preceded by a space, or any number
// of characters followed by a dot (tablename.fieldname)
// so do a direct comparison for the sort expression;
- // this avoids problems with queries like
+ // this avoids problems with queries like
// "SELECT id, count(id)..." and clicking to sort
// on id or on count(id).
// Another query to test this:
@@ -852,6 +852,13 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
$order_link_params['onmouseout'] = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }';
}
}
+ if ($GLOBALS['cfg']['HeaderFlipType'] == 'auto') {
+ if (PMA_USR_BROWSER_AGENT == 'IE') {
+ $GLOBALS['cfg']['HeaderFlipType'] = 'css';
+ } else {
+ $GLOBALS['cfg']['HeaderFlipType'] = 'fake';
+ }
+ }
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
&& $GLOBALS['cfg']['HeaderFlipType'] == 'css') {
$order_link_params['style'] = 'direction: ltr; writing-mode: tb-rl;';
@@ -1141,7 +1148,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$lnk_goto = 'sql.php' . PMA_generate_common_url($_url_params, 'text');
$del_query = 'DELETE FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table)
- . ' WHERE ' . $where_clause . ($clause_is_unique ? '' : ' LIMIT 1');
+ . ' WHERE ' . $where_clause . ($clause_is_unique ? '' : ' LIMIT 1');
$_url_params = array(
'db' => $db,
@@ -1154,7 +1161,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$js_conf = 'DELETE FROM ' . PMA_jsFormat($db) . '.' . PMA_jsFormat($table)
. ' WHERE ' . PMA_jsFormat($where_clause, false)
- . ($clause_is_unique ? '' : ' LIMIT 1');
+ . ($clause_is_unique ? '' : ' LIMIT 1');
$del_str = PMA_getIcon('b_drop.png', $GLOBALS['strDelete'], true);
} elseif ($is_display['del_lnk'] == 'kp') { // kill process case
@@ -1346,7 +1353,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$vertical_display['data'][$row_no][$i] = ' <td' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"> </td>' . "\n";
}
}
- // n o t n u m e r i c a n d n o t B L O B
+ // n o t n u m e r i c a n d n o t B L O B
} else {
if (!isset($row[$i]) || is_null($row[$i])) {
$vertical_display['data'][$row_no][$i] = ' <td' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"><i>NULL</i></td>' . "\n";
@@ -1676,8 +1683,8 @@ function PMA_displayTable_checkConfigParams()
// as this is a form value, the type is always string so we cannot
// use PMA_isValid($_REQUEST['session_max_rows'], 'integer')
- if ((PMA_isValid($_REQUEST['session_max_rows'], 'numeric')
- && (int) $_REQUEST['session_max_rows'] == $_REQUEST['session_max_rows'])
+ if ((PMA_isValid($_REQUEST['session_max_rows'], 'numeric')
+ && (int) $_REQUEST['session_max_rows'] == $_REQUEST['session_max_rows'])
|| $_REQUEST['session_max_rows'] == 'all') {
$_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows'] = $_REQUEST['session_max_rows'];
unset($_REQUEST['session_max_rows']);
@@ -1718,7 +1725,7 @@ function PMA_displayTable_checkConfigParams()
// according to low-level field flags
$_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary'] = true;
}
-
+
if (isset($_REQUEST['display_binary_as_hex'])) {
$_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary_as_hex'] = true;
unset($_REQUEST['display_binary_as_hex']);
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via 90d862ca779dff4035a71c94b137b4a93f2ac1a4 (commit)
from 70e711bf29f46254b0b516a284a5920928fbcd1d (commit)
- Log -----------------------------------------------------------------
commit 90d862ca779dff4035a71c94b137b4a93f2ac1a4
Author: Michal Čihař <mcihar(a)novell.com>
Date: Fri Apr 16 14:53:55 2010 +0200
Czech translation update.
Finally we're at 100%.
-----------------------------------------------------------------------
Summary of changes:
po/cs.po | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index 3137a2e..898992f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-04-11 11:34+0200\n"
-"PO-Revision-Date: 2010-04-12 13:58+0200\n"
+"PO-Revision-Date: 2010-04-16 15:02+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -3554,6 +3554,10 @@ msgid ""
"ignore all databases by default and allow only certain databases to be "
"replicated. Please select the mode:"
msgstr ""
+"Tento server není nastaven jako nadřízený v replikačním procesu. Můžete si "
+"vybrat zda replikovat všechny databáze a přeskočit vybrané (vhodné pokud "
+"chcete replikovat většinu databází) nebo můžete zvolit opačný přístup - jen "
+"vybrat databáze, které chcete synchronizovat. Prosím zvolte požadovaný režim:"
#: libraries/messages.inc.php:790
msgid "Master configuration"
@@ -3573,6 +3577,8 @@ msgid ""
"should see a message informing you, that this server <b>is</b> configured as "
"master"
msgstr ""
+"Prosím klikněte na tlačítko po restartování MySQL serveru. Poté byste měli "
+"vidět zprávu informující vás že server <b>je</b> nastaven jako nadřízený"
#: libraries/messages.inc.php:794
msgid "Please select databases:"
@@ -3641,6 +3647,8 @@ msgid ""
"This server is not configured as slave in a replication process. Would you "
"like to <a href=\"%s\">configure</a> it?"
msgstr ""
+"Tento server není nastaven jako podřízený v replikačním procesu. Přejete si "
+"ho <a href=\"%s\">nastavit</a>?"
#: libraries/messages.inc.php:807
msgid "Reset slave"
@@ -4755,6 +4763,8 @@ msgid ""
"Make sure, you have unique server-id in your configuration file (my.cnf). If "
"not, please add the following line into [mysqld] section:"
msgstr ""
+"Ujistěte se, že máte unikátní ID serveru ve vašem konfiguračním souboru (my."
+"cnf). Pokud ne, prosím přidejte následující řádek to sekce [mysqld]:"
#: libraries/messages.inc.php:1026
msgid "Slovak"
@@ -7171,7 +7181,7 @@ msgid "Disable use of INFORMATION_SCHEMA"
msgstr "Zakázat použití INFORMATION_SCHEMA"
#: setup/lib/messages.inc.php:271
-#, fuzzy, php-format
+#, php-format
msgid ""
"If you feel this is necessary, use additional protection settings - [a@?"
"page=servers&mode=edit&id=%1$d#tab_Server_config]host authentication"
@@ -7180,13 +7190,12 @@ msgid ""
"IP belongs to an ISP where thousands of users, including you, are connected "
"to."
msgstr ""
-"Tato [a@?page=form&formset=features#tab_Security]volba[/a] by měla být "
-"zakázána, protože umožňuje útočníkům prolomit přihlašování k libovolnému "
-"MySQL serveru útokem hrobou silou. V případě nutnosti použijte [a@?"
-"page=form&formset=features#tab_Security]seznam důvěryhodných proxy[/a]. "
-"Nicméně ochrana založená na kotrole IP adres, nemusí být spolehlivá, pokud "
-"Vaše IP adresa patří poskytovateli internetových služeb, ke kterému jsou "
-"připojeny tisíce uživatelů."
+"Pokud to považujete za nutné, použijte další možnosti zabezpečení - [a@?"
+"page=servers&mode=edit&id=%1$d#tab_Server_config]omezení počítačů[/"
+"a] a [a@?page=form&formset=features#tab_Security]seznam důvěryhodných "
+"proxy[/a]. Nicméně zabezpečení založené na IP adresách nemusí být "
+"spolehlivé, pokud je vaše IP adresa dynamicky přidělována poskytovatelem "
+"spolu s mnoha dalšími uživateli."
#: setup/lib/messages.inc.php:272
msgid "Edit server"
@@ -7289,6 +7298,10 @@ msgid ""
"phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for "
"no support. Suggested: [kbd]phpmyadmin[/kbd]"
msgstr ""
+"Databáze používaná pro relace, záložky a PDF stránky. Více informací "
+"naleznete na [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a]. Pokud "
+"ponecháte prázdné, budou tyto funkce vypnuté. Doporučená hodnota: [kbd]"
+"phpmyadmin[/kbd]"
#: setup/lib/messages.inc.php:294
msgid "Port on which MySQL server is listening, leave empty for default"
@@ -7340,6 +7353,7 @@ msgid ""
"Whether the tracking mechanism creates versions for tables and views "
"automatically."
msgstr ""
+"Jestli má sledování tabulek automaticky vytvářet verze pro tabulky a pohledy."
#: setup/lib/messages.inc.php:304
msgid "Automatically create versions"
@@ -7480,6 +7494,10 @@ msgid ""
"authentication mode because the password is hard coded in the configuration "
"file; this does not limit the ability to execute the same command directly"
msgstr ""
+"Tato volba nemá žádný efekt s přihlašovací metodou [kbd]config[/kbd], "
+"protože v tomto případě je heslo uloženo v konfiguračním souboru; tato volba "
+"neomezuje možnost spustit daný příkaz přímo, jen ovlivňuje zobrazení "
+"formuláře"
#: setup/lib/messages.inc.php:332
msgid "Show password change form"
@@ -7543,6 +7561,8 @@ msgid ""
"If tooltips are enabled and a database comment is set, this will flip the "
"comment and the real name"
msgstr ""
+"Pokud jsou povoleny tooltipy a je nastaven komentář databáze, tato volba "
+"prohodí komentář a skutečné jméno"
#: setup/lib/messages.inc.php:346
msgid "Display database comment instead of its name"
@@ -7555,6 +7575,9 @@ msgid ""
"['LeftFrameTableSeparator'] directive, so only the folder is called like the "
"alias, the table name itself stays unchanged"
msgstr ""
+"Při nastavení na [kbd]nested[/kbd], bude komentář použit pro zanoření a "
+"rozdělení podle nastavení $cfg['LeftFrameTableSeparator']. Takže komentář se "
+"použije jen pro zanoření, ale jména tabulek zůstanou nezměněná"
#: setup/lib/messages.inc.php:348
msgid "Display table comment instead of its name"
@@ -7568,6 +7591,7 @@ msgstr "Zobrazit komentáře tabulky v tooltipu"
msgid ""
"Mark used tables and make it possible to show databases with locked tables"
msgstr ""
+"Označí používané tabulky a umožní zobrazit databáze se zamčenými tabulkami."
#: setup/lib/messages.inc.php:351
msgid "Skip locked tables"
@@ -7596,6 +7620,10 @@ msgid ""
"For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: "
"HTTP_X_FORWARDED_FOR[/kbd]"
msgstr ""
+"Zadejte proxy ve tvaru [kbd]IP: důvěryhodná hlavička s adresou[/kbd]. "
+"Následující příklad povolí používání hlavičky HTTP_X_FORWARDED_FOR (X-"
+"Forwarded-For) přicházející od proxy 1.2.3.4:[br][kbd]1.2.3.4: "
+"HTTP_X_FORWARDED_FOR[/kbd]"
#: setup/lib/messages.inc.php:361
msgid "List of trusted proxies for IP allow/deny"
@@ -7623,6 +7651,9 @@ msgid ""
"libraries/import.lib.php for defaults on how many queries a statement may "
"contain."
msgstr ""
+"Zobrazí počet ovlivněných řádek pro každý dotaz při zadání více dotazů. V "
+"souboru libraries/import.lib.php naleznete kolik dotazů můžete najednou "
+"zadat."
#: setup/lib/messages.inc.php:367
msgid "Verbose multiple statements"
hooks/post-receive
--
phpMyAdmin