summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
Diffstat (limited to 'template')
-rw-r--r--template/en/default/global/code-error.html.tmpl14
-rw-r--r--template/en/default/global/header.html.tmpl10
-rw-r--r--template/en/default/global/user-error.html.tmpl14
3 files changed, 20 insertions, 18 deletions
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 %]