From 6ba52cac1be83757b03a003ff049e0d574bf00fb Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Wed, 11 Apr 2012 23:47:07 +0530
Subject: [PATCH 1/2] bug #3516405 [display] Chart title is getting wrong
 within chart export

---
 ChangeLog       | 1 +
 js/tbl_chart.js | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2dfaac55fc..855c71bcb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
 - bug #3516183 [display] Missing image extension
 - bug [display] Added missing icons in original theme
 - bug #3516761 [edit] Query error after search
+- bug #3516405 [display] Chart title is getting wrong within chart export
 
 3.5.0.0 (2012-04-07)
 + rfe #2021981 [interface] Add support for mass prefix change.
diff --git a/js/tbl_chart.js b/js/tbl_chart.js
index bec9a5cc59..439ffb9d32 100644
--- a/js/tbl_chart.js
+++ b/js/tbl_chart.js
@@ -1,6 +1,7 @@
 var chart_xaxis_idx = -1;
 var chart_series;
 var chart_series_index = -1;
+var temp_chart_title;
 
 $(document).ready(function() {
     var currentChart = null;
@@ -66,11 +67,19 @@ $(document).ready(function() {
         drawChart();
     });
 
+    $('input[name="chartTitle"]').focus(function() {
+        temp_chart_title = $(this).val();
+    });
     $('input[name="chartTitle"]').keyup(function() {
         var title = $(this).attr('value');
         if(title.length == 0) title = ' ';
         currentChart.setTitle({ text: title });
     });
+    $('input[name="chartTitle"]').blur(function() {
+        if ($(this).val() != temp_chart_title) {
+            drawChart(true);
+        }
+    });
 
     $('select[name="chartXAxis"]').change(function() {
         chart_xaxis_idx = this.value;

From d628eab1e90418d566f52c79adbb636719ac860a Mon Sep 17 00:00:00 2001
From: Jo Michael <me@mynetx.net>
Date: Wed, 11 Apr 2012 23:25:17 +0200
Subject: [PATCH 2/2] - bug #3517021 [interface] Header links except 'More'
 hide after closing dialog

---
 ChangeLog       |  1 +
 js/functions.js | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 855c71bcb8..111cc5cbaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog
 - bug [display] Added missing icons in original theme
 - bug #3516761 [edit] Query error after search
 - bug #3516405 [display] Chart title is getting wrong within chart export
+- bug #3517021 [interface] Header links except 'More' hide after closing dialog
 
 3.5.0.0 (2012-04-07)
 + rfe #2021981 [interface] Add support for mass prefix change.
diff --git a/js/functions.js b/js/functions.js
index b33507819e..694b634a35 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1441,20 +1441,24 @@ function PMA_showNoticeForEnum(selectElement)
 function PMA_createTableDialog( $div, url , target)
 {
      /**
-     *  @var    button_options  Object that stores the options passed to jQueryUI
-     *                          dialog
-     */
+      *  @var    button_options  Object that stores the options passed to jQueryUI
+      *                          dialog
+      */
      var button_options = {};
      // in the following function we need to use $(this)
-     button_options[PMA_messages['strCancel']] = function() {$(this).closest('.ui-dialog-content').dialog('close').remove();}
+     button_options[PMA_messages['strCancel']] = function() {
+         $(this).closest('.ui-dialog-content').dialog('close').remove();
+     };
 
      var button_options_error = {};
-     button_options_error[PMA_messages['strOK']] = function() {$(this).closest('.ui-dialog-content').dialog('close').remove();}
+     button_options_error[PMA_messages['strOK']] = function() {
+         $(this).closest('.ui-dialog-content').dialog('close').remove();
+     };
 
      var $msgbox = PMA_ajaxShowMessage();
 
-     $.get( target , url ,  function(data) {
-         //in the case of an error, show the error message returned.
+     $.get(target, url, function(data) {
+      //in the case of an error, show the error message returned.
          if (data.success != undefined && data.success == false) {
              $div
              .append(data.error)
@@ -1466,7 +1470,8 @@ function PMA_createTableDialog( $div, url , target)
              })// end dialog options
              //remove the redundant [Back] link in the error message.
              .find('fieldset').remove();
-         } else {
+         }
+         else {
              var size = getWindowSize();
              var timeout;
              $div
@@ -1515,12 +1520,15 @@ function PMA_createTableDialog( $div, url , target)
                  close: function() {
                      $(window).unbind('resize.dialog-resizer');
                      $('#content-hide > *').unwrap();
+                     // resize topmenu
+                     menuResize();
+                     menuResize(); // somehow need to call it twice to work
                  },
                  buttons: button_options
              }); // end dialog options
          }
-         PMA_convertFootnotesToTooltips($div);
-         PMA_ajaxRemoveMessage($msgbox);
+        PMA_convertFootnotesToTooltips($div);
+        PMA_ajaxRemoveMessage($msgbox);
      }); // end $.get()
 
 }