From 6189208fa5305b5759d45d1d9a8b1a5179d0b6d8 Mon Sep 17 00:00:00 2001
From: Trent White <trent@raintank.io>
Date: Thu, 11 Feb 2016 14:18:55 -0500
Subject: [PATCH] org and user form tweaks

---
 .../features/datasources/partials/edit.html   |  6 +-
 .../datasources/partials/http_settings.html   |  2 +-
 .../features/datasources/partials/list.html   |  2 +-
 public/app/features/org/partials/invite.html  |  2 +-
 .../app/features/org/partials/orgDetails.html | 64 ++++++++++---------
 .../app/features/org/partials/orgUsers.html   | 14 ++--
 .../features/profile/partials/password.html   | 40 ++++++------
 .../features/profile/partials/profile.html    | 53 ++++++++-------
 public/less/bootswatch.dark.less              |  2 +
 public/less/gfbox.less                        |  1 +
 public/less/overrides.less                    |  2 +-
 public/less/tabs.less                         |  4 +-
 public/vendor/bootstrap/less/buttons.less     |  2 +-
 13 files changed, 107 insertions(+), 87 deletions(-)

diff --git a/public/app/features/datasources/partials/edit.html b/public/app/features/datasources/partials/edit.html
index f442d3e7f35..6113ebed18b 100644
--- a/public/app/features/datasources/partials/edit.html
+++ b/public/app/features/datasources/partials/edit.html
@@ -14,8 +14,8 @@
 
 <div class="page-container">
 	<div class="page">
-		<h2 ng-show="isNew">Add data source</h2>
-		<h2 ng-show="!isNew">Edit data source</h2>
+		<h1 ng-show="isNew">Add data source</h1>
+		<h1 ng-show="!isNew">Edit data source</h1>
 		<p class="small" ng-show="isNew">This text will only appear on Add Data Source</p>
 
 		<form name="editForm">
@@ -69,7 +69,7 @@
 				<button type="submit" class="btn btn-inverse" ng-show="!isNew" ng-click="saveChanges(true)">
 					Test Connection
 				</button>
-				<a class="btnText" href="datasources">Cancel</a>
+				<a class="btn-text" href="datasources">Cancel</a>
 			</div>
 			<br>
 		</form>
diff --git a/public/app/features/datasources/partials/http_settings.html b/public/app/features/datasources/partials/http_settings.html
index 9d78b3273a4..24c4ceb51f5 100644
--- a/public/app/features/datasources/partials/http_settings.html
+++ b/public/app/features/datasources/partials/http_settings.html
@@ -1,5 +1,5 @@
 <br>
-<h4>Http settings</h4>
+<h3>Http settings</h3>
 <div class="norm-form-container">
 	<div class="norm-form">
 		<ul class="norm-form-list">
diff --git a/public/app/features/datasources/partials/list.html b/public/app/features/datasources/partials/list.html
index 34e05954c5e..fe1c7176b99 100644
--- a/public/app/features/datasources/partials/list.html
+++ b/public/app/features/datasources/partials/list.html
@@ -11,7 +11,7 @@
 <div class="page-container">
 	<div class="page-wide">
 	<div class="page-header-align">
-		<h1>Data sources</h1>
+		<h1>Data Sources</h1>
 		<a class="btn btn-success" href="datasources/new">
 			<i class="fa fa-plus"></i>
 			Add data source
diff --git a/public/app/features/org/partials/invite.html b/public/app/features/org/partials/invite.html
index ae5d3a7ea61..3e7ac6291a4 100644
--- a/public/app/features/org/partials/invite.html
+++ b/public/app/features/org/partials/invite.html
@@ -59,8 +59,8 @@
 			</div>
 
 			<div class="" style="margin-top: 30px; margin-bottom: 20px;">
-				<button type="button" class="btn btn-inverse" ng-click="dismiss()">Cancel</button>
 				<button type="submit" class="btn btn-success" ng-click="sendInvites();">Invite Users</button>
+				<a class="btn-text" ng-click="dismiss()">Cancel</a>
 
 			</div>
 		</div>
