summaryrefslogtreecommitdiffstats
path: root/template/en/default/global
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2018-07-08 06:59:55 +0200
committerDylan William Hardison <dylan@hardison.net>2018-07-08 06:59:55 +0200
commitbe1f92450788dc89280c9e04a4bf983b5d7fac54 (patch)
treeb5513fd846597fe5f152177dbbda88dca08fdf5f /template/en/default/global
parent9bbd8d368598046c47964ee043620621b6c3634b (diff)
parent446a08b30b0dbaac9f2b88e0a5cad410f0446140 (diff)
downloadbugzilla-be1f92450788dc89280c9e04a4bf983b5d7fac54.tar.gz
bugzilla-be1f92450788dc89280c9e04a4bf983b5d7fac54.tar.xz
Merge remote-tracking branch 'bmo/master'
Diffstat (limited to 'template/en/default/global')
-rw-r--r--template/en/default/global/code-error.html.tmpl10
-rw-r--r--template/en/default/global/header.html.tmpl5
-rw-r--r--template/en/default/global/site-navigation.html.tmpl20
-rw-r--r--template/en/default/global/user.html.tmpl2
4 files changed, 14 insertions, 23 deletions
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index bf1ff5ad3..b37e7ca7b 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -532,9 +532,6 @@
admindocslinks = admindocslinks
%]
-[%# return the generated error_message for sentry %]
-[% processed.error_message = error_message %]
-
<p>
[% terms.Bugzilla %] has suffered an internal error:
</p>
@@ -543,13 +540,6 @@
[% error_message FILTER none %]
</p>
-[% IF maintainers_notified %]
-<p>
- The [% terms.Bugzilla %] maintainers have been notified of this error
- [#[% uid FILTER html %]].
-</p>
-[% END %]
-
[% IF variables %]
<pre>
Variables:
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 1d304ad04..153137394 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -101,11 +101,12 @@
[% IF Bugzilla.cgi.should_block_referrer %]
<meta name="referrer" content="origin">
[% ELSE %]
- <meta name="referrer" content="origin-when-crossorigin">
+ <meta name="referrer" content="origin-when-cross-origin">
[% END %]
[%- js_BUGZILLA = {
param => {
+ maxattachmentsize => Param('maxattachmentsize'),
maxusermatches => Param('maxusermatches'),
splinter_base => Param('splinter_base'),
},
@@ -294,7 +295,7 @@
<li role="presentation">
<a href="report.cgi" role="menuitem" tabindex="-1">Reports</a>
</li>
- [% IF user.in_group('tweakparams') || user.in_group('editusers') || user.can_bless
+ [% IF user.in_group('tweakparams') || user.in_group('editusers') || user.can_bless || user.in_group('disableusers')
|| (Param('useclassification') && user.in_group('editclassifications'))
|| user.in_group('editcomponents') || user.in_group('admin') || user.in_group('creategroups')
|| user.in_group('editkeywords') || user.in_group('bz_canusewhines')
diff --git a/template/en/default/global/site-navigation.html.tmpl b/template/en/default/global/site-navigation.html.tmpl
index 06b0eaa92..510875422 100644
--- a/template/en/default/global/site-navigation.html.tmpl
+++ b/template/en/default/global/site-navigation.html.tmpl
@@ -69,22 +69,22 @@
[% END %]
[%# *** Bugzilla Administration Tools *** %]
- [% IF user.login %]
- [% '<link rel="Administration" title="Parameters"
+ [% IF user.login %]
+ [% '<link rel="Administration" title="Parameters"
href="editparams.cgi">' IF user.in_group('tweakparams') %]
- [% '<link rel="Administration" title="Users"
- href="editusers.cgi">' IF user.in_group('editusers') %]
+ [% '<link rel="Administration" title="Users"
+ href="editusers.cgi">' IF user.in_group('editusers') || user.in_group('disableusers') %]
[% '<link rel="Administration" title="Products" href="editproducts.cgi">'
IF user.in_group('editcomponents') || user.get_products_by_permission("editcomponents").size %]
- [% '<link rel="Administration" title="Flag Types"
+ [% '<link rel="Administration" title="Flag Types"
href="editflagtypes.cgi">' IF user.in_group('editcomponents') %]
- [% '<link rel="Administration" title="Groups"
+ [% '<link rel="Administration" title="Groups"
href="editgroups.cgi">' IF user.in_group('creategroups') %]
- [% '<link rel="Administration" title="Keywords"
+ [% '<link rel="Administration" title="Keywords"
href="editkeywords.cgi">' IF user.in_group('editkeywords') %]
- [% '<link rel="Administration" title="Whining"
+ [% '<link rel="Administration" title="Whining"
href="editwhines.cgi">' IF user.in_group('bz_canusewhines') %]
- [% '<link rel="Administration" title="Sanity Check"
+ [% '<link rel="Administration" title="Sanity Check"
href="sanitycheck.cgi">' IF user.in_group('editcomponents') %]
- [% END %]
+ [% END %]
[% END %]
diff --git a/template/en/default/global/user.html.tmpl b/template/en/default/global/user.html.tmpl
index caea27c46..876d12805 100644
--- a/template/en/default/global/user.html.tmpl
+++ b/template/en/default/global/user.html.tmpl
@@ -28,7 +28,7 @@
[% IF user.id %]
<a class="email" href="mailto:[% who.email FILTER html %]"
onclick="return show_usermenu([% who.id FILTER none %], '[% who.email FILTER js %]',
- [% user.in_group('editusers') || user.bless_groups.size > 0 ? "true" : "false" %]);"
+ [% user.in_group('editusers') || user.in_group('disableusers') || user.bless_groups.size > 0 ? "true" : "false" %]);"
title="[% who.identity FILTER html %]">
[%- END -%]
[% IF who %]