Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a logout button when only the error page is shown #1289

Merged
merged 1 commit into from
Oct 6, 2017
Merged

Add a logout button when only the error page is shown #1289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions components/app-core/frontend/src/view/navbar/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
<!-- Top navigation -->
<div class="nav-logout-only app-actions-bar" ng-if="applicationCtrl.hideNavigation && !applicationCtrl.hideAccount">
<div class="actions-toolbar">
<button
class="no-focus btn btn-link actions-toolbar-btn"
id="navbar-item-logout"
ng-click="applicationCtrl.logout()" tabindex="0">
<span translate>menu.logout</span>
</button>
</div>
</div>
<nav class="secondary-nav"
ng-class="{'navbar-icons-only' : applicationCtrl.navbarIconsOnly, 'navbar-hidden': applicationCtrl.hideNavigation}">
<div ng-if="!applicationCtrl.hideNavigation" type="button"
Expand Down
8 changes: 8 additions & 0 deletions components/app-core/frontend/src/view/navbar/navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,3 +411,11 @@ nav.secondary-nav {
}
}
}

.nav-logout-only {
text-align: right;

.actions-toolbar {
margin-right: $console-unit-space;
}
}
2 changes: 1 addition & 1 deletion components/app-framework/src/widgets/actions-toolbar/actions-toolbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
actions-toolbar {
actions-toolbar, .app-actions-bar {
width: 100%;
display: flex;
align-items: center;
Expand Down