Moved dashboard title into dashboard search button

docs/mkdocs.yml

@@ -46,6 +46,7 @@ pages:
 - ['reference/playlist.md', 'Reference', 'Playlist']
 - ['reference/playlist.md', 'Reference', 'Playlist']
 - ['reference/export_import.md', 'Reference', 'Import & Export']
 - ['reference/export_import.md', 'Reference', 'Import & Export']
 - ['reference/admin.md', 'Reference', 'Grafana Admin']
 - ['reference/admin.md', 'Reference', 'Grafana Admin']
+- ['reference/admin.md', 'Reference', 'HTTP API']
 
 
 - ['datasources/graphite.md', 'Data Sources', 'Graphite']
 - ['datasources/graphite.md', 'Data Sources', 'Graphite']
 - ['datasources/influxdb.md', 'Data Sources', 'InfluxDB']
 - ['datasources/influxdb.md', 'Data Sources', 'InfluxDB']

docs/sources/guides/changes_in_v2.md

@@ -20,13 +20,13 @@ This is a guide that descriptes some of changes and new features that can be fou
 5. Share current dashboard (Make sure the dashboard is saved before)
 5. Share current dashboard (Make sure the dashboard is saved before)
 6. Save current dashboard
 6. Save current dashboard
 7. Settings dropdown
 7. Settings dropdown
-  - Dashboard settings
-  - Annotations
-  - Templating
-  - Export (exports current dashboard to json file)
-  - View JSON (view current dashboard json model)
-  - Save As... (Copy & Save current dashboard under a new name)
-  - Delete dashboard
+    - Dashboard settings
+    - Annotations
+    - Templating
+    - Export (exports current dashboard to json file)
+    - View JSON (view current dashboard json model)
+    - Save As... (Copy & Save current dashboard under a new name)
+    - Delete dashboard
 
 
 > **Note** In Grafana v2.0 when you change the title of a dashboard and then save it it will no
 > **Note** In Grafana v2.0 when you change the title of a dashboard and then save it it will no
 > longer create a new dashboard. It will just change the name for the current dashboard.
 > longer create a new dashboard. It will just change the name for the current dashboard.

docs/sources/installation/index.md

@@ -69,6 +69,18 @@ Grafana has an offical docker container.
 All grafana configuration settings can be defined using ENVIRONMENT variables, this is especially useful when using the
 All grafana configuration settings can be defined using ENVIRONMENT variables, this is especially useful when using the
 above container.
 above container.
 
 
+### Docker volumes & ENV config
+
+The docker container exposes two volumes, the sqlite3 database in the folder `/opt/grafana/data` and
+configuration files in the `/opt/grafana/conf` folder. You can map these volumes to host folders when you start the container:
+
+    $ docker run -d -p 3000:3000 \
+        -v /var/grafana/data:/opt/grafana/data \
+        -e "GF_SECURITY_ADMIN_PASSWORD=secret  \
+        grafana/grafana:develop
+
+In the above example I map the data folder and set a config option via an `ENV` variable.
+
 ## Configuration
 ## Configuration
 
 
 The backend web server has a number of configuration options. Go the [Configuration](configuration) page for details
 The backend web server has a number of configuration options. Go the [Configuration](configuration) page for details

docs/sources/installation/migrating_to2.md

@@ -9,7 +9,13 @@ page_keywords: grafana, installation, migration, documentation
 Grafana 2.x is pretty different from v1.x in that Grafana 2.x has its own backend and its own
 Grafana 2.x is pretty different from v1.x in that Grafana 2.x has its own backend and its own
 database to store dashboards and users in.
 database to store dashboards and users in.
 
 
-## Import dashboards
+## Adding Data sources
+
+Data sources in Grafana v2.0 are no longer configured via the `config.js` file. That config file is no more.
+You add data sources via UI or via the [HTTP API](../reference/http_api). Go the `Data Sources` view via the side menu.
+The side menu can be toggled via the Grafana icon in the top header (to the right).
+
+## Importing dashboards
 
 
 ### From Elasticsearch
 ### From Elasticsearch
 Start by going to the `Data Sources` view and add your elasticsearch datasource. Specify the elasticsearch
 Start by going to the `Data Sources` view and add your elasticsearch datasource. Specify the elasticsearch
@@ -39,4 +45,3 @@ and click the `Import` button.
 
 
 ![](/img/v2/migrate_dashboards.jpg)
 ![](/img/v2/migrate_dashboards.jpg)
 
 
-

docs/sources/reference/http_api.md

+----
+page_title: HTTP API
+page_description: Grafana HTTP API Reference
+page_keywords: grafana, admin, http, api, documentation
+---
+
+# HTTP API Reference
+
+This documentation page has yet to be written.
+

src/app/partials/dashboard_topnav.html

@@ -11,16 +11,11 @@
 				<div class="top-nav-dashboards-btn">
 				<div class="top-nav-dashboards-btn">
 					<a class="pointer" ng-click="openSearch()">
 					<a class="pointer" ng-click="openSearch()">
 						<i class="fa fa-th-large"></i>
 						<i class="fa fa-th-large"></i>
+						<span class="top-nav-title pointer">{{dashboard.title}}</span>
 						<i class="fa fa-caret-down"></i>
 						<i class="fa fa-caret-down"></i>
 					</a>
 					</a>
 				</div>
 				</div>
 
 
-				<span class="fa fa-angle-right top-nav-breadcrumb-icon">
-				</span>
-
-				<a ng-click="dashboardTitleAction()" class="top-nav-title pointer">
-					{{dashboard.title}}
-				</a>
 			</div>
 			</div>
 
 
 			<ul class="nav pull-left top-nav-dash-actions" ng-if="!dashboardMeta.isHome">
 			<ul class="nav pull-left top-nav-dash-actions" ng-if="!dashboardMeta.isHome">

src/css/less/navbar.less

@@ -60,7 +60,7 @@
 .top-nav-dashboards-btn {
 .top-nav-dashboards-btn {
   display: block;
   display: block;
   float: left;
   float: left;
-  margin: 9px 8px 5px 14px;
+  margin: 9px 18px 5px 14px;
   border-radius: 3px;
   border-radius: 3px;
   font-size: 1.4em;
   font-size: 1.4em;
   font-weight: bold;
   font-weight: bold;
@@ -81,6 +81,11 @@
     }
     }
   }
   }
 
 
+  .fa-th-large {
+    position: relative;
+    top: 2px;
+  }
+
   .fa-caret-down {
   .fa-caret-down {
     font-size: 60%;
     font-size: 60%;
     position: relative;
     position: relative;
@@ -105,16 +110,10 @@
 }
 }
 
 
 .top-nav-title {
 .top-nav-title {
-  display: block;
-  float: left;
-  padding: 17px 10px 10px 13px;
+  padding: 0px 6px 5px 5px;
   font-weight: bold;
   font-weight: bold;
-  color: @textColor;
-  i {
-    padding-left: 4px;
-    position: relative;
-    top: 2px;
-  }
+  color: #FFFFFF;
+  font-size: 17px;
 }
 }