From 2b06ceda711fd61ccbbc61201bd49ec0a7aea113 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 19 May 2016 08:00:48 +0200
Subject: [PATCH 1/4] feat(panels): adds queryparameter for choose active tab
 in edit mode

---
 public/app/features/panel/panel_ctrl.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts
index 82e19f8681b..94de0166f61 100644
--- a/public/app/features/panel/panel_ctrl.ts
+++ b/public/app/features/panel/panel_ctrl.ts
@@ -90,6 +90,15 @@ export class PanelCtrl {
     this.addEditorTab('General', 'public/app/partials/panelgeneral.html');
     this.editModeInitiated = true;
     this.events.emit('init-edit-mode', null);
+
+    var route = this.$injector.get('$route');
+    if (route.current.params.editorTab) {
+      this.editorTabs.forEach((tab, i) => {
+        if (tab.title === route.current.params.editorTab) {
+          this.editorTabIndex = i;
+        }
+      });
+    }
   }
 
   addEditorTab(title, directiveFn, index?) {

From 617d18e587153b5d4b86810164afda1eafde3bdb Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 19 May 2016 08:42:21 +0200
Subject: [PATCH 2/4] feat(panel): active tab is now placed in querystring
 aswell

---
 public/app/features/panel/panel_ctrl.ts      | 14 +++++++++++---
 public/app/features/panel/panel_directive.ts |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts
index 94de0166f61..994eaa5fd5b 100644
--- a/public/app/features/panel/panel_ctrl.ts
+++ b/public/app/features/panel/panel_ctrl.ts
@@ -91,16 +91,24 @@ export class PanelCtrl {
     this.editModeInitiated = true;
     this.events.emit('init-edit-mode', null);
 
-    var route = this.$injector.get('$route');
-    if (route.current.params.editorTab) {
+    var routeParams = this.$injector.get('$routeParams');
+    if (routeParams.editorTab) {
       this.editorTabs.forEach((tab, i) => {
-        if (tab.title === route.current.params.editorTab) {
+        if (tab.title === routeParams.editorTab) {
           this.editorTabIndex = i;
         }
       });
     }
   }
 
+  changeTab(newIndex) {
+    this.editorTabIndex = newIndex;
+    var route = this.$injector.get('$route');
+
+    route.current.params.editorTab = this.editorTabs[newIndex].title;
+    route.updateParams();
+  }
+
   addEditorTab(title, directiveFn, index?) {
     var editorTab = {title, directiveFn};
 
diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index a9bb75760f5..7d63e620f98 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -36,7 +36,7 @@ var panelTemplate = `
 
         <ul class="gf-tabs">
           <li class="gf-tabs-item" ng-repeat="tab in ::ctrl.editorTabs">
-            <a class="gf-tabs-link" ng-click="ctrl.editorTabIndex = $index" ng-class="{active: ctrl.editorTabIndex === $index}">
+            <a class="gf-tabs-link" ng-click="ctrl.changeTab($index)" ng-class="{active: ctrl.editorTabIndex === $index}">
               {{::tab.title}}
             </a>
           </li>

From 7c4642372795ca6418f127f1de07395224fa6908 Mon Sep 17 00:00:00 2001
From: Richard Hartmann <RichiH@users.noreply.github.com>
Date: Thu, 19 May 2016 10:34:12 +0200
Subject: [PATCH 3/4] ISSUE_TEMPLATE.md: Fix typo (#5099)

---
 .github/ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index b7d73592ef4..29b44752bc5 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -4,7 +4,7 @@ To help us respond to your issues faster, please make sure to add as much inform
 
 If this issue is about a plugin, please open the issue in that repository.
 
-Start your issues title with [Feature Request] / [Bug] / [Question] or no tag if your unsure. Also, please be aware that GitHub now supports uploading of screenshots; look at the bottom of this input field.
+Start your issues title with [Feature Request] / [Bug] / [Question] or no tag if you're unsure. Also, please be aware that GitHub now supports uploading of screenshots; look at the bottom of this input field.
 
 Please include some basic information:
 - What grafana version are you using?

From 78360ece8ae2f4e411a650fc9b85b65aa812468c Mon Sep 17 00:00:00 2001
From: Richard Hartmann <RichiH@users.noreply.github.com>
Date: Thu, 19 May 2016 10:59:38 +0200
Subject: [PATCH 4/4] ISSUE_TEMPLATE.md: Improve wording and fix typos (#5101)

---
 .github/ISSUE_TEMPLATE.md | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 29b44752bc5..e53a1159941 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,20 +1,19 @@
-Thank you! For helping us make Grafana even better.
+Thank you for helping us make Grafana even better!
 
-To help us respond to your issues faster, please make sure to add as much information as possible.
+To help us respond to your issues more quickly, please make sure to add as much information as possible.
 
-If this issue is about a plugin, please open the issue in that repository.
+If this issue is about a plugin, please open the issue in that plugin's repository.
 
-Start your issues title with [Feature Request] / [Bug] / [Question] or no tag if you're unsure. Also, please be aware that GitHub now supports uploading of screenshots; look at the bottom of this input field.
+Start your issue's title with [Feature Request] / [Bug] / [Question] or no tag if you're unsure. Also, please be aware that GitHub now supports uploading of screenshots; look at the bottom of this input field.
 
 Please include some basic information:
-- What grafana version are you using?
+- What Grafana version are you using?
 - What datasource are you using?
 - What OS are you running grafana on?
 - What did you do?
 - What was the expected result?
 - What happenend instead?
 
-If you question/bug relates to a metric query / unexpected data visualization, please include:
+If your question/bug relates to a metric query / unexpected data visualization, please include:
 - An image or text representation of your metric query
 - The raw query and response from your data source (check this in chrome dev tools network tab)
-