public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pro' of github.com:torkelo/grafana-private into pro

Browse Source
This commit is contained in:
Torkel Ödegaard
2014-11-14 17:15:44 +01:00
parent 1e81f8ecfc 526e232c09
commit a9d9939bdd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/partials/pro/login.html
+2 -2
View File
@@ -29,10 +29,10 @@
</div>
<div class="login-oauth text-center">
<a class="btn btn-primary" href="/oauth2/google" target="_self">
<a class="btn btn-primary" href="/login/google" target="_self">
Sign in with Google
</a>
<a class="btn btn-primary" href="/oauth2/github" target="_self">
<a class="btn btn-primary" href="/login/github" target="_self">
Sign in with Github
</a>
</div>
src/app/partials/pro/sidemenu.html
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="dropdown">
<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>
<img ng-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>