From 680ff95b8e760adcde103e0979e6f028316e010b Mon Sep 17 00:00:00 2001
From: Matt <matt@raintank.io>
Date: Mon, 22 Feb 2016 11:39:11 -0500
Subject: [PATCH 1/3] Form adjustments and startting to add sidemenu

---
 pkg/api/index.go                                          | 2 ++
 public/app/features/annotations/partials/editor.html      | 8 ++++++--
 .../app/features/dashboard/partials/graphiteImport.html   | 6 ++++--
 public/app/features/dashboard/partials/import.html        | 4 +++-
 .../app/features/datasources/partials/http_settings.html  | 4 +++-
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkg/api/index.go b/pkg/api/index.go
index 72277fe301b..5b0c5df2c29 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -56,6 +56,8 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 			{Text: "Home dashboard", Icon: "fa fa-fw fa-list", Url: setting.AppSubUrl + "/"},
 			{Text: "Playlists", Icon: "fa fa-fw fa-list", Url: setting.AppSubUrl + "/playlists"},
 			{Text: "Snapshots", Icon: "fa-fw icon-gf icon-gf-snapshot", Url: setting.AppSubUrl + "/dashboard/snapshots"},
+			{Text: "New dashboard", icon: "fa fa-fw fa-plus", url: this.getUrl('/dashboard/new')},
+			{Text: "Import dashboard", icon: "fa fa-fw fa-plus", url: this.getUrl('/dashboard/import')},
 		},
 	})
 
diff --git a/public/app/features/annotations/partials/editor.html b/public/app/features/annotations/partials/editor.html
index 0e026e51294..25222b2f89a 100644
--- a/public/app/features/annotations/partials/editor.html
+++ b/public/app/features/annotations/partials/editor.html
@@ -73,13 +73,17 @@
 					</div>
 					<div class="gf-form">
 						<span class="gf-form-label max-width-10">Datasource</span>
-						<select class="gf-form-input gf-size-auto" ng-model="currentAnnotation.datasource" ng-options="f.name as f.name for f in datasources" ng-change="datasourceChanged()"></select>
+						<div class="gf-form-select-wrapper">
+							<select class="gf-form-input gf-size-auto" ng-model="currentAnnotation.datasource" ng-options="f.name as f.name for f in datasources" ng-change="datasourceChanged()"></select>
+						</div>
 					</div>
 				</div>
 				<div class="gf-form-inline">
 					<div class="gf-form gf-size-max-xl">
 						<span class="gf-form-label width-10">Icon size</span>
-						<select class="gf-form-input gf-size-md" ng-model="currentAnnotation.iconSize" ng-options="f for f in [7,8,9,10,13,15,17,20,25,30]"></select>
+						<div class="gf-form-select-wrapper">
+							<select class="gf-form-input gf-size-md" ng-model="currentAnnotation.iconSize" ng-options="f for f in [7,8,9,10,13,15,17,20,25,30]"></select>
+						</div>
 					</div>
 					<div class="gf-form">
 						<label class="gf-form-label">
diff --git a/public/app/features/dashboard/partials/graphiteImport.html b/public/app/features/dashboard/partials/graphiteImport.html
index 9c351346fe6..b3ffaaefcc1 100644
--- a/public/app/features/dashboard/partials/graphiteImport.html
+++ b/public/app/features/dashboard/partials/graphiteImport.html
@@ -9,8 +9,10 @@
 					<strong>Data source</strong>
 				</li>
 				<li>
-					<select type="text" ng-model="options.sourceName" class="input-medium tight-form-input" ng-options="f for f in datasources">
-					</select>
+					<div class="gf-form-select-wrapper">
+						<select type="text" ng-model="options.sourceName" class="input-medium tight-form-input" ng-options="f for f in datasources">
+						</select>
+					</div>
 				</li>
 				<li style="float: right">
 					<button class="btn btn-inverse tight-form-btn" ng-click="listAll()">List dashboards</button>
diff --git a/public/app/features/dashboard/partials/import.html b/public/app/features/dashboard/partials/import.html
index 15988bb55cd..d1f028f7222 100644
--- a/public/app/features/dashboard/partials/import.html
+++ b/public/app/features/dashboard/partials/import.html
@@ -24,7 +24,9 @@
 		<div class="gf-form">
 			<div class="gf-form-label">Dashboard source</div>
 			<div>
-				<select type="text" ng-model="sourceName" class="input-medium tight-form-input" ng-options="f for f in datasources"></select>
+				<div class="gf-form-select-wrapper">
+					<select class="gf-form-input gf-size-auto" ng-model="sourceName" ng-options="f for f in datasources"></select>
+				</div>
 			</div>
 			<div class="gf-form-btn">
 				<button class="btn btn-success" ng-click="startImport()">Import</button>
