From 7c80240573aeb0f415d71a70055765409bf95f8d Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 6 Oct 2017 13:31:03 +0100
Subject: [PATCH] Add a logout button when only the error page is shown (#1289)

---
 .../app-core/frontend/src/view/navbar/navbar.html      | 10 ++++++++++
 .../app-core/frontend/src/view/navbar/navbar.scss      |  8 ++++++++
 .../src/widgets/actions-toolbar/actions-toolbar.scss   |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/components/app-core/frontend/src/view/navbar/navbar.html b/components/app-core/frontend/src/view/navbar/navbar.html
index 6a83ce70b9..931b9026c0 100644
--- a/components/app-core/frontend/src/view/navbar/navbar.html
+++ b/components/app-core/frontend/src/view/navbar/navbar.html
@@ -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"
diff --git a/components/app-core/frontend/src/view/navbar/navbar.scss b/components/app-core/frontend/src/view/navbar/navbar.scss
index 66f51fe2a1..2fcbaa86a3 100644
--- a/components/app-core/frontend/src/view/navbar/navbar.scss
+++ b/components/app-core/frontend/src/view/navbar/navbar.scss
@@ -411,3 +411,11 @@ nav.secondary-nav {
     }
   }
 }
+
+.nav-logout-only {
+  text-align: right;
+
+  .actions-toolbar {
+    margin-right: $console-unit-space;
+  }
+}
\ No newline at end of file
diff --git a/components/app-framework/src/widgets/actions-toolbar/actions-toolbar.scss b/components/app-framework/src/widgets/actions-toolbar/actions-toolbar.scss
index c4b7d1506b..5338a711ee 100644
--- a/components/app-framework/src/widgets/actions-toolbar/actions-toolbar.scss
+++ b/components/app-framework/src/widgets/actions-toolbar/actions-toolbar.scss
@@ -1,4 +1,4 @@
-actions-toolbar {
+actions-toolbar, .app-actions-bar {
   width: 100%;
   display: flex;
   align-items: center;