Merge branch 'famousgarkin-master'

03353cb6 · Torkel Ödegaard · ffbdea78 · 6f808625 · 03353cb6 · 03353cb6
Commit 03353cb6 authored Aug 24, 2014 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

CHANGELOG.md
+1 -0

src/app/components/settings.js
+1 -0

src/app/controllers/dashboardCtrl.js
+1 -1

src/config.sample.js
+4 -1

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [Issue #709](https://github.com/grafana/grafana/issues/709). Dashboard: Small UI look polish to search results, made dashboard title link are larger
 - [Issue #425](https://github.com/grafana/grafana/issues/425). Graph: New section in 'Display Styles' tab to override any display setting on per series bases (mix and match lines, bars, points, fill, stack, line width etc)
 - [Issue #634](https://github.com/grafana/grafana/issues/634). Dashboard: Dashboard tags now in different colors (from fixed palette) determined by tag name.
+- [Issue #685](https://github.com/grafana/grafana/issues/685). Dashboard: New config.js option to change/remove window title prefix.
 **Fixes**
 - [Issue #696](https://github.com/grafana/grafana/issues/696). Graph: Fix for y-axis format 'none' when values are in scientific notation (ex 2.3e-13)

--- a/src/app/components/settings.js
+++ b/src/app/components/settings.js
@@ -14,6 +14,7 @@ function (_, crypto) {
     */
    var defaults = {
      datasources                   : {},
+      window_title_prefix           : 'Grafana - ',
      panels                        : ['graph', 'text'],
      plugins                       : {},
      default_route                 : '/dashboard/file/default.json',

--- a/src/app/controllers/dashboardCtrl.js
+++ b/src/app/controllers/dashboardCtrl.js
@@ -56,7 +56,7 @@ function (angular, $, config, _) {
      $scope.panelMoveOver = panelMove.onOver;
      $scope.panelMoveOut = panelMove.onOut;
-      window.document.title = 'Grafana - ' + $scope.dashboard.title;
+      window.document.title = config.window_title_prefix + $scope.dashboard.title;
      // start auto refresh
      if($scope.dashboard.refresh) {

--- a/src/config.sample.js
+++ b/src/config.sample.js
@@ -78,7 +78,7 @@ function (Settings) {
      max_results: 20
    },
-    // default start dashboard
+    // default home dashboard
    default_route: '/dashboard/file/default.json',
    // set to false to disable unsaved changes warning
@@ -94,6 +94,9 @@ function (Settings) {
      password: ''
    },
+    // Change window title prefix from 'Grafana - <dashboard title>'
+    window_title_prefix: 'Grafana - ',
    // Add your own custom pannels
    plugins: {
      // list of plugin panels