Form adjustments and startting to add sidemenu

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')},
 		},
 	})
 

public/app/features/annotations/partials/editor.html

@@ -73,14 +73,18 @@
 					</div>
 					<div class="gf-form">
 						<span class="gf-form-label max-width-10">Datasource</span>
+						<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>
+						<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">
 							<span>Icon color</span>

public/app/features/dashboard/partials/graphiteImport.html

@@ -9,8 +9,10 @@
 					<strong>Data source</strong>
 				</li>
 				<li>
+					<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>

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>

public/app/features/datasources/partials/http_settings.html

@@ -24,8 +24,10 @@
 		<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>
+		<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">
 		<span class="gf-form-label width-7">