From 071ac0dc85e48be546315dde196f90f01ad7b274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 22 Sep 2014 10:46:38 +0200
Subject: [PATCH] added gravatar

---
 src/app/partials/pro/account.html  |  6 +++---
 src/app/partials/pro/login.html    | 13 +++++++++----
 src/app/partials/pro/sidemenu.html |  8 ++++----
 src/css/less/p_pro.less            | 13 +++++++++++++
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/app/partials/pro/account.html b/src/app/partials/pro/account.html
index 33789cda881..1fbd415a756 100644
--- a/src/app/partials/pro/account.html
+++ b/src/app/partials/pro/account.html
@@ -26,21 +26,21 @@
 				<div class="editor-row">
 					<div class="editor-option">
 						<label class="small">Name</label>
-						<input type="text" class="input-xxlarge" ng-model='currentAnnotation.name' placeholder="name"></input>
+						<input type="text" class="input-xxlarge" ng-model='account.name' placeholder="name"></input>
 					</div>
 				</div>
 
 				<div class="editor-row">
 					<div class="editor-option">
 						<label class="small">Email</label>
-						<input type="text" class="input-xxlarge" ng-model='currentAnnotation.name' placeholder="name"></input>
+						<input type="text" class="input-xxlarge" ng-model='account.email' placeholder="name"></input>
 					</div>
 				</div>
 
 				<div class="editor-row">
 					<div class="editor-option">
 						<label class="small">Account Name</label>
-						<input type="text" class="input-xxlarge" ng-model='currentAnnotation.name' placeholder="name"></input>
+						<input type="text" class="input-xxlarge" ng-model='account.accountName' placeholder="name"></input>
 					</div>
 				</div>
 
diff --git a/src/app/partials/pro/login.html b/src/app/partials/pro/login.html
index 22340b89ffe..3c93272f58c 100644
--- a/src/app/partials/pro/login.html
+++ b/src/app/partials/pro/login.html
@@ -41,14 +41,19 @@
 				<button type="button" class="close" data-dismiss="alert">&times;</button>
 				<strong>Login failed:</strong> {{loginError}}
 			</div>
+
+			<div class="login-oauth text-center">
+				<a class="btn btn-primary" href="/login/google" target="_self">
+					Sign in with Google
+				</a>
+			</div>
+
 		</form>
 
 		<div class="register-box text-center">
 			<h3>If you do not already have an account<h3>
-			</a> <a href="/register" class="btn btn-info btn-large">Sign up now!</a>
+				</a> <a href="/register" class="btn btn-info btn-large">Sign up now!</a>
+			</div>
 		</div>
 
 	</div>
-
-
-</div>
diff --git a/src/app/partials/pro/sidemenu.html b/src/app/partials/pro/sidemenu.html
index c118b1c186a..7628f7de536 100644
--- a/src/app/partials/pro/sidemenu.html
+++ b/src/app/partials/pro/sidemenu.html
@@ -1,11 +1,11 @@
 <section class="pro-sidemenu-items">
 	<div class="dropdown">
-		<a class="pro-sidemenu-link pointer" data-toggle="dropdown">
-			<i class="icon-user"></i>
-			{{grafana.user.login}}
+		<a class="pro-sidemenu-link pointer gravatar" data-toggle="dropdown" title="{{grafana.user.email}}">
+			<span class="gravatar-missing">f</span>
+			<img src="{{grafana.user.gravatarUrl}}" width="35"> <span class="gravatar-email small">{{grafana.user.login}}</span>
 		</a>
 		<ul class="dropdown-menu">
-			<li><a href="/login?logout">Logout</a>
+			<li><a href="/login?logout">Logout</a></li>
 		</ul>
 	</div>
 	<a class="pro-sidemenu-link" href="/">
diff --git a/src/css/less/p_pro.less b/src/css/less/p_pro.less
index 9d1970f3289..5f0a200fd1f 100644
--- a/src/css/less/p_pro.less
+++ b/src/css/less/p_pro.less
@@ -56,6 +56,19 @@
   }
 }
 
+.gravatar {
+  width: 170px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  .gravatar-missing {
+    display: none;
+  }
+  .gravatar-email {
+    padding-left: 4px;
+  }
+}
+
 .login-box {
   width: 700px;
   margin: 100px auto 0 auto;