Merge branch 'master' into panel_edit_menu_poc

CHANGELOG.md

-# 1.8.0 (unreleased)
+# 1.8.0 (2014-09-22)
+
+Read this [blog post](http://grafana.org/blog/2014/09/11/grafana-1-8-0-rc1-released.html) for an overview of all improvements.
 
 
 **Fixes**
 **Fixes**
 - [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource
 - [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource

latest.json

 {
 {
-	"version": "1.8.0-rc1",
-	"url": "http://grafanarel.s3.amazonaws.com/grafana-1.8.0-rc1"
+	"version": "1.8.0",
+	"url": "http://grafanarel.s3.amazonaws.com/grafana-1.8.0.tar.gz"
 }
 }

package.json

@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
     "company": "Coding Instinct AB"
   },
   },
   "name": "grafana",
   "name": "grafana",
-  "version": "1.8.0-rc1",
+  "version": "1.8.0",
   "repository": {
   "repository": {
     "type": "git",
     "type": "git",
     "url": "http://github.com/torkelo/grafana.git"
     "url": "http://github.com/torkelo/grafana.git"

src/app/directives/dashEditLink.js

@@ -51,9 +51,12 @@ function (angular, $) {
           scope.onAppEvent('hide-dash-editor', hideEditorPane);
           scope.onAppEvent('hide-dash-editor', hideEditorPane);
 
 
           scope.onAppEvent('show-dash-editor', function(evt, payload) {
           scope.onAppEvent('show-dash-editor', function(evt, payload) {
+            if (lastEditor === payload.src) {
               hideEditorPane();
               hideEditorPane();
+              return;
+            }
 
 
-            if (lastEditor === payload.src) { return; }
+            hideEditorPane();
 
 
             scope.exitFullscreen();
             scope.exitFullscreen();
 
 

src/app/panels/graph/legend.html

@@ -5,7 +5,7 @@
        ng-class="{'pull-right': series.yaxis === 2, 'graph-legend-series-hidden': hiddenSeries[series.alias]}"
        ng-class="{'pull-right': series.yaxis === 2, 'graph-legend-series-hidden': hiddenSeries[series.alias]}"
        >
        >
     <div class="graph-legend-icon">
     <div class="graph-legend-icon">
-      <i class='icon-minus pointer' ng-style="{color: series.color}" bs-popover="'colorPopup.html'">
+      <i class='icon-minus pointer' ng-style="{color: series.color}" bs-popover="'colorPopup.html'" data-placement="bottom">
       </i>
       </i>
     </div>
     </div>
     <div class="graph-legend-alias small">
     <div class="graph-legend-alias small">

src/app/services/dashboard/dashboardSrv.js

@@ -25,7 +25,7 @@ function (angular, $, kbn, _, moment) {
       this.tags = data.tags || [];
       this.tags = data.tags || [];
       this.style = data.style || "dark";
       this.style = data.style || "dark";
       this.timezone = data.timezone || 'browser';
       this.timezone = data.timezone || 'browser';
-      this.editable = data.editable || true;
+      this.editable = data.editable === false ? false : true;
       this.hideControls = data.hideControls || false;
       this.hideControls = data.hideControls || false;
       this.rows = data.rows || [];
       this.rows = data.rows || [];
       this.nav = data.nav || [];
       this.nav = data.nav || [];

src/test/specs/dashboardSrv-specs.js

@@ -82,6 +82,22 @@ define([
 
 
   });
   });
 
 
+  describe('when creating dashboard with editable false', function() {
+    var model;
+
+    beforeEach(module('grafana.services'));
+    beforeEach(inject(function(dashboardSrv) {
+      model = dashboardSrv.create({
+        editable: false
+      });
+    }));
+
+    it('should set editable false', function() {
+      expect(model.editable).to.be(false);
+    });
+
+  });
+
   describe('when creating dashboard with old schema', function() {
   describe('when creating dashboard with old schema', function() {
     var model;
     var model;
     var graph;
     var graph;