diff --git a/ChangeLog b/ChangeLog
index fa5ef4d855..815f3a7597 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@ phpMyAdmin - ChangeLog
- bug #4297 DROP DATABASE tick box in export no longer works
- bug #4291 Unable to export comments in OpenDocument text format
- bug #4299 Deletion even when the user says "No" to the confirmation message
+- bug #4303 "New" link in navi panel is shown even if no privileges
4.1.8.0 (2014-02-22)
- bug #4276 Login loop on session expiry
diff --git a/js/functions.js b/js/functions.js
index d57cdb7f3f..c8c0444767 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1802,7 +1802,8 @@ function PMA_createProfilingChartJqplot(target, data)
},
legend: {
show: true,
- location: 'e'
+ location: 'e',
+ rendererOptions: {numberColumns: 2}
},
// from http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines#Color_Palette
seriesColors: [
diff --git a/libraries/navigation/Nodes/Node_Database_Container.class.php b/libraries/navigation/Nodes/Node_Database_Container.class.php
index 6396b03cb0..c76da069d1 100644
--- a/libraries/navigation/Nodes/Node_Database_Container.class.php
+++ b/libraries/navigation/Nodes/Node_Database_Container.class.php
@@ -29,19 +29,21 @@ class Node_Database_Container extends Node
{
parent::__construct($name, Node::CONTAINER);
- $new = PMA_NodeFactory::getInstance(
- 'Node', _pgettext('Create new database', 'New')
- );
- $new->isNew = $GLOBALS['is_create_db_priv'];
- $new->icon = PMA_Util::getImage('b_newdb.png', '');
- $new->links = array(
- 'text' => 'server_databases.php?server=' . $GLOBALS['server']
- . '&token=' . $GLOBALS['token'],
- 'icon' => 'server_databases.php?server=' . $GLOBALS['server']
- . '&token=' . $GLOBALS['token'],
- );
- $new->classes = 'new_database italics';
- $this->addChild($new);
+ if ($GLOBALS['is_create_db_priv']) {
+ $new = PMA_NodeFactory::getInstance(
+ 'Node', _pgettext('Create new database', 'New')
+ );
+ $new->isNew = true;
+ $new->icon = PMA_Util::getImage('b_newdb.png', '');
+ $new->links = array(
+ 'text' => 'server_databases.php?server=' . $GLOBALS['server']
+ . '&token=' . $GLOBALS['token'],
+ 'icon' => 'server_databases.php?server=' . $GLOBALS['server']
+ . '&token=' . $GLOBALS['token'],
+ );
+ $new->classes = 'new_database italics';
+ $this->addChild($new);
+ }
}
}
-?>
\ No newline at end of file
+?>
diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
index ab1a4fc55d..840aa0687a 100644
--- a/libraries/sql.lib.php
+++ b/libraries/sql.lib.php
@@ -506,6 +506,7 @@ function PMA_getHtmlForProfilingChart($url_query, $db, $profiling_results)
EOT;
$profiling_table .= "";
+ $profiling_table .= "
";
//require_once 'libraries/chart.lib.php';
$profiling_table .= '';
diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index 36cac6ac4d..bcf4b7e4d1 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -1369,7 +1369,7 @@ function PMA_getHtmlForCheckAllTableColumn($pmaThemeImage, $text_dir,
$tbl_is_view, $db_is_system_schema, $tbl_storage_engine
) {
$html_output = '
![' . __('With selected:') . ']()
';
$html_output .= '
\n"
-"Language-Team: Swedish
\n"
+"Language-Team: Swedish "
+"\n"
+"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 1.9-dev\n"
@@ -2385,16 +2385,14 @@ msgid "Saved searches:"
msgstr ""
#: libraries/DBQbe.class.php:1479
-#, fuzzy
#| msgid "Search"
msgid "Save search"
-msgstr "Sök"
+msgstr "Spara sökning"
#: libraries/DBQbe.class.php:1481
-#, fuzzy
#| msgid "Delete relation"
msgid "Delete search"
-msgstr "Ta bort relation"
+msgstr "Ta bort sökning"
#: libraries/DatabaseInterface.class.php:2041
msgid ""
@@ -3097,20 +3095,18 @@ msgid "There are no recent tables."
msgstr "Det finns inga nya tabeller."
#: libraries/SavedSearches.php:249
-#, fuzzy
#| msgid "Missing phpMyAdmin configuration storage tables"
msgid "Missing information to save the search."
-msgstr "Saknade phpMyAdmin konfiguration lagringstabeller"
+msgstr "Saknar information för att spara sökningen."
#: libraries/SavedSearches.php:265 libraries/SavedSearches.php:295
-#, fuzzy
#| msgid "The user %s already exists!"
msgid "An entry with this name already exists."
-msgstr "Användaren %s finns redan!"
+msgstr "En post med detta namn existerar redan."
#: libraries/SavedSearches.php:315
msgid "Missing information to delete the search."
-msgstr ""
+msgstr "Saknar information för att ta bort sökningen."
#: libraries/SavedSearches.php:336
msgid "Missing information to load the search."
@@ -4537,7 +4533,7 @@ msgstr "Blowfish-lösenord"
#: libraries/config/messages.inc.php:33
msgid "Highlight selected rows."
-msgstr "Markera valda rader"
+msgstr "Markera valda rader."
#: libraries/config/messages.inc.php:34
msgid "Row marker"
@@ -4708,7 +4704,7 @@ msgstr "Visa binärt innehåll som HEX som standard."
#: libraries/config/messages.inc.php:95
msgid "Show server listing as a list instead of a drop down."
-msgstr "Visa serverlista som en lista istället för en drop-down"
+msgstr "Visa serverlista som en lista istället för en drop-down."
#: libraries/config/messages.inc.php:96
msgid "Display servers as a list"
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 5d4d738e4f..5a1dd1a040 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -1146,7 +1146,7 @@ div#querywindowcontainer fieldset {
/* profiling */
div#profilingchart {
- width: 550px;
+ width: 850px;
height: 370px;
float: left;
}
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 450d418004..2d00856d69 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -1502,7 +1502,7 @@ div#querywindowcontainer fieldset {
/* profiling */
div#profilingchart {
- width: 550px;
+ width: 850px;
height: 370px;
float: ;
}