From 62412db14081dd66cd5b2701b598b5af9eb31528 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Tue, 2 Oct 2018 14:22:05 -0400
Subject: add helpers for handling logins and error handling

---
 template/en/default/global/code-error.html.tmpl | 14 ++++++++------
 template/en/default/global/header.html.tmpl     | 10 ++++------
 template/en/default/global/user-error.html.tmpl | 14 ++++++++------
 3 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'template')

diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 23d7c203b..8aaf10127 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -514,13 +514,15 @@
 
 [%# We only want HTML error messages for ERROR_MODE_WEBPAGE %]
 [% USE Bugzilla %]
-[% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %]
-  [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %]
-    [% error_message FILTER none %]
-  [% ELSE %]
-    [% error_message FILTER txt %]
+[% IF Bugzilla.usage_mode != constants.USAGE_MODE_MOJO %]
+  [% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %]
+    [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %]
+      [% error_message FILTER none %]
+    [% ELSE %]
+      [% error_message FILTER txt %]
+    [% END %]
+    [% RETURN %]
   [% END %]
-  [% RETURN %]
 [% END %]
 
 [% UNLESS header_done %]
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 4c6069c74..1cb46a07a 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -346,12 +346,10 @@
           <li role="presentation">
             <a href="userprefs.cgi" role="menuitem" tabindex="-1">Preferences</a>
           </li>
-          [% IF user.authorizer.can_logout %]
-            <li role="separator"></li>
-            <li role="presentation">
-              <a href="index.cgi?logout=1" role="menuitem" tabindex="-1">Log out</a>
-            </li>
-          [% END %]
+          <li role="separator"></li>
+          <li role="presentation">
+            <a href="index.cgi?logout=1" role="menuitem" tabindex="-1">Log out</a>
+          </li>
           [% IF sudoer %]
             <li role="presentation">
               <a href="relogin.cgi?action=end-sudo" role="menuitem" tabindex="-1">End sudo session impersonating [% user.login FILTER html %]</a>
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index c6efb5649..9b0583009 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1982,13 +1982,15 @@
 
 [%# We only want HTML error messages for ERROR_MODE_WEBPAGE %]
 [% USE Bugzilla %]
-[% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %]
-  [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %]
-    [% error_message FILTER none %]
-  [% ELSE %]
-    [% error_message FILTER txt %]
+[% IF Bugzilla.usage_mode != constants.USAGE_MODE_MOJO %]
+  [% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %]
+    [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %]
+      [% error_message FILTER none %]
+    [% ELSE %]
+      [% error_message FILTER txt %]
+    [% END %]
+    [% RETURN %]
   [% END %]
-  [% RETURN %]
 [% END %]
 
 [% UNLESS header_done %]
-- 
cgit v1.2.3-24-g4f1b