From 9ba932077e47b13572ce8828248ecdacc38fae80 Mon Sep 17 00:00:00 2001
From: Edward Cheng <c4150221@gmail.com>
Date: Thu, 27 Feb 2014 22:28:05 +0800
Subject: [PATCH 1/4] Fix jqplot display

Add clearfloat before jqplot element.
Fix bug: legend overflow.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
---
 js/functions.js                    | 3 ++-
 libraries/sql.lib.php              | 1 +
 themes/original/css/common.css.php | 2 +-
 themes/pmahomme/css/common.css.php | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

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/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)
 </script>
 EOT;
         $profiling_table .= "</div>";
+        $profiling_table .= "<div class='clearfloat'></div>";
 
         //require_once 'libraries/chart.lib.php';
         $profiling_table .= '<div id="profilingChartData" style="display:none;">';
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index f6326906f4..e423994c2e 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 d87ebbe396..f4c90c70d8 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: <?php echo $left; ?>;
 }

From bda2da60aac397cc7f01715a0dd5ad1f0d4a717f Mon Sep 17 00:00:00 2001
From: Dennis1993 <marvin-wegener@outlook.com>
Date: Fri, 28 Feb 2014 19:56:53 +0100
Subject: [PATCH 2/4] No space between attribute

Signed-off-by: Marvin Wegener <mw197@web.de>
---
 libraries/structure.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 = '<img class="selectallarrow" '
-        . 'src="' . $pmaThemeImage . 'arrow_' . $text_dir . '.png' . '"'
+        . 'src="' . $pmaThemeImage . 'arrow_' . $text_dir . '.png" '
         . 'width="38" height="22" alt="' . __('With selected:') . '" />';
 
     $html_output .= '<input type="checkbox" id="fieldsForm_checkall" '

From 16a958de975456b7af21dba1c22011740b960f3e Mon Sep 17 00:00:00 2001
From: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date: Sat, 1 Mar 2014 01:55:19 +0100
Subject: [PATCH 3/4] Translated using Weblate (Swedish)

Currently translated at 99.4% (2737 of 2752)
---
 po/sv.po | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index 81f127d641..2a78438f1d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,14 +4,14 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.2.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-02-26 12:50-0500\n"
-"PO-Revision-Date: 2014-02-12 10:14+0200\n"
+"PO-Revision-Date: 2014-03-01 01:55+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
-"Language-Team: Swedish <http://l10n.cihar.com/projects/phpmyadmin/master/sv/"
-">\n"
+"Language-Team: Swedish "
+"<https://l10n.cihar.com/projects/phpmyadmin/master/sv/>\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"

From 58f0552e314b71ac9e7aa9f3ba4e15c16945a027 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 1 Mar 2014 07:42:53 -0500
Subject: [PATCH 4/4] bug #4303 "New" link in navi panel is shown even if no
 privileges

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 ChangeLog                                     |  1 +
 .../Nodes/Node_Database_Container.class.php   | 30 ++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8e6c8a8c18..55d67a3905 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,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/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']
-                    . '&amp;token=' . $GLOBALS['token'],
-            'icon' => 'server_databases.php?server=' . $GLOBALS['server']
-                    . '&amp;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']
+                        . '&amp;token=' . $GLOBALS['token'],
+                'icon' => 'server_databases.php?server=' . $GLOBALS['server']
+                        . '&amp;token=' . $GLOBALS['token'],
+            );
+            $new->classes = 'new_database italics';
+            $this->addChild($new);
+        }
     }
 }
-?>
\ No newline at end of file
+?>