diff --git a/public/app/features/org/partials/orgDetails.html b/public/app/features/org/partials/orgDetails.html
index 9175ff35b91..d6e40952915 100644
--- a/public/app/features/org/partials/orgDetails.html
+++ b/public/app/features/org/partials/orgDetails.html
@@ -1,7 +1,11 @@
-<navbar icon="fa fa-fw fa-users" title="Organization">
-	<ul class="nav">
-		<li class="active"><a href="org">Preferences</a></li>
-	</ul>
+<navbar> 
+<div class="top-nav-btn dashnav-dashboards-btn" >
+	<a class="pointer" ng-click="openSearch()">
+		<i class="icon-gf icon-gf-users"></i>
+		<span class="dashboard-title">Organization Preferences</span>
+		<i class="fa fa-caret-down"></i>
+	</a>
+</div>
 </navbar>
 
 <div class="page-container">
@@ -10,86 +14,86 @@
 		<h1>Organization</h1>
 
 		<section class="simple-box">
-			<h3 class="simple-box-header">Preferences</h3>
+			<h3 class="">Preferences</h3>
 		</section>
 
 		<form name="orgForm">
-			<div class="tight-form last">
-				<ul class="tight-form-list">
-					<li class="tight-form-item" style="width: 100px">
+			<div class="norm-form last">
+				<ul class="norm-form-list">
+					<li class="norm-form-item" style="width: 100px">
 						Name
 					</li>
 					<li>
-						<input type="text" required ng-model="org.name" class="tight-form-input last" style="width: 475px">
+						<input type="text" required ng-model="org.name" class="norm-form-input last" style="width: 475px">
 					</li>
 				</ul>
 				<div class="clearfix"></div>
 			</div>
 
 			<br>
-			<button type="submit" class="pull-right btn btn-success" ng-click="update()">Update</button>
+			<button type="submit" class="btn btn-success" ng-click="update()">Update</button>
 			<br>
 		</form>
 
 		<section class="simple-box">
-			<h3 class="simple-box-header">Address</h3>
+			<h3 class="">Address</h3>
 		</section>
 
 		<form name="addressForm">
-			<div class="tight-form">
-				<ul class="tight-form-list">
-					<li class="tight-form-item" style="width: 100px">
+			<div class="norm-form">
+				<ul class="norm-form-list">
+					<li class="norm-form-item" style="width: 100px">
 						Address 1
 					</li>
 					<li>
-						<input type="text" ng-model="address.address1" class="tight-form-input" style="width:193px">
+						<input type="text" ng-model="address.address1" class="norm-form-input" style="width:193px">
 					</li>
-					<li class="tight-form-item" style="width: 75px">
+					<li class="norm-form-item" style="width: 75px">
 						Address 2
 					</li>
 					<li>
-						<input type="text" ng-model="address.address2" class="tight-form-input last" style="width:193px">
+						<input type="text" ng-model="address.address2" class="norm-form-input last" style="width:193px">
 					</li>
 				</ul>
 				<div class="clearfix"></div>
 			</div>
-			<div class="tight-form">
-				<ul class="tight-form-list">
-					<li class="tight-form-item" style="width: 100px">
+			<div class="norm-form">
+				<ul class="norm-form-list">
+					<li class="norm-form-item" style="width: 100px">
 						City
 					</li>
 					<li>
-						<input type="text" ng-model="address.city" class="tight-form-input" style="width: 193px">
+						<input type="text" ng-model="address.city" class="norm-form-input" style="width: 193px">
 					</li>
-					<li class="tight-form-item" style="width: 75px">
+					<li class="norm-form-item" style="width: 75px">
 						Postal code
 					</li>
 					<li>
-						<input type="text" ng-model="address.zipCode" class="input-medium tight-form-input last" style="width: 193px">
+						<input type="text" ng-model="address.zipCode" class="input-medium norm-form-input last" style="width: 193px">
 					</li>
 				</ul>
 				<div class="clearfix"></div>
 			</div>