diff --git a/public/app/features/datasources/partials/http_settings.html b/public/app/features/datasources/partials/http_settings.html
index a42d3e76c1b..44c28eb82dd 100644
--- a/public/app/features/datasources/partials/http_settings.html
+++ b/public/app/features/datasources/partials/http_settings.html
@@ -24,7 +24,9 @@
 		<span class="gf-form-label width-7">
 			Access <tip>Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request</tip>
 		</span>
-		<select class="gf-form-input gf-size-auto" ng-model="current.access" ng-options="f for f in ['direct', 'proxy']"></select>
+		<div class="gf-form-select-wrapper">
+			<select class="gf-form-input gf-size-auto" ng-model="current.access" ng-options="f for f in ['direct', 'proxy']"></select>
+		</div>
 	</div>
 
 	<div class="gf-form">

From 2215095be8a53d1c4b20ab582acb04e795e10270 Mon Sep 17 00:00:00 2001
From: Matt <matt@raintank.io>
Date: Mon, 22 Feb 2016 14:30:35 -0500
Subject: [PATCH 2/3] adjusted button copy on New playlist page

---
 .bra.toml                                           | 2 +-
 pkg/api/index.go                                    | 2 --
 public/app/features/playlist/partials/playlist.html | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.bra.toml b/.bra.toml
index 54019208984..f56e88fb02a 100644
--- a/.bra.toml
+++ b/.bra.toml
@@ -3,7 +3,7 @@ init_cmds = [
   ["go", "build", "-o", "./bin/grafana-server", "./pkg/cmd/grafana-server"],
 	["./bin/grafana-server"]
 ]
-watch_all = true
+watch_all = false
 watch_dirs = [
 	"$WORKDIR/pkg",
 	"$WORKDIR/public/views",
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 723f1bc74b1..3b7c195b91b 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -56,8 +56,6 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 			{Text: "Home dashboard", Icon: "fa fa-fw fa-list", Url: setting.AppSubUrl + "/"},
 			{Text: "Playlists", Icon: "fa fa-fw fa-list", Url: setting.AppSubUrl + "/playlists"},
 			{Text: "Snapshots", Icon: "fa-fw icon-gf icon-gf-snapshot", Url: setting.AppSubUrl + "/dashboard/snapshots"},
-			{Text: "New dashboard", icon: "fa fa-fw fa-plus", url: this.getUrl('/dashboard/new')},
-			{Text: "Import dashboard", icon: "fa fa-fw fa-plus", url: this.getUrl('/dashboard/import')},
 		},
 	})
 
diff --git a/public/app/features/playlist/partials/playlist.html b/public/app/features/playlist/partials/playlist.html
index 3701796b4a1..0441bed2589 100644
--- a/public/app/features/playlist/partials/playlist.html
+++ b/public/app/features/playlist/partials/playlist.html
@@ -107,7 +107,7 @@
 	<div class="gf-form-button-row">
 		<a class="btn btn-success " ng-show="ctrl.isNew()"
 			ng-disabled="ctrl.playlistEditForm.$invalid || ctrl.isPlaylistEmpty()"
-			ng-click="ctrl.savePlaylist(ctrl.playlist, ctrl.playlistItems)"><i class="fa fa-plus"></i>&nbsp;Add</a>
+			ng-click="ctrl.savePlaylist(ctrl.playlist, ctrl.playlistItems)">Create new playlist</a>
 		<a class="btn btn-success" ng-show="!ctrl.isNew()"
 			ng-disabled="ctrl.playlistEditForm.$invalid || ctrl.isPlaylistEmpty()"
 			ng-click="ctrl.savePlaylist(ctrl.playlist, ctrl.playlistItems)">Save</a>

From 1ae2fc648dc0300ccaca07c1c8ec2aa7d7dbffbb Mon Sep 17 00:00:00 2001
From: Matt <matt@raintank.io>
Date: Mon, 22 Feb 2016 14:32:01 -0500
Subject: [PATCH 3/3] grr, .bra.toml

---
 .bra.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.bra.toml b/.bra.toml
index f56e88fb02a..54019208984 100644
--- a/.bra.toml
+++ b/.bra.toml
@@ -3,7 +3,7 @@ init_cmds = [
   ["go", "build", "-o", "./bin/grafana-server", "./pkg/cmd/grafana-server"],
 	["./bin/grafana-server"]
 ]
-watch_all = false
+watch_all = true
 watch_dirs = [
 	"$WORKDIR/pkg",
 	"$WORKDIR/public/views",