summaryrefslogtreecommitdiffstats
path: root/template/en/default/global
diff options
context:
space:
mode:
Diffstat (limited to 'template/en/default/global')
-rw-r--r--template/en/default/global/common-links.html.tmpl7
-rw-r--r--template/en/default/global/useful-links.html.tmpl60
-rw-r--r--template/en/default/global/user-error.html.tmpl4
3 files changed, 11 insertions, 60 deletions
diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index dca5d7262..937f7a955 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -55,6 +55,13 @@
[% IF user.login %]
<li><span class="separator">| </span><a href="userprefs.cgi">Preferences</a></li>
+ [% IF user.groups.tweakparams || user.groups.editusers || user.can_bless
+ || (Param('useclassification') && user.groups.editclassifications)
+ || user.groups.editcomponents || user.groups.admin || user.groups.creategroups
+ || user.groups.editkeywords || user.groups.bz_canusewhines
+ || user.get_products_by_permission("editcomponents").size %]
+ <li><span class="separator">| </span><a href="admin.cgi">Administration</a></li>
+ [% END %]
<li>
<span class="separator">| </span>
[% IF user.authorizer.can_logout %]
diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
index 5dff3d578..998b5a67a 100644
--- a/template/en/default/global/useful-links.html.tmpl
+++ b/template/en/default/global/useful-links.html.tmpl
@@ -32,65 +32,7 @@
[% PROCESS "global/common-links.html.tmpl" btn_id = "find_bottom" %]
</li>
- [%# We have no other choices than enumerating all required privileges to have
- # at least one link in this section. %]
- [% IF user.login
- && (user.groups.tweakparams || user.groups.editusers || user.can_bless
- || (Param('useclassification') && user.groups.editclassifications)
- || user.groups.editcomponents || user.groups.admin || user.groups.creategroups
- || user.groups.editkeywords || user.groups.bz_canusewhines) %]
-
- [% print_pipe = 0 %]
- <li id="links-edit">
- <div class="label">Edit: </div>
- <ul class="links">
- [% IF user.groups.tweakparams %]
- <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editparams.cgi">Parameters</a></li>
- [% print_pipe = 1 %]
- <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editsettings.cgi">User Preferences</a></li>
- [% END %]
- [% IF user.groups.editcomponents %]
- <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="sanitycheck.cgi">Sanity Check</a></li>
- [% print_pipe = 1 %]
- [% END %]
- [% IF user.groups.editusers || user.can_bless %]
- <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editusers.cgi">Users</a></li>
- [% print_pipe = 1 %]
- [% END %]
- [% IF Param('useclassification') && user.groups.editclassifications %]
- <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editclassifications.cgi">Classifications</a></li>
- [% print_pipe = 1 %]
- [% END %]
- [% IF user.groups.editcomponents || user.get_products_by_permission("editcomponents").size %]
- <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editproducts.cgi">Products</a></li>
- [% print_pipe = 1 %]
- [% END %]
- [% IF user.groups.editcomponents %]
- <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editflagtypes.cgi">Flags</a></li>
- [% print_pipe = 1 %]
- [% END %]
- [% IF user.groups.admin %]
- <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editfields.cgi">Custom Fields</a></li>
- [% print_pipe = 1 %]
- <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editvalues.cgi">Field Values</a></li>
- [% END %]
- [% IF user.groups.creategroups %]
- <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editgroups.cgi">Groups</a></li>
- [% print_pipe = 1 %]
- [% END %]
- [% IF user.groups.editkeywords %]
- <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editkeywords.cgi">Keywords</a></li>
- [% print_pipe = 1 %]
- [% END %]
- [% IF user.groups.bz_canusewhines %]
- <li>[% '<span class="separator">| </span>' IF print_pipe %]<a href="editwhines.cgi">Whining</a></li>
- [% print_pipe = 1 %]
- [% END %]
- </ul>
- </li>
- [% END %]
-
- [%# Saved searches %]
+ [%# Saved searches %]
[% IF user.showmybugslink OR user.queries.size
OR user.queries_subscribed.size
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 7452ab8d1..171eb9c20 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -148,7 +148,9 @@
use
[% END %]
- [% IF object == "attachment" %]
+ [% IF object == "administrative_pages" %]
+ administrative pages
+ [% ELSIF object == "attachment" %]
this attachment
[% ELSIF object == "bugs" %]
[%+ terms.bugs %]