-			<div class="tight-form last">
-				<ul class="tight-form-list">
-					<li class="tight-form-item" style="width: 100px">
+			<div class="norm-form last">
+				<ul class="norm-form-list">
+					<li class="norm-form-item" style="width: 100px">
 						State
 					</li>
 					<li>
-						<input type="text" ng-model="address.state" class="tight-form-input" style="width: 193px">
+						<input type="text" ng-model="address.state" class="norm-form-input" style="width: 193px">
 					</li>
-					<li class="tight-form-item" style="width: 75px">
+					<li class="norm-form-item" style="width: 75px">
 						Country
 					</li>
 					<li>
-						<input type="text" ng-model="address.country" class="tight-form-input last" style="width: 193px">
+						<input type="text" ng-model="address.country" class="norm-form-input last" style="width: 193px">
 					</li>
 				</ul>
 				<div class="clearfix"></div>
 			</div>
 
 			<br>
-			<button type="submit" class="pull-right btn btn-success" ng-click="updateAddress()">Update</button>
+			<button type="submit" class="btn btn-success" ng-click="updateAddress()">Update</button>
 			<br>
 		</form>
 	</div>
diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html
index c029dff2955..8e391d3a467 100644
--- a/public/app/features/org/partials/orgUsers.html
+++ b/public/app/features/org/partials/orgUsers.html
@@ -1,13 +1,17 @@
-<navbar title="Organization" icon="fa fa-fw fa-users" subnav="true">
-	<ul class="nav">
-		<li class="active"><a href="org/users">Users</a></li>
-	</ul>
+<navbar> 
+<div class="top-nav-btn dashnav-dashboards-btn" >
+	<a class="pointer" ng-click="openSearch()">
+		<i class="icon-gf icon-gf-users"></i>
+		<span class="dashboard-title">Organization Users</span>
+		<i class="fa fa-caret-down"></i>
+	</a>
+</div>
 </navbar>
 
 <div class="page-container">
 	<div class="page-wide">
 
-		<button class="btn btn-inverse pull-right" ng-click="openInviteModal()">
+		<button class="btn btn-success pull-right" ng-click="openInviteModal()">
 			<i class="fa fa-plus"></i>
 			Add or Invite
 		</button>
diff --git a/public/app/features/profile/partials/password.html b/public/app/features/profile/partials/password.html
index df940dd14a5..17647503f58 100644
--- a/public/app/features/profile/partials/password.html
+++ b/public/app/features/profile/partials/password.html
@@ -1,7 +1,11 @@
-<navbar title="Profile" title-url="profile" icon="fa fa-fw fa-user" subnav="true">
-	<ul class="nav">
-		<li class="active"><a href="profile/password">Change password</a></li>
-	</ul>
+<navbar> 
+<div class="top-nav-btn dashnav-dashboards-btn" >
+	<a class="pointer" ng-click="openSearch()">
+		<i class="icon-gf icon-gf-users"></i>
+		<span class="dashboard-title">Change Password</span>
+		<i class="fa fa-caret-down"></i>
+	</a>
+</div>
 </navbar>
 
 <div class="page-container">
@@ -11,35 +15,35 @@
 
 		<form name="userForm">
 			<div>
-				<div class="tight-form">
-					<ul class="tight-form-list">
-						<li class="tight-form-item" style="width: 100px">
+				<div class="norm-form">
+					<ul class="norm-form-list">
+						<li class="norm-form-item" style="width: 100px">
 							Old Password
 						</li>
 						<li>
-							<input type="password" required ng-model="command.oldPassword" class="input-xxlarge tight-form-input last" >
+							<input type="password" required ng-model="command.oldPassword" class="input-xlarge norm-form-input last" >
 						</li>
 					</ul>
 					<div class="clearfix"></div>
 				</div>
-				<div class="tight-form">
-					<ul class="tight-form-list">
-						<li class="tight-form-item" style="width: 100px">
+				<div class="norm-form">
+					<ul class="norm-form-list">
+						<li class="norm-form-item" style="width: 100px">
 							New Password
 						</li>
 						<li>
