From 3366e1f97beb8c194d967686e2b3910eb93cc481 Mon Sep 17 00:00:00 2001
From: Tyron Madlener <tyronx@gmail.com>
Date: Wed, 29 Jun 2011 21:01:43 +0200
Subject: [PATCH] 2 small bugfixes

---
 js/highcharts/exporting.js | 3 ++-
 js/server_status.js        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/js/highcharts/exporting.js b/js/highcharts/exporting.js
index d6021fb097..cb04357b32 100644
--- a/js/highcharts/exporting.js
+++ b/js/highcharts/exporting.js
@@ -114,6 +114,7 @@ defaultOptions.exporting = {
             symbolFill: '#A8BF77',
             hoverSymbolFill: '#768F3E',
             _titleKey: 'exportButtonTitle',
+            menuName: 'export',
             menuItems: [{
                 textKey: 'downloadPNG',
                 onclick: function() {
@@ -574,7 +575,7 @@ extend(Chart.prototype, {
             onclick = function(e) {
                 revert();
                 var bBox = button.getBBox();
-                chart.contextMenu('export-menu', menuItems, bBox.x, bBox.y, buttonWidth, buttonHeight);
+                chart.contextMenu(btnOptions.menuName, menuItems, bBox.x, bBox.y, buttonWidth, buttonHeight);
             };
         }
         /*addEvent(button.element, 'click', function() {
diff --git a/js/server_status.js b/js/server_status.js
index d79e77e107..6523be7dff 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -501,6 +501,7 @@ $(function() {
         symbolFill: '#B5C9DF',
         hoverSymbolFill: '#779ABF',
         _titleKey: 'settings',
+        menuName: 'gridsettings',
         menuItems: [{
             textKey: 'editChart',
             onclick: function() {
@@ -672,7 +673,7 @@ $(function() {
             },
             xAxis: {
                 min: new Date().getTime() - server_time_diff - gridMaxPoints * gridRefresh,
-                max: new Date().getTime() - server_time_diff
+                max: new Date().getTime() - server_time_diff + gridRefresh
             },
             yAxis: {
                 title: {