27 Jan
2011
27 Jan
'11
12:02 p.m.
The branch, master has been updated
via 03b648ff46c207c43ef97cf1df454a6cc1f13fdc (commit)
via 3d54060945b6ef3968e40f812c1ca7663fb5943b (commit)
via 8252f8a4cab2d3ac0857a61af6757023cbb9fdce (commit)
via b0d1ba07208c8599bf16bad7ea50062a0e727a4a (commit)
from f57daa0a59a0058a4b3be1bbdf1577b59d7d697a (commit)
- Log -----------------------------------------------------------------
commit 03b648ff46c207c43ef97cf1df454a6cc1f13fdc
Merge: 3d54060945b6ef3968e40f812c1ca7663fb5943b f57daa0a59a0058a4b3be1bbdf1577b59d7d697a
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Jan 27 10:02:03 2011 +0100
Merge remote branch 'origin/master'
commit 3d54060945b6ef3968e40f812c1ca7663fb5943b
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Jan 27 10:01:17 2011 +0100
Generate reload params on place where they are used.
This fixes reloading navigation frame when database is selected.
commit 8252f8a4cab2d3ac0857a61af6757023cbb9fdce
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Jan 27 09:58:39 2011 +0100
Offer switch to designer only if it is available.
commit b0d1ba07208c8599bf16bad7ea50062a0e727a4a
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Jan 27 09:55:30 2011 +0100
Better translation.
-----------------------------------------------------------------------
Summary of changes:
db_qbe.php | 6 +++++-
libraries/navigation_header.inc.php | 4 ++++
navigation.php | 4 ----
po/cs.po | 4 ++--
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/db_qbe.php b/db_qbe.php
index ea95884..95e72d8 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -176,16 +176,20 @@ function showColumnSelectCell($columns, $column_number, $selected =
'')
if (! empty($tab['fragment'])) {
$tab['link'] .= $tab['fragment'];
}
+ if (isset($tab_designer['link'])) {
?>
<div id="visual_builder_anchor" class="notice hide">
<span id="footnote_1">
<?php echo __('Switch to'); ?>
<form action="<?php echo $tab_designer['link'] ?>"
method="post">
- <input type="submit" style="background-color:#FFD; border-width:0;
color:#00F;
+ <input type="submit" style="background-color:#FFD; border-width:0;
color:#00F;
font-size: 15px;cursor: pointer" name="query"
onmouseover="this.style.color='#F00';"
value="<?php echo __('visual builder'); ?>"
onmouseout="this.style.color='#00F'"/></span>
</form>
</div>
+<?php
+ }
+?>
<form action="db_qbe.php" method="post">
<fieldset>
<table class="data" style="width: 100%;">
diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php
index 2b4606e..fa5255a 100644
--- a/libraries/navigation_header.inc.php
+++ b/libraries/navigation_header.inc.php
@@ -101,6 +101,10 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) {
echo '</a>';
echo ' ' . PMA_showMySQLDocu('', '', TRUE) .
"\n";
+ $params = array('uniqid' => uniqid());
+ if (!empty($GLOBALS['db'])) {
+ $params['db'] = $GLOBALS['db'];
+ }
echo '<a href="navigation.php?' . PMA_generate_common_url($params) .
'" target="frame_navigation">';
if ($GLOBALS['cfg']['MainPageIconic']) {
echo '<img class="icon" src="'.
$GLOBALS['pmaThemeImage'] . 's_reload.png"'
diff --git a/navigation.php b/navigation.php
index 6f799d6..8c2b65c 100644
--- a/navigation.php
+++ b/navigation.php
@@ -49,10 +49,6 @@ require_once './libraries/common.inc.php';
*/
function PMA_exitNavigationFrame()
{
- $params = array('uniqid' => uniqid());
- if (!empty($GLOBALS['db'])) {
- $params['db'] = $GLOBALS['db'];
- }
echo '</body></html>';
exit;
}
diff --git a/po/cs.po b/po/cs.po
index 7e12be1..fc17d79 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -414,11 +414,11 @@ msgstr "Musíte zvolit alespoň jedno pole, které chcete
zobrazit"
#: db_qbe.php:182
msgid "Switch to"
-msgstr "Přepnou na"
+msgstr "Přepnout na"
#: db_qbe.php:186
msgid "visual builder"
-msgstr "vizuální návrhář"
+msgstr "vizuálního návrháře"
#: db_qbe.php:219 libraries/db_structure.lib.php:95
#: libraries/display_tbl.lib.php:860
hooks/post-receive
--
phpMyAdmin