From: lpsolit%gmail.com <> Date: Thu, 5 Apr 2007 23:18:06 +0000 (+0000) Subject: Bug 286338: Remove admin options from footer in favor of a single link to Admin Optio... X-Git-Tag: bugzilla-3.1.2~250 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c64d00a569bb404a8a7f41affc26d662bde2772;p=thirdparty%2Fbugzilla.git Bug 286338: Remove admin options from footer in favor of a single link to Admin Options - Patch by Frédéric Buclin r=justdave a=LpSolit --- diff --git a/admin.cgi b/admin.cgi new file mode 100644 index 0000000000..3edff13387 --- /dev/null +++ b/admin.cgi @@ -0,0 +1,49 @@ +#!/usr/bin/perl -wT +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Frédéric Buclin. +# Portions created by Frédéric Buclin are Copyright (C) 2007 +# Frédéric Buclin. All Rights Reserved. +# +# Contributor(s): Frédéric Buclin + +use strict; + +use lib qw(.); + +use Bugzilla; +use Bugzilla::Constants; +use Bugzilla::Error; + +my $cgi = Bugzilla->cgi; +my $template = Bugzilla->template; +my $user = Bugzilla->login(LOGIN_REQUIRED); + +print $cgi->header(); + +$user->in_group('admin') + || $user->in_group('tweakparams') + || $user->in_group('editusers') + || $user->can_bless + || (Bugzilla->params->{'useclassification'} && $user->in_group('editclassifications')) + || $user->in_group('editcomponents') + || scalar(@{$user->get_products_by_permission('editcomponents')}) + || $user->in_group('creategroups') + || $user->in_group('editkeywords') + || $user->in_group('bz_canusewhines') + || ThrowUserError('auth_failure', {action => 'access', object => 'administrative_pages'}); + +$template->process('admin/admin.html.tmpl') + || ThrowTemplateError($template->error()); diff --git a/skins/standard/admin.css b/skins/standard/admin.css index e94e889da0..9fcb46c94e 100644 --- a/skins/standard/admin.css +++ b/skins/standard/admin.css @@ -43,3 +43,25 @@ p.areyoureallyreallysure { tr.param_disabled { background-color: lightgrey; } + +td.admin_links { + width: 50%; + padding: 1em; + vertical-align: top; +} + +td.admin_links dt { + margin-top: 1em; +} + +td.admin_links dt.forbidden, td.admin_links dd.forbidden { + font-size: smaller; + font-style: italic; + color: #aaa; +} + +td.admin_links dt.forbidden a, td.admin_links dd.forbidden a { + text-decoration: none; + color: inherit; + cursor: default; +} diff --git a/skins/standard/global.css b/skins/standard/global.css index 0b0a51300f..1687a4aa0c 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -139,7 +139,6 @@ } #footer #links-actions, - #footer #links-edit, #footer #links-saved, #footer #links-special { display: table-row; diff --git a/template/en/default/admin/admin.html.tmpl b/template/en/default/admin/admin.html.tmpl new file mode 100644 index 0000000000..15316ed647 --- /dev/null +++ b/template/en/default/admin/admin.html.tmpl @@ -0,0 +1,126 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # Contributor(s): Frédéric Buclin + #%] + +[% PROCESS global/variables.none.tmpl %] + +[% title = BLOCK %] + Administrate your installation ([% terms.Bugzilla %] + [%+ constants.BUGZILLA_VERSION FILTER html %]) +[% END %] + +[% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] +%] + +
+ This page is only accessible to empowered users. You can access administrive pages + from here (based on your privileges), letting you configure different aspects of + this installation. Note: some sections may not be accessible to you and are marked + using a lighter color. +
+ + + + + + + +
+
+ [% class = user.groups.tweakparams ? "" : "forbidden" %] +
Parameters
+
Set core parameters of the installation. That's the + place where you specify the URL to access this installation, determine how + users authenticate, choose which [% terms.bug %] fields to display, select + the mail transfer agent to send email notifications, choose which group of + users can use charts and share queries, and much more.
+ +
User Preferences
+
Set the default user preferences. These are the values + which will be used by default for all users. Users will be able to edit their + own preferences from the Preferences.
+ + [% class = user.groups.editcomponents ? "" : "forbidden" %] +
Sanity Check
+
Run sanity checks to locate problems in your database. + This may take several tens of minutes depending on the size of your installation. + You can also automate this check by running sanitycheck.pl from a cron job. + A notification will be sent per email to the specified user if errors are detected.
+ + [% class = (user.groups.editusers || user.can_bless) ? "" : "forbidden" %] +
Users
+
Create new user accounts or edit existing ones. You can + also add and remove users from groups (also known as "user privileges").
+ + [% class = (Param('useclassification') && user.groups.editclassifications) ? "" : "forbidden" %] +
Classifications
+
If your installation has to manage many products at once, + it's a good idea to group these products into distinct categories. This lets users + find information more easily when doing searches or when filing new [% terms.bugs %].
+ + [% class = (user.groups.editcomponents + || user.get_products_by_permission("editcomponents").size) ? "" : "forbidden" %] +
Products
+
Edit all aspects of products, including group restrictions + which let you define who can access [% terms.bugs %] being in these products. You + can also edit some specific attributes of products such as + components, versions + and milestones directly.
+
+ 		+
+ [% class = user.groups.editcomponents ? "" : "forbidden" %] +
Flags
+
A flag is a custom 4-states attribute of [% terms.bugs %] + and/or attachments. These states are: granted, denied, requested and undefined. + You can set as many flags as desired per [% terms.bug %], and define which users + are allowed to edit them.
+ + [% class = user.groups.admin ? "" : "forbidden" %] +
Custom Fields
+
[% terms.Bugzilla %] lets you define fields which are + not implemented by default, based on your local and specific requirements. + These fields can then be used as any other field, meaning that you can set + them in [% terms.bugs %] and run any search involving them.
+ Before creating new fields, keep in mind that too many fields may make the user + interface more complex and harder to use. Be sure you have investigated other ways + to satisfy your needs before doing this.
+ +
Field Values
+
Define legal values for fields whose values must belong + to some given list. This is also the place where you define legal values for some + types of custom fields.
+ + [% class = user.groups.creategroups ? "" : "forbidden" %] +
Groups
+
Define groups which will be used in the installation. + They can either be used to define new user privileges or to restrict the access + to some [% terms.bugs %].
+ + [% class = user.groups.editkeywords ? "" : "forbidden" %] +
Keywords
+
Set keywords to be used with [% terms.bugs %]. Keywords + are an easy way to "tag" [% terms.bugs %] to let you find them more easily later.
+ + [% class = user.groups.bz_canusewhines ? "" : "forbidden" %] +
Whining
+
Set queries which will be run at some specified date + and time, and get the result of these queries directly per email. This is a + good way to create reminders and to keep track of the activity in your installation.
+
+
+ +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index 231ad98f51..72ab1550ab 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -460,6 +460,10 @@ 'section_num' ], +'admin/admin.html.tmpl' => [ + 'class' +], + 'admin/table.html.tmpl' => [ 'link_uri' ], diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl index dca5d7262e..937f7a9553 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 %]
  • | Preferences
    • + [% 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 %] +
  • | Administration
    • + [% END %]
  • | [% 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 5dff3d5786..998b5a67a0 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" %]
    • - [%# 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 %] - - [% 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 7452ab8d1a..171eb9c204 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 %]