-							<input type="password" required ng-model="command.newPassword" ng-minlength="4" class="input-xxlarge tight-form-input last" >
+							<input type="password" required ng-model="command.newPassword" ng-minlength="4" class="input-xlarge norm-form-input last" >
 						</li>
 					</ul>
 					<div class="clearfix"></div>
 				</div>
-				<div class="tight-form">
-					<ul class="tight-form-list">
-						<li class="tight-form-item" style="width: 100px">
+				<div class="norm-form">
+					<ul class="norm-form-list">
+						<li class="norm-form-item" style="width: 100px">
 							Confirm New
 						</li>
 						<li>
-							<input type="password" required ng-model="command.confirmNew" ng-minlength="4" class="input-xxlarge tight-form-input last" >
+							<input type="password" required ng-model="command.confirmNew" ng-minlength="4" class="input-xlarge norm-form-input last" >
 						</li>
 					</ul>
 					<div class="clearfix"></div>
@@ -47,10 +51,10 @@
 			</div>
 
 			<br>
-			<div class="pull-right">
+			<div class="p">
 				<button type="submit" class="btn btn-success" ng-click="changePassword()">Change Password</button>
 				&nbsp;
-				<a class="btn btn-inverse" href="profile">Cancel</a>
+				<a class="btn-text" href="profile">Cancel</a>
 			</div>
 		</form>
 
diff --git a/public/app/features/profile/partials/profile.html b/public/app/features/profile/partials/profile.html
index 4e8c15044c2..a684e1f36b8 100644
--- a/public/app/features/profile/partials/profile.html
+++ b/public/app/features/profile/partials/profile.html
@@ -1,4 +1,11 @@
-<navbar title="Profile" title-url="profile" icon="fa fa-fw fa-user">
+<navbar> 
+<div class="top-nav-btn dashnav-dashboards-btn" >
+	<a class="pointer" ng-click="openSearch()">
+		<i class="icon-gf icon-gf-users"></i>
+		<span class="dashboard-title">Profile</span>
+		<i class="fa fa-caret-down"></i>
+	</a>
+</div>
 </navbar>
 
 <div class="page-container">
@@ -7,68 +14,66 @@
 		<h1>Profile</h1>
 
 		<section class="simple-box">
-			<h3 class="simple-box-header">Preferences</h3>
+			<h3 class="">Preferences</h3>
 		</section>
 			<form name="userForm">
-				<div class="tight-form">
-					<ul class="tight-form-list">
-						<li class="tight-form-item" style="width: 100px">
+				<div class="norm-form">
+					<ul class="norm-form-list">
+						<li class="norm-form-item" style="width: 100px">
 							Name
 						</li>
 						<li>
-							<input type="text" required ng-model="user.name" class="input-xxlarge tight-form-input last" >
+							<input type="text" required ng-model="user.name" class="input-xlarge norm-form-input last" >
 						</li>
 					</ul>
 					<div class="clearfix"></div>
 				</div>
-				<div class="tight-form">
-					<ul class="tight-form-list">
-						<li class="tight-form-item" style="width: 100px">
+				<div class="norm-form">
+					<ul class="norm-form-list">
+						<li class="norm-form-item" style="width: 100px">
 							Email
 						</li>
 						<li>
-							<input type="email" required ng-model="user.email" class="input-xxlarge tight-form-input last" >
+							<input type="email" required ng-model="user.email" class="input-xlarge norm-form-input last" >
 						</li>
 					</ul>
 					<div class="clearfix"></div>
 				</div>
-				<div class="tight-form">
-					<ul class="tight-form-list">
-						<li class="tight-form-item" style="width: 100px">
+				<div class="norm-form">
+					<ul class="norm-form-list">
+						<li class="norm-form-item" style="width: 100px">
 							Username
 						</li>
 						<li>
-							<input type="text" required ng-model="user.login" class="input-xxlarge tight-form-input last" >
+							<input type="text" required ng-model="user.login" class="input-xlarge norm-form-input last" >
 						</li>
 					</ul>
 					<div class="clearfix"></div>
 				</div>
 
