IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3.1.x'

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-07-07 14:48:41 +02:00
parent e58ccc5a83 4545b4d323
commit 3f83bf6e47
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/components/sidemenu/sidemenu.html
View File

@@ -45,7 +45,7 @@
</li>
<li ng-show="::!ctrl.isSignedIn">
<a href="{{ctrl.loginUrl}}" class="sidemenu-item">
<a href="{{ctrl.loginUrl}}" class="sidemenu-item" target="_self">
<span class="icon-circle sidemenu-icon"><i class="fa fa-fw fa-sign-in"></i></span>
<span class="sidemenu-item-text">Sign in</span>
</a>

4
public/app/core/components/sidemenu/sidemenu.ts
View File

@@ -23,13 +23,13 @@ export class SideMenuCtrl {
this.mainLinks = config.bootData.mainNavLinks;
this.openUserDropdown();
this.loginUrl = '/login?redirect=' + encodeURIComponent(this.$location.path());
this.loginUrl = 'login?redirect=' + encodeURIComponent(this.$location.path());
this.$scope.$on('$routeChangeSuccess', () => {
if (!this.contextSrv.pinned) {
this.contextSrv.sidemenu = false;
}
this.loginUrl = '/login?redirect=' + encodeURIComponent(this.$location.path());
this.loginUrl = 'login?redirect=' + encodeURIComponent(this.$location.path());
});
}