-				<div class="tight-form last">
-					<ul class="tight-form-list">
-						<li class="tight-form-item" style="width: 100px">
+				<div class="norm-form last">
+					<ul class="norm-form-list">
+						<li class="norm-form-item" style="width: 100px">
 							UI Theme
 						</li>
 						<li>
-							<select class="input-small tight-form-input" ng-model="user.theme" ng-options="f for f in ['dark', 'light']"></select>
+							<select class="input-small norm-form-input" ng-model="user.theme" ng-options="f for f in ['dark', 'light']"></select>
 						</li>
 					</ul>
 					<div class="clearfix"></div>
 				</div>
 				<br>
-				<button type="submit" class="pull-right btn btn-success" ng-click="update()">Update</button>
+				<button type="submit" class="btn btn-success" ng-click="update()">Update</button>
 				<div class="clearfix"></div>
 			</form>
 
 			<section class="simple-box">
-				<a class="btn btn-inverse btn-small pull-right" href="profile/password" style="margin: 7px 10px 0 0">Change Password</a>
-				<h3 class="simple-box-header">
-					Password
-				</h3>
+				<h3 class="">Password</h3>
+				<a class="btn btn-inverse btn-small" href="profile/password" style="margin: 7px 10px 0 0">Change Password</a>
 			</section>
 
 			<section class="simple-box">
-				<h3 class="simple-box-header">Organizations</h3>
+				<h3 class="">Organizations</h3>
 				<table class="filter-table form-inline">
 					<thead>
 						<tr>
diff --git a/public/less/bootswatch.dark.less b/public/less/bootswatch.dark.less
index f884a5ef06f..95ffaaa3824 100644
--- a/public/less/bootswatch.dark.less
+++ b/public/less/bootswatch.dark.less
@@ -383,6 +383,8 @@ div.subnav {
 
 .btn-mini {
 	padding: 2px 6px;
+	margin-right: 0;
+	margin-right: 0;
 }
 
 .btn-group {
diff --git a/public/less/gfbox.less b/public/less/gfbox.less
index 16660f18a54..4cdace27acf 100644
--- a/public/less/gfbox.less
+++ b/public/less/gfbox.less
@@ -72,6 +72,7 @@
   background-color: @pageBackground;
   position: relative;
   padding: 25px 56px;
+  padding: 25px 56px;
   min-height: 900px;
   max-width: 1060px;
   margin-left: 0;
diff --git a/public/less/overrides.less b/public/less/overrides.less
index eda136fc04d..2b574f829e3 100644
--- a/public/less/overrides.less
+++ b/public/less/overrides.less
@@ -23,7 +23,7 @@
 // Backgrounds
 // ---------------------
 .main-view {
-  background: url(/img/grafana_pattern.png);
+  // background: url(/img/grafana_pattern.png);
   background-position: 100% -550px;
   background-repeat: no-repeat;
 }
diff --git a/public/less/tabs.less b/public/less/tabs.less
index 13ad593ef80..8301eef15bb 100644
--- a/public/less/tabs.less
+++ b/public/less/tabs.less
@@ -2,7 +2,7 @@
 .nav-tabs-alt {
   border-bottom: @grafanaTriggerBorder;
   padding-left: 10px;
-  margin: 0;
+  margin: 0 0 10px 0;
 
 	& > li > a {
 	  color: darken(@linkColor, 20%);
@@ -16,7 +16,7 @@
 	li.active > a:focus,
 	li.active > a:hover {
     .border-radius(3px);
-		border: @grafanaTriggerBorder;
+	  border: @grafanaTriggerBorder;
 	  background-color: transparent;
 	  border-bottom: 1px solid @grafanaPanelBackground;
 	  color: @linkColor;
diff --git a/public/vendor/bootstrap/less/buttons.less b/public/vendor/bootstrap/less/buttons.less
index 94922100e0c..f59bf696f89 100644
--- a/public/vendor/bootstrap/less/buttons.less
+++ b/public/vendor/bootstrap/less/buttons.less
@@ -227,7 +227,7 @@ input[type="submit"].btn {
   text-decoration: none;
 }
 
-.btnText {
+.btn-text {
   color: @btnText;
   margin: 0 10px;
 }
\ No newline at end of file