From 4b2ce2725e9a4525e273fb1b08243aad74770a3d Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Sat, 11 Jul 2015 15:27:33 +0200 Subject: Vanilla 4.4.9 to 5.0 without history due to massive merge conflicts --- .../en/default/account/auth/login-small.html.tmpl | 88 +- template/en/default/account/auth/login.html.tmpl | 26 +- template/en/default/account/cancel-token.txt.tmpl | 4 +- template/en/default/account/create.html.tmpl | 46 +- .../en/default/account/email/confirm-new.html.tmpl | 32 +- .../en/default/account/email/confirm.html.tmpl | 6 +- .../account/password/forgotten-password.txt.tmpl | 8 +- .../password/set-forgotten-password.html.tmpl | 12 +- .../en/default/account/prefs/account.html.tmpl | 31 +- template/en/default/account/prefs/apikey.html.tmpl | 84 + template/en/default/account/prefs/email.html.tmpl | 202 +- .../en/default/account/prefs/permissions.html.tmpl | 48 +- template/en/default/account/prefs/prefs.html.tmpl | 59 +- .../default/account/prefs/saved-searches.html.tmpl | 98 +- .../en/default/account/prefs/settings.html.tmpl | 4 +- .../en/default/account/profile-activity.html.tmpl | 3 +- template/en/default/admin/admin.html.tmpl | 18 +- .../en/default/admin/classifications/add.html.tmpl | 3 +- .../en/default/admin/classifications/del.html.tmpl | 48 +- .../admin/classifications/edit-common.html.tmpl | 8 +- .../default/admin/classifications/edit.html.tmpl | 19 +- .../admin/classifications/reclassify.html.tmpl | 53 +- .../default/admin/classifications/select.html.tmpl | 40 +- .../admin/components/confirm-delete.html.tmpl | 168 +- .../en/default/admin/components/create.html.tmpl | 12 +- .../default/admin/components/edit-common.html.tmpl | 16 +- .../en/default/admin/components/edit.html.tmpl | 34 +- .../en/default/admin/components/list.html.tmpl | 3 +- .../admin/components/select-product.html.tmpl | 3 +- template/en/default/admin/confirm-action.html.tmpl | 59 +- .../admin/custom_fields/confirm-delete.html.tmpl | 36 +- .../default/admin/custom_fields/create.html.tmpl | 138 +- .../admin/custom_fields/edit-common.html.tmpl | 193 ++ .../en/default/admin/custom_fields/edit.html.tmpl | 143 +- .../en/default/admin/custom_fields/list.html.tmpl | 3 +- .../admin/fieldvalues/confirm-delete.html.tmpl | 58 +- .../en/default/admin/fieldvalues/create.html.tmpl | 15 +- .../en/default/admin/fieldvalues/edit.html.tmpl | 20 +- .../en/default/admin/fieldvalues/list.html.tmpl | 1 + .../admin/fieldvalues/select-field.html.tmpl | 1 + .../admin/flag-type/confirm-delete.html.tmpl | 33 +- template/en/default/admin/flag-type/edit.html.tmpl | 53 +- template/en/default/admin/flag-type/list.html.tmpl | 81 +- .../default/admin/groups/confirm-remove.html.tmpl | 4 +- template/en/default/admin/groups/create.html.tmpl | 69 +- template/en/default/admin/groups/delete.html.tmpl | 27 +- template/en/default/admin/groups/edit.html.tmpl | 192 +- template/en/default/admin/groups/list.html.tmpl | 7 +- .../admin/keywords/confirm-delete.html.tmpl | 21 +- .../en/default/admin/keywords/create.html.tmpl | 16 +- template/en/default/admin/keywords/edit.html.tmpl | 12 +- template/en/default/admin/keywords/list.html.tmpl | 3 +- .../admin/milestones/confirm-delete.html.tmpl | 52 +- .../en/default/admin/milestones/create.html.tmpl | 13 +- .../en/default/admin/milestones/edit.html.tmpl | 12 +- .../en/default/admin/milestones/list.html.tmpl | 3 +- .../admin/milestones/select-product.html.tmpl | 3 +- template/en/default/admin/params/admin.html.tmpl | 7 +- .../en/default/admin/params/advanced.html.tmpl | 20 +- .../en/default/admin/params/attachment.html.tmpl | 30 +- template/en/default/admin/params/auth.html.tmpl | 33 +- .../en/default/admin/params/bugfields.html.tmpl | 12 +- template/en/default/admin/params/common.html.tmpl | 10 +- template/en/default/admin/params/core.html.tmpl | 16 +- .../default/admin/params/dependencygraph.html.tmpl | 16 +- .../en/default/admin/params/editparams.html.tmpl | 46 +- template/en/default/admin/params/general.html.tmpl | 27 +- .../default/admin/params/groupsecurity.html.tmpl | 18 +- template/en/default/admin/params/index.html.tmpl | 42 +- template/en/default/admin/params/ldap.html.tmpl | 8 +- .../en/default/admin/params/memcached.html.tmpl | 22 + template/en/default/admin/params/mta.html.tmpl | 22 +- .../en/default/admin/params/patchviewer.html.tmpl | 51 - template/en/default/admin/params/query.html.tmpl | 17 +- .../en/default/admin/params/shadowdb.html.tmpl | 10 +- .../en/default/admin/params/usermatch.html.tmpl | 2 +- .../admin/products/confirm-delete.html.tmpl | 136 +- .../en/default/admin/products/create.html.tmpl | 9 +- .../default/admin/products/edit-common.html.tmpl | 16 +- template/en/default/admin/products/edit.html.tmpl | 55 +- .../products/groupcontrol/confirm-edit.html.tmpl | 45 +- .../admin/products/groupcontrol/edit.html.tmpl | 27 +- .../admin/products/groupcontrol/updated.html.tmpl | 26 +- .../admin/products/list-classifications.html.tmpl | 3 +- template/en/default/admin/products/list.html.tmpl | 15 +- .../en/default/admin/products/updated.html.tmpl | 2 +- .../en/default/admin/sanitycheck/list.html.tmpl | 2 +- template/en/default/admin/settings/edit.html.tmpl | 67 +- template/en/default/admin/sudo.html.tmpl | 8 +- template/en/default/admin/table.html.tmpl | 14 +- .../default/admin/users/confirm-delete.html.tmpl | 19 +- template/en/default/admin/users/create.html.tmpl | 33 +- template/en/default/admin/users/edit.html.tmpl | 28 +- template/en/default/admin/users/list.html.tmpl | 8 +- .../default/admin/users/listselectvars.html.tmpl | 2 +- .../default/admin/users/responsibilities.html.tmpl | 4 +- template/en/default/admin/users/search.html.tmpl | 24 +- template/en/default/admin/users/userdata.html.tmpl | 34 +- .../admin/versions/confirm-delete.html.tmpl | 54 +- .../en/default/admin/versions/create.html.tmpl | 7 +- template/en/default/admin/versions/edit.html.tmpl | 20 +- template/en/default/admin/versions/list.html.tmpl | 3 +- .../admin/versions/select-product.html.tmpl | 3 +- .../en/default/admin/workflow/comment.html.tmpl | 17 +- template/en/default/admin/workflow/edit.html.tmpl | 20 +- template/en/default/attachment/choose.html.tmpl | 17 +- .../en/default/attachment/confirm-delete.html.tmpl | 45 +- template/en/default/attachment/create.html.tmpl | 17 +- template/en/default/attachment/created.html.tmpl | 4 +- template/en/default/attachment/diff-file.html.tmpl | 63 +- .../en/default/attachment/diff-header.html.tmpl | 71 +- template/en/default/attachment/edit.html.tmpl | 73 +- template/en/default/attachment/list.html.tmpl | 14 +- .../en/default/attachment/show-multiple.html.tmpl | 35 +- template/en/default/bug/activity/show.html.tmpl | 4 +- template/en/default/bug/activity/table.html.tmpl | 10 +- template/en/default/bug/comment.html.tmpl | 37 + template/en/default/bug/comments.html.tmpl | 99 +- .../en/default/bug/create/create-guided.html.tmpl | 293 +- template/en/default/bug/create/create.html.tmpl | 161 +- .../en/default/bug/create/make-template.html.tmpl | 2 +- template/en/default/bug/dependency-graph.html.tmpl | 6 +- template/en/default/bug/dependency-tree.html.tmpl | 37 +- template/en/default/bug/edit.html.tmpl | 392 ++- template/en/default/bug/field-help.none.tmpl | 10 +- template/en/default/bug/field-label.html.tmpl | 1 + template/en/default/bug/field.html.tmpl | 84 +- template/en/default/bug/link.html.tmpl | 6 +- template/en/default/bug/navigate.html.tmpl | 41 +- template/en/default/bug/process/bugmail.html.tmpl | 24 +- .../bug/process/confirm-duplicate.html.tmpl | 2 +- template/en/default/bug/process/header.html.tmpl | 2 +- template/en/default/bug/process/midair.html.tmpl | 9 +- template/en/default/bug/process/results.html.tmpl | 9 +- .../bug/process/verify-new-product.html.tmpl | 16 +- template/en/default/bug/show-header.html.tmpl | 33 +- template/en/default/bug/show-multiple.html.tmpl | 26 +- template/en/default/bug/summarize-time.html.tmpl | 232 +- template/en/default/bug/time.html.tmpl | 8 +- template/en/default/email/bugmail-header.txt.tmpl | 17 +- template/en/default/email/bugmail.html.tmpl | 46 +- template/en/default/email/bugmail.txt.tmpl | 9 + template/en/default/email/flagmail.txt.tmpl | 8 +- template/en/default/email/header-common.txt.tmpl | 24 + template/en/default/email/new-api-key.txt.tmpl | 33 + .../en/default/email/new-user-details.txt.tmpl | 31 + template/en/default/extensions/config.pm.tmpl | 5 +- template/en/default/extensions/extension.pm.tmpl | 12 +- .../en/default/extensions/hook-readme.txt.tmpl | 6 +- .../en/default/extensions/index-admin.rst.tmpl | 23 + template/en/default/extensions/index-user.rst.tmpl | 23 + .../en/default/extensions/name-readme.txt.tmpl | 6 +- template/en/default/extensions/util.pm.tmpl | 10 +- template/en/default/filterexceptions.pl | 19 +- template/en/default/flag/list.html.tmpl | 80 +- .../default/global/choose-classification.html.tmpl | 24 +- .../en/default/global/choose-product.html.tmpl | 24 +- template/en/default/global/code-error.html.tmpl | 49 +- template/en/default/global/common-links.html.tmpl | 10 +- .../en/default/global/confirm-user-match.html.tmpl | 39 +- template/en/default/global/docslinks.html.tmpl | 3 +- template/en/default/global/field-descs.none.tmpl | 9 +- template/en/default/global/footer.html.tmpl | 27 +- template/en/default/global/header.html.tmpl | 195 +- template/en/default/global/messages.html.tmpl | 97 +- .../en/default/global/product-select.html.tmpl | 92 + template/en/default/global/setting-descs.none.tmpl | 1 + .../en/default/global/site-navigation.html.tmpl | 75 - template/en/default/global/tabs.html.tmpl | 2 +- template/en/default/global/textarea.html.tmpl | 4 +- template/en/default/global/useful-links.html.tmpl | 60 +- template/en/default/global/user-error.html.tmpl | 181 +- template/en/default/global/userselect.html.tmpl | 3 + template/en/default/global/variables.none.tmpl | 2 + template/en/default/index.html.tmpl | 202 +- template/en/default/list/change-columns.html.tmpl | 2 +- template/en/default/list/edit-multiple.html.tmpl | 74 +- template/en/default/list/list-simple.html.tmpl | 3 +- template/en/default/list/list.html.tmpl | 151 +- template/en/default/list/list.ics.tmpl | 3 + template/en/default/list/quips.html.tmpl | 64 +- template/en/default/list/server-push.html.tmpl | 7 +- template/en/default/list/table.html.tmpl | 75 +- template/en/default/pages/bug-writing.html.tmpl | 8 +- template/en/default/pages/bugzilla.dtd.tmpl | 6 +- template/en/default/pages/fields.html.tmpl | 6 +- template/en/default/pages/linked.html.tmpl | 2 +- template/en/default/pages/linkify.html.tmpl | 2 +- template/en/default/pages/quicksearch.html.tmpl | 72 +- template/en/default/pages/release-notes.html.tmpl | 2520 ++------------ template/en/default/pages/release-notes3.html.tmpl | 3474 -------------------- template/en/default/pages/sudo.html.tmpl | 4 +- template/en/default/reports/chart.html.tmpl | 4 +- template/en/default/reports/chart.png.tmpl | 31 +- template/en/default/reports/components.html.tmpl | 30 +- template/en/default/reports/create-chart.html.tmpl | 60 +- .../en/default/reports/delete-series.html.tmpl | 2 +- .../en/default/reports/duplicates-simple.html.tmpl | 5 +- .../en/default/reports/duplicates-table.html.tmpl | 8 +- template/en/default/reports/duplicates.html.tmpl | 27 +- template/en/default/reports/edit-series.html.tmpl | 14 +- template/en/default/reports/keywords.html.tmpl | 41 +- template/en/default/reports/menu.html.tmpl | 6 +- template/en/default/reports/old-charts.html.tmpl | 32 +- template/en/default/reports/report-bar.png.tmpl | 28 +- template/en/default/reports/report-line.png.tmpl | 28 +- template/en/default/reports/report-pie.png.tmpl | 16 +- .../en/default/reports/report-simple.html.tmpl | 7 +- template/en/default/reports/report-table.html.tmpl | 45 +- template/en/default/reports/report.html.tmpl | 74 +- .../en/default/reports/series-common.html.tmpl | 4 +- template/en/default/reports/series.html.tmpl | 44 +- template/en/default/request/queue.csv.tmpl | 46 + template/en/default/request/queue.html.tmpl | 37 +- template/en/default/rest.html.tmpl | 19 + .../en/default/search/boolean-charts.html.tmpl | 12 +- template/en/default/search/field.html.tmpl | 8 +- template/en/default/search/form.html.tmpl | 26 +- .../en/default/search/search-advanced.html.tmpl | 4 +- .../default/search/search-create-series.html.tmpl | 4 +- .../default/search/search-report-graph.html.tmpl | 126 +- .../default/search/search-report-select.html.tmpl | 2 +- .../default/search/search-report-table.html.tmpl | 52 +- .../en/default/search/search-specific.html.tmpl | 58 +- template/en/default/search/tabs.html.tmpl | 12 +- template/en/default/setup/strings.txt.pl | 48 +- template/en/default/welcome-admin.html.tmpl | 7 +- template/en/default/whine/mail.html.tmpl | 18 +- template/en/default/whine/schedule.html.tmpl | 100 +- 229 files changed, 4620 insertions(+), 9826 deletions(-) create mode 100644 template/en/default/account/prefs/apikey.html.tmpl create mode 100644 template/en/default/admin/custom_fields/edit-common.html.tmpl create mode 100644 template/en/default/admin/params/memcached.html.tmpl delete mode 100644 template/en/default/admin/params/patchviewer.html.tmpl create mode 100644 template/en/default/bug/comment.html.tmpl create mode 100644 template/en/default/email/header-common.txt.tmpl create mode 100644 template/en/default/email/new-api-key.txt.tmpl create mode 100644 template/en/default/email/new-user-details.txt.tmpl create mode 100644 template/en/default/extensions/index-admin.rst.tmpl create mode 100644 template/en/default/extensions/index-user.rst.tmpl create mode 100644 template/en/default/global/product-select.html.tmpl delete mode 100644 template/en/default/global/site-navigation.html.tmpl delete mode 100644 template/en/default/pages/release-notes3.html.tmpl create mode 100644 template/en/default/request/queue.csv.tmpl create mode 100644 template/en/default/rest.html.tmpl (limited to 'template/en/default') diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl index 818aa6b72..790c135bf 100644 --- a/template/en/default/account/auth/login-small.html.tmpl +++ b/template/en/default/account/auth/login-small.html.tmpl @@ -9,6 +9,9 @@ [%# Use the current script name. If an empty name is returned, # then we are accessing the home page. %] +[% USE Bugzilla %] +[% cgi = Bugzilla.cgi %] + [% login_target = cgi.url("-relative" => 1, "-query" => 1) %] [% IF !login_target OR login_target.match("^token.cgi") %] [% login_target = "index.cgi" %] @@ -25,76 +28,31 @@ onclick="return show_mini_login_form('[% qs_suffix %]')">Log In [% Hook.process('additional_methods') %] - -
- - - + id="mini_login[% qs_suffix FILTER html %]"> + + [% IF Param('rememberlogin') == 'defaulton' || - Param('rememberlogin') == 'defaultoff' - %] + Param('rememberlogin') == 'defaultoff' %] + [%+ "checked" IF Param('rememberlogin') == "defaulton" %]> [% END %] - [x]
@@ -105,11 +63,17 @@
- + - + [x]
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl index 77a1ba2d6..0af84542d 100644 --- a/template/en/default/account/auth/login.html.tmpl +++ b/template/en/default/account/auth/login.html.tmpl @@ -15,8 +15,7 @@ [% END %] [% PROCESS global/header.html.tmpl - title = "Log in to $terms.Bugzilla", - onload = "document.forms['login'].Bugzilla_login.focus()" + title = "Log in to $terms.Bugzilla" %] [% USE Bugzilla %] @@ -25,20 +24,29 @@ [% terms.Bugzilla %] needs a legitimate login and password to continue.

-
- + - + @@ -91,7 +99,7 @@ If you don't have a [% terms.Bugzilla %] account, you can create a new account. [% IF Param("requirelogin") %] - A user account is required because this [% terms.Bugzilla %] + A user account is required because this Bugzilla installation is only accessible to authenticated users. [% ELSIF target.match("_bug\.cgi$") %] A user account is required to file a new [% terms.bug %] or to comment @@ -109,7 +117,7 @@ If you have an account, but have forgotten your password, enter your login name below and submit a request to change your password.
- + diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl index b9a7dd82e..384f2cfe0 100644 --- a/template/en/default/account/cancel-token.txt.tmpl +++ b/template/en/default/account/cancel-token.txt.tmpl @@ -11,7 +11,7 @@ To: [% emailaddress %] Subject: [% PROCESS subject %] X-Bugzilla-Type: admin -A request was canceled from [% remoteaddress %]. +[% PROCESS subject %] from [% remoteaddress %]. If you did not request this, it could be either an honest mistake or someone attempting to break into your [% terms.Bugzilla %] account. @@ -81,7 +81,7 @@ Canceled Because: [% PROCESS cancelactionmessage %] [% ELSE %] [%# Give sensible error if the cancel-token function is used incorrectly. #%] - You are using [% terms.Bugzilla %]'s cancel-token function incorrectly. You + You are using Bugzilla's cancel-token function incorrectly. You passed in the string '[% cancelaction %]'. The correct use is to pass in a tag, and define that tag in the file cancel-token.txt.tmpl. diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl index bf2cf31f0..5711a726f 100644 --- a/template/en/default/account/create.html.tmpl +++ b/template/en/default/account/create.html.tmpl @@ -13,13 +13,9 @@ # Param("emailsuffix") is used to pre-fill the email field. #%] -[% title = BLOCK %] - Create a new [% terms.Bugzilla %] account -[% END %] - [% PROCESS global/header.html.tmpl - title = title - onload = "document.forms['account_creation_form'].login.focus();" %] + title = "Create a new $terms.Bugzilla account" +%]

To create a [% terms.Bugzilla %] account, all you need to do is to enter @@ -32,16 +28,28 @@ You will receive an email at this address to confirm the creation of your account. You will not be able to log in until you receive the email. If it doesn't arrive within a reasonable amount of time, you may contact - the maintainer of this [% terms.Bugzilla %] installation + the maintainer of this Bugzilla installation at [% Param("maintainer") %].

+[% IF Param('allowemailchange') %] +

+ If you already have an account and want to change your + [% IF Param('emailsuffix') == '' %] + email address, + [% ELSE %] + login name, + [% END %] + you can change it from the Preferences page after logging in. +

+[% END %] +

A user account is required to report new [% terms.bugs %] or to comment into existing ones, as you may be contacted for more information if needed. This also lets other users clearly identify who is the author of comments or changes made into [% terms.bugs %]. Note that your email address will - never be displayed to logged out users. Only registered users will be + never be displayed to logged out users. Only registered users will be able to see it.

@@ -56,18 +64,16 @@ [% END %] -
+ + - + [% Param('emailsuffix') FILTER html %]
- +
- - - - -
- Email address: - - - [% Param('emailsuffix') FILTER html %] -
-
+ + [% IF Param('emailsuffix') %] + Login: + [% ELSE %] + Email address: + [% END %] + + + [% Param('emailsuffix') FILTER html %] diff --git a/template/en/default/account/email/confirm-new.html.tmpl b/template/en/default/account/email/confirm-new.html.tmpl index 0fb9b7e7d..3b9866004 100644 --- a/template/en/default/account/email/confirm-new.html.tmpl +++ b/template/en/default/account/email/confirm-new.html.tmpl @@ -15,7 +15,9 @@ [% title = BLOCK %]Create a new user account for '[% email FILTER html %]'[% END %] [% PROCESS "global/header.html.tmpl" title = title - onload = "document.forms['confirm_account_form'].realname.focus();" %] +%] + +[% password_complexity = Param('password_complexity') %]

To create your account, you must enter a password in the form below. @@ -28,26 +30,34 @@ - + - - + + - + - - + + - +
Email Address:Email Address: [% email FILTER html %]
(OPTIONAL) :(OPTIONAL) :
:: - - (minimum [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters) + + (Password should be a minimum of [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters long + [% IF password_complexity == "mixed_letters" %] + and must contain at least one UPPER and one lowercase letter + [% ELSIF password_complexity == "letters_numbers" %] + and must contain at least one UPPER and one lowercase letter and a number + [% ELSIF password_complexity == "letters_numbers_specialchars" %] + and must contain at least one letter, a number and a special character + [% END ~%] + .)
::
  
@@ -55,7 +65,7 @@

This account will not be created if this form is not completed by - [% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z") %]. + [% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z") %].

diff --git a/template/en/default/account/email/confirm.html.tmpl b/template/en/default/account/email/confirm.html.tmpl index 5b547782d..8edc7a9ba 100644 --- a/template/en/default/account/email/confirm.html.tmpl +++ b/template/en/default/account/email/confirm.html.tmpl @@ -22,11 +22,11 @@ - - + + - +
Password:Password:
  
diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl index 0c135a9ed..de2e79596 100644 --- a/template/en/default/account/password/forgotten-password.txt.tmpl +++ b/template/en/default/account/password/forgotten-password.txt.tmpl @@ -12,7 +12,9 @@ Subject: [% terms.Bugzilla %] Change Password Request X-Bugzilla-Type: admin You have (or someone impersonating you has) requested to change your -[%+ terms.Bugzilla %] password. To complete the change, visit the following link: +[%+ terms.Bugzilla %] password. The request originated from [% ip_addr %]. + +To complete the change, visit the following link: [%+ urlbase %]token.cgi?t=[% token FILTER uri %]&a=cfmpw @@ -24,3 +26,7 @@ this request, visit the following link: If you do nothing, the request will lapse after [% constants.MAX_TOKEN_AGE %] days (on [% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z", timezone) %]) or when you log in successfully. + +If you think someone tried to compromise your account, please inform +[%+ Param('maintainer') %] with the IP address reported above +and the exact time when you got this email. diff --git a/template/en/default/account/password/set-forgotten-password.html.tmpl b/template/en/default/account/password/set-forgotten-password.html.tmpl index 95e4d3fcf..eca11174f 100644 --- a/template/en/default/account/password/set-forgotten-password.html.tmpl +++ b/template/en/default/account/password/set-forgotten-password.html.tmpl @@ -28,21 +28,21 @@ - + - + - + - + diff --git a/template/en/default/account/prefs/account.html.tmpl b/template/en/default/account/prefs/account.html.tmpl index 59e4ab76a..af1df315e 100644 --- a/template/en/default/account/prefs/account.html.tmpl +++ b/template/en/default/account/prefs/account.html.tmpl @@ -21,7 +21,7 @@ - + - + - + - + - + [% END %] - + @@ -59,28 +59,35 @@ [% IF login_change_date %] [% IF new_login_name %] - + - + [% ELSE %] - + - + [% END %] [% ELSE %] - + [% END %] diff --git a/template/en/default/account/prefs/apikey.html.tmpl b/template/en/default/account/prefs/apikey.html.tmpl new file mode 100644 index 000000000..bed3f3809 --- /dev/null +++ b/template/en/default/account/prefs/apikey.html.tmpl @@ -0,0 +1,84 @@ +[%# This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. + #%] + +[%# INTERFACE: + # api_keys: array. Array of api keys this user has. + # any_revoked: boolean. True is any keys have been revoked. + #%] + +

+ API keys are used to authenticate WebService API calls. You can create more than + one API key if required. Each API key has an optional description which can help + you record what each key is used for. Documentation on how to log in is + available from + here. +

+ +

Existing API keys

+ +

You can update the description, and revoke or unrevoke existing API keys +here.

+ +
New Password:New password: - +
New Password Again:Confirm new password: - +
  
Password:Password: @@ -34,22 +34,22 @@ [% IF user.authorizer.can_change_password %]
New password:New password:
Confirm new password:Confirm new password:
Your real name (optional, but encouraged):Your real name (optional, but encouraged):
Pending email address:Pending email address: [% new_login_name FILTER html %]
Change request expires:Change request expires: [% login_change_date FILTER time %]
Confirmed email address:Confirmed email address: [% user.login FILTER html %]
Completion date:Completion date: [% login_change_date FILTER time %]
New email address: + [% IF Param('emailsuffix') %] + New login: + [% ELSE %] + New email address: + [% END %] + - +
+ + + + + + + + [% FOREACH api_key IN api_keys %] + + + + [% IF api_key.last_used %] + + [% ELSE %] + + [% END %] + + + [% END %] + [% UNLESS api_keys.size %] + + [% END %] +
API keyDescription (optional)Last usedRevoked
[% api_key.api_key FILTER html %] + + [% api_key.last_used FILTER time %]never used + +
You don't have any API keys.
+ +[% IF any_revoked %] + Hide Revoked Keys + [%# Show the link if the browser supports JS %] + +[% END %] + +

New API key

+ +

You can generate a new API key by ticking the check box below and optionally +providing a description for the API key. The API key will be randomly +generated for you.

+ +

+ + Generate a new API key with optional description + +

+ diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl index 57fa60f3b..052484174 100644 --- a/template/en/default/account/prefs/email.html.tmpl +++ b/template/en/default/account/prefs/email.html.tmpl @@ -47,7 +47,10 @@ function SetCheckboxes(setting) { for (var count = 0; count < document.userprefsform.elements.length; count++) { var theinput = document.userprefsform.elements[count]; - if (theinput.type == "checkbox" && !theinput.disabled) { + if (theinput.type == "checkbox" + && !theinput.disabled + && !theinput.name.match("remove_ignored_bug")) + { if (theinput.name.match("neg")) { theinput.checked = !setting; } @@ -57,61 +60,36 @@ function SetCheckboxes(setting) { } } } - -document.write('\n'); -document.write('\n'); // --> + + +
- - - - +

Global options

+ +[% prefname = "email-$constants.REL_ANY-$constants.EVT_FLAG_REQUESTED" %] + + +
+[% prefname = "email-$constants.REL_ANY-$constants.EVT_REQUESTED_FLAG" %] + + - - - - - - - - [% IF user.is_global_watcher %] - - - - +

+ You are watching all [% terms.bugs %]. To be removed from this role, contact + [% Param("maintainer") %]. +

[% END %] -
- Global options: -
- [% prefname = "email-$constants.REL_ANY-$constants.EVT_FLAG_REQUESTED" %] - - -
-
- [% prefname = "email-$constants.REL_ANY-$constants.EVT_REQUESTED_FLAG" %] - - -
-
- You are watching all [% terms.bugs %]. To be removed from this role, - contact - [% Param("maintainer") %]. -
-Field/recipient specific options: -
-
+ +

Field/recipient specific options

[% events = [ { id = constants.EVT_ADDED_REMOVED, @@ -129,7 +107,7 @@ document.write(' - - - When my relationship to this [% terms.bug %] is: - - - I want to receive mail when: - + + + + [% FOREACH relationship = relationships %] - + [% END %] - + [% FOREACH event = events %] [% count = loop.count() %] [% FOREACH relationship = relationships %] - [% END %] - + + + + [% FOREACH event = neg_events %] [% count = loop.count() %] [% FOREACH relationship = relationships %] - [% END %] - + [% END %] -
+ When my relationship to this [% terms.bug %] is: + I want to receive mail when:
- [% relationship.description FILTER html %] - [% relationship.description FILTER html %]
- + + @@ -210,62 +182,54 @@ document.write(' -   - - but not when (overrides above): -
 but not when (overrides above):
- + + - [% event.description FILTER html %] - [% event.description FILTER html %]
-User Watching + +

User Watching

If you watch a user, it is as if you are standing in their shoes for the -purposes of getting email. Email is sent or not according to your -preferences for their relationship to the [% terms.bug %] +purposes of getting email. Email is sent or not according to your +preferences for their relationship to the [% terms.bug %] (e.g. Assignee).

-

[% IF watchedusers.size %] -You are watching everyone in the following list: -

+

You are watching everyone in the following list:


+ +
+

[% ELSE %] -You are currently not watching any users. +

You are currently not watching any users.

[% END %] -

+

Add users to my watch list (comma separated list): [% INCLUDE global/userselect.html.tmpl @@ -275,7 +239,7 @@ You are currently not watching any users. size => 60 multiple => 5 %] -

+

Users watching you:
[% IF watchers.size %] @@ -289,4 +253,42 @@ You are currently not watching any users.

-
+

Ignore [% terms.Bugs %]

+ +

+ You can specify a list of [% terms.bugs %] from which you never want to get + any email notification of any kind by adding their ID(s) as a comma-separated + list. Removing [% terms.abug %] by selecting it from the current ignored list + will re-enable email notifications for the [% terms.bug %]. +

+[% IF user.bugs_ignored.size %] +

+ You are currently ignoring: + + [% FOREACH bug = user.bugs_ignored %] + + + + + + + [% END %] +
+ + + [% bug.id FILTER html %] + [% bug.status FILTER html %] + [% IF user.can_see_bug(bug.id) %] + - [% bug.summary FILTER html %] + [% ELSE %] + (private) + [% END %] +
+

+[% END %] + +

+ Add [% terms.bugs %]:
+ +

diff --git a/template/en/default/account/prefs/permissions.html.tmpl b/template/en/default/account/prefs/permissions.html.tmpl index 450765afc..53583f35b 100644 --- a/template/en/default/account/prefs/permissions.html.tmpl +++ b/template/en/default/account/prefs/permissions.html.tmpl @@ -17,12 +17,11 @@ # other people. #%] - - -
+
[% IF has_bits.size %] - You have the following permission bits set on your account: - +

You have the following permission bits set on your account:

+ +
[% FOREACH bit_description = has_bits %] @@ -34,46 +33,47 @@ [% FOREACH privs = ["editcomponents", "canconfirm", "editbugs"] %] [% SET products = ${"local_$privs"} %] [% IF products && products.size %] -

You also have local '[% privs FILTER html %]' privileges for the following products:

-

+

    [% FOREACH product = products %] - [% product.name FILTER html %]
    +
  • [% product.name FILTER html %]
    • [% END %] -

    +
[% END %] [% END %] [% ELSE %] - There are no permission bits set on your account. +

There are no permission bits set on your account.

[% END %] [% IF user.in_group('editusers') %] -
- You have editusers privileges. You can turn on and off - all permissions for all users. +

+ You have editusers privileges. You can turn on and off all + permissions for all users. +

[% ELSIF set_bits.size %] -
- And you can turn on or off the following bits for - other users: -
[% bit_description.name FILTER html %]
+

+ And you can turn on or off the following bits for + other users: +

+ +
[% FOREACH bit_description = set_bits %] [% END %] -
[% bit_description.name FILTER html %] [% bit_description.desc FILTER html_light %]
+
[% END %] [% IF user.in_group('bz_sudoers') %] -
- You are a member of the bz_sudoers group, so you can - impersonate someone else. +

+ You are a member of the bz_sudoers group, so you can + impersonate someone else. +

[% END %] - - - + diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl index 4416c95dd..8875eb26f 100644 --- a/template/en/default/account/prefs/prefs.html.tmpl +++ b/template/en/default/account/prefs/prefs.html.tmpl @@ -23,25 +23,25 @@ #%] [% filtered_login = user.login FILTER html %] -[% PROCESS global/header.html.tmpl - title = "User Preferences" - subheader = filtered_login - style_urls = ['skins/standard/admin.css'] - javascript_urls = ['js/util.js', 'js/field.js'] - doc_section = "userpreferences.html" - yui = ['autocomplete'] - %] [% tabs = [{ name => "settings", label => "General Preferences", - link => "userprefs.cgi?tab=settings", saveable => "1" }, - { name => "email", label => "Email Preferences", - link => "userprefs.cgi?tab=email", saveable => "1" }, - { name => "saved-searches", label => "Saved Searches", - link => "userprefs.cgi?tab=saved-searches", saveable => "1" }, + link => "userprefs.cgi?tab=settings", saveable => "1", + doc_section => "using/preferences.html#general-preferences" }, + { name => "email", label => "Email Preferences", + link => "userprefs.cgi?tab=email", saveable => "1", + doc_section => "using/preferences.html#email-preferences" }, + { name => "saved-searches", label => "Saved Searches", + link => "userprefs.cgi?tab=saved-searches", saveable => "1", + doc_section => "using/preferences.html#saved-searches" }, { name => "account", label => "Account Information", - link => "userprefs.cgi?tab=account", saveable => "1" }, - { name => "permissions", label => "Permissions", - link => "userprefs.cgi?tab=permissions", saveable => "0" } ] %] + link => "userprefs.cgi?tab=account", saveable => "1", + doc_section => "using/preferences.html#account-information" }, + { name => "apikey", label => "API Keys", + link => "userprefs.cgi?tab=apikey", saveable => "1", + doc_section => "using/preferences.html#api-keys" }, + { name => "permissions", label => "Permissions", + link => "userprefs.cgi?tab=permissions", saveable => "0", + doc_section => "using/preferences.html#permissions" } ] %] [% Hook.process('tabs') %] @@ -52,6 +52,16 @@ [% END %] [% END %] +[% PROCESS global/header.html.tmpl + title = current_tab.label + subheader = filtered_login + generate_api_token = 1 + style_urls = ['skins/standard/admin.css'] + javascript_urls = ['js/util.js', 'js/field.js', 'js/TUI.js'] + doc_section = current_tab.doc_section + yui = ['autocomplete'] + %] + [% WRAPPER global/tabs.html.tmpl tabs = tabs current_tab = current_tab @@ -63,8 +73,9 @@ [% IF email_changes_saved %]

- An email has been sent to both old and new email - addresses to confirm the change of email address. + In order to confirm your request, we have sent an email to your + new email address. As a precaution, an email has also been sent + to your old address allowing you to cancel this change if needed.

[% END %] @@ -83,16 +94,10 @@ [% IF current_tab.saveable %] - [% UNLESS dont_show_button %] - - - - - -
  - -
+

+ +

[% END %] [% END %] diff --git a/template/en/default/account/prefs/saved-searches.html.tmpl b/template/en/default/account/prefs/saved-searches.html.tmpl index 11d7ef868..9b0447a83 100644 --- a/template/en/default/account/prefs/saved-searches.html.tmpl +++ b/template/en/default/account/prefs/saved-searches.html.tmpl @@ -30,58 +30,40 @@

Your saved searches are as follows:

-
- - - - - - - +
- Search - - Run - - Edit - - Forget - - Show in - Footer -
+ + + + + + [% may_share = user.in_group(Param('querysharegroup')) && queryshare_groups.size %] [% IF may_share %] - + [% END %] + [% Hook.process('saved-header') %] + - - - + + [% IF may_share %] - + [% END %] + [% Hook.process('saved-row') %] + [% FOREACH q = user.queries %] - + - [% END %] + [% Hook.process('saved-row') %] [% END %]
SearchRunEditForgetShow in Footer - Share With a Group - Share With a Group
My [% terms.Bugs %] [% filtered_username = user.login FILTER uri %] Run -   - -   - - + + - — - —
[% q.name FILTER html %] Forget [% END %] + [% group.name FILTER html %] [% END %] + [% IF q.shared_with_group.id %] + (Link) + [% END %] [% IF user.can_bless %] @@ -133,41 +120,30 @@ [% END %]
+ [% IF user.can_bless %]

Note that for every search that has the "Add to footer" selected, a link to the shared search is added to the footer of every user that is a direct member of the group at the time you click Submit Changes.

[% END %] -
[% IF user.queries_available.size %]

You may use these searches saved and shared by others:

- - - - - - - - +
- Search - - Shared By - - Shared To - - Run - - Edit - - Show in - Footer -
+ + + + + + + + [% FOREACH q = user.queries_available %] @@ -182,7 +158,7 @@ Edit - - + + value="[% classification.name FILTER html %]" required> - + - + diff --git a/template/en/default/admin/classifications/edit.html.tmpl b/template/en/default/admin/classifications/edit.html.tmpl index 429eefc69..b1f6ce225 100644 --- a/template/en/default/admin/classifications/edit.html.tmpl +++ b/template/en/default/admin/classifications/edit.html.tmpl @@ -8,15 +8,16 @@ [% PROCESS global/header.html.tmpl title = "Edit classification" + style_urls = ['skins/standard/admin.css'] %] -
SearchShared ByShared ToRunEditShow in Footer
[% q.name FILTER html %] + [% END %] - +
[% FOREACH name = setting_names %] [% default_name = name _ '-isdefault' %] [% default_val = settings.${name}.default_value %] - diff --git a/template/en/default/admin/classifications/add.html.tmpl b/template/en/default/admin/classifications/add.html.tmpl index d818d3166..d56275aa2 100644 --- a/template/en/default/admin/classifications/add.html.tmpl +++ b/template/en/default/admin/classifications/add.html.tmpl @@ -8,10 +8,11 @@ [% PROCESS global/header.html.tmpl title = "Add new classification" + style_urls = ['skins/standard/admin.css'] %] -
+ [% setting_descs.$name OR name FILTER html %] diff --git a/template/en/default/account/profile-activity.html.tmpl b/template/en/default/account/profile-activity.html.tmpl index 3f8030a0e..ff989c6a5 100644 --- a/template/en/default/account/profile-activity.html.tmpl +++ b/template/en/default/account/profile-activity.html.tmpl @@ -22,12 +22,13 @@ #%] [% title = BLOCK %] - Account History for '[% otheruser.login FILTER html %]' + Account History for '[% otheruser.identity FILTER html %]' [% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] [% PROCESS admin/users/listselectvars.html.tmpl diff --git a/template/en/default/admin/admin.html.tmpl b/template/en/default/admin/admin.html.tmpl index 38194e963..7e3e5a157 100644 --- a/template/en/default/admin/admin.html.tmpl +++ b/template/en/default/admin/admin.html.tmpl @@ -7,13 +7,13 @@ #%] [% title = BLOCK %] - Administer your installation ([% terms.Bugzilla %] + Administer your installation (Bugzilla [%+ constants.BUGZILLA_VERSION FILTER html %]) [% END %] [% PROCESS global/header.html.tmpl title = title style_urls = ['skins/standard/admin.css'] - doc_section = "administration.html" + doc_section = "administering/index.html" %]
@@ -44,7 +44,7 @@
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. + 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.in_group('editusers') || user.can_bless) ? "" : "forbidden" %] @@ -83,7 +83,7 @@
[% class = user.in_group('admin') ? "" : "forbidden" %]
Custom Fields
-
[% terms.Bugzilla %] lets you define fields which are +
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.
@@ -118,6 +118,16 @@ 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.
+ [% IF Param('use_mailer_queue') %] + [% class = user.in_group('admin') ? "" : "forbidden" %] +
Job Queue
+
View the queue of undelivered/deferred jobs/emails.
+ [% END %] + +
+ Release Notes
+
Detailed information related to this release of Bugzilla.
+ [% Hook.process('end_links_right') %]
+
[% PROCESS "admin/classifications/edit-common.html.tmpl" %] diff --git a/template/en/default/admin/classifications/del.html.tmpl b/template/en/default/admin/classifications/del.html.tmpl index 215db848f..24a39b4b6 100644 --- a/template/en/default/admin/classifications/del.html.tmpl +++ b/template/en/default/admin/classifications/del.html.tmpl @@ -8,32 +8,32 @@ [% PROCESS global/header.html.tmpl title = "Delete classification" + style_urls = ['skins/standard/admin.css'] %] -
- - - - - - - - - - - - - - - - - +
PartValue
Classification:[% classification.name FILTER html %]
Description: - [% IF classification.description %] - [% classification.description FILTER html_light %] - [% ELSE %] - description missing - [% END %] -
Sortkey:[% classification.sortkey FILTER html %]
+ + + + + + + + + + + + + + + +
FieldValue
Classification[% classification.name FILTER html %]
Description + [% IF classification.description %] + [% classification.description FILTER html_light %] + [% ELSE %] + description missing + [% END %] +
Sortkey[% classification.sortkey FILTER html %]

Confirmation

diff --git a/template/en/default/admin/classifications/edit-common.html.tmpl b/template/en/default/admin/classifications/edit-common.html.tmpl index 6f038fceb..c2bae5c42 100644 --- a/template/en/default/admin/classifications/edit-common.html.tmpl +++ b/template/en/default/admin/classifications/edit-common.html.tmpl @@ -11,12 +11,12 @@ #%]
Classification:Classification:
Description:Description: [% INCLUDE global/textarea.html.tmpl name = 'description' @@ -27,7 +27,7 @@
+
[% PROCESS "admin/classifications/edit-common.html.tmpl" %] - - + @@ -25,19 +26,13 @@
+
Edit Products:
[% FOREACH product = classification.products %] - - + + [% END %]
[% product.name FILTER html %] - [% IF product.description %] - [% product.description FILTER html_light %] - [% ELSE %] - description missing - [% END %] - [% product.name FILTER html %][% product.description FILTER html_light %]
[% ELSE %] - none + none [% END %] diff --git a/template/en/default/admin/classifications/reclassify.html.tmpl b/template/en/default/admin/classifications/reclassify.html.tmpl index 13fb3a3bf..b230d670c 100644 --- a/template/en/default/admin/classifications/reclassify.html.tmpl +++ b/template/en/default/admin/classifications/reclassify.html.tmpl @@ -8,38 +8,39 @@ [% PROCESS global/header.html.tmpl title = "Reclassify products" + style_urls = ['skins/standard/admin.css'] %] - +
- - - - - - + + + + + - - - - - - - - + + + + + + + + - - - + + + - + + - - + +
Classification:[% classification.name FILTER html %]
Description: + Classification:[% classification.name FILTER html %]
Description: [% IF classification.description %] [% classification.description FILTER html_light %] [% ELSE %] - description missing + description missing [% END %]
Sortkey:[% classification.sortkey FILTER html %]
Products:Other Classifications
Sortkey:[% classification.sortkey FILTER html %]
Products:Other Classifications This Classification
This Classification
- + +

+
diff --git a/template/en/default/admin/classifications/select.html.tmpl b/template/en/default/admin/classifications/select.html.tmpl index 541ded918..ffe183cfa 100644 --- a/template/en/default/admin/classifications/select.html.tmpl +++ b/template/en/default/admin/classifications/select.html.tmpl @@ -8,39 +8,49 @@ [% PROCESS global/header.html.tmpl title = "Select classification" + style_urls = ['skins/standard/admin.css'] %] - - - - - - - +
Edit Classification ...DescriptionSortkeyProductsAction
+ + + + + + [% FOREACH cl = classifications %] - - + - + [% IF (cl.id == 1) %] - + [% ELSE %] - + [% END %] [%# don't allow user to delete the default id. %] [% IF (cl.id == 1) %] - + [% ELSE %] - + [% END %] [% END %] diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl index 82bf018b3..9018dcda2 100644 --- a/template/en/default/admin/components/confirm-delete.html.tmpl +++ b/template/en/default/admin/components/confirm-delete.html.tmpl @@ -22,101 +22,96 @@ from '[% product.name FILTER html %]' product style_urls = ['skins/standard/admin.css'] %] -
Edit Classification...DescriptionSortkeyProductsAction
[% cl.name FILTER html %] + + + [% cl.name FILTER html %] + + [% IF cl.description %] [% cl.description FILTER html_light %] [% ELSE %] - none + none [% END %] [% cl.sortkey FILTER html %][% cl.sortkey FILTER html %][% cl.product_count FILTER html %][% cl.product_count FILTER html %]reclassify ([% cl.product_count FILTER html %]) + + reclassify ([% cl.product_count FILTER html %]) +  delete + delete +
- - - - - - - - - - - - - - - - -[% IF Param('useqacontact') %] - - - - -[% END %] - - - - - - -[% IF product.description %] - - - - -[% END %] +
FieldValue
Component:[% comp.name FILTER html %]
Component Description:[% comp.description FILTER html_light %]
Default assignee:[% comp.default_assignee.login FILTER html %]
Default QA contact:[% comp.default_qa_contact.login FILTER html %]
Component of Product:[% product.name FILTER html %]
Product Description:[% product.description FILTER html_light %]
+ + + + + + + + + + + + + + + + + + [% IF Param('useqacontact') %] + + + + + [% END %] -[% IF Param('usetargetmilestone') %] - - - - -[% END %] + + + + - - - - - - - - - + [% IF product.description %] + + + + + [% END %] + + [% IF Param('usetargetmilestone') %] + + + + + [% END %] + + + + + + + + +
FieldValue
Component[% comp.name FILTER html %]
Component Description[% comp.description FILTER html_light %]
Default assignee[% comp.default_assignee.login FILTER html %]
Default QA contact[% comp.default_qa_contact.login FILTER html %]
Product Milestone URL: - - [% product.milestone_url FILTER html %] - -
Component of Product[% product.name FILTER html %]
Open for [% terms.bugs %]:[% IF product.is_active && comp.isactive %]Yes[% ELSE %]No[% END %]
[% terms.Bugs %]: -[% IF comp.bug_count %] - [% comp.bug_count %] -[% ELSE %] - None -[% END %] -
Product Description[% product.description FILTER html_light %]
Product Milestone URL + + [% product.milestone_url FILTER html %] +
Open for [% terms.bugs %][% IF product.is_active && comp.isactive %]Yes[% ELSE %]No[% END %]
[% terms.Bugs %] + [% IF comp.bug_count %] + [% comp.bug_count %] + [% ELSE %] + None + [% END %] +

Confirmation

- + [% IF comp.bug_count %] [% IF !Param("allowbugdeletion") %] -

- Sorry, there - - [% IF comp.bug_count > 1 %] - are [% comp.bug_count %] [%+ terms.bugs %] - [% ELSE %] - is [% comp.bug_count %] [%+ terms.bug %] - [% END %] - - outstanding for this component. You must reassign - - [% IF comp.bug_count > 1 %] - those [% terms.bugs %] - [% ELSE %] - that [% terms.bug %] - [% END %] +

+ Sorry, there + [% IF comp.bug_count > 1 %] + are [% comp.bug_count %] [%+ terms.bugs %] + [% ELSE %] + is 1 [% terms.bug %] + [% END %] + outstanding for this component. You must reassign - to another component before you can delete this one. -

+ [% IF comp.bug_count > 1 %] + those [% terms.bugs %] + [% ELSE %] + that [% terms.bug %] + [% END %] + to another component before you can delete this one. +

[% ELSE %] - -
- - There [% IF comp.bug_count > 1 %] +

+ There + [% IF comp.bug_count > 1 %] are [% comp.bug_count %] [%+ terms.bugs %] [% ELSE %] is 1 [% terms.bug %] @@ -124,8 +119,7 @@ from '[% product.name FILTER html %]' product entered for this component! When you delete this component, ALL stored [% terms.bugs %] and their history will be deleted too. -

- +

[% END %] [% END %] diff --git a/template/en/default/admin/components/create.html.tmpl b/template/en/default/admin/components/create.html.tmpl index f281160c0..96c9ce384 100644 --- a/template/en/default/admin/components/create.html.tmpl +++ b/template/en/default/admin/components/create.html.tmpl @@ -10,21 +10,23 @@ # product: object; Bugzilla::Product object representing the product to # which the component belongs. #%] - + [% title = BLOCK %]Add component to the [% product.name FILTER html %] product[% END %] [% PROCESS global/header.html.tmpl + title = title + generate_api_token = 1 + style_urls = ['skins/standard/admin.css'] yui = [ 'autocomplete' ] javascript_urls = [ "js/field.js" ] - title = title %] - +
[% PROCESS "admin/components/edit-common.html.tmpl" %] - +
-
+ diff --git a/template/en/default/admin/components/edit-common.html.tmpl b/template/en/default/admin/components/edit-common.html.tmpl index 6ff4e07e6..72300af79 100644 --- a/template/en/default/admin/components/edit-common.html.tmpl +++ b/template/en/default/admin/components/edit-common.html.tmpl @@ -15,12 +15,12 @@ [% DEFAULT desc_name = "description" %] - + + value="[%- comp.name FILTER html %]" required> - + [% INCLUDE global/textarea.html.tmpl name = desc_name @@ -29,23 +29,25 @@ cols = 64 wrap = 'virtual' defaultcontent = comp.description + mandatory = 1 %] - + [% INCLUDE global/userselect.html.tmpl name => "initialowner" id => "initialowner" value => comp.default_assignee.login size => 64 + mandatory => 1 %] [% IF Param('useqacontact') %] - + [% INCLUDE global/userselect.html.tmpl name => "initialqacontact" @@ -58,7 +60,7 @@ [% END %] - + [% INCLUDE global/userselect.html.tmpl name => "initialcc" @@ -69,7 +71,7 @@ %]
[% IF !Param("usemenuforusers") %] - Enter user names for the CC list as a comma-separated list. + Enter user names for the CC list as a comma-separated list. [% END %] diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl index 748175b75..c4da1181b 100644 --- a/template/en/default/admin/components/edit.html.tmpl +++ b/template/en/default/admin/components/edit.html.tmpl @@ -18,45 +18,45 @@ [% END %] [% PROCESS global/header.html.tmpl title = title + generate_api_token = 1 + style_urls = ['skins/standard/admin.css'] yui = [ 'autocomplete' ] javascript_urls = [ "js/field.js" ] %] - +
[% PROCESS "admin/components/edit-common.html.tmpl" %] - + - + -
[% terms.Bugs %]:[% terms.Bugs %]: -[% IF comp.bug_count > 0 %] - [% comp.bug_count %] -[% ELSE %] - None -[% END %] + [% IF comp.bug_count > 0 %] + [% comp.bug_count %] + [% ELSE %] + None + [% END %]
- or Delete this component. - + or + Delete this component. [% PROCESS admin/components/footer.html.tmpl diff --git a/template/en/default/admin/components/list.html.tmpl b/template/en/default/admin/components/list.html.tmpl index fc36bcdd2..91808fbae 100644 --- a/template/en/default/admin/components/list.html.tmpl +++ b/template/en/default/admin/components/list.html.tmpl @@ -16,6 +16,7 @@ '[% product.name FILTER html %]'[% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] [% edit_contentlink = BLOCK %]editcomponents.cgi?action=edit&product= @@ -68,7 +69,7 @@ [% columns.push({ name => 'bug_count' heading => "$terms.Bugs" - align => "right" + class => "right" contentlink => bug_count_contentlink }) %] diff --git a/template/en/default/admin/components/select-product.html.tmpl b/template/en/default/admin/components/select-product.html.tmpl index 55600d9cd..a152415c3 100644 --- a/template/en/default/admin/components/select-product.html.tmpl +++ b/template/en/default/admin/components/select-product.html.tmpl @@ -13,6 +13,7 @@ [% PROCESS global/header.html.tmpl title = "Edit components for which product?" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ @@ -34,7 +35,7 @@ [% columns.push({ name => 'bug_count' heading => "$terms.Bugs" - align => "right" + class => "right" contentlink => "buglist.cgi?product=%%name%%" }) %] diff --git a/template/en/default/admin/confirm-action.html.tmpl b/template/en/default/admin/confirm-action.html.tmpl index e3b9ef5f7..6dda0d014 100644 --- a/template/en/default/admin/confirm-action.html.tmpl +++ b/template/en/default/admin/confirm-action.html.tmpl @@ -12,52 +12,43 @@ # expected_action: the action the user was going to do. # script_name: the script generating this warning. # alternate_script: the suggested script to redirect the user to - # if he declines submission. + # if they decline submission. #%] -[% PROCESS global/header.html.tmpl title = "Suspicious Action" - style_urls = ['skins/standard/global.css'] %] +[% PROCESS global/header.html.tmpl + title = "Suspicious Action" +%] [% IF abuser %]
-

When you view an administrative form in [% terms.Bugzilla %], a token string +

When you view an administrative form in Bugzilla, a token string is randomly generated and stored both in the database and in the form you loaded, to make sure that the requested changes are being made as a result of submitting - a form generated by [% terms.Bugzilla %]. Unfortunately, the token used right now + a form generated by Bugzilla. Unfortunately, the token used right now is incorrect, meaning that it looks like you didn't come from the right page. The following token has been used :

- - [% IF token_action != expected_action %] - - - - - - - - - [% END %] + [% IF token_action != expected_action %] +

+ Action stored: + [%+ token_action FILTER html %] +
+ This action doesn't match the one expected ([% expected_action FILTER html %]). +

+ [% END %] - [% IF abuser != user.identity %] - - - - - - - - - [% END %] -
Action stored:[% token_action FILTER html %]
  - This action doesn't match the one expected ([% expected_action FILTER html %]). -
Generated by:[% abuser FILTER html %]
  - This token has not been generated by you. It is possible that someone - tried to trick you! -
- -

Please report this problem to [%+ Param("maintainer") FILTER html %].

+ [% IF abuser != user.identity %] +

+ Generated by: + [%+ abuser FILTER html %] +
+ This token has not been generated by you. It is possible that someone + tried to trick you! +

+ [% END %]
+ +

Please report this problem to [% Param("maintainer") FILTER html %].

[% ELSE %]
It looks like you didn't come from the right page (you have no valid token for diff --git a/template/en/default/admin/custom_fields/confirm-delete.html.tmpl b/template/en/default/admin/custom_fields/confirm-delete.html.tmpl index 85338c003..1d2348a0f 100644 --- a/template/en/default/admin/custom_fields/confirm-delete.html.tmpl +++ b/template/en/default/admin/custom_fields/confirm-delete.html.tmpl @@ -20,26 +20,26 @@ [% PROCESS global/header.html.tmpl title = title style_urls = ['skins/standard/admin.css'] - doc_section = "custom-fields.html#delete-custom-fields" + doc_section = "administering/custom-fields.html#deleting-custom-fields" %] - - - - - - - - - - - - - - - - - +
FieldValue
Custom Field:[% field.name FILTER html %]
Description:[% field.description FILTER html %]
Type:[% field_types.${field.type} FILTER html %]
+ + + + + + + + + + + + + + + +
FieldValue
Custom Field[% field.name FILTER html %]
Description[% field.description FILTER html %]
Type[% field_types.${field.type} FILTER html %]

Confirmation

diff --git a/template/en/default/admin/custom_fields/create.html.tmpl b/template/en/default/admin/custom_fields/create.html.tmpl index fb7f06f86..71ba08f46 100644 --- a/template/en/default/admin/custom_fields/create.html.tmpl +++ b/template/en/default/admin/custom_fields/create.html.tmpl @@ -10,8 +10,6 @@ # none #%] -[% PROCESS "global/field-descs.none.tmpl" %] - [% javascript = BLOCK %] [% INCLUDE "admin/custom_fields/cf-js.js.tmpl" %] [% END %] @@ -20,21 +18,21 @@ title = "Add a new Custom Field" onload = "document.getElementById('new_bugmail').disabled = true;" javascript_urls = [ 'js/util.js' ] - doc_section = "custom-fields.html#add-custom-fields" + doc_section = "administering/custom-fields.html#adding-custom-fields" style_urls = ['skins/standard/admin.css'] %] [%# set initial editability of fields such as Reverse Relationship Description %]

- Adding custom fields can make the interface of [% terms.Bugzilla %] very - complicated. Many admins who are new to [% terms.Bugzilla %] start off + Adding custom fields can make the interface of Bugzilla very + complicated. Many admins who are new to Bugzilla start off adding many custom fields, and then their users complain that the interface is "too complex". Please think carefully before adding any custom fields. - It may be the case that [% terms.Bugzilla %] already does what you need, + It may be the case that Bugzilla already does what you need, and you just haven't enabled the correct feature yet.

@@ -47,129 +45,11 @@ YAHOO.util.Event.onDOMReady(function() {onChangeType(document.getElementById('ty
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + [% PROCESS "admin/custom_fields/edit-common.html.tmpl" %] - - -
- - - - - -
- -
- -
- -
Long Description: - [% INCLUDE global/textarea.html.tmpl - name = 'long_desc' - id = 'long_desc' - minrows = 3 - maxrows = 5 - cols = 46 - defaultcontent = defaultcontent - %] - - - - - - -
- - - -
- Use this label for the list of [% terms.bugs %] that link to - [%+ terms.abug %] with this - [%+ field_types.${constants.FIELD_TYPE_BUG_ID} FILTER html %] - field. For example, if the description is "Is a duplicate of", - the reverse description would be "Duplicates of this [% terms.bug %]". - Leave blank to disable the list for this field. - 		- - - -
-

- - - -

+ + +

diff --git a/template/en/default/admin/custom_fields/edit-common.html.tmpl b/template/en/default/admin/custom_fields/edit-common.html.tmpl new file mode 100644 index 000000000..6c22bb81f --- /dev/null +++ b/template/en/default/admin/custom_fields/edit-common.html.tmpl @@ -0,0 +1,193 @@ +[%# This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. + #%] + +[%# INTERFACE: + # field: Bugzila::Field; the current field being edited + #%] + +[% PROCESS "global/field-descs.none.tmpl" %] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [% IF !field || field.is_select || field.type == constants.FIELD_TYPE_BUG_ID %] + + [% IF field.is_select %] + + + [% ELSE %] + + + [% END %] + + [% IF !field || field.is_select %] + + + [% ELSE %] + + + [% END %] + + [% END %] +
+ [% IF field %] + [% field.name FILTER html %] + [% ELSE %] + + [% END %] + + + + +
+ + + + + +
+ [% IF field %] + [% field_types.${field.type} FILTER html %] + [% ELSE %] + + [% END %] + + +
+ + + +
Long Description: + [% INCLUDE global/textarea.html.tmpl + name = 'long_desc' + id = 'long_desc' + minrows = 3 + maxrows = 5 + cols = 46 + defaultcontent = field.long_desc + %] + + + + +
+ +
+ +
  + Edit legal values for this field. + + + + +
+ Use this label for the list of [% terms.bugs %] that link to [% terms.abug %] + with this [% field_types.${constants.FIELD_TYPE_BUG_ID} FILTER html %] field. + For example, if the description is "Is a duplicate of", the reverse description + would be "Duplicates of this [% terms.bug %]". Leave blank to disable the list + for this field. + 		+ + + +
diff --git a/template/en/default/admin/custom_fields/edit.html.tmpl b/template/en/default/admin/custom_fields/edit.html.tmpl index a1d739365..6f7389d05 100644 --- a/template/en/default/admin/custom_fields/edit.html.tmpl +++ b/template/en/default/admin/custom_fields/edit.html.tmpl @@ -10,8 +10,6 @@ # field: Bugzila::Field; the current field being edited #%] -[% PROCESS "global/field-descs.none.tmpl" %] - [% title = BLOCK %] Edit the Custom Field '[% field.name FILTER html %]' ([% field.description FILTER html %]) [% END %] @@ -24,7 +22,7 @@ title = title onload = "toggleCheckbox(document.getElementById('enter_bug'), 'new_bugmail');" javascript_urls = [ 'js/util.js' ] - doc_section = "custom-fields.html#edit-custom-fields" + doc_section = "administering/custom-fields.html#editing-custom-fields" style_urls = ['skins/standard/admin.css'] %] @@ -34,145 +32,8 @@

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [% IF field.type == constants.FIELD_TYPE_BUG_ID %] - - - - - - [% END %] - [% IF field.is_select %] - - - - - + [% PROCESS "admin/custom_fields/edit-common.html.tmpl" field = field %] - - - [% END %] -
Name:[% field.name FILTER html %] - -
- -
Type:[% field_types.${field.type} FILTER html %]
- -
Long Description: - [% INCLUDE global/textarea.html.tmpl - name = 'long_desc' - id = 'long_desc' - minrows = 3 - maxrows = 5 - cols = 46 - defaultcontent = field.long_desc - %] - - - - - - -
- - - -
- Use this label for the list of [% terms.bugs %] that link to - [%+ terms.abug %] with this - [%+ field_types.${constants.FIELD_TYPE_BUG_ID} FILTER html %] field. - For example, if the description is "Is a duplicate of", - the reverse description would be "Duplicates of this [% terms.bug %]". - Leave blank to disable the list for this field. - 		 
  - Edit - legal values for this field. - - - - -
-
diff --git a/template/en/default/admin/custom_fields/list.html.tmpl b/template/en/default/admin/custom_fields/list.html.tmpl index e6ec0c283..5e9183e56 100644 --- a/template/en/default/admin/custom_fields/list.html.tmpl +++ b/template/en/default/admin/custom_fields/list.html.tmpl @@ -14,7 +14,8 @@ [% PROCESS global/header.html.tmpl title = "Custom Fields" - doc_section = "custom-fields.html" + style_urls = ['skins/standard/admin.css'] + doc_section = "administering/custom-fields.html" %] [% delete_contentlink = BLOCK %]editfields.cgi?action=del&name=%%name%%[% END %] diff --git a/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl b/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl index 122df3612..579d07cdc 100644 --- a/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl +++ b/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl @@ -22,34 +22,34 @@ style_urls = ['skins/standard/admin.css'] %] - - - - - - - - - - - - - - - - - +
FieldValue
Field Name:[% field.description FILTER html %]
Field Value:[% value.name FILTER html %]
[% terms.Bugs %]: -[% IF value.bug_count %] - - [%- value.bug_count FILTER html %] -[% ELSE %] - None -[% END %] -
+ + + + + + + + + + + + + + + +
FieldValue
Field Name[% field.description FILTER html %]
Field Value[% value.name FILTER html %]
[% terms.Bugs %] + [% IF value.bug_count %] + + [%- value.bug_count FILTER html %] + [% ELSE %] + None + [% END %] +

Confirmation

@@ -149,6 +149,6 @@ [% PROCESS admin/fieldvalues/footer.html.tmpl no_edit_link = 1 - +%] +%] [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/fieldvalues/create.html.tmpl b/template/en/default/admin/fieldvalues/create.html.tmpl index f9f0f7e54..8d1dbc8b9 100644 --- a/template/en/default/admin/fieldvalues/create.html.tmpl +++ b/template/en/default/admin/fieldvalues/create.html.tmpl @@ -15,6 +15,7 @@ [% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %]

@@ -23,21 +24,21 @@

- +
- + - + [% IF field.name == "bug_status" %] - + - [% END %] diff --git a/template/en/default/admin/fieldvalues/edit.html.tmpl b/template/en/default/admin/fieldvalues/edit.html.tmpl index ab6418552..2630fee92 100644 --- a/template/en/default/admin/fieldvalues/edit.html.tmpl +++ b/template/en/default/admin/fieldvalues/edit.html.tmpl @@ -17,15 +17,13 @@ [% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] -
+ maxlength="[% constants.MAX_FIELD_VALUE_SIZE FILTER none %]" required>
@@ -56,7 +57,7 @@ [% END %] [% IF field.value_field %]
+ @@ -74,7 +75,7 @@ [% END %] - (Leave unset to have this value always appear.) + (Leave unset to have this value always appear.)
- +
- + - + [% IF field.name == "bug_status" %] - + [% END %] [% IF field.value_field %] - [% END %] - + @@ -129,12 +126,12 @@ diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl index 7a0293866..b91b49199 100644 --- a/template/en/default/admin/flag-type/list.html.tmpl +++ b/template/en/default/admin/flag-type/list.html.tmpl @@ -10,15 +10,10 @@ [% PROCESS global/header.html.tmpl title = 'Administer Flag Types' - style = " - table#flag_types_bugs tr th, - table#flag_types_attachments tr th { text-align: left; } - .inactive { color: #787878; } - .multiplicable { display: block; } - " + style_urls = ['skins/standard/admin.css'] onload="var f = document.flagtype_form; selectProduct(f.product, f.component, null, null, '__All__');" javascript_urls=["js/productform.js"] - doc_section = "flags-overview.html#flag-types" + doc_section = "administering/flags.html" %]

@@ -42,38 +37,36 @@

-
- - [% IF value.is_static %] + value="[% value.name FILTER html %]" required> [% END %]
[% IF value.is_open %]Open[% ELSE %]Closed[% END %]
+ @@ -71,12 +69,12 @@ [% END %] - (Leave unset to have this value always appear.) + (Leave unset to have this value always appear.)
diff --git a/template/en/default/admin/fieldvalues/list.html.tmpl b/template/en/default/admin/fieldvalues/list.html.tmpl index 01c5717b8..109665131 100644 --- a/template/en/default/admin/fieldvalues/list.html.tmpl +++ b/template/en/default/admin/fieldvalues/list.html.tmpl @@ -23,6 +23,7 @@ ([% field.name FILTER html %]) field[% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] [% edit_contentlink = BLOCK %]editvalues.cgi?action=edit&field= diff --git a/template/en/default/admin/fieldvalues/select-field.html.tmpl b/template/en/default/admin/fieldvalues/select-field.html.tmpl index 099eebab6..b3e1d97b6 100644 --- a/template/en/default/admin/fieldvalues/select-field.html.tmpl +++ b/template/en/default/admin/fieldvalues/select-field.html.tmpl @@ -17,6 +17,7 @@ [% PROCESS global/header.html.tmpl title = "Edit values for which field?" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ diff --git a/template/en/default/admin/flag-type/confirm-delete.html.tmpl b/template/en/default/admin/flag-type/confirm-delete.html.tmpl index 70f5efb3d..a05e857d2 100644 --- a/template/en/default/admin/flag-type/confirm-delete.html.tmpl +++ b/template/en/default/admin/flag-type/confirm-delete.html.tmpl @@ -10,7 +10,8 @@ [% PROCESS global/header.html.tmpl title = title - doc_section = "flags-overview.html#flags-delete" + style_urls = ['skins/standard/admin.css'] + doc_section = "administering/flags.html#deleting-a-flag" %]

@@ -23,27 +24,17 @@ deactivate it, in which case the type [% IF flag_type.flag_count %] and its flags [% END %] will remain - in the database but will not appear in the [% terms.Bugzilla %] UI. + in the database but will not appear in the Bugzilla UI.

- - - - - - - - -
- Do you really want to delete this type? -
- Yes, delete - - - - No, don't delete - -
+

+ Do you really want to delete this type? +

+ +

+ Yes, delete - + No, don't delete +

[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl index ab70e232b..6c0e0cb78 100644 --- a/template/en/default/admin/flag-type/edit.html.tmpl +++ b/template/en/default/admin/flag-type/edit.html.tmpl @@ -15,22 +15,17 @@ Based on [% type.name FILTER html %] [% END %] [% END %] - [% doc_section = "flags-overview.html#flags-create" %] [% ELSE %] [% title = BLOCK %]Edit Flag Type [% type.name FILTER html %][% END %] - [% doc_section = "flags-overview.html#flags-edit" %] [% END %] [% PROCESS global/header.html.tmpl title = title - style = " - table#form th { text-align: right; vertical-align: baseline; white-space: nowrap; } - table#form td { text-align: left; vertical-align: baseline; } - " + style_urls = ['skins/standard/admin.css'] onload="var f = document.forms['flagtype_properties']; selectProduct(f.product, f.component, null, null, '__Any__');" javascript_urls=["js/productform.js"] - doc_section = doc_section + doc_section = "administering/flags.html" %] @@ -49,15 +44,15 @@ [%# Add a hidden button at the top of the form so that the user pressing "return" # really submit the form, as expected. %] - + - +
@@ -71,6 +66,7 @@ cols = 80 defaultcontent = type.description disabled = !can_fully_edit + mandatory = 1 %] @@ -90,14 +86,15 @@ [% END %]
Name: a short name identifying this type.
+ maxlength="50" [%- ' disabled="disabled"' UNLESS can_fully_edit %] required>
-
- Product/Component:
-
+ 		+ Product/Component:
+ [% INCLUDE "global/product-select.html.tmpl" + id => "product" + name => "product" + add => "__Any__" + onchange => "selectProduct(this, this.form.component, null, null, '__Any__');" + products => products + %]
- - 		- Inclusions:
+ + 		+ Inclusions:
[% PROCESS category_select name="inclusion_to_remove" categories = inclusions %]
- - 		- Exclusions:
+ + 		+ Exclusions:
[% PROCESS category_select name="exclusion_to_remove" categories = exclusions %]
- +
Sort Key: - a number between 1 and [% constants.MAX_SMALLINT FILTER none %] by which + a number between 0 and [% constants.MAX_SMALLINT FILTER none %] by which this type will be sorted when displayed to users in a list; ignore if you don't care what order the types appear in or if you want them to appear in alphabetical order.
- +
- - - - - - - - -
- - - - - - -
+
+ + [% INCLUDE "global/product-select.html.tmpl" + id => "product" + name => "product" + add => "__Any__" + onchange => "selectProduct(this, this.form.component, null, null, '__Any__');" + products => products + %] +
+ +
+ + +
+ +
+ + +
+ +

Flag Types for [% terms.Bugs %]

@@ -96,9 +89,9 @@ [% BLOCK display_flag_types %] - +
- + @@ -116,9 +109,11 @@ [% FOREACH type = types %] - + - +
Edit name ... Description Sortkey
[% type.name FILTER html FILTER no_break %] + [% type.name FILTER html %] + [% type.description FILTER html %][% type.sortkey FILTER html %][% type.sortkey FILTER html %] [% IF type.is_requestable %] requestable diff --git a/template/en/default/admin/groups/confirm-remove.html.tmpl b/template/en/default/admin/groups/confirm-remove.html.tmpl index a9aa7e132..3249ee384 100644 --- a/template/en/default/admin/groups/confirm-remove.html.tmpl +++ b/template/en/default/admin/groups/confirm-remove.html.tmpl @@ -19,7 +19,7 @@ [% PROCESS global/header.html.tmpl title = title - doc_section = "groups.html" + doc_section = "administering/groups.html" %] [% IF regexp %] @@ -32,7 +32,7 @@ [% END %]

Generally, you will only need to do this when upgrading groups - created with [% terms.Bugzilla %] versions 2.16 and earlier. Use + created with Bugzilla versions 2.16 and earlier. Use this option with extreme care and consult the documentation for further information.

diff --git a/template/en/default/admin/groups/create.html.tmpl b/template/en/default/admin/groups/create.html.tmpl index db65629d0..3827fb0e3 100644 --- a/template/en/default/admin/groups/create.html.tmpl +++ b/template/en/default/admin/groups/create.html.tmpl @@ -13,30 +13,35 @@ [% PROCESS global/header.html.tmpl title = "Add group" subheader = "This page allows you to define a new user group." - doc_section = "groups.html#create-groups" + style_urls = ['skins/standard/admin.css'] + doc_section = "administering/groups.html#creating-groups" %]
- - - - - - - - - - - - - - - - [% Hook.process('field') %] +
New NameNew DescriptionNew User RegExpUse For [% terms.Bugs %]
Icon URL:
+ + + + + + + + + + + + + + + + + + + + + [% Hook.process('field') %]
Group Name:
Description:
User Regexp:
Icon URL:
Use For [% terms.Bugs %]:
-
- @@ -46,7 +51,9 @@
-

Name is what is used with the Bugzilla->user->in_group() +

+ +

Group Name is what is used with the B[%%]ugzilla->user->in_group() function in any customized cgi files you write that use a given group. It can also be used by people submitting [% terms.bugs %] by email to limit [% terms.abug %] to a certain set of groups.

@@ -55,15 +62,6 @@ limit [% terms.abug %] to a certain set of groups.

to members of the group where they can choose whether the [% terms.bug %] will be restricted to others in the same group.

-

The Use For [% terms.Bugs %] flag determines whether or not the -group is eligible to be used for [% terms.bugs %]. If you clear this, it will -no longer be possible for users to add [% terms.bugs %] to this group, -although [% terms.bugs %] already in the group will remain in the group. -Doing so is a much less drastic way to stop a group from growing -than deleting the group would be. Note: If you are creating -a group, you probably want it to be usable for [% terms.bugs %], in which -case you should leave this checked.

-

User RegExp is optional, and if filled in, will automatically grant membership to this group to anyone with an email address that matches this regular expression.

@@ -75,6 +73,15 @@ email address that matches this regular expression.

in comments in [% terms.bugs %] besides the name of the author of comments.

+

The Use For [% terms.Bugs %] flag determines whether or not the +group is eligible to be used for [% terms.bugs %]. If you clear this, it will +no longer be possible for users to add [% terms.bugs %] to this group, +although [% terms.bugs %] already in the group will remain in the group. +Doing so is a much less drastic way to stop a group from growing +than deleting the group would be. Note: If you are creating +a group, you probably want it to be usable for [% terms.bugs %], in which +case you should leave this checked.

+ [% IF Param("makeproductgroups") %]

By default, the new group will be associated with existing products. Unchecking the "Insert new group into all existing products" option will @@ -87,8 +94,6 @@ email address that matches this regular expression.

a product.

[% END %] -

Back to the main [% terms.bugs %] page - -or to the group list. +

Back to the group list.

[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/groups/delete.html.tmpl b/template/en/default/admin/groups/delete.html.tmpl index 5ae0ce92d..465860761 100644 --- a/template/en/default/admin/groups/delete.html.tmpl +++ b/template/en/default/admin/groups/delete.html.tmpl @@ -13,21 +13,28 @@ # group. #%] - +[% title = BLOCK %]Delete group '[% group.name FILTER html %]'[% END %] [% PROCESS global/header.html.tmpl - title = "Delete group" - doc_section = "groups.html" + title = title + style_urls = ['skins/standard/admin.css'] + doc_section = "administering/groups.html" %] - - - - - +
IdNameDescription
+ + + + + + + + + +
FieldValue
Id [% group.id FILTER html %]
Name [% group.name FILTER html %]
Description [% group.description FILTER html_light %]
@@ -151,7 +158,9 @@

Confirmation

-

Do you really want to delete this group?

+

+ Do you really want to delete this group? +

[% IF group.users.size || group.bugs.size || group.products.size || group.flags.size %] diff --git a/template/en/default/admin/groups/edit.html.tmpl b/template/en/default/admin/groups/edit.html.tmpl index 2f4101a13..3e64fa7c4 100644 --- a/template/en/default/admin/groups/edit.html.tmpl +++ b/template/en/default/admin/groups/edit.html.tmpl @@ -18,30 +18,21 @@ [% PROCESS global/header.html.tmpl title = title - doc_section = "groups.html#edit-groups" - style = " - .grant_table { border-collapse: collapse; } - .grant_table td, .grant_table th { - padding-left: .5em; - } - .grant_table td.one, .grant_table th.one { - border-right: 1px solid black; - padding-right: .5em; - } - " + style_urls = ['skins/standard/admin.css'] + doc_section = "administering/groups.html#editing-groups-and-assigning-group-permissions" %]
- +
@@ -76,7 +67,7 @@ [% END %] @@ -95,78 +86,72 @@

Group Permissions

-
Group: [% IF group.is_bug_group %] - + [% ELSE %] [% group.name FILTER html %] [% END %] @@ -52,8 +43,8 @@ Description: [% IF group.is_bug_group %] - + [% ELSE %] [% group.description FILTER html %] [% END %] @@ -63,7 +54,7 @@
User Regexp: -
-
+
- - + + + - - - + [% PROCESS select_pair name = "members" size = 10 + items_available = members_available + items_current = members_current %] + + [% PROCESS select_pair name = "member_of" size = 10 + items_available = member_of_available + items_current = member_of_current %] -
Groups That Are a Member of This Group
- ("Users in X are automatically in - [%+ group.name FILTER html %]")		Groups That This Group Is a Member Of
- ("If you are in [% group.name FILTER html %], you are - automatically also in...")		 + Groups That Are a Member of This Group
+ ("Users in X are automatically in [% group.name FILTER html %]") + 		+ Groups That This Group Is a Member Of
+ ("If you are in [% group.name FILTER html %], you are automatically also in...") +
- [% PROCESS select_pair name = "members" size = 10 - items_available = members_available - items_current = members_current %] - [% PROCESS select_pair name = "member_of" size = 10 - items_available = member_of_available - items_current = member_of_current %]
- - + - + - - + [% PROCESS select_pair name = "bless_from" size = 10 + items_available = bless_from_available + items_current = bless_from_current %] + + [% PROCESS select_pair name = "bless_to" size = 10 + items_available = bless_to_available + items_current = bless_to_current %] -
+ Groups That Can Grant Membership in This Group
- ("Users in X can add other users to - [%+ group.name FILTER html %]") - + ("Users in X can add other users to [% group.name FILTER html %]") + 		+ Groups That This Group Can Grant Membership In
+ ("Users in [% group.name FILTER html %] can add users to...") 		Groups That This Group Can Grant Membership In
- ("Users in [% group.name FILTER html %] can add users to...") -
- [% PROCESS select_pair name = "bless_from" size = 10 - items_available = bless_from_available - items_current = bless_from_current %] - [% PROCESS select_pair name = "bless_to" size = 10 - items_available = bless_to_available - items_current = bless_to_current %] -
- [% IF Param('usevisibilitygroups') %] - + [% IF Param('usevisibilitygroups') %] - + - + - - + [% PROCESS select_pair name = "visible_from" size = 10 + items_available = visible_from_available + items_current = visible_from_current %] + + [% PROCESS select_pair name = "visible_to_me" size = 10 + items_available = visible_to_me_available + items_current = visible_to_me_current %] -
+ Groups That Can See This Group
- ("Users in X can see users in - [%+ group.name FILTER html %]") + ("Users in X can see users in [% group.name FILTER html %]") + 		+ Groups That This Group Can See
+ ("Users in [% group.name FILTER html %] can see users in...") 		Groups That This Group Can See
- ("Users in [% group.name FILTER html %] can see users in...") -
- [% PROCESS select_pair name = "visible_from" size = 10 - items_available = visible_from_available - items_current = visible_from_current %] - [% PROCESS select_pair name = "visible_to_me" size = 10 - items_available = visible_to_me_available - items_current = visible_to_me_current %] -
- [% END %] + [% END %] +
@@ -175,12 +160,11 @@

Mass Remove

You can use this form to do mass-removal of users from groups. - This is often very useful if you upgraded from [% terms.Bugzilla %] + This is often very useful if you upgraded from Bugzilla 2.16.

-
-
+
Remove all explicit memberships from users whose login names match the following regular expression: @@ -193,41 +177,35 @@
-
- +

Back to the group list.

[% PROCESS global/footer.html.tmpl %] [% BLOCK select_pair %] - - - - - - - - - -
- - - -
+ + +
+ + + + + +
+ + [% END %] diff --git a/template/en/default/admin/groups/list.html.tmpl b/template/en/default/admin/groups/list.html.tmpl index 859f26205..673c053cb 100644 --- a/template/en/default/admin/groups/list.html.tmpl +++ b/template/en/default/admin/groups/list.html.tmpl @@ -19,7 +19,8 @@ [% PROCESS global/header.html.tmpl title = "Edit Groups" subheader = "This lets you edit the groups available to put users in." - doc_section = "groups.html" + style_urls = ['skins/standard/admin.css'] + doc_section = "administering/groups.html" %] [% edit_contentlink = "editgroups.cgi?action=changeform&group=%%id%%" %] @@ -74,8 +75,8 @@ } %] -[% FOREACH group IN ["chartgroup", "insidergroup", "timetrackinggroup", - "querysharegroup", "debug_group"] %] +[% FOREACH group IN ["chartgroup", "comment_taggers_group", "debug_group", + "insidergroup", "querysharegroup", "timetrackinggroup"] %] [% special_group = Param(group) %] [% IF special_group %] diff --git a/template/en/default/admin/keywords/confirm-delete.html.tmpl b/template/en/default/admin/keywords/confirm-delete.html.tmpl index 718a32ec5..9f59cc57f 100644 --- a/template/en/default/admin/keywords/confirm-delete.html.tmpl +++ b/template/en/default/admin/keywords/confirm-delete.html.tmpl @@ -12,26 +12,29 @@ [% PROCESS global/header.html.tmpl title = "Delete Keyword" + style_urls = ['skins/standard/admin.css'] %] -

+

Confirmation

+ +

[% IF keyword.bug_count == 1 %] - There is one [% terms.bug %] with this keyword set. + There is one [% terms.bug %] [% ELSIF keyword.bug_count > 1 %] - There are [% keyword.bug_count FILTER html %] [%+ terms.bugs %] with - this keyword set. + There are [% keyword.bug_count FILTER html %] [%+ terms.bugs %] [% END %] - - Are you sure you want to delete - the [% keyword.name FILTER html %] keyword? + with the [% keyword.name FILTER html %] keyword set. +

+ +

+ Do you really want to delete this keyword?

- +

Edit other keywords.

diff --git a/template/en/default/admin/keywords/create.html.tmpl b/template/en/default/admin/keywords/create.html.tmpl index e29db400c..21ecaf920 100644 --- a/template/en/default/admin/keywords/create.html.tmpl +++ b/template/en/default/admin/keywords/create.html.tmpl @@ -9,37 +9,41 @@ [%# INTERFACE: # none #%] - + [% PROCESS global/header.html.tmpl title = "Add keyword" subheader = "This page allows you to add a new keyword." + style_urls = ['skins/standard/admin.css'] %]
- +
- - + + - +
Name:Name:
Description:Description: [% INCLUDE global/textarea.html.tmpl name = 'description' minrows = 4 cols = 64 wrap = 'virtual' + mandatory = 1 %]
-
+
+
+

Edit other keywords.

[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/keywords/edit.html.tmpl b/template/en/default/admin/keywords/edit.html.tmpl index 07603e1de..23158d36f 100644 --- a/template/en/default/admin/keywords/edit.html.tmpl +++ b/template/en/default/admin/keywords/edit.html.tmpl @@ -12,17 +12,18 @@ [% PROCESS global/header.html.tmpl title = "Edit keyword" + style_urls = ['skins/standard/admin.css'] %]
- +
- + + value="[% keyword.name FILTER html %]" required> - + - +
Name:Name:
Description:Description: [% INCLUDE global/textarea.html.tmpl name = 'description' @@ -30,11 +31,12 @@ cols = 64 wrap = 'virtual' defaultcontent = keyword.description + mandatory = 1 %]
[% terms.Bugs %]:[% terms.Bugs %]: [% IF keyword.bug_count > 0 %] diff --git a/template/en/default/admin/keywords/list.html.tmpl b/template/en/default/admin/keywords/list.html.tmpl index ea98ca773..c3f4a5292 100644 --- a/template/en/default/admin/keywords/list.html.tmpl +++ b/template/en/default/admin/keywords/list.html.tmpl @@ -16,6 +16,7 @@ [% PROCESS global/header.html.tmpl title = "Select keyword" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ @@ -32,7 +33,7 @@ { name => "bug_count" heading => "$terms.Bugs" - align => "right" + class => "right" contentlink => "buglist.cgi?keywords=%%name%%" }, { diff --git a/template/en/default/admin/milestones/confirm-delete.html.tmpl b/template/en/default/admin/milestones/confirm-delete.html.tmpl index cc30f164f..bc8b4eee3 100644 --- a/template/en/default/admin/milestones/confirm-delete.html.tmpl +++ b/template/en/default/admin/milestones/confirm-delete.html.tmpl @@ -21,33 +21,33 @@ style_urls = ['skins/standard/admin.css'] %] - - - - - - - - - - - - - - - -
FieldValue
Milestone:[% milestone.name FILTER html %]
Milestone of Product:[% product.name FILTER html %]
[% terms.Bugs %]: -[% IF milestone.bug_count %] - + + + + + + + + + + + + + + + + - + [% ELSE %] + None + [% END %] + +
FieldValue
Milestone[% milestone.name FILTER html %]
Milestone of Product[% product.name FILTER html %]
[% terms.Bugs %] + [% IF milestone.bug_count %] + [% milestone.bug_count FILTER none %] -[% ELSE %] - None -[% END %] -

Confirmation

diff --git a/template/en/default/admin/milestones/create.html.tmpl b/template/en/default/admin/milestones/create.html.tmpl index 8006c0cd0..4f1a24144 100644 --- a/template/en/default/admin/milestones/create.html.tmpl +++ b/template/en/default/admin/milestones/create.html.tmpl @@ -17,20 +17,19 @@ [% PROCESS global/header.html.tmpl title = title subheader = subheader - onload = "document.forms['f'].milestone.focus()" + style_urls = ['skins/standard/admin.css'] %] - +
- + + autofocus required> - - + +
diff --git a/template/en/default/admin/milestones/edit.html.tmpl b/template/en/default/admin/milestones/edit.html.tmpl index 759bd708a..cbc7330fe 100644 --- a/template/en/default/admin/milestones/edit.html.tmpl +++ b/template/en/default/admin/milestones/edit.html.tmpl @@ -17,24 +17,24 @@ [%- product.name FILTER html %]'[% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] onload = "document.forms['f'].milestone.select()" %] - - +
- + + [%- milestone.name FILTER html %]" required> - + - + diff --git a/template/en/default/admin/milestones/list.html.tmpl b/template/en/default/admin/milestones/list.html.tmpl index 16382799f..aa377d88e 100644 --- a/template/en/default/admin/milestones/list.html.tmpl +++ b/template/en/default/admin/milestones/list.html.tmpl @@ -19,6 +19,7 @@ '[% product.name FILTER html %]'[% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] [% edit_contentlink = BLOCK %]editmilestones.cgi?action=edit&product= @@ -52,7 +53,7 @@ [% columns.push({ name => "bug_count" heading => "$terms.Bugs" - align => "right" + class => "right" contentlink => bug_count_contentlink }) %] diff --git a/template/en/default/admin/milestones/select-product.html.tmpl b/template/en/default/admin/milestones/select-product.html.tmpl index 18bb88c7e..e2784127e 100644 --- a/template/en/default/admin/milestones/select-product.html.tmpl +++ b/template/en/default/admin/milestones/select-product.html.tmpl @@ -13,6 +13,7 @@ [% PROCESS global/header.html.tmpl title = "Edit milestones for which product?" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ @@ -34,7 +35,7 @@ [% columns.push({ name => 'bug_count' heading => "$terms.Bugs" - align => "right" + class => "right" contentlink => "buglist.cgi?product=%%name%%" }) %] diff --git a/template/en/default/admin/params/admin.html.tmpl b/template/en/default/admin/params/admin.html.tmpl index c63329cae..f172a6316 100644 --- a/template/en/default/admin/params/admin.html.tmpl +++ b/template/en/default/admin/params/admin.html.tmpl @@ -21,8 +21,11 @@ "switching this option on will not let users use an invalid address.", allowuserdeletion => "The user editing pages are capable of letting you delete user accounts. " _ - "$terms.Bugzilla will issue a warning in case you'd run into inconsistencies " _ + "Bugzilla will issue a warning in case you'd run into inconsistencies " _ "when you're about to do so, but such deletions remain kinda scary. " _ "So, you have to turn on this option before any such deletions " _ - "will ever happen." } + "will ever happen." + + last_visit_keep_days => "This option controls how many days $terms.Bugzilla will " _ + "remember when users visit specific ${terms.bugs}."} %] diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl index 076d2dc7b..1f24c7d06 100644 --- a/template/en/default/admin/params/advanced.html.tmpl +++ b/template/en/default/admin/params/advanced.html.tmpl @@ -18,7 +18,7 @@ security to your SSL connections by forcing the browser to always access your domain over SSL and never accept an invalid certificate. However, it should only be used if you have the ssl_redirect - parameter turned on, [% terms.Bugzilla %] is the only thing running + parameter turned on, Bugzilla is the only thing running on its domain (i.e., your urlbase is something like http://bugzilla.example.com/), and you never plan to disable the ssl_redirect parameter. @@ -35,7 +35,7 @@ with the includeSubDomains flag, which will apply the security change to all subdomains. This is especially useful when combined with an attachment_base that exists as (a) - subdomain(s) under the main [% terms.Bugzilla %] domain. + subdomain(s) under the main Bugzilla domain. [% END %] @@ -44,22 +44,22 @@ cookiedomain => "If your website is at 'www.foo.com', setting this to" _ " '.foo.com' will also allow 'bar.foo.com' to access" - _ " $terms.Bugzilla cookies. This is useful if you have more than" + _ " Bugzilla cookies. This is useful if you have more than" _ " one hostname pointing at the same web server, and you" - _ " want them to share the $terms.Bugzilla cookie.", + _ " want them to share the Bugzilla cookie.", inbound_proxies => - "When inbound traffic to $terms.Bugzilla goes through a proxy," - _ " $terms.Bugzilla thinks that the IP address of every single" + "When inbound traffic to Bugzilla goes through a proxy," + _ " Bugzilla thinks that the IP address of every single" _ " user is the IP address of the proxy. If you enter a comma-separated" - _ " list of IPs in this parameter, then $terms.Bugzilla will trust any" + _ " list of IPs in this parameter, then Bugzilla will trust any" _ " X-Forwarded-For header sent from those IPs," _ " and use the value of that header as the end user's IP address.", proxy_url => - "$terms.Bugzilla may have to access the web to get notifications about" - _ " new releases (see the upgrade_notification parameter)." - _ " If your $terms.Bugzilla server is behind a proxy, it may be" + "Bugzilla may have to access the web to get notifications about" + _ " new releases (see the upgrade_notification parameter)." + _ " If your Bugzilla server is behind a proxy, it may be" _ " necessary to enter its URL if the web server cannot access the" _ " HTTP_PROXY environment variable. If you have to authenticate," _ " use the http://user:pass@proxy_url/ syntax.", diff --git a/template/en/default/admin/params/attachment.html.tmpl b/template/en/default/admin/params/attachment.html.tmpl index c0c32a4d5..5efcc1106 100644 --- a/template/en/default/admin/params/attachment.html.tmpl +++ b/template/en/default/admin/params/attachment.html.tmpl @@ -19,44 +19,44 @@ _ "

This is a security restriction for installations where untrusted" _ " users may upload attachments that could be potentially damaging if" _ " viewed directly in the browser.

" - _ "

It is highly recommended that you set the attachment_base" + _ "

It is highly recommended that you set the attachment_base" _ " parameter if you turn this parameter on.", attachment_base => - "When the allow_attachment_display parameter is on, it is " + "When the allow_attachment_display parameter is on, it is " _ " possible for a malicious attachment to steal your cookies or" - _ " perform an attack on $terms.Bugzilla using your credentials." + _ " perform an attack on Bugzilla using your credentials." _ "

If you would like additional security on attachments to avoid" - _ " this, set this parameter to an alternate URL for your $terms.Bugzilla" - _ " that is not the same as urlbase or sslbase." + _ " this, set this parameter to an alternate URL for your Bugzilla" + _ " that is not the same as urlbase or sslbase." _ " That is, a different domain name that resolves to this exact" - _ " same $terms.Bugzilla installation.

" + _ " same Bugzilla installation.

" _ "

Note that if you have set the" - _ " cookiedomain" - _" parameter, you should set attachment_base to use a" + _ " cookiedomain" + _" parameter, you should set attachment_base to use a" _ " domain that would not be matched by" - _ " cookiedomain.

" - _ "

For added security, you can insert %bugid% into the URL," + _ " cookiedomain.

" + _ "

For added security, you can insert %bugid% into the URL," _ " which will be replaced with the ID of the current $terms.bug that" _ " the attachment is on, when you access an attachment. This will limit" _ " attachments to accessing only other attachments on the same" _ " ${terms.bug}. Remember, though, that all those possible domain names " - _ " (such as 1234.your.domain.com) must point to this same" - _ " $terms.Bugzilla instance.", + _ " (such as 1234.your.domain.com) must point to this same" + _ " Bugzilla instance.", allow_attachment_deletion => "If this option is on, administrators will be able to delete " _ "the content of attachments.", maxattachmentsize => "The maximum size (in kilobytes) of attachments to be stored " _ "in the database. If a file larger than this size is attached " _ - "to ${terms.abug}, $terms.Bugzilla will look at the " _ - "maxlocalattachment parameter " _ + "to ${terms.abug}, Bugzilla will look at the " _ + "maxlocalattachment parameter " _ "to determine if the file can be stored locally on the web server. " _ "If the file size exceeds both limits, then the attachment is rejected. " _ "Settings both parameters to 0 will prevent attaching files to ${terms.bugs}.", maxlocalattachment => "The maximum size (in megabytes) of attachments to be stored " _ "locally on the web server. If set to a value lower than the " _ - "maxattachmentsize parameter, " _ + "maxattachmentsize parameter, " _ "attachments will never be kept on the local filesystem." } %] diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl index 0a72938ca..902d2fc82 100644 --- a/template/en/default/admin/params/auth.html.tmpl +++ b/template/en/default/admin/params/auth.html.tmpl @@ -50,13 +50,13 @@

DB
- ${terms.Bugzilla}'s built-in authentication. This is the most common + Bugzilla's built-in authentication. This is the most common choice.
RADIUS
RADIUS authentication using a RADIUS server. - Please see the $terms.Bugzilla documentation for + Please see the Bugzilla documentation for more information. Using this method requires additional @@ -65,7 +65,7 @@
LDAP
LDAP authentication using an LDAP server. - Please see the $terms.Bugzilla documentation + Please see the Bugzilla documentation for more information. Using this method requires additional parameters to be set. @@ -84,8 +84,8 @@
  • defaulton/defaultoff - Default behavior as described - above, but user can choose whether $terms.Bugzilla will remember his - login or not. + above, but user can choose whether Bugzilla will + remember their login or not.
    • ", @@ -93,20 +93,27 @@ "front page will require a login. No anonymous users will " _ "be permitted.", + webservice_email_filter => + "Filter email addresses returned by the WebService API depending on " _ + "if the user is logged in or not. This works similarly to how the " _ + "web UI currently filters email addresses. If requirelogin " _ + "is enabled, then this parameter has no effect as users must be logged " _ + "in to use Bugzilla.", + emailregexp => "This defines the regular expression to use for legal email addresses. " _ "The default tries to match fully qualified email addresses. " _ - "Use .* to accept any email address following the " _ + "Use .* to accept any email address following the " _ "RFC 2822 " _ - "specification. Another popular value to put here is ^[^@]+$, " _ + "specification. Another popular value to put here is ^[^@]+$, " _ "which means 'local usernames, no @ allowed.'", - emailregexpdesc => "This describes in English words what kinds of legal addresses " _ - "are allowed by the emailregexp param.", + emailregexpdesc => "This description explains valid addresses that " _ + "are allowed by the emailregexp param.", emailsuffix => "This is a string to append to any email addresses when actually " _ "sending mail to that address. It is useful if you have changed " _ - "the emailregexp param to only allow local usernames, " _ + "the emailregexp param to only allow local usernames, " _ "but you want the mail to be delivered to username@my.local.hostname.", createemailregexp => "This defines the (case-insensitive) regexp to use for email addresses that are " _ @@ -126,5 +133,11 @@ "lower case letter and a number." _ "
  • letters_numbers_specialchars - Passwords must contain at least one " _ "letter, a number and a special character.
    • " + + password_check_on_login => + "If set, $terms.Bugzilla will check that the password meets the current " _ + "complexity rules and minimum length requirements when the user logs " _ + "into the $terms.Bugzilla web interface. If it doesn't, the user would " _ + "not be able to log in, and recieve a message to reset their password." } %] diff --git a/template/en/default/admin/params/bugfields.html.tmpl b/template/en/default/admin/params/bugfields.html.tmpl index 07b200825..1f177067a 100644 --- a/template/en/default/admin/params/bugfields.html.tmpl +++ b/template/en/default/admin/params/bugfields.html.tmpl @@ -11,7 +11,7 @@ %] [% param_descs = { - useclassification => "If this is on, $terms.Bugzilla will associate each product with a " _ + useclassification => "If this is on, Bugzilla will associate each product with a " _ "specific classification. But you must have 'editclassification' " _ "permissions enabled in order to edit classifications.", @@ -34,12 +34,16 @@ defaultplatform => "This is the platform that is preselected on the $terms.bug " _ "entry form.
    " _ "You can leave this empty: " _ - "$terms.Bugzilla will then use the platform that the browser " _ + "Bugzilla will then use the platform that the browser " _ "reports to be running on as the default.", defaultopsys => "This is the operating system that is preselected on the $terms.bug " _ "entry form.
    " _ "You can leave this empty: " _ - "$terms.Bugzilla will then use the operating system that the browser " _ - "reports to be running on as the default." } + "Bugzilla will then use the operating system that the browser " _ + "reports to be running on as the default.", + + collapsed_comment_tags => "A comma separated list of tags which, when applied " _ + "to comments, will cause them to be collapsed by default", + } %] diff --git a/template/en/default/admin/params/common.html.tmpl b/template/en/default/admin/params/common.html.tmpl index bf2675b16..db3bde777 100644 --- a/template/en/default/admin/params/common.html.tmpl +++ b/template/en/default/admin/params/common.html.tmpl @@ -69,14 +69,14 @@ [% END %] -
    - @@ -107,10 +107,10 @@ [% END %] [% ELSE %] - + Unknown param type [% param.type FILTER html %]!!! - - [% END %] + + [% END %]

    [% UNLESS param.no_reset %]

    diff --git a/template/en/default/admin/params/core.html.tmpl b/template/en/default/admin/params/core.html.tmpl index fd839ed9b..d7703b5b8 100644 --- a/template/en/default/admin/params/core.html.tmpl +++ b/template/en/default/admin/params/core.html.tmpl @@ -8,7 +8,7 @@ [% title = "Required Settings" - desc = "Settings that are required for proper operation of $terms.Bugzilla" + desc = "Settings that are required for proper operation of Bugzilla" %] [% param_descs = { @@ -19,17 +19,17 @@ "(SSL) $terms.Bugzilla URLs.", ssl_redirect => - "When this is enabled, $terms.Bugzilla will ensure that every page is" + "When this is enabled, Bugzilla will ensure that every page is" _ " accessed over SSL, by redirecting any plain HTTP requests to HTTPS" - _ " using the sslbase parameter. Also, when this is enabled," - _ " $terms.Bugzilla will send out links using sslbase in emails" - _ " instead of urlbase.", + _ " using the sslbase parameter. Also, when this is enabled," + _ " Bugzilla will send out links using sslbase in emails" + _ " instead of urlbase.", cookiepath => "Path, relative to your web document root, to which to restrict " _ - "$terms.Bugzilla cookies. Normally this is the URI portion of your URL " _ + "Bugzilla cookies. Normally this is the URI portion of your URL " _ "base. Begin with a / (single slash mark). For instance, if " _ - "$terms.Bugzilla serves from 'http://www.somedomain.com/bugzilla/', set " _ + "Bugzilla serves from 'http://www.somedomain.com/bugzilla/', set " _ "this parameter to /bugzilla/. Setting it to / will allow " _ "all sites served by this web server or virtual host to read " _ - "$terms.Bugzilla cookies.", + "Bugzilla cookies.", } %] diff --git a/template/en/default/admin/params/dependencygraph.html.tmpl b/template/en/default/admin/params/dependencygraph.html.tmpl index e8baf4572..64a334a20 100644 --- a/template/en/default/admin/params/dependencygraph.html.tmpl +++ b/template/en/default/admin/params/dependencygraph.html.tmpl @@ -6,8 +6,8 @@ # defined by the Mozilla Public License, v. 2.0. #%] [% - title = "Dependency Graphs" - desc = "Optional setup for dependency graphing" + title = "Graphs" + desc = "Optional setup to generate graphs" %] [% param_descs = { @@ -32,5 +32,15 @@ this value, make certain that the webdot server can read files from your webdot directory. On Apache you do this by editing the .htaccess file, for other systems the needed measures may vary. You can run checksetup.pl - to recreate the .htaccess file if it has been lost."} + to recreate the .htaccess file if it has been lost.", + + font_file => "You can specify the full path to a TrueType font file which will be used " _ + "to display text (labels, legends, ...) in charts and graphical reports. " _ + "To support as many languages as possible, we recommend to specify a TrueType " _ + "font such as Unifont " _ + "which supports all printable characters in the Basic Multilingual Plane. " _ + "If you leave this parameter empty, a default font will be used, but " _ + "its support is limited to English characters only and so other characters " _ + "will be displayed incorrectly.", + } %] diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl index 3febbaba4..4e1946dd8 100644 --- a/template/en/default/admin/params/editparams.html.tmpl +++ b/template/en/default/admin/params/editparams.html.tmpl @@ -35,14 +35,13 @@ [% PROCESS global/header.html.tmpl title = title message = message - style_urls = ['skins/standard/params.css'] + style_urls = ['skins/standard/admin.css'] javascript_urls = ['js/params.js', 'js/util.js'] - doc_section = "parameters.html" + doc_section = "administering/parameters.html" %] -

    +
    +
    - - - - -
    +
    +
    [%# NAVIGATION BAR %] @@ -66,38 +65,37 @@ [% END %] -
    		- [% IF curpanel == -1 %] - [% PROCESS admin/params/index.html.tmpl panels = panels %] - [% ELSE %] + -
    Note: - B[% %]ugzilla is developed entirely by volunteers. - The best way to give back to the B[% %]ugzilla project is to - contribute - yourself! - You don't have to be a programmer to contribute, there are lots of - things that we need. -
    +
    +
    + Note: + Bugzilla is developed entirely by volunteers. + The best way to give back to the Bugzilla project is to + contribute yourself! + You don't have to be a programmer to contribute, there are lots of + things that we need. +
    + [% IF curpanel == -1 %] + [% PROCESS admin/params/index.html.tmpl panels = panels %] + [% ELSE %]

    - This lets you edit the basic operating parameters of [% terms.Bugzilla %]. + This lets you edit the basic operating parameters of Bugzilla. Be careful!
    Any item you check "Reset" on will get reset to its default value.

    [%# CONTENT PANEL %] - + [% PROCESS admin/params/common.html.tmpl panel = current_panel %] - [% END %] -
    + [% END %] + + [% INCLUDE global/footer.html.tmpl %] diff --git a/template/en/default/admin/params/general.html.tmpl b/template/en/default/admin/params/general.html.tmpl index daa1f359e..6ebef8ea2 100644 --- a/template/en/default/admin/params/general.html.tmpl +++ b/template/en/default/admin/params/general.html.tmpl @@ -14,15 +14,7 @@ [% param_descs = { maintainer => "The email address of the person who maintains this installation " - _ " of ${terms.Bugzilla}.", - - docs_urlbase => - "The URL that is the common initial leading part of all" - _ " $terms.Bugzilla documentation URLs. It may be an absolute URL," - _ " or a URL relative to the urlbase parameter. Leave this" - _ " empty to suppress links to the documentation." - _ "'%lang%' will be replaced by user's preferred language (if" - _ " documentation is available in that language).", + _ " of Bugzilla.", utf8 => "Use UTF-8 (Unicode) encoding for all text in ${terms.Bugzilla}. New" @@ -36,24 +28,23 @@ _ " afterward.

    ", shutdownhtml => - "If this field is non-empty, then $terms.Bugzilla will be completely" + "If this field is non-empty, then Bugzilla will be completely" _ " disabled and this text will be displayed instead of all the" _ " $terms.Bugzilla pages.", announcehtml => - "If this field is non-empty, then $terms.Bugzilla will" + "If this field is non-empty, then Bugzilla will" _ " display whatever is in this field at the top of every" _ " HTML page. The HTML you put in this field is not wrapped or" _ " enclosed in anything. You might want to wrap it inside a" - _ "<div>. Give the div id=\"message\" to get" + _ "<div>. Give the div id=\"message\" to get" _ " green text inside a red box, or class=\"bz_private\" for" _ " dark red on a red background. Anything defined in " - _ " skins/standard/global.css or skins/custom/global.css" - _ " will work. To get centered text, use style=\"text-align: " - _ " center;\".", + _ " skins/standard/global.css or skins/custom/global.css" + _ " will work. To get centered text, use class=\"center\".", upgrade_notification => - "$terms.Bugzilla can inform you when a new release is available." + "Bugzilla can inform you when a new release is available." _ " The notification will appear on the $terms.Bugzilla homepage," _ " for administrators only." _ "
    • 'development_snapshot' notifies you about the development " @@ -67,7 +58,7 @@ _ " for newer release candidates too.
      • " _ "
    • 'disabled' will never notify you about new releases and no" _ " connection will be established to a remote server.
    " - _ "

    Note that if your $terms.Bugzilla server requires a proxy to" - _ " access the Internet, you may also need to set the proxy_url" + _ "

    Note that if your Bugzilla server requires a proxy to" + _ " access the Internet, you may also need to set the proxy_url" _ " parameter in the Advanced section.

    ", } %] diff --git a/template/en/default/admin/params/groupsecurity.html.tmpl b/template/en/default/admin/params/groupsecurity.html.tmpl index 7e30f0723..590f4da02 100644 --- a/template/en/default/admin/params/groupsecurity.html.tmpl +++ b/template/en/default/admin/params/groupsecurity.html.tmpl @@ -11,7 +11,7 @@ %] [% param_descs = { - makeproductgroups => "If this is on, $terms.Bugzilla will associate $terms.abug group " _ + makeproductgroups => "If this is on, Bugzilla will associate $terms.abug group " _ "with each product in the database, and use it for querying ${terms.bugs}.", chartgroup => "The name of the group of users who can use the 'New Charts' " _ @@ -29,18 +29,28 @@ querysharegroup => "The name of the group of users who can share their " _ "saved searches with others.", + comment_taggers_group => "The name of the group of users who can tag comment." _ + " Setting this to empty disables comment tagging.", + debug_group => "The name of the group of users who can view the actual " _ "SQL query generated when viewing $terms.bug lists and reports.", usevisibilitygroups => "Do you wish to restrict visibility of users to members of " _ "specific groups?", - + strict_isolation => "Don't allow users to be assigned to, " _ "be qa-contacts on, " _ "be added to CC list, " _ "or make or remove dependencies " _ "involving any bug that is in a product on which that " _ - "user is forbidden to edit.", - + "user is forbidden to edit.", + + or_groups => "Define the visibility of $terms.abug which is in multiple " _ + "groups. If this is on (recommended), a user only needs to " _ + "be a member of one of the $terms.bug's groups in order to " _ + "view it. If it is off, a user needs to be a member of all " _ + "the $terms.bug's groups. Note that in either case, if the " _ + "user has a role on the $terms.bug (e.g. reporter) that may " _ + "also affect their permissions." } %] diff --git a/template/en/default/admin/params/index.html.tmpl b/template/en/default/admin/params/index.html.tmpl index 65aa398eb..ee64eca9f 100644 --- a/template/en/default/admin/params/index.html.tmpl +++ b/template/en/default/admin/params/index.html.tmpl @@ -6,33 +6,23 @@ # defined by the Mozilla Public License, v. 2.0. #%] -

    - All parameters are displayed below, per section. - If you cannot find one from here, then the parameter does not exist. -

    +
    +

    + All parameters are displayed below, per section. + If you cannot find one from here, then the parameter does not exist. +

    -
    - - - - - - [% FOREACH panel = panels %] + [% FOREACH panel = panels %] +

    [% panel.title FILTER html %]

    + +
      [% FOREACH param = panel.param_list.sort('name') %] -
    - - - +
  • + + [% param.name FILTER html %] +
    • [% END %] - - - - [% END %] -
    ParameterSection
    - - [% param.name FILTER html %] - - [% panel.title FILTER html %] -
      
    + + [% END %]
    diff --git a/template/en/default/admin/params/ldap.html.tmpl b/template/en/default/admin/params/ldap.html.tmpl index 64b3dbd52..ab3521f27 100644 --- a/template/en/default/admin/params/ldap.html.tmpl +++ b/template/en/default/admin/params/ldap.html.tmpl @@ -35,11 +35,11 @@ LDAPmailattribute => "The name of the attribute of a user in your " _ "directory that contains the email address, to be " _ - "used as $terms.Bugzilla username. If this parameter " _ - "is empty, $terms.Bugzilla will use the LDAP username"_ - " as the $terms.Bugzilla username. You may also want" _ + "used as Bugzilla username. If this parameter " _ + "is empty, Bugzilla will use the LDAP username"_ + " as the Bugzilla username. You may also want" _ " to set the \"emailsuffix\" parameter, in this case.", - LDAPfilter => "LDAP filter to AND with the LDAPuidattribute for " _ + LDAPfilter => "LDAP filter to AND with the LDAPuidattribute for " _ "filtering the list of valid users." } %] diff --git a/template/en/default/admin/params/memcached.html.tmpl b/template/en/default/admin/params/memcached.html.tmpl new file mode 100644 index 000000000..50ec435fb --- /dev/null +++ b/template/en/default/admin/params/memcached.html.tmpl @@ -0,0 +1,22 @@ +[%# This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. + #%] +[% + title = "Memcached" + desc = "Set up Memcached integration" +%] + +[% param_descs = { + memcached_servers => + "If this option is set, Bugzilla will integrate with Memcached. " _ + "Specify one or more servers, separated by spaces, using hostname:port " _ + "notation (for example: 127.0.0.1:11211).", + + memcached_namespace => + "Specify a string to prefix to each key on Memcached.", + } +%] diff --git a/template/en/default/admin/params/mta.html.tmpl b/template/en/default/admin/params/mta.html.tmpl index f491a3035..bd93a3ee9 100644 --- a/template/en/default/admin/params/mta.html.tmpl +++ b/template/en/default/admin/params/mta.html.tmpl @@ -14,7 +14,12 @@ mail_delivery_method => "Defines how email is sent, or if it is sent at all.
    • - 'Sendmail', 'SMTP' and 'Qmail' are all MTAs. + 'SMTP' means use the SMTP protocol to talk to a remote + mail server. +
      • +
    • + 'Sendmail' means use the sendmail-compatible MTA + installed on the Bugzilla machine. You need to install a third-party sendmail replacement if you want to use sendmail on Windows.
      • @@ -23,7 +28,7 @@ in 'data/mailer.testfile' instead of being sent.
    • - 'none' will completely disable email. $terms.Bugzilla continues + 'None' will completely disable email. Bugzilla continues to act as though it is sending mail, but nothing is sent or stored.
      • @@ -32,17 +37,18 @@ mailfrom => "The email address of the $terms.Bugzilla mail daemon. Some email systems " _ "require this to be a valid email address.", - use_mailer_queue => "In a large $terms.Bugzilla installation, updating" - _ " $terms.bugs can be very slow, because $terms.Bugzilla sends all" - _ " email at once. If you enable this parameter, $terms.Bugzilla will" + use_mailer_queue => "In a large Bugzilla installation, updating" + _ " $terms.bugs can be very slow, because Bugzilla sends all" + _ " email at once. If you enable this parameter, Bugzilla will" _ " queue all mail and then send it in the background. This requires" _ " that you have installed certain Perl modules (as listed by" _ " checksetup.pl for this feature), and that you are" _ " running the jobqueue.pl daemon (otherwise your mail" - _ " won't get sent). This affects all mail sent by $terms.Bugzilla," + _ " won't get sent). This affects all mail sent by Bugzilla," _ " not just $terms.bug updates.", - smtpserver => "The SMTP server address (if using SMTP for mail delivery).", + smtpserver => "The SMTP server address with optional port number (if using SMTP" _ + " for mail delivery). eg: example.com or example.com:1234", smtp_username => "The username to pass to the SMTP server for SMTP authentication. " _ "Leave this field empty if your SMTP server doesn't require authentication.", @@ -54,7 +60,7 @@ smtp_debug => "If enabled, this will print detailed information to your" _ " web server's error log about the communication between" _ - " $terms.Bugzilla and your SMTP server. You can use this to" _ + " Bugzilla and your SMTP server. You can use this to" _ " troubleshoot email problems.", whinedays => "The number of days that we'll let a $terms.bug sit untouched in a CONFIRMED " _ diff --git a/template/en/default/admin/params/patchviewer.html.tmpl b/template/en/default/admin/params/patchviewer.html.tmpl deleted file mode 100644 index 61d32a07b..000000000 --- a/template/en/default/admin/params/patchviewer.html.tmpl +++ /dev/null @@ -1,51 +0,0 @@ -[%# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - # - # This Source Code Form is "Incompatible With Secondary Licenses", as - # defined by the Mozilla Public License, v. 2.0. - #%] -[% - title = "Patch Viewer" - desc = "Set up third-party applications to run with PatchViewer" -%] - -[% param_descs = { - cvsroot => "The CVS root that most " _ - "users of your system will be using for 'cvs diff'. Used in " _ - "Patch Viewer ('Diff' option on patches) to figure out where " _ - "patches are rooted even if users did the 'cvs diff' from " _ - "different places in the directory structure. (NOTE: if your " _ - "CVS repository is remote and requires a password, you must " _ - "either ensure the $terms.Bugzilla user has done a 'cvs login' or " _ - "specify the password " _ - "as " _ - "part of the CVS root.) Leave this blank if you have no " _ - "CVS repository.", - - cvsroot_get => "The CVS root $terms.Bugzilla will be using to get patches from. " _ - "Some installations may want to mirror their CVS repository on " _ - "the $terms.Bugzilla server or even have it on that same server, and " _ - "thus the repository can be the local file system (and much " _ - "faster). Make this the same as cvsroot if you don't " _ - "understand what this is (if cvsroot is blank, make this blank too).", - - bonsai_url => "The URL to a Bonsai " _ - "server containing information about your CVS repository. " _ - "Patch Viewer will use this information to create links to " _ - "bonsai's blame for each section of a patch (it will append " _ - "'/cvsblame.cgi?...' to this url). Leave this blank if you " _ - "don't understand what this is.", - - lxr_url => "The URL to an LXR server " _ - "that indexes your CVS repository. Patch Viewer will use this " _ - "information to create links to LXR for each file in a patch. " _ - "Leave this blank if you don't understand what this is.", - - lxr_root => "Some LXR installations do not index the CVS repository from the root -- " _ - "Mozilla's, for " _ - "example, starts indexing under mozilla/. This " _ - "means URLs are relative to that extra path under the root. " _ - "Enter this if you have a similar situation. Leave it blank " _ - "if you don't know what this is." } -%] diff --git a/template/en/default/admin/params/query.html.tmpl b/template/en/default/admin/params/query.html.tmpl index 52a960b44..d8a510282 100644 --- a/template/en/default/admin/params/query.html.tmpl +++ b/template/en/default/admin/params/query.html.tmpl @@ -26,29 +26,24 @@
    ", - mostfreqthreshold => "The minimum number of duplicates $terms.abug needs to show up on the " _ - "most frequently reported $terms.bugs page. " _ - "If you have a large database and this page takes a long time to " _ - "load, try increasing this number.", - mybugstemplate => "This is the URL to use to bring up a simple 'all of my $terms.bugs' " _ - "list for a user. %userid% will get replaced with the login name of a user.", + "list for a user. %userid% will get replaced with the login name of a user. " _ + "Special characters must be URL-encoded.", defaultquery => "This is the default query that initially comes up when you " _ - "access the advanced query page. It's in URL parameter " _ - "format, which makes it hard to read. Sorry!", + "access the advanced query page. It's in URL parameter format.", search_allow_no_criteria => "Unless the code explicitly allows all $terms.bugs to be returned, this " _ "parameter permits to block the execution of queries with no criteria. " _ "When turned off, a query must have some criteria specified to limit " _ "the number of $terms.bugs returned to the user. When turned on, a user " _ - "is allowed to run a query with no criteria and get all $terms.bugs he can " _ - "see in his list. Turning this parameter on is not recommended on large " _ + "is allowed to run a query with no criteria and get all $terms.bugs they can " _ + "see in their list. Turning this parameter on is not recommended on large " _ "installations.", default_search_limit => - "By default, $terms.Bugzilla limits searches done in the web" + "By default, Bugzilla limits searches done in the web" _ " interface to returning only this many results, for performance" _ " reasons. (This only affects the HTML format of search results--CSV," _ " XML, and other formats are exempted.) Users can click a link on the" diff --git a/template/en/default/admin/params/shadowdb.html.tmpl b/template/en/default/admin/params/shadowdb.html.tmpl index 9f9f31491..2d5fced3b 100644 --- a/template/en/default/admin/params/shadowdb.html.tmpl +++ b/template/en/default/admin/params/shadowdb.html.tmpl @@ -14,7 +14,7 @@ shadowdbhost => "The host the shadow database is on.", shadowdbport => "The port the shadow database is on. Ignored if " _ - "shadowdbhost is blank. Note: if the host is the local " _ + "shadowdbhost is blank. Note: if the host is the local " _ "machine, then MySQL will ignore this setting, and you must " _ "specify a socket below.", @@ -23,14 +23,14 @@ "ignores the port specified by the client and connects using " _ "its compiled-in socket path (on unix machines) when connecting " _ "from a client to a local server. If you leave this blank, and " _ - "have the database on localhost, then the shadowdbport " _ + "have the database on localhost, then the shadowdbport " _ "will be ignored.", shadowdb => "If non-empty, then this is the name of another database in " _ - "which $terms.Bugzilla will use as a read-only copy of everything. " _ + "which Bugzilla will use as a read-only copy of everything. " _ "This is done so that long slow read-only operations can be used " _ "against this db, and not lock up things for everyone else. This " _ - "database is on the shadowdbhost, and must exist. " _ - "$terms.Bugzilla does not update it, if you use this parameter, then " _ + "database is on the shadowdbhost, and must exist. " _ + "Bugzilla does not update it, if you use this parameter, then " _ "you need to set up replication for your database." } %] diff --git a/template/en/default/admin/params/usermatch.html.tmpl b/template/en/default/admin/params/usermatch.html.tmpl index ebbc363b3..ad13f3864 100644 --- a/template/en/default/admin/params/usermatch.html.tmpl +++ b/template/en/default/admin/params/usermatch.html.tmpl @@ -11,7 +11,7 @@ %] [% param_descs = { - usemenuforusers => "If this option is set, $terms.Bugzilla will offer you a list " _ + usemenuforusers => "If this option is set, Bugzilla will offer you a list " _ "to select from (instead of a text entry field) where a user " _ "needs to be selected. This option should not be enabled on " _ "sites where there are a large number of users.", diff --git a/template/en/default/admin/products/confirm-delete.html.tmpl b/template/en/default/admin/products/confirm-delete.html.tmpl index eb1094fce..2e02068a4 100644 --- a/template/en/default/admin/products/confirm-delete.html.tmpl +++ b/template/en/default/admin/products/confirm-delete.html.tmpl @@ -24,53 +24,45 @@ style_urls = ['skins/standard/admin.css'] %] - - - - +
    FieldValue
    + + + [% IF Param('useclassification') %] - + - - [%# descriptions are intentionally not filtered to allow html content %] + [% END %] - - + - - [%# descriptions are intentionally not filtered to allow html content %] - + + [% IF Param('usetargetmilestone') %] - + - + - - +
    FieldValue
    Classification:Classification [% classification.name FILTER html %]
    Classification Description:Classification Description [% IF classification.description %] [% classification.description FILTER html_light %] [% ELSE %] - missing + missing [% END %]
    Product: + Product [% product.name FILTER html %]
    Description: - [% IF product.description %] - [% product.description FILTER html_light %] - [% ELSE %] - missing - [% END %] - Description[% product.description FILTER html_light %]
    Milestone URL:Milestone URL [% IF product.milestone_url %] @@ -84,7 +76,7 @@ [% END %]
    Closed for [% terms.bugs %]:Closed for [% terms.bugs %] [% IF product.is_active %] open @@ -99,26 +91,19 @@ [% IF product.components.size > 0 %] - Components: + Components [% ELSE %] - Components: + Components [% END %] [% IF product.components.size > 0 %] - +
    [% FOREACH c = product.components %] - - [%# descriptions are intentionally not filtered to allow html content %] - + + [% END %]
    [% c.name FILTER html %]: - [% IF c.description %] - [% c.description FILTER html_light %] - [% ELSE %] - missing - [% END %] - [% c.name FILTER html %]:[% c.description FILTER html_light %]
    @@ -132,17 +117,19 @@     		[% IF product.versions.size > 0 %] - Versions: + Versions [% ELSE %] - Versions: + Versions [% END %] [% IF product.versions.size > 0 %] - [% FOREACH v = product.versions %] - [% v.name FILTER html %]
    - [% END %] +
    + [% FOREACH v = product.versions %] + [% v.name FILTER html %]
    + [% END %] +
    [% ELSE %] none [% END %] @@ -152,20 +139,22 @@ [% IF Param('usetargetmilestone') %]
    + [% IF product.milestones.size > 0 %] - Milestones: + Milestones [% ELSE %] - Milestones: + Milestones [% END %] [% IF product.milestones.size > 0 %] - [% FOREACH m = product.milestones %] - [% m.name FILTER html %]
    - [% END %] +
    + [% FOREACH m = product.milestones %] + [% m.name FILTER html %]
    + [% END %] +
    [% ELSE %] none [% END %] @@ -174,7 +163,7 @@ [% END %]
    [% terms.Bugs %]:[% terms.Bugs %] [% IF product.bug_count %] Sorry, there - - [% IF product.bug_count > 1 %] - are [% product.bug_count FILTER html %] [%+ terms.bugs %] - [% ELSE %] - is 1 [% terms.bug %] - [% END %] - - outstanding for this product. You must reassign - - [% IF product.bug_count > 1 %] - those [% terms.bugs %] - [% ELSE %] - that [% terms.bug %] - [% END %] - - to another product before you can delete this one.

    +

    + Sorry, there + [% IF product.bug_count > 1 %] + are [% product.bug_count FILTER html %] [%+ terms.bugs %] + [% ELSE %] + is 1 [% terms.bug %] + [% END %] + outstanding for this product. You must reassign + [% IF product.bug_count > 1 %] + those [% terms.bugs %] + [% ELSE %] + that [% terms.bug %] + [% END %] + to another product before you can delete this one. +

    [% ELSE %] - - - - -
    - There - [% IF product.bug_count > 1 %] - are [% product.bug_count FILTER html %] [%+ terms.bugs %] - [% ELSE %] - is 1 [% terms.bug %] - [% END %] - entered for this product! When you delete this - product, ALL stored [% terms.bugs %] and - their history will be deleted, too. -
    +

    + There + [% IF product.bug_count > 1 %] + are [% product.bug_count FILTER html %] [%+ terms.bugs %] + [% ELSE %] + is 1 [% terms.bug %] + [% END %] + entered for this product! When you delete this product, ALL + stored [% terms.bugs %] and their history will be deleted, too. +

    [% END %] diff --git a/template/en/default/admin/products/create.html.tmpl b/template/en/default/admin/products/create.html.tmpl index 6d4009586..0dcfd7283 100644 --- a/template/en/default/admin/products/create.html.tmpl +++ b/template/en/default/admin/products/create.html.tmpl @@ -17,6 +17,7 @@ [% PROCESS global/header.html.tmpl title = title + generate_api_token = 1 style_urls = ['skins/standard/admin.css'] javascript_urls = ['js/util.js', 'js/field.js'] yui = [ 'autocomplete' ] @@ -30,18 +31,18 @@ %]
    - +
    [% PROCESS "admin/products/edit-common.html.tmpl" %] - + - + diff --git a/template/en/default/admin/products/edit-common.html.tmpl b/template/en/default/admin/products/edit-common.html.tmpl index 2b76c44ac..baf5015ae 100644 --- a/template/en/default/admin/products/edit-common.html.tmpl +++ b/template/en/default/admin/products/edit-common.html.tmpl @@ -14,32 +14,32 @@ [% IF Param('useclassification') %] - + [% END %] - + - - - + - - +
    Version:Version: + value="[% version FILTER html %]" required>
    Create chart datasets for this product:Create chart datasets for this product:
    Classification:Classification: [% classification.name FILTER html %]
    Product:Product: + value="[% product.name FILTER html %]" required>
    Description:
    Open for [% terms.bug %] entry:Open for [% terms.bug %] entry:
    + @@ -51,7 +51,7 @@ [% IF Param('usetargetmilestone') -%]
    Default milestone:Default milestone: [% IF product.milestones.size %] +
    [% PROCESS "admin/products/edit-common.html.tmpl" %] - - [% IF Param('usetargetmilestone') %] - [% END %] - - - + +
    + Edit components: @@ -45,55 +45,52 @@ [% FOREACH comp = product.components %] [% comp.name FILTER html %]:  - [% IF comp.description %] - [% comp.description FILTER html_light %] - [% ELSE %] - description missing - [% END %] + [%- comp.name FILTER uri %]">[% comp.name FILTER html %]: + [% comp.description FILTER html_light %]
    [% END %] [% ELSE %] - missing + missing [% END %]
    - Edit -versions: + + Edit versions: [%- IF product.versions.size -%] - [% FOREACH v = product.versions %] - [% v.name FILTER html %] -
    - [% END %] +
    + [% FOREACH v = product.versions %] + [% v.name FILTER html %]
    + [% END %] +
    [% ELSE %] - missing + missing [% END %]
    + Edit milestones: [%- IF product.milestones.size -%] - [%- FOREACH m = product.milestones -%] - [% m.name FILTER html %] -
    - [% END %] +
    + [%- FOREACH m = product.milestones -%] + [% m.name FILTER html %]
    + [% END %] +
    [% ELSE %] - missing + missing [% END %]
    + Edit Group Access Controls: @@ -102,7 +99,7 @@ versions: [% IF product.group_controls.size %] [% FOREACH g = product.group_controls.values.sort("name") %] - [% g.group.name FILTER html %]:  + [% g.group.name FILTER html %]: [% IF g.group.isactive %] [% group_control.${g.membercontrol} FILTER html %]/ [% group_control.${g.othercontrol} FILTER html %] @@ -122,9 +119,11 @@ versions:
    [% terms.Bugs %]: - [% product.bug_count FILTER html %][% terms.Bugs %]: + + [% product.bug_count FILTER html %] +
    diff --git a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl index fc3ad9b82..354673c3d 100644 --- a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl @@ -11,32 +11,41 @@ [% END %] [% PROCESS global/header.html.tmpl title = title %] + [% FOREACH group = mandatory_groups %] -

    -group '[% group.name FILTER html %]' impacts [% group.count %] -[%+ terms.bugs %] for -which the group is newly mandatory and will be added. +

    + Group '[% group.name FILTER html %]' impacts + [% IF group.count == 1 %] + one [%+ terms.bug %] + [% ELSE %] + [% group.count %] [%+ terms.bugs %] + [% END %] + for which this group is mandatory and will be added. +

    [% END %] [% FOREACH group = na_groups %] -

    -group '[% group.name FILTER html %]' impacts [% group.count %]  -[% terms.bugs %] for which the group is no longer applicable and will -be removed.[% END %] - +

    + Group '[% group.name FILTER html %]' impacts + [% IF group.count == 1 %] + one [%+ terms.bug %] + [% ELSE %] + [% group.count %] [%+ terms.bugs %] + [% END %] + for which this group is no longer applicable and will be removed. +

    +[% END %] + [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %] - -
    - Click "Continue" to proceed with the change including the changes - indicated above. If you do not want these changes, use "back" to - return to the previous page.

    - - +
    + Click "Continue" to proceed with the change including the changes + indicated above. If you do not want these changes, use "back" to + return to the previous page.

    - + + - [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/products/groupcontrol/edit.html.tmpl b/template/en/default/admin/products/groupcontrol/edit.html.tmpl index 889647e7e..876d95f92 100644 --- a/template/en/default/admin/products/groupcontrol/edit.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/edit.html.tmpl @@ -10,7 +10,8 @@ Edit Group Controls for [% product.name FILTER html %] [% END %] [% PROCESS global/header.html.tmpl - title = title + title = title + style_urls = ['skins/standard/admin.css'] %] [% display_headers = 1 %] @@ -23,8 +24,8 @@ - - +
    + @@ -37,9 +38,9 @@ [% END %] [% IF !group.group.isactive %] - + - + [% ELSE %] @@ -129,15 +130,17 @@ product.

    If any group has Entry selected, then this product will -restrict [% terms.bug %] entry to only those users who are members of all the -groups with entry selected. +restrict [% terms.bug %] entry to only those users who are members of +[%+ IF Param('or_groups') %]at least one of[% ELSE %]all[% END %] the groups +with entry selected.

    If any group has Canedit selected, then this product -will be read-only for any users who are not members of all of -the groups with Canedit selected. ONLY users who are members of -all the canedit groups will be able to edit. This is an additional -restriction that further restricts what can be edited by a user. +will be read-only for any users who are not members of +[%+ IF Param('or_groups') %]one[% ELSE %]all[% END %] of the groups with +Canedit selected. ONLY users who are members of +[%+ IF Param('or_groups') %]at least one of[% ELSE %]all[% END %] the canedit groups +will be able to edit. This is an additional restriction that further restricts what can be edited by a user.

    The following settings control let you choose privileges on a per-product basis. @@ -164,7 +167,7 @@ indicate which [% terms.bugs %] will be placed in this group according to the following definitions.

    -
    Group Entry MemberControl
    [% group.group.name FILTER html %]DisabledDisabled [% group.bug_count FILTER html %]
    +
    MemberControl diff --git a/template/en/default/admin/products/groupcontrol/updated.html.tmpl b/template/en/default/admin/products/groupcontrol/updated.html.tmpl index 5ee066c86..1294754fb 100644 --- a/template/en/default/admin/products/groupcontrol/updated.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/updated.html.tmpl @@ -18,24 +18,36 @@ [% PROCESS global/header.html.tmpl title = title %] -

    + [% IF changes._group_controls.now_na.size %] [% FOREACH g = changes._group_controls.now_na %] - Removing [% terms.bugs %] from group '[% g.name FILTER html %]' which - no longer applies to this product

    - [% g.bug_count FILTER html %] [%+ terms.bugs %] removed

    +

    + Removing [% terms.bugs %] from group '[% g.name FILTER html %]' which is + no longer applicable to this product.
    + [% IF g.bug_count == 1 %] + One [% terms.bug %] removed. + [% ELSE %] + [% g.bug_count FILTER html %] [%+ terms.bugs %] removed. + [% END %] +

    [% END %] [% END %] [% IF changes._group_controls.now_mandatory.size %] [% FOREACH g = changes._group_controls.now_mandatory %] +

    Adding [% terms.bugs %] to group '[% g.name FILTER html %]' which is - mandatory for this product

    - [% g.bug_count FILTER html %] [%+ terms.bugs %] added

    + now mandatory for this product.
    + [% IF g.bug_count == 1 %] + One [% terms.bug %] added. + [% ELSE %] + [% g.bug_count FILTER html %] [%+ terms.bugs %] added. + [% END %] +

    [% END %] [% END %] -Group control updates done

    +

    Group control updated.

    [% PROCESS admin/products/footer.html.tmpl %] diff --git a/template/en/default/admin/products/list-classifications.html.tmpl b/template/en/default/admin/products/list-classifications.html.tmpl index ea32a0057..39f3ee1c1 100644 --- a/template/en/default/admin/products/list-classifications.html.tmpl +++ b/template/en/default/admin/products/list-classifications.html.tmpl @@ -16,6 +16,7 @@ [% PROCESS global/header.html.tmpl title = "Select Classification" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ @@ -31,7 +32,7 @@ }, { name => "product_count" - align => "right" + class => "right" heading => "Product Count" } ] diff --git a/template/en/default/admin/products/list.html.tmpl b/template/en/default/admin/products/list.html.tmpl index a5126afc3..58edaa7bd 100644 --- a/template/en/default/admin/products/list.html.tmpl +++ b/template/en/default/admin/products/list.html.tmpl @@ -26,24 +26,31 @@ [% PROCESS global/header.html.tmpl title = "Select product $classification_title" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ - { + { name => "name" heading => "Edit product..." contentlink => 'editproducts.cgi?action=edit&product=%%name%%' }, - { + { name => "description" heading => "Description" allow_html_content => 1 }, - { + { name => "is_active" heading => "Open For New $terms.Bugs" yesno_field => 1 }, + { + name => "allows_unconfirmed" + heading => "Allow " _ display_value('bug_status', 'UNCONFIRMED') _ + " " _ terms.Bugs + yesno_field => 1 + }, ] %] [% IF showbugcounts %] @@ -51,7 +58,7 @@ [% columns.push({ name => "bug_count" heading => "$terms.Bug Count" - align => 'right' + class => 'right' contentlink => 'buglist.cgi?product=%%name%%' }) %] diff --git a/template/en/default/admin/products/updated.html.tmpl b/template/en/default/admin/products/updated.html.tmpl index 4d2280163..cc0c9f8ea 100644 --- a/template/en/default/admin/products/updated.html.tmpl +++ b/template/en/default/admin/products/updated.html.tmpl @@ -39,7 +39,7 @@

    Updated description to:

    -

    [% product.description FILTER html_light %]

    +

    [% product.description FILTER html_light %]

    [% END %] [% IF changes.isactive.defined %] diff --git a/template/en/default/admin/sanitycheck/list.html.tmpl b/template/en/default/admin/sanitycheck/list.html.tmpl index 681466262..5da6b8735 100644 --- a/template/en/default/admin/sanitycheck/list.html.tmpl +++ b/template/en/default/admin/sanitycheck/list.html.tmpl @@ -11,7 +11,7 @@

    - [% terms.Bugzilla %] is checking the referential integrity of your database. + Bugzilla is checking the referential integrity of your database. This may take several minutes to complete.

    diff --git a/template/en/default/admin/settings/edit.html.tmpl b/template/en/default/admin/settings/edit.html.tmpl index 411c527a6..86fb79e7b 100644 --- a/template/en/default/admin/settings/edit.html.tmpl +++ b/template/en/default/admin/settings/edit.html.tmpl @@ -16,41 +16,38 @@ #%] [% PROCESS global/header.html.tmpl - title = "Default Preferences" - %] + title = "Default Preferences" + style_urls = ['skins/standard/admin.css'] +%] [% PROCESS "global/setting-descs.none.tmpl" %]

    -This lets you edit the default preferences values. + This lets you edit the default preferences values. The Default Value displayed + for each preference will apply to all users who do not choose their own value, + and to anyone who is not logged in.

    -

    -The Default Value displayed for each preference will apply to all users who -do not choose their own value, and to anyone who is not logged in. -

    -

    -The 'Enabled' checkbox controls whether or not this preference is available -to users.
    -If it is checked, users will see this preference on their User Preferences page, -and will be allowed to choose their own value if they desire.
    -If it is not checked, this preference will not appear on the User Preference -page, and the Default Value will automatically apply to everyone. -

    -
    -[% IF settings.size %] -
    - - - - - - +
    + The 'Enabled' checkbox controls whether or not this preference is available to users: +
      +
    • If it is checked, users will be allowed to choose their own value if they desire.
      • +
    • If it is not checked, the Default Value will automatically apply to everyone.
      • +
    +
    + + +
    Preference TextDefault ValueEnabled
    + + + + + - [% FOREACH name = settings.keys %] + [% FOREACH name = settings.keys %] [% checkbox_name = name _ '-enabled' %] - - - [% END %] + [% END %]
    Preference TextDefault ValueEnabled
    + [% setting_descs.$name OR name FILTER html %] @@ -63,31 +60,19 @@ page, and the Default Value will automatically apply to everyone. [% END %] + -
    - - - - - -
    - -
    - +
    -[% ELSE %] - There are no preferences to edit. -[% END %] [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/sudo.html.tmpl b/template/en/default/admin/sudo.html.tmpl index 4d072f114..8cdfb5204 100644 --- a/template/en/default/admin/sudo.html.tmpl +++ b/template/en/default/admin/sudo.html.tmpl @@ -8,14 +8,15 @@ [% PROCESS global/header.html.tmpl title = "Begin sudo session" + generate_api_token = 1 style_urls = ['skins/standard/admin.css'] - doc_section = "useradmin.html#impersonatingusers" + doc_section = "administering/users.html#impersonating-users" %] [% DEFAULT target_login = "" %]

    - The sudo feature of [% terms.Bugzilla %] allows you to impersonate a + The sudo feature of Bugzilla allows you to impersonate a user for a short time While an sudo session is in progress, every action you perform will be taking place as if you had logged in as the user whom will be impersonating. @@ -41,6 +42,7 @@ value => target_login_default accesskey => "u" size => 30 + mandatory => 1 %]

    @@ -68,7 +70,7 @@ Finally, enter : - +
    diff --git a/template/en/default/admin/table.html.tmpl b/template/en/default/admin/table.html.tmpl index 80f6417a3..993181c7f 100644 --- a/template/en/default/admin/table.html.tmpl +++ b/template/en/default/admin/table.html.tmpl @@ -25,8 +25,6 @@ # field_descs hash will be used instead of "content." # See fieldvalues/select-field for an example of use. # This content WILL be HTML-filtered in this case. - # align: left/center/right. Controls the horizontal alignment of the - # text in the column. # allow_html_content: if defined, then this column allows some html content # and so it will be only partially filtered. # yesno_field: Turn the data from 0/!0 into Yes/No @@ -67,11 +65,11 @@ [%################### TABLE HEADER ######################%] - - +
    + [% FOREACH c = columns %] [%# Default to align left for headers %] - [% END %] @@ -89,7 +87,6 @@ [% contentlink = c.contentlink content = c.content content_use_field = c.content_use_field - align = c.align class = c.class allow_html_content = c.allow_html_content yesno_field = c.yesno_field @@ -121,8 +118,7 @@ [% END %] [% END %] - + [% END %] diff --git a/template/en/default/admin/users/confirm-delete.html.tmpl b/template/en/default/admin/users/confirm-delete.html.tmpl index 73a72d08d..4dab8b471 100644 --- a/template/en/default/admin/users/confirm-delete.html.tmpl +++ b/template/en/default/admin/users/confirm-delete.html.tmpl @@ -38,16 +38,19 @@ [% PROCESS global/header.html.tmpl title = title - style_urls = ['skins/standard/admin.css', - 'skins/standard/editusers.css'] - doc_section = "useradmin.html#user-account-deletion" + style_urls = ['skins/standard/admin.css'] + doc_section = "administering/users.html#deleting-users" %] [% PROCESS admin/users/listselectvars.html.tmpl listselectionvalues = listselectionvalues %] -
    + [% c.heading FILTER html %] + [% IF contentlink %] [% FOREACH m = contentlink.match('%%(.+?)%%', 1) %] @@ -155,7 +151,7 @@ [% END %] [% IF data.size == 0 %] -
    <none>
    <none>
    +
    + + + + @@ -426,7 +429,7 @@ The user has performed audited administrative tasks that are logged in the database. If you delete this user account, the audit log entries - will no longer be indentifiable. + will no longer be identifiable. [% END %] [% Hook.process('warn_safe') %] @@ -441,9 +444,9 @@

    - - - + + + [% INCLUDE listselectionhiddenfields %]

    diff --git a/template/en/default/admin/users/create.html.tmpl b/template/en/default/admin/users/create.html.tmpl index 354ba5f2d..6fbd1dc2f 100644 --- a/template/en/default/admin/users/create.html.tmpl +++ b/template/en/default/admin/users/create.html.tmpl @@ -14,29 +14,28 @@ [% PROCESS global/header.html.tmpl title = "Add user" - style_urls = ['skins/standard/editusers.css'] - onload = "document.forms['f'].login.focus()" - doc_section = "useradmin.html#createnewusers" + style_urls = ['skins/standard/admin.css'] + doc_section = "administering/users.html#creating-new-users" %] [% PROCESS admin/users/listselectvars.html.tmpl listselectionvalues = listselectionvalues %] - -
    FieldValue
    Login name: [% otheruser.login FILTER html %]
    - [% PROCESS admin/users/userdata.html.tmpl - editform = 0 - editusers = editusers - otheruser = [] - %] -
    -

    - - - - [% INCLUDE listselectionhiddenfields %] -

    + + + [% PROCESS admin/users/userdata.html.tmpl + editform = 0 + editusers = editusers + otheruser = [] + %] +
    +

    + + + + [% INCLUDE listselectionhiddenfields %] +

    diff --git a/template/en/default/admin/users/edit.html.tmpl b/template/en/default/admin/users/edit.html.tmpl index b75f8400d..2b28aa2d3 100644 --- a/template/en/default/admin/users/edit.html.tmpl +++ b/template/en/default/admin/users/edit.html.tmpl @@ -22,8 +22,8 @@ [% PROCESS global/header.html.tmpl title = title message = message - style_urls = ['skins/standard/admin.css', 'skins/standard/editusers.css'] - doc_section = "useradmin.html#modifyusers" + style_urls = ['skins/standard/admin.css'] + doc_section = "administering/users.html#modifying-users" javascript_urls = [ 'js/field.js' ] %] @@ -32,7 +32,7 @@ %]

    - +
    [% PROCESS admin/users/userdata.html.tmpl editform = 1 editusers = editusers @@ -42,7 +42,7 @@
    Group access: - +
    [% IF editusers %] [% IF editusers %] - + [% END %] @@ -65,7 +65,7 @@ [% %] + [% ' checked="checked"' IF perms.directbless %]> [% ']' IF perms.indirectbless %] [% END %]
    @@ -52,7 +52,7 @@
    ||User is a member of these groups
    @@ -75,7 +75,7 @@ id="group_[% group.id %]" name="group_[% group.id %]" value="1" - [% ' checked="checked"' IF perms.directmember %] /> + [% ' checked="checked"' IF perms.directmember %]> [% '*' IF perms.regexpmember %] [% ']' IF perms.derivedmember %] @@ -115,9 +115,9 @@

    - - - + + + [% INCLUDE listselectionhiddenfields %] @@ -127,7 +127,7 @@

    - User is a member of any groups shown with a check or grey bar. + User is a member of all groups shown with a check or grey bar. A grey bar indicates indirect membership, either derived from other groups (marked with square brackets) or via regular expression (marked with '*'). @@ -143,9 +143,9 @@ [% IF Param('allowuserdeletion') && editusers %]

    - - - + + + [% INCLUDE listselectionhiddenfields %]

    diff --git a/template/en/default/admin/users/list.html.tmpl b/template/en/default/admin/users/list.html.tmpl index ff23b7727..f90996882 100644 --- a/template/en/default/admin/users/list.html.tmpl +++ b/template/en/default/admin/users/list.html.tmpl @@ -16,8 +16,8 @@ [% PROCESS global/header.html.tmpl title = "Select user" - style_urls = ['skins/standard/editusers.css'] - doc_section = "useradmin.html" + style_urls = ['skins/standard/admin.css'] + doc_section = "administering/users.html" %] [% PROCESS admin/users/listselectvars.html.tmpl @@ -65,11 +65,11 @@ [% FOREACH thisuser = users %] [% IF !thisuser.realname %] [%# We cannot pass one class now and one class later. %] - [% SET classes = (thisuser.is_enabled ? "missing" : "bz_inactive missing") %] + [% SET classes = (thisuser.is_enabled ? "warning" : "bz_inactive warning") %] [% overrides.realname.login_name.${thisuser.login_name} = { content => "missing" override_content => 1 - class => "$classes" + class => classes override_class => 1 } %] diff --git a/template/en/default/admin/users/listselectvars.html.tmpl b/template/en/default/admin/users/listselectvars.html.tmpl index bd03113d5..d738b254c 100644 --- a/template/en/default/admin/users/listselectvars.html.tmpl +++ b/template/en/default/admin/users/listselectvars.html.tmpl @@ -21,6 +21,6 @@ [% BLOCK listselectionhiddenfields %] [% FOREACH field = listselectionvalues.keys %] + value="[% listselectionvalues.$field FILTER html %]"> [% END %] [% END %] diff --git a/template/en/default/admin/users/responsibilities.html.tmpl b/template/en/default/admin/users/responsibilities.html.tmpl index 67ea7d294..defe47173 100644 --- a/template/en/default/admin/users/responsibilities.html.tmpl +++ b/template/en/default/admin/users/responsibilities.html.tmpl @@ -7,7 +7,7 @@ #%] [% hidden_products = 0 %] - +
    [% FOREACH item = otheruser.product_responsibilities %] [% IF !user.can_see_product(item.product.name) %] [% hidden_products = 1 %] @@ -15,7 +15,7 @@ [% END %] - + diff --git a/template/en/default/admin/users/search.html.tmpl b/template/en/default/admin/users/search.html.tmpl index c66af4c5c..17477a012 100644 --- a/template/en/default/admin/users/search.html.tmpl +++ b/template/en/default/admin/users/search.html.tmpl @@ -17,9 +17,8 @@ [% PROCESS global/header.html.tmpl title = "Search users" - style_urls = ['skins/standard/editusers.css'] - onload = "document.forms['f'].matchstr.focus()" - doc_section = "useradmin.html#user-account-search" + style_urls = ['skins/standard/admin.css'] + doc_section = "administering/users.html" %] [% PROCESS admin/users/listselectvars.html.tmpl @@ -27,7 +26,7 @@ %] - +

    - + -

    + +

    [% IF restrictablegroups.size %] -

    +

    - + Restrict search to + + users.

    [% Hook.process('end') %] diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl index ae952d151..c08cd0018 100644 --- a/template/en/default/admin/users/userdata.html.tmpl +++ b/template/en/default/admin/users/userdata.html.tmpl @@ -21,11 +21,12 @@ @@ -107,3 +114,12 @@ [% END %] +[% UNLESS editform %] + + + + +[% END %] diff --git a/template/en/default/admin/versions/confirm-delete.html.tmpl b/template/en/default/admin/versions/confirm-delete.html.tmpl index e6f39226f..928170f50 100644 --- a/template/en/default/admin/versions/confirm-delete.html.tmpl +++ b/template/en/default/admin/versions/confirm-delete.html.tmpl @@ -21,33 +21,33 @@ style_urls = ['skins/standard/admin.css'] %] -
    Product: [% item.product.name FILTER html %]Product: [% item.product.name FILTER html %]
    Component
    [% IF editusers %] - + [% IF editform %] [% IF !otheruser.in_group('bz_sudo_protect') %] -
    +
    Impersonate this user [% END %] @@ -52,9 +53,8 @@     		[% IF editusers %] - + [% ELSE %] [% otheruser.name FILTER html %] [% END %] @@ -65,15 +65,22 @@ # if we ever have a login system that can create accounts through # createaccount.cgi but can't change passwords. #%] - + [% password_complexity = Param('password_complexity') %] [% IF editusers %] [% IF user.authorizer.can_change_password %]
    - [% IF editform %]
    + value="" autocomplete="off" [% 'required' IF !editform %]> + [% IF password_complexity == "mixed_letters" %] + (Password must contain at least one UPPER and one lowercase letter.) + [% ELSIF password_complexity == "letters_numbers" %] + (Password must contain at least one UPPER and one lower case letter and a number.) + [% ELSIF password_complexity == "letters_numbers_specialchars" %] + (Password must contain at least one letter, a number and a special character.) + [% END %] + [% IF editform %]
    (Enter new password to change.) [% END %]
    + + (Email this user their account information. The password will not be included.) +
    - - - - - - - - - - - - - - - - +
    FieldValue
    Version:[% version.name FILTER html %]
    Version of Product:[% product.name FILTER html %]
    [% terms.Bugs %]: -[% IF version.bug_count %] - - [%- version.bug_count FILTER none %] -[% ELSE %] - None -[% END %] -
    + + + + + + + + + + + + + + + +
    FieldValue
    Version[% version.name FILTER html %]
    Version of Product[% product.name FILTER html %]
    [% terms.Bugs %] + [% IF version.bug_count %] + + [%- version.bug_count FILTER none %] + [% ELSE %] + None + [% END %] +

    Confirmation

    diff --git a/template/en/default/admin/versions/create.html.tmpl b/template/en/default/admin/versions/create.html.tmpl index af7258238..648adcebd 100644 --- a/template/en/default/admin/versions/create.html.tmpl +++ b/template/en/default/admin/versions/create.html.tmpl @@ -17,14 +17,15 @@ [% PROCESS global/header.html.tmpl title = title subheader = subheader + style_urls = ['skins/standard/admin.css'] %] - +
    - + + value="" required>
    diff --git a/template/en/default/admin/versions/edit.html.tmpl b/template/en/default/admin/versions/edit.html.tmpl index 195a94c26..1ef0b2f66 100644 --- a/template/en/default/admin/versions/edit.html.tmpl +++ b/template/en/default/admin/versions/edit.html.tmpl @@ -17,20 +17,24 @@ [%- product.name FILTER html %]'[% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] - - +
    - - + + - - + +
    + +
    + +
    diff --git a/template/en/default/admin/versions/list.html.tmpl b/template/en/default/admin/versions/list.html.tmpl index 1cf3e8643..43a14f9ee 100644 --- a/template/en/default/admin/versions/list.html.tmpl +++ b/template/en/default/admin/versions/list.html.tmpl @@ -15,6 +15,7 @@ '[% product.name FILTER html %]'[% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] [% edit_contentlink = BLOCK %]editversions.cgi?action=edit&product= @@ -44,7 +45,7 @@ [% columns.push({ name => "bug_count" heading => "$terms.Bugs" - align => "right" + class => "right" contentlink => bug_count_contentlink }) %] diff --git a/template/en/default/admin/versions/select-product.html.tmpl b/template/en/default/admin/versions/select-product.html.tmpl index e40e4086c..119ec9a71 100644 --- a/template/en/default/admin/versions/select-product.html.tmpl +++ b/template/en/default/admin/versions/select-product.html.tmpl @@ -13,6 +13,7 @@ [% PROCESS global/header.html.tmpl title = "Edit versions for which product?" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ @@ -34,7 +35,7 @@ [% columns.push({ name => 'bug_count' heading => "$terms.Bugs" - align => "right" + class => "right" contentlink => "buglist.cgi?product=%%name%%" }) %] diff --git a/template/en/default/admin/workflow/comment.html.tmpl b/template/en/default/admin/workflow/comment.html.tmpl index b5907d1d0..19762d154 100644 --- a/template/en/default/admin/workflow/comment.html.tmpl +++ b/template/en/default/admin/workflow/comment.html.tmpl @@ -15,9 +15,9 @@ @@ -28,7 +28,7 @@

    - +
    @@ -38,7 +38,7 @@ [% FOREACH status = statuses %] - [% END %] @@ -48,28 +48,27 @@ [% p = [{id => 0, name => "{Start}", is_open => 1}] %] [% FOREACH status = p.merge(statuses) %] - [% FOREACH new_status = statuses %] [% IF workflow.${status.id}.${new_status.id}.defined %] - [% ELSE %] - + [% END %] [% END %] [% END %]
      ToFrom   + [% display_value("bug_status", status.name) FILTER html %]
    + [% display_value("bug_status", status.name) FILTER html %]   
    -

    +

    - diff --git a/template/en/default/admin/workflow/edit.html.tmpl b/template/en/default/admin/workflow/edit.html.tmpl index 403405b16..a85db2339 100644 --- a/template/en/default/admin/workflow/edit.html.tmpl +++ b/template/en/default/admin/workflow/edit.html.tmpl @@ -15,25 +15,25 @@

    This page allows you to define which status transitions are valid in your workflow. - For compatibility with older versions of [% terms.Bugzilla %], reopening [% terms.abug %] + For compatibility with older versions of Bugzilla, reopening [% terms.abug %] will only display either [% display_value("bug_status", "UNCONFIRMED") FILTER html %] or [%+ display_value("bug_status", "REOPENED") FILTER html %] (if allowed by your workflow) but not both. The decision depends on whether the [% terms.bug %] has ever been confirmed or not. - So it is a good idea to allow both transitions and let [% terms.Bugzilla %] select the + So it is a good idea to allow both transitions and let Bugzilla select the correct one.

    - +
    @@ -43,7 +43,7 @@ [% FOREACH status = statuses %] - [% END %] @@ -53,7 +53,7 @@ [% p = [{id => 0, name => "{Start}", is_open => 1}] %] [% FOREACH status = p.merge(statuses) %] - @@ -61,7 +61,7 @@ [% IF status.id != new_status.id %] [% checked = workflow.${status.id}.${new_status.id}.defined ? 1 : 0 %] [% mandatory = (status.id && new_status.name == Param("duplicate_or_move_bug_status")) ? 1 : 0 %] - [% ELSE %] - + [% END %] [% END %] @@ -87,7 +87,7 @@ page and editing the duplicate_or_move_bug_status parameter.

    -

    +

    - diff --git a/template/en/default/attachment/choose.html.tmpl b/template/en/default/attachment/choose.html.tmpl index c6b94d792..f20facd90 100644 --- a/template/en/default/attachment/choose.html.tmpl +++ b/template/en/default/attachment/choose.html.tmpl @@ -7,23 +7,28 @@ #%] [% PROCESS global/header.html.tmpl - title = "Locate attachment", - onload = "document.forms['choose-id'].id.focus()" - %] + title = "Locate or Create Attachment" +%]

    Access an attachment by entering its ID into the form below:

    -

    Attachment ID: +

    Attachment ID:

    -

    Or, access it from the list of attachments in its associated [% terms.bug %] report:

    -

    [% terms.Bug %] ID: +

    Or, Access it from the list of attachments in its associated [% terms.bug %] report:

    +

    [% terms.Bug %] ID:

    + +

    Or, Create a new attachment by entering its [% terms.bug %] Id below:

    +

    [% terms.Bug %] ID: + +

    + [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/attachment/confirm-delete.html.tmpl b/template/en/default/attachment/confirm-delete.html.tmpl index 4557af616..5108692a8 100644 --- a/template/en/default/attachment/confirm-delete.html.tmpl +++ b/template/en/default/attachment/confirm-delete.html.tmpl @@ -17,51 +17,48 @@ [% PROCESS global/header.html.tmpl title = title - doc_section = "attachments.html" + style_urls = ['skins/standard/admin.css'] + doc_section = "using/editing.html#attachments" %] -
      ToFrom   + [% display_value("bug_status", status.name) FILTER html %]
    + [% display_value("bug_status", status.name) FILTER html %]   
    - - - +
    FieldValue
    + + + - - + - - + + - - + + - - + + - - + + - - + +
    FieldValue
    Attachment ID: + Attachment ID [% a.id FILTER html %]
    File name:[% a.filename FILTER html %]File name[% a.filename FILTER html %]
    Description:[% a.description FILTER html %]Description[% a.description FILTER html %]
    Contained in [% terms.Bug %]:[% a.bug_id FILTER bug_link(a.bug_id) FILTER none %]Contained in [% terms.Bug %][% a.bug_id FILTER bug_link(a.bug_id) FILTER none %]
    Creator:[% a.attacher.identity FILTER html %]Creator[% a.attacher.identity FILTER html %]
    Creation Date:[% a.attached FILTER time %]Creation Date[% a.attached FILTER time %]

    Confirmation

    - - - - -
    - The content of this attachment will be deleted in an irreversible way. -
    +

    + The content of this attachment will be deleted in an irreversible way. +

    Do you really want to delete this attachment?

    diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl index abc0f97bf..e566b428e 100644 --- a/template/en/default/attachment/create.html.tmpl +++ b/template/en/default/attachment/create.html.tmpl @@ -16,10 +16,11 @@ title = title header = header subheader = subheader - style_urls = [ 'skins/standard/attachment.css' ] + generate_api_token = 1 + style_urls = ['skins/standard/bug.css'] yui = [ 'autocomplete' ] javascript_urls = [ "js/attachment.js", 'js/field.js', "js/util.js", "js/TUI.js" ] - doc_section = "attachments.html" + doc_section = "using/editing.html#attachments" %] - - + + + + + + [% END %] - + [%# If we have attachid, we are in diff, otherwise we're in interdiff %] [% IF attachid %] [%# HEADER %] [% IF headers %] View | Details - | Raw Unified + | Raw Unified | Return to [% "$terms.bug $bugid" FILTER bug_link(bugid) FILTER none %] [% END %] [% IF other_patches.size > 0 %] [% IF headers %] |[%END%] Differences between -
    +
    ) -[% END %] - [% IF warning %] -

    Warning: +

    + Warning: [% IF warning == "interdiff1" %] - this difference between two patches may show things in the wrong places due - to a limitation in [% terms.Bugzilla %] when comparing patches with different - sets of files. - [% END %] - [% IF warning == "interdiff2" %] - this difference between two patches may be inaccurate due to a limitation in - [%+ terms.Bugzilla %] when comparing patches made against different revisions. + this difference between two patches may show things in the wrong places due + to a limitation in Bugzilla when comparing patches with + different sets of files. + [% ELSIF warning == "interdiff2" %] + this difference between two patches may be inaccurate due to a limitation + in Bugzilla when comparing patches made against different + revisions. + [% ELSIF warning == "interdiff3" %] + interdiff encountered errors while comparing these patches. [% END %]

    [% ELSE %] @@ -136,4 +121,4 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %] [%# Restore Stuff %]
    - + diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl index 518737788..184cdde05 100644 --- a/template/en/default/attachment/edit.html.tmpl +++ b/template/en/default/attachment/edit.html.tmpl @@ -9,6 +9,7 @@ [%# Define strings that will serve as the title and header of this page %] [% title = BLOCK %] Attachment [% attachment.id %] Details for [% terms.Bug %] [%+ attachment.bug_id %] + – [% attachment.description FILTER html %] [% END %] [% header = BLOCK %] Attachment [% attachment.id %] Details for @@ -20,15 +21,16 @@ title = title header = header subheader = subheader - doc_section = "attachments.html" + generate_api_token = 1 + doc_section = "using/editing.html#attachments" javascript_urls = ['js/attachment.js', 'js/field.js'] - style_urls = ['skins/standard/attachment.css'] + style_urls = ['skins/standard/bug.css'] yui = [ 'autocomplete' ] bodyclasses = "no_javascript" %] [%# No need to display the Diff button and iframe if the attachment is not a patch. %] -[% use_patchviewer = (feature_enabled('patch_viewer') && attachment.ispatch) %] +[% use_patchviewer = (feature_enabled('patch_viewer') && attachment.ispatch) ? 1 : 0 %] [% can_edit = attachment.validate_can_edit %] [% editable_or_hide = can_edit ? "" : " bz_hidden_option" %] @@ -197,35 +199,38 @@ readonly = 'readonly' %] [% ELSE %] - [% END %] + + [% IF use_patchviewer %] + + [% END %] + + [% IF user.id %] + + + + [% END %] + + [% IF use_patchviewer %] + + [% END %] + + [% ELSE %] @@ -247,13 +252,12 @@ [% classNames = 'block' %] [% classNames = "$classes bz_private" IF attachment.isprivate %] - [% INCLUDE global/textarea.html.tmpl - id = 'comment' - name = 'comment' - minrows = 10 - cols = 80 - wrap = 'soft' - classes = classNames + [% INCLUDE bug/comment.html.tmpl + bug = attachment.bug + minrows = 10 + cols = 80 + classes = classNames + wrap = 'soft' %] [% IF NOT attachment.bug.cc.contains(user.login) %] [% END %] + [% Hook.process('after_comment_textarea') %] [% END %]
    diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl index e30492c36..9676dd67b 100644 --- a/template/en/default/attachment/list.html.tmpl +++ b/template/en/default/attachment/list.html.tmpl @@ -42,9 +42,9 @@ function toggle_display(link) {
    - +
    - @@ -65,7 +65,7 @@ function toggle_display(link) { [% " bz_private" IF attachment.isprivate %] [% " bz_tr_obsolete bz_default_hidden" IF attachment.isobsolete %]"> - [% IF show_attachment_flags %] - [% END %] -
    + Attachments
    + [% IF attachment.datasize %] @@ -88,7 +88,7 @@ function toggle_display(link) {
    - [%- attachment.attached FILTER time %], + [%- attachment.attached FILTER time("%Y-%m-%d %H:%M %Z") %], [%# No need to recreate the exact same template if we already have it. %] [% attacher_id = attachment.attacher.id %] @@ -102,7 +102,7 @@ function toggle_display(link) {     		+ [% IF attachment.flags.size == 0 %] no flags [% ELSE %] @@ -114,7 +114,7 @@ function toggle_display(link) { [% ELSE %] [% flag.setter.nick FILTER html %]: [% END %] - [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %] + [%+ flag.type.name FILTER html %][% flag.status %] [%+ IF flag.status == "?" && flag.requestee %] [% IF user.id %] ([% flag.requestee.nick FILTER html %]) @@ -129,7 +129,7 @@ function toggle_display(link) { + Details [% IF attachment.ispatch && feature_enabled('patch_viewer') %] | Diff diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl index 8791e0dfe..e2c95cb80 100644 --- a/template/en/default/attachment/show-multiple.html.tmpl +++ b/template/en/default/attachment/show-multiple.html.tmpl @@ -18,7 +18,7 @@ title = title header = header subheader = filtered_summary - style_urls = ['skins/standard/attachment.css'] + style_urls = ['skins/standard/bug.css'] %] [% IF hide_obsolete %]
    @@ -26,23 +26,17 @@ click here.
    [% END %] -
    [% FOREACH a = attachments %] - -
    - +
    +
    - + - + - - - + + - - +
    - Attachment #[% a.id %] - Attachment #[% a.id %]
    - [% a.description FILTER html FILTER obsolete(a.isobsolete) %] - [% a.description FILTER html FILTER obsolete(a.isobsolete) %] + [% IF a.ispatch %] patch [% ELSE %] @@ -50,10 +44,10 @@ [% END %] [% a.attached FILTER time %][% a.datasize FILTER unitconvert %][% a.attached FILTER time %][% a.datasize FILTER unitconvert %] + [% IF a.flags.size == 0 %] no flags [% ELSE %] @@ -68,9 +62,7 @@ [% END %] - Details - Details
    @@ -86,7 +78,7 @@ classes = 'viewall_frame' %] [% ELSE %] - @@ -97,10 +89,7 @@ Download the attachment instead.

    [% END %] -
    - -

    - + [% END %] [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/bug/activity/show.html.tmpl b/template/en/default/bug/activity/show.html.tmpl index a442abd4b..0d4f06323 100644 --- a/template/en/default/bug/activity/show.html.tmpl +++ b/template/en/default/bug/activity/show.html.tmpl @@ -21,14 +21,14 @@ %]

    - [% "Back to $terms.bug $bug.bug_id" FILTER bug_link(bug) FILTER none %] + Back to [% "$terms.bug $bug.bug_id" FILTER bug_link(bug) FILTER none %]

    [% PROCESS bug/activity/table.html.tmpl %] [% IF operations.size > 0 %]

    - [% "Back to $terms.bug $bug.bug_id" FILTER bug_link(bug) FILTER none %] + Back to [% "$terms.bug $bug.bug_id" FILTER bug_link(bug) FILTER none %]

    [% END %] diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl index 253d16109..8b371f0b5 100644 --- a/template/en/default/bug/activity/table.html.tmpl +++ b/template/en/default/bug/activity/table.html.tmpl @@ -33,8 +33,8 @@ [% END %] [% IF operations.size > 0 %] - - +
    + @@ -44,10 +44,10 @@ [% FOREACH operation = operations %] - - [% FOREACH change = operation.changes %] @@ -94,7 +94,7 @@ change.fieldname == 'flagtypes.name' %] [% display_value(change.fieldname, change_type) FILTER email FILTER html %] [% ELSE %] - [% display_value(change.fieldname, change_type) FILTER html %] + [% display_value(change.fieldname, change_type) FILTER html FILTER html_line_break %] [% END %] [% ELSE %]   diff --git a/template/en/default/bug/comment.html.tmpl b/template/en/default/bug/comment.html.tmpl new file mode 100644 index 000000000..96cbb63ed --- /dev/null +++ b/template/en/default/bug/comment.html.tmpl @@ -0,0 +1,37 @@ +[%# This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. + #%] + +[%# INTERFACE: + # + # This template supports the same parameters as global/textarea.html.tmpl + # with the exception of "name" and "id", which will always be "comment". + #%] + +[% IF feature_enabled('jsonrpc') %] +
    + + +
    +[% END %] + +[% INCLUDE global/textarea.html.tmpl + name = "comment" + id = "comment" +%] + +[% IF feature_enabled('jsonrpc') %] +
    +
    Generating Preview...
    +
    + 
    
+  
    
+[% END %]
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 61d1c67e0..f4f79ec5c 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -13,7 +13,7 @@
 
 
 
-[% DEFAULT start_at = 0 mode = "show" %]
-[% sort_order = user.settings.comment_sort_order.value %]
+[% DEFAULT mode = "show" %]
 [% user_cache = template_cache.users %]
-
-[%# NOTE: (start_at > 0) means we came here from a midair collision,
-  #       in which case we don't care what the user's preference is.
- %]
-[% IF (start_at > 0) %]
-    [% sort_order = "oldest_to_newest" %]
-[% END %]
+[% can_edit_comments = bug.check_can_change_field('longdesc', 0, 1) %]
 
 
-
    
       Who
       When
       What
    
+        
           [% operation.who FILTER email FILTER html %]
         
+        
           [% operation.when FILTER time %]
         
    
+
    
+
@@ -102,12 +95,14 @@
 [%# Block for individual comments                                            #%]
 [%############################################################################%]
 
-[% BLOCK a_comment %]
-  [% RETURN IF comment.is_private AND NOT (user.is_insider || user.id == comment.author.id) %]
-  [% comment_text = comment.body_full %]
-  [% RETURN IF comment_text == '' AND (comment.work_time - 0) != 0 AND !user.is_timetracker %]
+[% BLOCK display_comments %]
+  [% FOREACH comment = comments %]
+    [% NEXT IF comment.is_private AND NOT (user.is_insider || user.id == comment.author.id) %]
+    [% comment_text = comment.body_full %]
+    [% NEXT IF comment_text == '' AND (comment.work_time - 0) != 0 AND !user.is_timetracker %]
 
     
    
       [% IF comment.count == 0 %]
@@ -119,23 +114,38 @@
       [% END %]
 
       
    
-
         [% IF mode == "edit" %]
           
-            [% IF bug.check_can_change_field('longdesc', 0, 1) %]
+            [% IF comment.collapsed %]
+              
+            [% END %]
+            [% IF can_edit_comments %]
+              [% IF user.can_tag_comments %]
+                [tag]
+              [% END %]
               [reply]
             [% END %]
-            
+          
+        [% ELSIF comment.collapsed %]
+          
+            
           
         [% END %]
 
-        [% IF mode == "edit" && user.is_insider && bug.check_can_change_field('longdesc', 0, 1) %]
+        [% IF mode == "edit" && can_edit_comments && user.is_insider %]
           
    
             
@@ -176,6 +186,14 @@
         
           [%+ comment.creation_ts FILTER time %]
         
+
+        [% IF comment.collapsed %]
+          
+            Comment hidden ([% comment.tags.join(', ') FILTER html %])
+          
+        [% END %]
       
    
 
       [% IF user.is_timetracker &&
@@ -185,12 +203,35 @@
          [% PROCESS formattimeunit time_unit=comment.work_time %]
       [% END %]
 
+      [% IF user.id && Param('comment_taggers_group') %]
+        
    
+          
+            [% IF comment.tags.size %]
+              
+            [% END %]
+          
+        
    
+      [% END %]
+
 [%# Don't indent the 
     block, since then the spaces are displayed in the
   # generated HTML
   #%]
-
    +
       [%- comment_text FILTER quoteUrls(bug, comment) -%]
 
    
+    [% Hook.process('a_comment-end', 'bug/comments.html.tmpl') %]
     
    
+  [% END %]
 [% END %]
diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index e7de84799..1adae4588 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -16,25 +16,9 @@
 [% PROCESS global/header.html.tmpl
    title = "Enter $terms.ABug"
    onload = "PutDescription()"
-   style = "#somebugs { width: 100%; height: 500px }"
+   style_urls = ['skins/standard/bug.css']
  %]
 
-[% style = "" %]
-
-
    
-  
-    This is a template used on mozilla.org.  This template, and the
-    comment-guided.txt.tmpl template that formats the data submitted via 
-    the form in this template, are included as a demo of what it's
-    possible to do with custom templates in general, and custom [% terms.bug %]
-    entry templates in particular. As much of the text will not apply, 
-    you should alter it 
-    if you want to use this form on your [% terms.Bugzilla %] installation.
-  
-
    
-
-[% tablecolour = "#FFFFCC" %]
-
 [%# This script displays the descriptions for selected components. %]
 
 
 
    Step 1 of 3 - has your [% terms.bug %] already been reported?
    
 
-
    
-  Please don't skip this step - half of all 
-  [% terms.bugs %] filed are
-  reported already.
-    Check the two lists of frequently-reported [% terms.bugs %]:
+
    
+  Please don't skip this step - half of all [% terms.bugs %] filed are
+  reported already.
 
    
 
-[%# Include other products if sensible %]
-[% IF product.name == "Firefox" %]
-  [% productstring = "product=Mozilla%20Application%20Suite&product=Firefox" %]
-[% ELSIF product.name == "Thunderbird" %]
-  [% productstring = "product=Mozilla%20Application%20Suite&product=Thunderbird" %]
-[% ELSE %]
-  [% productstring = BLOCK %]product=[% product.name FILTER uri %][% END %]
-[% END %]
+
    Check the two lists of frequently-reported [% terms.bugs %]:
    
 
 
    
-    All-time Top 100 (loaded initially) |
-    Hot in the last two weeks  
+  All-time Top 100 (loaded initially) |
+  Hot in the last two weeks
 
    
 
 
 
 
    
     If your [% terms.bug %] isn't there, search [% terms.Bugzilla %] by entering
     a few key words having to do with your [% terms.bug %] in this box.
-    For example: pop3 mail or copy paste.
+    For example: pop3 mail or copy paste.
     The results will appear above.
-  
    
+
    
 
 [%# All bugs opened inside the past six months %]
   
@@ -96,16 +71,6 @@ function PutDescription() {
     
     
     
-    [% IF product.name == "Firefox" OR 
-          product.name == "Thunderbird" OR 
-          product.name == "Mozilla Application Suite" OR
-          product.name == "Camino" %]
-      
-      
-      
-      
-      
-    [% END %]      
     
     
     
@@ -115,7 +80,7 @@ function PutDescription() {
 
 
    
   Look through the search results. If you get the
-  [% terms.zeroSearchResults %] message, [% terms.Bugzilla %]
+  [% terms.zeroSearchResults %] message, [% terms.Bugzilla %]
   found no [% terms.bugs %] that
   match. Check for typing mistakes, or try fewer or different keywords.
   If you find [% terms.abug %] that looks the same as yours, please add
@@ -130,7 +95,7 @@ function PutDescription() {
   there, tell us all about it.
 
    
 
-
+
   
   
   
   
 
-
    
 
 
-[% FOREACH comment = comments %]
-  [% IF comment.count >= start_at %]
-    [% PROCESS a_comment %]
-  [% END %]
-[% END %]
+[% PROCESS display_comments %]
 
 [% IF mode == "edit" && user.id
       && user.settings.comment_box_position.value == "before_comments" %]
@@ -84,15 +74,18 @@
 
   [% IF mode == "edit" %]
     
   [% END %]
 
    
-
-  
-    
-    
    
-      Product
-    
+
+  
+    
+    
-    
-    
+    
 
-  [%# We override rep_platform and op_sys for simplicity. The values chosen
-      are based on which are most common in the b.m.o database %]
+  [%# We override rep_platform and op_sys for simplicity. %]
   [% rep_platform = [ "PC", "Macintosh", "All", "Other" ] %]
 
-  
-    
-    
+    
+    
 
-  [% op_sys = [ "Windows 2000", "Windows XP", "Windows Vista", "Windows 7",
+  [% op_sys = [ "Windows XP", "Windows Vista", "Windows 7", "Windows 8",
                 "Mac OS X", "Linux", "All", "Other" ] %]
 
   
-    
-    
+    
 
-  [% IF product.name.match("Firefox|Camino|Mozilla Application Suite") %]
-    [% matches = cgi.user_agent('Gecko/(\d+)') %]
-    [% buildid = cgi.user_agent() IF matches %]
-  [% END %]
-  
   [%# Accept URL parameter build ID for non-browser products %]
   [% IF cgi.param("buildid") %]
     [% buildid = cgi.param("buildid") %]
   [% END %]
 
-  
-    
-    
+    
+    
-    
-    
+    
 
-  
-    
-    
+    
+    
-    
-    
+    
 
-  
-    
-    
+    
+    
-    
-    
+    
 
-  
-    
-    
+    
+    
-    
-    
+    
 
-  
-    
-    
+    
+    
-    
-    
+    
 
+  
+    [% IF Param('letsubmitterchoosepriority') %]
+      [% INCLUDE bug/field.html.tmpl
+        bug = default, field = bug_fields.priority, editable = 1, 
+        value = default.priority %]
+    [% ELSE %]
+      
+    [% END %]
+  
+
   
     [% INCLUDE bug/field.html.tmpl
       bug = default, field = bug_fields.rep_platform, editable = 1,
@@ -287,7 +227,8 @@ TUI_hide_default('attachment_text_field');
   
   [% IF (!Param('defaultplatform') || !Param('defaultopsys')) && !cloned_bug_id %]
     
-      
+      
+      
     [% END %]
 
-    [% IF Param('letsubmitterchoosepriority') %]
-      [% INCLUDE bug/field.html.tmpl
-        bug = default, field = bug_fields.priority, editable = 1, 
-        value = default.priority %]
-    [% ELSE %]
-      
-    [% END %]
+    
 
@@ -334,7 +269,7 @@ TUI_hide_default('attachment_text_field');
 
     
     [%# Calculate the number of rows we can use for flags %]
-    [% num_rows = 7 + (Param("useqacontact") ? 1 : 0) +
+    [% num_rows = 6 + (Param("useqacontact") ? 1 : 0) +
                       (user.is_timetracker ? 3 : 0)
     %]
 
@@ -458,7 +393,7 @@ TUI_hide_default('attachment_text_field');
     [% INCLUDE "bug/field-label.html.tmpl"
       field = bug_fields.bug_file_loc editable = 1
     %]
-    
@@ -492,7 +427,8 @@ TUI_hide_default('attachment_text_field');
     
 
-  [% IF feature_enabled('jsonrpc') AND !cloned_bug_id %]
+  [% IF feature_enabled('jsonrpc') AND !cloned_bug_id
+        AND user.settings.possible_duplicates.value == 'on' %]
     
+    
   [% END %]
 
   [% IF Param("maxattachmentsize") || Param("maxlocalattachment") %]
@@ -599,17 +533,17 @@ TUI_hide_default('attachment_text_field');
 
+  [% IF use_keywords %]
+    
+      [% INCLUDE bug/field.html.tmpl
+        bug = default, field = bug_fields.keywords, editable = 1,
+        value = keywords, possible_values = all_keywords,
+        desc_url = "describekeywords.cgi", value_span = 3
+      %]
+    
+  [% END %]
+  
   [% IF user.in_group('editbugs', product.id) %]
-    [% IF use_keywords %]
-      
-        [% INCLUDE bug/field.html.tmpl
-           bug = default, field = bug_fields.keywords, editable = 1,
-           value = keywords, possible_values = all_keywords,
-           desc_url = "describekeywords.cgi", value_span = 2
-        %]
-      
-    [% END %]
-
     
       [% INCLUDE "bug/field-label.html.tmpl"
         field = bug_fields.dependson editable = 1
@@ -627,6 +561,17 @@ TUI_hide_default('attachment_text_field');
       
   [% END %]
+
+  [% IF Param('use_see_also') %]
+    
+      [% INCLUDE bug/field.html.tmpl
+         bug            = default
+         field          = bug_fields.see_also
+         editable       = 1
+         value          = see_also
+      %]
+    
+  [% END %]
 
@@ -636,13 +581,13 @@ TUI_hide_default('attachment_text_field');
     
-      
       [% IF any_flags_requesteeble %]
-        
       [% END %]
+      [% IF edit_multiple_bugs %]
+        
+      [% END %]
     
 [% END %]
diff --git a/template/en/default/global/choose-classification.html.tmpl b/template/en/default/global/choose-classification.html.tmpl
index 76789a2fc..8433380ea 100644
--- a/template/en/default/global/choose-classification.html.tmpl
+++ b/template/en/default/global/choose-classification.html.tmpl
@@ -12,23 +12,26 @@
   #%]
 
 [% IF target == "enter_bug.cgi" %]
-  [% title = "Select Classification" %]
-  [% subheader = "Please select the classification." %]
+  [% title = "Enter $terms.Bug" %]
+  [% subheader = "Select Classification" %]
 [% END %]
 
 [% DEFAULT title = "Choose the classification" %]
 [% PROCESS global/header.html.tmpl %]
 
-
    Product
       
       [% product.name FILTER html %]
     
   
    
 
   
    
-      Component
-    
-      
-        
-          
-          
-        
-      
    
-            
-          
-              
    
-                
-              
    
-          
    
-      
+        		Component
+      
+
+      
    
+        Select a component to see its description here.
+      
    
+
       
    
         The area where the problem occurs.
         To pick the right component, you could use the same one as
         similar [% terms.bugs %] you found in your search, or read the full list of
-        component
-        descriptions (opens in new window) if you need more help.
+        component descriptions (opens in new window) if
+        you need more help.
       
    
         		
   
    
-      [% field_descs.rep_platform FILTER html %]
-    
+  
    [% field_descs.rep_platform FILTER html %]
       [% PROCESS select sel = 'rep_platform' %]
     
   
    
-      Operating System
-    
+    Operating System
       [% PROCESS select sel = 'op_sys' %]
     
   
    
-      Build Identifier
-    
+  
    Build Identifier
       
       
    
         This should identify the exact version of the product you were using.  
@@ -253,25 +185,18 @@ function PutDescription() {
   
    
 
   
    
-      URL
-    
+    URL
       
       
    
-        URL that demonstrates the problem you are seeing (optional).
    
-        IMPORTANT: if the problem is with a broken web page, you need
-        to report it
-        a different way.
+        URL that demonstrates the problem you are seeing (optional).
       
    
        		
   
    
-      Summary
-    
+  
    Summary
       
       
    
@@ -279,53 +204,50 @@ function PutDescription() {
         Please be descriptive and use lots of keywords.
       
    
       
    
-        
-          Bad example: mail crashed
-        
+        
+          Bad example: mail crashed
+        
         
    
-        
-          Good example:
+        
+          Good example:
           crash if I close the mail window while checking for new POP mail
-        
+        
       
    
         		
   
    
 
   
    
-      Details
-    
+    Details
       [% INCLUDE global/textarea.html.tmpl
-        name    = 'comment'
-        minrows = 6
-        cols    = constants.COMMENT_COLS
+        name      = 'comment'
+        minrows   = 6
+        cols      = constants.COMMENT_COLS
+        mandatory = 1
       %]
       
    
         Expand on the Summary. Please be
         as specific as possible about what is wrong.
       
    
       
    
-        
-          Bad example: Mozilla crashed.
+        
+          Bad example: Mozilla crashed.
           You suck!
-        
+        
         
    
-        
-          Good example: After a crash which
+        
+          Good example: After a crash which
           happened when I was sorting in the Bookmark Manager,
     all of my
           top-level bookmark folders beginning with the letters Q to Z are 
           no longer present.
-            
+        
       
    
         		
   
    
-      Reproducibility
-    
+  
    Reproducibility
       
    
 
   
    
-      Steps to Reproduce
-    
+    Steps to Reproduce
       [% INCLUDE global/textarea.html.tmpl
         name           = 'reproduce_steps'
         minrows        = 4
@@ -361,11 +281,9 @@ function PutDescription() {
     
   
    
-      Actual Results
-    
+  
    Actual Results
       [% INCLUDE global/textarea.html.tmpl
         name    = 'actual_results'
         minrows = 4
@@ -378,10 +296,8 @@ function PutDescription() {
   
    
 
   
    
-      Expected Results
-    
+    Expected Results
       [% INCLUDE global/textarea.html.tmpl
         name    = 'expected_results'
         minrows = 4
@@ -393,11 +309,9 @@ function PutDescription() {
     
   
    
-      Additional Information
-    
+  
    Additional Information
       [% INCLUDE global/textarea.html.tmpl
         name    = 'additional_info'
         minrows = 8
@@ -407,29 +321,26 @@ function PutDescription() {
         Add any additional information you feel may be
         relevant to this [% terms.bug %], such as the theme you were
         using (does the [% terms.bug %] still occur
-        with the default theme?), a 
-        Talkback crash ID, or special
+        with the default theme?), or special
         information about your computer's configuration. Any information
         longer than a few lines, such as a stack trace or HTML
         testcase, should be added
         using the "Add an Attachment" link on the [% terms.bug %], after
         it is filed. If you believe that it's relevant, please also include
-        your build configuration, obtained by typing about:buildconfig
+        your build configuration, obtained by typing about:buildconfig
         into your URL bar.
         
    
         
    
         If you are reporting a crash, note the module in
-        which the software crashed (e.g., Application Violation in
-        gkhtml.dll).
+        which the software crashed (e.g., Application Violation in
+        gkhtml.dll).
       
    
         		
   
    
 
   
    
-      [% field_descs.bug_severity FILTER html %]
-    
+    [% field_descs.bug_severity FILTER html %]
       
+  
 
    
 
 
    
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index c3e18adfd..61faf1c1a 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -7,15 +7,16 @@
   #%]
 
 [% title = BLOCK %]Enter [% terms.Bug %]: [% product.name FILTER html %][% END %]
+[% use_qa_contact = Param("useqacontact") %]
 
 [% PROCESS global/header.html.tmpl
   title = title
+  generate_api_token = 1
   yui = [ 'autocomplete', 'calendar', 'datatable', 'button' ]
-  style_urls = [ 'skins/standard/attachment.css',
-                 'skins/standard/enter_bug.css' ]
+  style_urls = ['skins/standard/bug.css']
   javascript_urls = [ "js/attachment.js", "js/util.js",
                       "js/field.js", "js/TUI.js", "js/bug.js" ]
-  onload = "set_assign_to(); hideElementById('attachment_true');
+  onload = "set_assign_to($use_qa_contact); hideElementById('attachment_true');
             showElementById('attachment_false'); showElementById('btn_no_attachment');"
 %]
 
@@ -61,77 +62,6 @@ var flags = new Array([% product.components.size %]);
     [% count = count + 1 %]
 [%- END %]
 
-function set_assign_to() {
-    // Based on the selected component, fill the "Assign To:" field
-    // with the default component owner, and the "QA Contact:" field
-    // with the default QA Contact. It also selectively enables flags.
-    var form = document.Create;
-    var assigned_to = form.assigned_to.value;
-
-[% IF Param("useqacontact") %]
-    var qa_contact = form.qa_contact.value;
-[% END %]
-
-    var index = -1;
-    if (form.component.type == 'select-one') {
-        index = form.component.selectedIndex;
-    } else if (form.component.type == 'hidden') {
-        // Assume there is only one component in the list
-        index = 0;
-    }
-    if (index != -1) {
-        var owner = initialowners[index];
-        var component = components[index];
-        if (assigned_to == last_initialowner
-            || assigned_to == owner
-            || assigned_to == '') {
-            form.assigned_to.value = owner;
-            last_initialowner = owner;
-        }
-
-        document.getElementById('initial_cc').innerHTML = initialccs[index];
-        document.getElementById('comp_desc').innerHTML = comp_desc[index];
-
-        [% IF Param("useqacontact") %]
-            var contact = initialqacontacts[index];
-            if (qa_contact == last_initialqacontact
-                || qa_contact == contact
-                || qa_contact == '') {
-                  form.qa_contact.value = contact;
-                  last_initialqacontact = contact;
-            }
-        [% END %]
-
-        // We show or hide the available flags depending on the selected component.
-        var flag_rows = YAHOO.util.Dom.getElementsByClassName('bz_flag_type', 'tbody');
-        for (var i = 0; i < flag_rows.length; i++) {
-            // Each flag table row should have one flag form select element
-            // We get the flag type id from the id attribute of the select.
-            var flag_select = YAHOO.util.Dom.getElementsByClassName('flag_select', 
-                                                                    'select', 
-                                                                    flag_rows[i])[0];
-            var type_id = flag_select.id.split('-')[1];
-            var can_set = flag_select.options.length > 1 ? 1 : 0;
-            var show = 0;
-            // Loop through the allowed flag ids for the selected component
-            // and if we match, then show the row, otherwise hide the row.
-            for (var j = 0; j < flags[index].length; j++) {
-                if (flags[index][j] == type_id) {
-                    show = 1;
-                    break;
-                }
-            }
-            if (show && can_set) {
-                flag_select.disabled = false;
-                YAHOO.util.Dom.removeClass(flag_rows[i], 'bz_default_hidden');
-            } else {
-                flag_select.disabled = true;
-                YAHOO.util.Dom.addClass(flag_rows[i], 'bz_default_hidden');
-            }
-        }
-    }
-}
-
 var status_comment_required = new Array();
 [% FOREACH status = bug_status %]
   status_comment_required['[% status.name FILTER js %]'] = 
@@ -200,7 +130,7 @@ TUI_hide_default('attachment_text_field');
       desc_url = component_desc_url
     %]      
     
    		
-      
+    
       
     
       
       
         
    We've made a guess at your
         [% IF Param('defaultplatform') %]
@@ -311,13 +252,7 @@ TUI_hide_default('attachment_text_field');
       
    		   
   
    
 
     
+    
       
     
   
    
       Possible
    Duplicates:    		
       
@@ -541,9 +477,7 @@ TUI_hide_default('attachment_text_field');
           # by global/textarea.html.tmpl. So we must not escape the comment here. %]
         [% comment FILTER none %]
       [%- END %]
-      [% INCLUDE global/textarea.html.tmpl
-         name           = 'comment'
-         id             = 'comment'
+      [% INCLUDE bug/comment.html.tmpl
          minrows        = 10
          maxrows        = 25
          cols           = constants.COMMENT_COLS
@@ -565,11 +499,11 @@ TUI_hide_default('attachment_text_field');
           Make description and any new attachment private (visible only to members 
           of the [% Param('insidergroup') FILTER html %] group)
         
-        
       
     
    
 
 
    
     
    
 
 
    
       
    
         
-          Only users in all of the selected groups can view this 
+          Only users in [%+ IF Param('or_groups') %]at least one[% ELSE %]all[% END %] of the selected groups can view this 
           [%+ terms.bug %]:
         
       
    
-      
+      
         (Leave all boxes unchecked to make this a public [% terms.bug %].)
-      
+      
       
    
       
    
 
diff --git a/template/en/default/bug/create/make-template.html.tmpl b/template/en/default/bug/create/make-template.html.tmpl
index 4b1b0c084..31f255f81 100644
--- a/template/en/default/bug/create/make-template.html.tmpl
+++ b/template/en/default/bug/create/make-template.html.tmpl
@@ -12,7 +12,7 @@
   #%]
 
 [% PROCESS global/header.html.tmpl
-  title = "Bookmarks are your friend"
+  title = "Bookmark For $terms.Bug Entry"
   header = "Template constructed"
 %]
 
diff --git a/template/en/default/bug/dependency-graph.html.tmpl b/template/en/default/bug/dependency-graph.html.tmpl
index 153cebdfa..69afa2ddf 100644
--- a/template/en/default/bug/dependency-graph.html.tmpl
+++ b/template/en/default/bug/dependency-graph.html.tmpl
@@ -51,7 +51,7 @@
 
   
-      
+      
-      
+      
-      
+      
+    
+    
+    
+  
+
+  
+    
+    
+    
+  
+
+  
+    
+    
+  
+
    
     
    ::
       
       
         
@@ -60,7 +60,7 @@
     
    
 
     
    
       
         
    
 
     
    
       
         
+ 
    
    [%# Hide/show resolved button
        Swaps text depending on the state of hide_resolved %]
-   
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 7b7c0dfc5..90151161e 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -8,26 +8,42 @@
 
 [% PROCESS bug/time.html.tmpl %]
 
+[% IF Param('comment_taggers_group') %]
+  [% IF user.can_tag_comments %]
+    
    
+      x
+      
    
+        
+        
+      
    
+       
+    
    
+    
    
+      x
+      
+    
    
+  [% END %]
+  [% IF user.id %]
+    
+  [% END %]
+[% END %]
+
 
 
      [% CASE constants.FIELD_TYPE_TEXTAREA %]
-       [% INCLUDE global/textarea.html.tmpl
-           id = field.name name = field.name minrows = 4 maxrows = 8
-           cols = 60 defaultcontent = value mandatory = field.is_mandatory %]
+       
    
+         
    
+             (edit)
+         
    
+         [% IF value %]
+           
    [% value FILTER html %]
    
+         [% END %]
+       
    
+       
    
+         [% INCLUDE global/textarea.html.tmpl
+            id = field.name name = field.name minrows = 4 maxrows = 8
+            cols = 60 defaultcontent = value mandatory = field.is_mandatory %]
+       
    
+       
      [% CASE constants.FIELD_TYPE_BUG_URLS %]
-       [% '
      ' IF value.size %]
-       [% FOREACH bug_url = value %]
-         
    • 
-           [% PROCESS bug_url_link bug_url = bug_url %]
-           
-         
      • 
+       [% IF bug.id && value.size %]
+         
        
+         [% FOREACH bug_url = value %]
+           
      • 
+             [% PROCESS bug_url_link bug_url = bug_url %]
+             
+           
        • 
+         [% END %]
+         
      
        [% END %]
-       [% '
    ' IF value.size %]
-
        [% IF Param('use_see_also') %]
          
            (add)
          
    
-           
    
            
+                  class="text_input" name="[% field.name FILTER html %]"
+                  [% IF !bug.id %]value="[% value FILTER html %]"[% END %]>
          
    
-         
+           
+         [% END %]
        [% END %]
      [% CASE constants.FIELD_TYPE_KEYWORDS %]
        
    
@@ -179,7 +203,7 @@
                 value="[% value FILTER html %]">
          
    
        
    
-       
 
-      
    
    
    
-   
+   
+   
      
      [% IF maxdepth %]
        
@@ -191,11 +190,9 @@
    
 
    
-   
+   
      [%# set to one form %]
-     
      
      
@@ -204,8 +201,7 @@
    
 
    
-   
+   
      [%# Minus one form
          Allow subtracting only when realdepth and maxdepth > 1 %]
      
@@ -214,14 +210,13 @@
                        : ( maxdepth ? maxdepth - 1 : realdepth - 1 )
      %]">
      
-     
    
    
 
    
-   
    
+   
      [%# Limit entry form: the button cannot do anything when total depth
          is less than two, so disable it %]
      
+   
      [%# plus one form
          Disable button if total depth < 2, or if depth set to unlimited %]
      
@@ -246,19 +240,18 @@
        
      [% END %]
      
-     = realdepth %]>
    
    
        		
 
    
-   
    
+   
      [%# Unlimited button %]
      
      
      
    
    
        		
          
    
+      
    
-          
-          
-          
+          
+          
+          
 
         [% FOREACH group = optional_groups %]
         
-          
-          
+    [% END %]
+    [% IF Param("timetrackinggroup") && bug.deadline %]
       [% PROCESS row cell="deadline" %]
     [% END %]
 
@@ -259,7 +263,7 @@
                     [% ELSE %]
                       [% FOREACH flag = attachment.flags %]
                         [% flag.setter.nick FILTER html %]:
-                        [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %]
+                        [%+ flag.type.name FILTER html %][% flag.status %]
                         [% IF flag.status == "?" && flag.requestee %]
                           ([% flag.requestee.nick FILTER html %])
                         [% END %][% ", " IF not loop.last() %]
@@ -348,7 +352,7 @@
           [% FOREACH type = bug.flag_types %]
             [% FOREACH flag = type.flags %]
                 [% flag.setter.nick FILTER html %]:
-                [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %]
+                [%+ flag.type.name FILTER html %][% flag.status %]
                 [%+ IF flag.status == "?" && flag.requestee %]
                   ([% flag.requestee.nick FILTER html %])
                 [% END %]
    
diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl
index 932a6e3f4..8bfe3c1c6 100644
--- a/template/en/default/bug/summarize-time.html.tmpl
+++ b/template/en/default/bug/summarize-time.html.tmpl
@@ -18,10 +18,10 @@
 [% END %]
 
 [% PROCESS global/header.html.tmpl 
-    title = title 
-    header = header 
-    style_urls = ["skins/standard/summarize-time.css"]
-    doc_section = "timetracking.html"
+    title = title
+    header = header
+    style_urls = ['skins/standard/buglist.css']
+    doc_section = "using/editing.html#time-tracking"
     yui = ['calendar']
     javascript_urls = [ "js/util.js", "js/field.js" ]
     %]
@@ -35,15 +35,13 @@
   [% FOREACH workdata = part_list %]
     [%# parts contains date ranges (from, to). %]
     [% part = parts.shift %]
-    
    
-      
    
-        [% IF part.0 or part.1 %]
-          [% part.0 OR "Up" FILTER html %] to [% part.1 OR "now" FILTER html %]
-        [% ELSE %]
-          Full summary (no period specified)
-        [% END %]
-      
    
-    
    
+    
    
+      [% IF part.0 or part.1 %]
+        [% part.0 OR "Up" FILTER html %] to [% part.1 OR "now" FILTER html %]
+      [% ELSE %]
+        Full summary (no period specified)
+      [% END %]
+    
    
     [% IF group_by == "number" %]
       [% INCLUDE number_report %]
     [% ELSE %]
@@ -52,7 +50,7 @@
   [% END %]
 
   [% IF detailed %]
-    
    
+    
    
       Total of [% global.remaining FILTER format("%.2f") %]h remains from
       original estimate of [% global.estimated FILTER format("%.2f") %]h
       [% IF global.deadline %]
@@ -62,13 +60,13 @@
   [% END %]
 
   [% IF monthly %]
-    
    Total of [% global.grand_total FILTER format("%.2f") %] hours worked
    
-    
    
+    
    Total of [% global.grand_total FILTER format("%.2f") %] hours worked
    
+    
    
   [% END %]
 
   [% IF null.size > 0 %]
     [% INCLUDE inactive_report %]
-    
    Total of [% null.size %] inactive [% terms.bugs %]
    
+    
    Total of [% null.size %] inactive [% terms.bugs %]
    
   [% END %]
 
 [% END %]
@@ -83,7 +81,7 @@
 
 [% BLOCK owner_report %]
     [% global.total = 0 global.bug_count = {} global.owner_count = {} %]
-    
    
         
    Remove
    [% terms.bugs %]
    from this
    group    		Add
    [% terms.bugs %]
    to this
    group    		Group Name:Remove [% terms.bugs %] from this groupAdd [% terms.bugs %] to this groupGroup Name
         
    
+          
             
           
+          
             
     [% terms.Bug %] 
     [% bug.bug_id FILTER html %]
-    [% IF bug.alias AND NOT bug.error %]
-      (
-        [% bug.alias FILTER html %])
+    [% IF bug.alias.size AND NOT bug.error %] (
+      [%- FOREACH alias IN bug.alias %]
+        [% alias FILTER html %][% UNLESS loop.last %], [% END %]
+      [%- END %])
     [% END %]
   
 
   
   [% IF bug.error %]
     
-      
    
+      
         [% IF bug.error == "InvalidBugId" %]
           '[%+ bug.bug_id FILTER html %]' is not a valid [% terms.bug %] number
           nor a known [% terms.bug %] alias.
@@ -145,7 +148,7 @@
         [% field_descs.bug_file_loc FILTER html %]:
         
           [% IF is_safe_url(bug.bug_file_loc) %]
-            
+            
                      [% bug.bug_file_loc FILTER html %]
           [% ELSE %]
             [% bug.bug_file_loc FILTER html %]
@@ -170,7 +173,6 @@
       [% PROCESS row cell = "status_whiteboard" fullrow = 1 %]
     [% END %]
 
-    [% USE Bugzilla %]
     [% field_counter = 0 %]
     [% FOREACH field = Bugzilla.active_custom_fields %]
         [% field_counter = field_counter + 1 %]
@@ -233,6 +235,8 @@
           
    
             		
       
    
+    
    
         [% FOREACH owner = workdata.keys.sort %]
             [% INCLUDE do_one_owner owner=owner ownerdata=workdata.$owner
                                     detailed=detailed %]
@@ -112,11 +110,10 @@
         [% subtotal = subtotal + bugdata.total_time %]
     [% END %]
     
-      
-      
-        [% global.total = global.total + subtotal %]
+      
+      
+    [% global.total = global.total + subtotal %]
 [% END %]
 
 [%#
@@ -128,7 +125,7 @@
 [% BLOCK number_report %]
     [% global.total = 0 global.owner_count = {} global.bug_count = {} %]
 
-    
    Total:
-        [% subtotal FILTER format("%.2f") %]Total:[% subtotal FILTER format("%.2f") %]
     
    
+    
    
     [% FOREACH bug = workdata.keys.nsort %]
         [% INCLUDE do_one_bug id=bug bugdata=workdata.$bug
                               detailed=detailed %]
@@ -156,51 +153,42 @@
             
-                
         [% END %]
     [% END %]
     
-      
-      
-      
+      
+      
     [% global.total = global.total + subtotal %]
 [% END %]
 
 [% BLOCK bug_header %]
     
-        
-        
+        
+        
         [% IF extra %]
-          
+          
         [% END %]
     
     [% IF detailed %]
       
         [% IF extra %]
           
@@ -222,7 +210,7 @@
 
 [% BLOCK inactive_report %]
     
    Inactive [% terms.bugs %]
    
-    
    
                  
                 [% login_name FILTER html %]
+                
                 [% work_time FILTER format("%.2f") %]
             
     
-      Total:
-      
-        [% subtotal FILTER format("%.2f") %]
-      Total:[% subtotal FILTER format("%.2f") %]
     
    
-          [% "$terms.Bug $id" FILTER bug_link(id) FILTER none %]
-        [% display_value("bug_status", bugs.$id.bug_status) FILTER html %][% "$terms.Bug $id" FILTER bug_link(id) FILTER none %]
+          [% display_value("bug_status", bugs.$id.bug_status) FILTER html %]
+        
         [% bugs.$id.short_desc FILTER html %][% bugdata.total_time FILTER html %][% bugdata.total_time FILTER html %]
    
          
         
-          
-            
-              
-              
-              
-            
-          
    
-                Estimated: [% bugs.$id.estimated_time FILTER format("%.2f") %]h
-              
-                Remaining: [% bugs.$id.remaining_time FILTER format("%.2f") %]h
-              
-                Deadline: [% bugs.$id.deadline || "Not set" %]
-              
    
+          
+            Estimated: [% bugs.$id.estimated_time FILTER format("%.2f") %]h
+          
+          
+            Remaining: [% bugs.$id.remaining_time FILTER format("%.2f") %]h
+          
+          
+            Deadline: [% bugs.$id.deadline || "Not set" %]
+          
             		 
    
+    
    
     [% cid = 0 %]
     [% FOREACH bug_id = null.nsort %]
         [% INCLUDE bug_header id=bug_id cid=cid %]
@@ -236,8 +224,8 @@
   [% IF global.total > 0 %]
     
-      
-      
+      
+      
   [% ELSE %]
     
@@ -254,88 +242,88 @@
   #%]
 
 [% BLOCK query_form %]
-
    
-
+
    
+
 
 [% IF warn_swap_dates %]
-    
    The
-    end date specified occurs before the start date, which doesn't
-    make sense; the dates below have therefore been swapped.
    
+  
    
+    The end date specified occurs before the start date, which doesn't
+    make sense; the dates below have therefore been swapped.
+  
    
 [% END %]
 
 
    
       Totals[% additional FILTER html %][% global.total FILTER format("%.2f") %][% additional FILTER html %][% global.total FILTER format("%.2f") %]
     
    
 
 
 
    
-
-
-
-
-
-
-
    
-  : 
-
-  
-  
-  
    
-   
-  and : 
-  
-  
-  
    
-    		
-  
-
     
-  (Dates are optional, and in YYYY-MM-DD format)
-
    
-  Group by:
-
-  
-  
-
-  : 
-
     
-  
-  
-  [%# XXX: allow splitting by other intervals %]
-   
-  
-  
-   
-  
-  
-
    
+  
    
+      :
+    
+      
+      
+      
+        and :
+      
+      
+      
+      
    
+      (Dates are optional, and in YYYY-MM-DD format)
+    
    Group by:
+      
+      
+      
+      
+    
+      :
+      
+    
     
+      
+      
+      [%# XXX: allow splitting by other intervals %]
+      
+      
+      
+      
+    
    
 
 
 
-
    
+  //-->
+
+
    
 [% END %]
diff --git a/template/en/default/bug/time.html.tmpl b/template/en/default/bug/time.html.tmpl
index 370aad679..317c19cde 100644
--- a/template/en/default/bug/time.html.tmpl
+++ b/template/en/default/bug/time.html.tmpl
@@ -5,7 +5,7 @@
   # This Source Code Form is "Incompatible With Secondary Licenses", as
   # defined by the Mozilla Public License, v. 2.0.
   #%]
-                                      
+
 [% BLOCK formattimeunit %]
   [%# INTERFACE:
     # time_unit:  the number converting, converts to 2 decimal places
@@ -13,11 +13,7 @@
     #             1 decimal place
     #%]
   [% time_unit = time_unit FILTER format('%.2f') %]
-  [% IF time_unit.match('0\Z') %]
-    [% time_unit FILTER format('%.1f') %]
-  [% ELSE %]
-    [% time_unit FILTER format('%.2f') %]
-  [% END %]
+  [% time_unit.replace('0\Z', '') %]
 [% END %]
 
 [% BLOCK calculatepercentage %]
diff --git a/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/bugmail-header.txt.tmpl
index c754f6a42..286c70bcd 100644
--- a/template/en/default/email/bugmail-header.txt.tmpl
+++ b/template/en/default/email/bugmail-header.txt.tmpl
@@ -16,21 +16,8 @@ To: [% to_user.email %]
 Subject: [[% terms.Bug %] [%+ bug.id %]] [% 'New: ' IF show_new %][%+ bug.short_desc %]
 Date: [% date %]
 X-Bugzilla-Reason: [% reasonsheader %]
-X-Bugzilla-Type: [% isnew ? 'new' : 'changed' %]
+X-Bugzilla-Type: [% bugmailtype %]
 X-Bugzilla-Watch-Reason: [% reasonswatchheader %]
-[% IF Param('useclassification') %]
-X-Bugzilla-Classification: [% bug.classification %]
-[% END %]
-X-Bugzilla-Product: [% bug.product %]
-X-Bugzilla-Component: [% bug.component %]
-X-Bugzilla-Version: [% bug.version %]
-X-Bugzilla-Keywords: [% bug.keywords %]
-X-Bugzilla-Severity: [% bug.bug_severity %]
-X-Bugzilla-Who: [% changer.login %]
-X-Bugzilla-Status: [% bug.bug_status %]
-X-Bugzilla-Priority: [% bug.priority %]
-X-Bugzilla-Assigned-To: [% bug.assigned_to.login %]
-X-Bugzilla-Target-Milestone: [% bug.target_milestone %]
-X-Bugzilla-Flags:[% FOREACH flag = bug.flags %] [%+ flag.name %][% flag.status %][% END %]
+[%+ INCLUDE "email/header-common.txt.tmpl" %]
 X-Bugzilla-Changed-Fields: [% changedfields.join(" ") %]
 [%+ threadingmarker %]
diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index b361b0889..fd348a656 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -11,7 +11,7 @@
 [% isnew = bug.lastdiffed ? 0 : 1 %]
 
     
-      
+      
     
     
       [% Hook.process('start') %]
@@ -20,18 +20,36 @@
       [% FOREACH comment = new_comments.reverse %]
         
    
           [% IF comment.count %]
-            [% "Comment # ${comment.count}" FILTER bug_link(bug,
-              {comment_num => comment.count, full_url => 1, user => to_user}) FILTER none %]
-              on [% "$terms.bug $bug.id" FILTER bug_link(bug, { full_url => 1, user => to_user }) FILTER none %]
-              from [% INCLUDE global/user.html.tmpl who = comment.author %]
+            [% INCLUDE bug/link.html.tmpl bug = bug, link_text = "Comment # ${comment.count}",
+                                             comment_num = comment.count, full_url = 1, user = to_user %]
+              on [% INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.bug $bug.id",
+                                               full_url = 1, user = to_user %]
+              from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]
           [% END %]
         
    [% comment.body_full({ wrap => 1 }) FILTER quoteUrls(bug, comment, to_user) %]
    
         
    
       [% END %]
       
    
+
+      [% IF referenced_bugs.size %]
+        
    
+          
    
+          Referenced [% terms.Bugs %]:
+          
      
+            [% FOREACH ref_bug = referenced_bugs %]
+              
    • 
+                [[% "${terms.Bug} ${ref_bug.id}" FILTER bug_link(ref_bug, {full_url => 1, user => to_user}) FILTER none %]] 
+                [% ref_bug.short_desc FILTER html %]
+              
      • 
+            [% END %]
+          
    
+        
    
+        
    
+      [% END %]
+
       
    
       You are receiving this mail because:
-      
+
       
      
       [% FOREACH reason = reasons %]
         [%  IF reason_descs.$reason  %]
@@ -58,14 +76,14 @@
           [% SET in_table = 0 %]
         [% END %]
         [% IF change.blocker %]
-              [% "${terms.Bug} ${bug.id}" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %]
-              depends on
-              [%+ "${terms.bug} ${change.blocker.id}"
-                  FILTER bug_link(change.blocker, {full_url => 1, user => to_user}) FILTER none %],
-              which changed state.
+          [% INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.Bug $bug.id", full_url = 1, user = to_user %]
+          depends on
+          [%+ INCLUDE bug/link.html.tmpl bug = change.blocker, link_text = "$terms.bug $change.blocker.id",
+                                         full_url = 1, user = to_user %],
+          which changed state.
         [% ELSE %]
-              [% INCLUDE global/user.html.tmpl who = change.who %] changed
-              [%+ "${terms.bug} ${bug.id}" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %]
+          [% INCLUDE global/user.html.tmpl user = to_user, who = change.who %] changed
+          [%+ INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.bug $bug.id", full_url = 1, user = to_user %]
         [% END %]
           
      
           [% IF in_table == 0 %]
@@ -89,7 +107,7 @@
           
    		[% field_label FILTER html %]
           
             [% IF change.field_name == "bug_id" %]
-              [% new_value FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %]
+              [% INCLUDE bug/link.html.tmpl bug = bug, link_text = new_value, full_url = 1, user = to_user %]
             [% ELSE %]
               [% new_value FILTER html %]
             [% END %]
diff --git a/template/en/default/email/bugmail.txt.tmpl b/template/en/default/email/bugmail.txt.tmpl
index b3c652fcc..1f04db7b1 100644
--- a/template/en/default/email/bugmail.txt.tmpl
+++ b/template/en/default/email/bugmail.txt.tmpl
@@ -22,6 +22,15 @@
 [%+ comment.body_full({ is_bugmail => 1, wrap => 1 }) FILTER strip_control_chars %]
 [% END %]
 
+[% IF referenced_bugs.size %]
+
+Referenced [% terms.Bugs %]:
+
+[% FOREACH ref_bug = referenced_bugs %]
+[%+ urlbase %]show_bug.cgi?id=[% ref_bug.id %]
+[%+ "[" _ terms.Bug _ " " _ ref_bug.id _ "] " _ ref_bug.short_desc FILTER wrap_comment %]
+[% END %]
+[% END %]
 -- [%# Protect the trailing space of the signature marker %]
 You are receiving this mail because:
 [% SET reason_lines = [] %]
diff --git a/template/en/default/email/flagmail.txt.tmpl b/template/en/default/email/flagmail.txt.tmpl
index 037673dfc..cf64d9661 100644
--- a/template/en/default/email/flagmail.txt.tmpl
+++ b/template/en/default/email/flagmail.txt.tmpl
@@ -27,6 +27,9 @@
 [% ELSE %]
   [% IF old_flag && old_flag.status == '?' %]
     [% to_identity = old_flag.setter.identity _ "'s request for" %]
+    [% IF old_flag.requestee.defined %]
+        [% requestee_identity = old_flag.requestee.identity _ "'s" %]
+    [% END %]
   [% END %]
   [% subject_status = statuses.$action %]
 [% END %]
@@ -37,16 +40,17 @@ Subject: [% flagtype_name %] [%+ subject_status %]: [[% terms.Bug %] [%+ bug.bug
   [Attachment [% attachment.id %]] [% attachment.description FILTER clean_text %][% END %]
 Date: [% date %]
 X-Bugzilla-Type: request
+[%+ INCLUDE "email/header-common.txt.tmpl" %]
 [%+ threadingmarker %]
 
 [%+ USE wrap -%]
 [%- FILTER bullet = wrap(80) -%]
 
 [% IF on_behalf_of %]
-[% user.identity %] has reassigned [% flag.setter.identity %]'s request for [% flagtype_name %]
+[% user.identity %] has reassigned [% flag.setter.identity %]'s request for [% IF requestee_identity %] [%+ requestee_identity %] [% END %] [% flagtype_name %]
 [% to_identity %]:
 [% ELSE %]
-[% user.identity %] has [% statuses.$action %] [%+ to_identity %] [%+ flagtype_name %]:
+[% user.identity %] has [% statuses.$action %] [%+ to_identity %] [% IF requestee_identity %] [%+ requestee_identity %] [% END %] [%+ flagtype_name %]:
 [% END %]
 
 [% terms.Bug %] [%+ bugidsummary %]
diff --git a/template/en/default/email/header-common.txt.tmpl b/template/en/default/email/header-common.txt.tmpl
new file mode 100644
index 000000000..02bd38e13
--- /dev/null
+++ b/template/en/default/email/header-common.txt.tmpl
@@ -0,0 +1,24 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+[% IF Param('useclassification') %]
+X-Bugzilla-Classification: [% bug.classification %]
+[% END %]
+X-Bugzilla-Product: [% bug.product %]
+X-Bugzilla-Component: [% bug.component %]
+X-Bugzilla-Version: [% bug.version %]
+X-Bugzilla-Keywords: [% bug.keywords %]
+X-Bugzilla-Severity: [% bug.bug_severity %]
+X-Bugzilla-Who: [% changer.login %]
+X-Bugzilla-Status: [% bug.bug_status %]
+X-Bugzilla-Resolution: [% bug.resolution %]
+X-Bugzilla-Priority: [% bug.priority %]
+X-Bugzilla-Assigned-To: [% bug.assigned_to.login %]
+[% IF Param('usetargetmilestone') %]
+X-Bugzilla-Target-Milestone: [% bug.target_milestone %]
+[% END %]
+X-Bugzilla-Flags:[% FOREACH flag = bug.flags %] [%+ flag.name %][% flag.status %][% END %]
diff --git a/template/en/default/email/new-api-key.txt.tmpl b/template/en/default/email/new-api-key.txt.tmpl
new file mode 100644
index 000000000..cfccefdcc
--- /dev/null
+++ b/template/en/default/email/new-api-key.txt.tmpl
@@ -0,0 +1,33 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[%# INTERFACE:
+  # user: The Bugzilla::User object of the user being created
+  # new_key: The API key created
+  #%]
+
+From: [% Param('mailfrom') %]
+To: [% user.email %]
+Subject: [% terms.Bugzilla %]: New API key created
+X-Bugzilla-Type: admin
+
+[This e-mail has been automatically generated]
+
+A new [% terms.Bugzilla %] API key[% IF new_key.description %], with the
+description '[% new_key.description %]'[% END %] has been created. You can view
+or update the key at the following URL:
+
+[%+ urlbase %]userprefs.cgi?tab=apikey
+
+IMPORTANT: If you did not request a new key, your [% terms.Bugzilla %] account
+may have been compromised. In this case, please disable the key at the above
+URL, and change your password immediately.
+
+For security reasons, we have not included your new key in this e-mail.
+
+If you have any issues regarding your account, please contact [% Param('maintainer') %].
diff --git a/template/en/default/email/new-user-details.txt.tmpl b/template/en/default/email/new-user-details.txt.tmpl
new file mode 100644
index 000000000..b1b43caf2
--- /dev/null
+++ b/template/en/default/email/new-user-details.txt.tmpl
@@ -0,0 +1,31 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[%# INTERFACE:
+  # new_user: The Bugzilla::User object of the user being created
+  #%]
+
+From: [% Param('mailfrom') %]
+To: [% new_user.email %]
+Subject: [% terms.Bugzilla %]: New account created
+X-Bugzilla-Type: admin
+
+[This e-mail has been automatically generated]
+
+A new [% terms.Bugzilla %] user account has been created at [% urlbase %]:
+
+Login: [% new_user.login %]
+[% IF new_user.realname %]
+Real name: [% new_user.realname %]
+[% END %]
+
+For security reasons, we have not included your new password in this e-mail.
+If you have not being given it via other means, you can use the 'Forgot
+Password' link to set a new password.
+
+If you have any issues regarding your account, please contact [% Param('maintainer') %].
diff --git a/template/en/default/extensions/config.pm.tmpl b/template/en/default/extensions/config.pm.tmpl
index cb7195767..68ed260c1 100644
--- a/template/en/default/extensions/config.pm.tmpl
+++ b/template/en/default/extensions/config.pm.tmpl
@@ -12,8 +12,11 @@
 
 [% PROCESS extensions/license.txt.tmpl %]
 
-package B[% %]ugzilla::Extension::[% name %];
+package Bugzilla::Extension::[% name %];
+
+use 5.10.1;
 use strict;
+use warnings;
 
 use constant NAME => '[% name %]';
 
diff --git a/template/en/default/extensions/extension.pm.tmpl b/template/en/default/extensions/extension.pm.tmpl
index 206ea88f4..823440421 100644
--- a/template/en/default/extensions/extension.pm.tmpl
+++ b/template/en/default/extensions/extension.pm.tmpl
@@ -12,16 +12,20 @@
 
 [% PROCESS extensions/license.txt.tmpl %]
 
-package B[% %]ugzilla::Extension::[% name %];
+package Bugzilla::Extension::[% name %];
+
+use 5.10.1;
 use strict;
-use base qw(B[% %]ugzilla::Extension);
+use warnings;
+
+use parent qw(Bugzilla::Extension);
 
 # This code for this is in [% path %]/lib/Util.pm
-use B[% %]ugzilla::Extension::[% name %]::Util;
+use Bugzilla::Extension::[% name %]::Util;
 
 our $VERSION = '0.01';
 
-# See the documentation of B[% %]ugzilla::Hook ("perldoc B[% %]ugzilla::Hook" 
+# See the documentation of Bugzilla::Hook ("perldoc Bugzilla::Hook" 
 # in the bugzilla directory) for a list of all available hooks.
 sub install_update_db {
     my ($self, $args) = @_;
diff --git a/template/en/default/extensions/hook-readme.txt.tmpl b/template/en/default/extensions/hook-readme.txt.tmpl
index 63e09e419..86ace3f51 100644
--- a/template/en/default/extensions/hook-readme.txt.tmpl
+++ b/template/en/default/extensions/hook-readme.txt.tmpl
@@ -7,7 +7,7 @@
   #%]
 
 Template hooks go in this directory. Template hooks are called in normal
-[%+ terms.Bugzilla %] templates like [[% '%' %] Hook.process('some-hook') %].
+Bugzilla templates like [[% '%' %] Hook.process('some-hook') %].
 More information about them can be found in the documentation of 
-B[% %]ugzilla::Extension. (Do "perldoc B[% %]ugzilla::Extension" from the main
-[%+ terms.Bugzilla %] directory to see that documentation.)
+Bugzilla::Extension. (Do "perldoc Bugzilla::Extension" from the main
+Bugzilla directory to see that documentation.)
diff --git a/template/en/default/extensions/index-admin.rst.tmpl b/template/en/default/extensions/index-admin.rst.tmpl
new file mode 100644
index 000000000..508937710
--- /dev/null
+++ b/template/en/default/extensions/index-admin.rst.tmpl
@@ -0,0 +1,23 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[%# INTERFACE:
+  # name: string; the name of the extension.
+  #%]
+
+[% USE String('#') %]
+[% name %]
+[%+ String.repeat(name.length) %]
+
+This is a sample Adminstrator documentation file for the [% name %] extension.
+Like all of the Bugzilla docs, it's written in
+`reStructured Text (reST) format `_
+and will be compiled by `Sphinx `_.
+
+If you build the docs yourself using :file:`makedocs.pl`, this file will get
+incorporated into the Installed Extensions chapter of the Administration Guide.
diff --git a/template/en/default/extensions/index-user.rst.tmpl b/template/en/default/extensions/index-user.rst.tmpl
new file mode 100644
index 000000000..b09fc1cd1
--- /dev/null
+++ b/template/en/default/extensions/index-user.rst.tmpl
@@ -0,0 +1,23 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[%# INTERFACE:
+  # name: string; the name of the extension.
+  #%]
+
+[% USE String('#') %]
+[% name %]
+[%+ String.repeat(name.length) %]
+
+This is a sample User documentation file for the [% name %] extension.
+Like all of the Bugzilla docs, it's written in
+`reStructured Text (reST) format `_
+and will be compiled by `Sphinx `_.
+
+If you build the docs yourself using :file:`makedocs.pl`, this file will get
+incorporated into the Installed Extensions chapter of the User Guide.
diff --git a/template/en/default/extensions/name-readme.txt.tmpl b/template/en/default/extensions/name-readme.txt.tmpl
index 22fbad4df..e792512b5 100644
--- a/template/en/default/extensions/name-readme.txt.tmpl
+++ b/template/en/default/extensions/name-readme.txt.tmpl
@@ -9,8 +9,8 @@
 Normal templates go in this directory. You can load them in your
 code like this:
 
-use B[% %]ugzilla::Error;
-my $template = B[% %]ugzilla->template;
+use Bugzilla::Error;
+my $template = Bugzilla->template;
 $template->process('[% name FILTER lower %]/some-template.html.tmpl')
   or ThrowTemplateError($template->error());
 
@@ -18,7 +18,7 @@ That would be how to load a file called some-template.html.tmpl that
 was in this directory.
 
 Note that you have to be careful that the full path of your template
-never conflicts with a template that exists in [% terms.Bugzilla %] or in 
+never conflicts with a template that exists in Bugzilla or in 
 another extension, or your template might override that template. That's why
 we created this directory called '[% name FILTER lower %]' for you, so you
 can put your templates in here to help avoid conflicts.
diff --git a/template/en/default/extensions/util.pm.tmpl b/template/en/default/extensions/util.pm.tmpl
index 6c9fe3795..3baab57fd 100644
--- a/template/en/default/extensions/util.pm.tmpl
+++ b/template/en/default/extensions/util.pm.tmpl
@@ -12,15 +12,19 @@
 
 [% PROCESS extensions/license.txt.tmpl %]
 
-package B[% %]ugzilla::Extension::[% name %]::Util;
+package Bugzilla::Extension::[% name %]::Util;
+
+use 5.10.1;
 use strict;
-use base qw(Exporter);
+use warnings;
+
+use parent qw(Exporter);
 our @EXPORT = qw(
     
 );
 
 # This file can be loaded by your extension via 
-# "use B[% %]ugzilla::Extension::[% name %]::Util". You can put functions
+# "use Bugzilla::Extension::[% name %]::Util". You can put functions
 # used by your extension in here. (Make sure you also list them in
 # @EXPORT.)
 
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index e37fec1a7..6adbbcb95 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -78,9 +78,6 @@
   'classes.$row_idx.$col_idx', 
   'urlbase', 
   'data.$tbl.$col.$row', 
-  'row_total',
-  'col_totals.$col',
-  'grand_total', 
 ],
 
 'reports/report.html.tmpl' => [
@@ -192,10 +189,6 @@
   'script',
 ],
 
-'global/site-navigation.html.tmpl' => [
-  'bug.bug_id', 
-],
-
 'bug/comments.html.tmpl' => [
   'comment.id',
   'comment.count',
@@ -261,16 +254,13 @@
 
 
 'bug/time.html.tmpl' => [
-  'time_unit FILTER format(\'%.1f\')', 
-  'time_unit FILTER format(\'%.2f\')', 
+  "time_unit.replace('0\\Z', '')",
   '(act / (act + rem)) * 100 
        FILTER format("%d")', 
 ],
 
 'bug/process/results.html.tmpl' => [
-  'title.$type', 
-  '"$terms.Bug $id" FILTER bug_link(id)',
-  '"$terms.bug $id" FILTER bug_link(id)',
+  'title.$type.ucfirst',
 ],
 
 'bug/create/create.html.tmpl' => [
@@ -278,9 +268,7 @@
 ],
 
 'bug/create/create-guided.html.tmpl' => [
-  'tablecolour',
   'sel',
-  'productstring', 
 ],
 
 'bug/activity/table.html.tmpl' => [
@@ -301,6 +289,7 @@
   'attachment.id', 
   'attachment.bug_id', 
   'editable_or_hide',
+  'use_patchviewer',
 ],
 
 'attachment/list.html.tmpl' => [
@@ -333,10 +322,8 @@
 ],
 
 'attachment/diff-file.html.tmpl' => [
-  'lxr_prefix',
   'file.minus_lines',
   'file.plus_lines',
-  'bonsai_prefix',
   'section.old_start',
   'section_num',
   'current_line_old',
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 4d7eefb48..169cf8a51 100644
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -6,7 +6,7 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
-[% IF user.id && !read_only_flags && (!bug || bug.check_can_change_field('flagtypes.name', 0, 1)) %]
+[% IF user.id && (!bug || bug.check_can_change_field('flagtypes.name', 0, 1)) %]
 
 [%# We list flags by looping twice over the flag types relevant for the bug.
   # In the first loop, we display existing flags and then, for active types,
@@ -23,13 +23,12 @@
 
   [% UNLESS flag_no_header %]
     
-      
+      
       [% IF any_flags_requesteeble %]
-        
+        
+      [% END %]
+      [% IF edit_multiple_bugs %]
+        
       [% END %]
     
   [% END %]
@@ -41,7 +40,9 @@
     [% FOREACH flag = type.flags %]
       [% PROCESS flag_row flag = flag type = type %]
     [% END -%]
+
     [% SET flag = "" %]
+    [% NEXT IF read_only_flags %]
 
     [%-# Step 1b: Display UI for setting flag. %]
     [% IF (!type.flags || type.flags.size == 0) && type.is_active %]
@@ -49,16 +50,21 @@
     [% END %]
   [% END %]
 
-  [%# Step 2: Display flag type again (if type is multiplicable). %]
-  [% FOREACH type = flag_types %]
-    [% NEXT UNLESS type.flags && type.flags.size > 0 && type.is_multiplicable && type.is_active %]
-    [% IF !separator_displayed %]
-      
-        
-      
-      [% separator_displayed = 1 %]
+  [% IF !read_only_flags %]
+    [%# Step 2: Display flag type again (if type is multiplicable). %]
+    [% FOREACH type = flag_types %]
+      [% NEXT UNLESS type.flags && type.flags.size > 0 && type.is_multiplicable && type.is_active %]
+      [% IF !separator_displayed %]
+        
+          [% sep_length = 3 + (any_flags_requesteeble ? 1 : 0) + (edit_multiple_bugs ? 1 : 0) %]
+          
+            
+          
+        
+        [% separator_displayed = 1 %]
+      [% END %]
+      [% PROCESS flag_row type = type addl_text = "addl." %]
     [% END %]
-    [% PROCESS flag_row type = type addl_text = "addl." %]
   [% END %]
 
    
-        Flags:
-      Flags:
-          Requestee:
-        Requestee: 
    
 
@@ -76,7 +82,7 @@
       [% ELSE %]
         [% flag.setter.nick FILTER html %]:
       [% END %]
-      [%+ type.name FILTER html FILTER no_break %][% flag.status %]
+      [%+ type.name FILTER html %][% flag.status %]
       [% IF flag.requestee %]
         [% IF flag.requestee.name %]
           ([% flag.requestee.nick FILTER html %])
@@ -93,6 +99,7 @@
 [% BLOCK flag_row %]
   [% RETURN IF !flag && !((type.is_requestable && user.can_request_flag(type)) || user.can_set_flag(type)) %]
   [% SET fid = flag ? "flag-$flag.id" : "flag_type-$type.id" %]
+  [% can_edit_flag = (!read_only_flags || (flag && (flag.setter_id == user.id || (flag.requestee_id && flag.requestee_id == user.id)))) ? 1 : 0 %]
   
     
    
       
@@ -102,21 +109,25 @@
           [% addl_text FILTER html %]
         [% END %]
       
+      
         
+          [%- type.name FILTER html %]
       
       
         
         
       
+        
           [% IF (type.is_active && type.is_requestable && type.is_requesteeble) || (flag && flag.requestee) %]
-            
               [% SET grant_list = [] %]
               [% IF Param('usemenuforusers') %]
-                [% grant_list = type.grant_list %]
-                [% IF flag && !(type.is_active && type.is_requestable && type.is_requesteeble) %]
+                [% IF !can_edit_flag || (flag && !(type.is_active && type.is_requestable && type.is_requesteeble)) %]
                   [%# We are here only because there was already a requestee. In this case,
                       the only valid action is to remove the requestee or leave it alone;
                       nothing else. %]
                   [% grant_list = [flag.requestee] %]
+                [% ELSE %]
+                  [% grant_list = type.grant_list %]
                 [% END %]
               [% END %]
               [% SET flag_name = flag ? "requestee-$flag.id" : "requestee_type-$type.id" %]
@@ -157,11 +168,24 @@
                          emptyok  => flag_empty_ok
                          classes  => ["requestee"]
                          custom_userlist => grant_list
+                         disabled => !can_edit_flag
               %]
-            
           [% END %]
         
+        [% IF type.is_multiplicable %]
+          
+          
+        [% END %]
+        
    
   
    
+[% USE Bugzilla %]
+[% previous_params = Bugzilla.cgi.canonicalise_query('classification') %]
+
+
    First, you must pick a classification on which to enter [% terms.abug %]:
    
+
    
-    
 
-    
+    
@@ -36,15 +39,14 @@
 
 [% FOREACH class = classifications %]
   
-    
 
     [% IF class.description %]
-      
+      
     [% END %]
   
 [% END %]
diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl
index dfa0b002a..a1582532a 100644
--- a/template/en/default/global/choose-product.html.tmpl
+++ b/template/en/default/global/choose-product.html.tmpl
@@ -11,13 +11,15 @@
   #                  classification object and 'products' the list of
   #                  product objects the user can enter bugs into.
   # target:   the script that displays this template.
-  # cloned_bug_id: ID of the bug being cloned.
-  # format:   the desired format to display the target.
   #%]
 
 [% IF target == "enter_bug.cgi" %]
   [% title = "Enter $terms.Bug" %]
-  [% h2 = BLOCK %]First, you must pick a product on which to enter [% terms.abug %]: [% END %]
+  [% subheader = "Select Product" %]
+  [% h2 = BLOCK %]
+    [% IF Param('useclassification') %]Next[% ELSE %]First[% END %],
+    you must pick a product on which to enter [% terms.abug %]:
+  [% END %]
 [% ELSIF target == "describecomponents.cgi" %]
   [% title = "Browse" %]
   [% h2 = "Select a product category to browse:" %]
@@ -26,28 +28,30 @@
 [% DEFAULT title = "Choose a Product" %]
 [% PROCESS global/header.html.tmpl %]
 
+[% USE Bugzilla %]
+[% previous_params = Bugzilla.cgi.canonicalise_query('classification', 'product') %]
+
 
    [% h2 FILTER html %]
    
 
-
    
   
    
+    
       
+            [%- IF previous_params %]&[% previous_params FILTER none %][% END -%]">
       All:
      Show all productsShow all products
   
    
   
    
      
    
+    
       
+            [%- IF previous_params %]&[% previous_params FILTER none %][% END -%]">
       [% class.name FILTER html %]:
      [% class.description FILTER html_light %][% class.description FILTER html_light %]
    
+
    
 
 [% FOREACH c = classifications %]
   [% IF c.object %]
     
-      
   [% END %]
 
   [% FOREACH p = c.products %]
     
-      
 
-      
+      
   [% END %]
 
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index e4416326b..d73d75e13 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -50,8 +50,8 @@
     
   [% ELSIF error == "chart_data_not_generated" %]
     [% admindocslinks = {'extraconfig.html' => 'Setting up Charting'} %]
-    [% IF product %]
-      Charts for the [% product FILTER html %] product are not
+    [% IF product.id %]
+      Charts for the [% product.name FILTER html %] product are not
       available yet because no charting data has been collected for it since it
       was created.
     [% ELSE %]
@@ -64,13 +64,13 @@
 
   [% ELSIF error == "chart_datafile_corrupt" %]
     The chart data file [% file FILTER html %] is corrupt.
-        
+
   [% ELSIF error == "chart_dir_nonexistent" %]
-    One of the directories [% dir FILTER html %] and 
-    [% graph_dir FILTER html %] does not exist.
-  
+    One of the directories [% dir FILTER html %] and
+    [% graph_dir FILTER html %] does not exist.
+
   [% ELSIF error == "chart_file_open_fail" %]
-    Unable to open the chart datafile [% filename FILTER html %].
+    Unable to open the chart datafile [% filename FILTER html %].
  
   [% ELSIF error == "column_alter_nonexistent_fk" %]
     You attempted to modify the foreign key for 
@@ -112,7 +112,7 @@
     Every cookie must have a value.
 
   [% ELSIF error == "env_no_email" %]
-    [% terms.Bugzilla %] did not receive an email address from the 
+    Bugzilla did not receive an email address from the
     environment.
     [% IF Param("auth_env_email") %]
       This means that the '[% Param("auth_env_email") FILTER html %]'
@@ -386,7 +386,7 @@
 
   [% ELSIF error == "search_field_operator_unsupported" %]
     [% title = "Invalid Search Type" %]
-    [% terms.Bugzilla %] does not support the search type
+    Bugzilla does not support the search type
     "[% operator.truncate(30, "...") FILTER html %]".
 
   [% ELSE %]
@@ -394,7 +394,7 @@
     [% error_message = Hook.process("errors") %]
     [% IF NOT error_message %]
       [% title = "Internal error" %]
-      An internal error has occurred, but [% terms.Bugzilla %] doesn't know
+      An internal error has occurred, but Bugzilla doesn't know
       what [% error FILTER html %] means.
 
       If you are a [% terms.Bugzilla %] end-user seeing this message, please save
@@ -432,25 +432,18 @@
   with details of what you were doing at the time this message appeared.
 
    
 
-
-  
-
-
-
    [% c.object.name FILTER html %]:
+      [% c.object.name FILTER html %]:
       [%+ c.object.description FILTER html_light %]
     
    
+      
         
-        [% p.name FILTER html FILTER no_break %]: 
+              [%- IF previous_params %]&[% previous_params FILTER none %][% END -%]">
+        [% p.name FILTER html %]:
       [% p.description FILTER html_light %][% p.description FILTER html_light %]
     
    
-  
-    
-  
-
    
-      [% error_message FILTER none %]
-    
    
+
    
+  URL: [% Bugzilla.cgi.self_url FILTER html %]
+
    
+
+
    
+  [% error_message FILTER none %]
+
    
+
+
    
+  Traceback:
+
    
 
-
    Traceback:
    
 
    [% traceback FILTER html %]
    
 
 [% IF variables %]
diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index 800fd5932..78b4eb80a 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -49,13 +49,11 @@
     [% END %]
   [%-# Work around FF bug: keep this on one line %]
 
+  [% Hook.process('action-links') %]
+
   [% IF user.login %]
     
  • | Preferences
    • 
-    [% IF user.in_group('tweakparams') || user.in_group('editusers') || user.can_bless
-          || (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')
-          || user.get_products_by_permission("editcomponents").size %]
+    [% IF user.can_administer %]
       
  • | Administration
    • 
     [% END %]
 
@@ -102,7 +100,7 @@
 
 [% Hook.process("link-row") %]
 [% BLOCK link_to_documentation %]
-    [% IF doc_section && Param('docs_urlbase') %]
+    [% IF doc_section %]
       
  • 
         | 
         Help
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index c31567a9c..613f097e1 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -54,7 +54,7 @@
 
   
    
     [% IF matchmultiple %]
-      [% terms.Bugzilla %] cannot make a conclusive match for one or more
+      Bugzilla cannot make a conclusive match for one or more
       of the names and/or email addresses you entered on the previous page.
       
    Please examine the lists of potential matches below and select the
       ones you want,
@@ -69,7 +69,7 @@
 [% ELSE %]
   [% PROCESS global/header.html.tmpl title="Match Failed" %]
   
    
-    [% terms.Bugzilla %] was unable to make any match at all for one or more of
+    Bugzilla was unable to make any match at all for one or more of
     the names and/or email addresses you entered on the previous page.
     [% IF !user.id %]
       Note: You are currently logged out. Only exact matches against e-mail
@@ -79,30 +79,22 @@
   
    Please go back and try other names or email addresses.
    
 [% END %]
 
-  
-    
-      
-    
-
-  [%# this is messy to allow later expansion %]
-
+
    
-        
    
-      
    
   [% FOREACH field = matches %]
     
-      
-      
-    
-      
-    
   [% END %]
-
-  
    
+      
         [% PROCESS field_names field_name=field.key %]:
       
+      
           [% FOREACH query = field.value %]
             
    
               [% query.key FILTER html %]
             [% IF query.value.users.size %]
                 [% IF query.value.users.size > 1 %]
                   [% IF query.value.status == 'fail' %]
-                    
+                    
                       matches multiple users.
-                    
+                    
                     Please go back and try again with a more specific
                     name/address.
                   [% ELSE %]
@@ -136,31 +128,26 @@
                   [% query.value.users.0.identity FILTER html %]
                 [% END %]
             [% ELSE %]
+              
                 [% IF query.key.length < 3 %]
-                  was too short for substring match
-                  (minimum 3 characters)
+                  was too short for substring match (minimum 3 characters)
                 [% ELSE %]
-                  did not match anything
+                  did not match anything
                 [% END %]
+              
             [% END %]
             
    
         [% END %]
           		
     
    
-        
    
-      
    
+
    • 
 
 [% IF matchsuccess == 1 %]
 
   [% SET exclude_these = ['Bugzilla_login', 'Bugzilla_password'] %]
   [% FOREACH key IN matches.keys %]
-    [% exclude_these.push(key) IF cgi.param(key) == '' %]
+    [% exclude_these.push(key) IF Bugzilla.cgi.param(key) == '' %]
   [% END %]
   [% SET exclude = '^' _ exclude_these.join('|') _ '$' %]
   [% PROCESS "global/hidden-fields.html.tmpl" exclude = exclude %]
diff --git a/template/en/default/global/docslinks.html.tmpl b/template/en/default/global/docslinks.html.tmpl
index c2cc830fa..e33aa3b17 100644
--- a/template/en/default/global/docslinks.html.tmpl
+++ b/template/en/default/global/docslinks.html.tmpl
@@ -22,8 +22,7 @@
   #                 members of the admin group.
   #%]
 
-[% IF Param('docs_urlbase') &&
-      docslinks.keys.size || (admindocslinks.keys.size && user.in_group('admin')) %]
+[% IF docslinks.keys.size || (admindocslinks.keys.size && user.in_group('admin')) %]
   
+      [% Hook.process('main-end') %]
+    
 
-[%# Migration note: below this point, this file corresponds to the old Param
-  # 'footerhtml'
-  #%]
-
-
 
-
+    [% Hook.process("end") %]
+  
 
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index dceb44db9..e461e3746 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -20,6 +20,7 @@
   # style_urls: list. List of URLs to CSS style sheets.
   # message: string. A message to display to the user. May contain HTML.
   # atomlink: Atom link URL, May contain HTML
+  # generate_api_token: generate a token which can be used to make authenticated webservice calls
   #%]
 
 [% IF message %]
@@ -32,6 +33,7 @@
   onload = ""
   style_urls = []
   yui = []
+  generate_api_token = 0
 %]
 
 [% SET yui_css = {
@@ -75,8 +77,7 @@
   # set header's default value here only if it is undefined. %]
 [% IF !header.defined %][% header = title %][% END %]
 
-
+
 
   
     [% Hook.process("start") %]
@@ -86,42 +87,34 @@
       
     [% END %]
 
-[%# Migration note: contents of the old Param 'headerhtml' would go here %]
-
-    [% PROCESS "global/site-navigation.html.tmpl" %]
-
-    [% PROCESS 'global/setting-descs.none.tmpl' %]
-
     [% SET yui = yui_resolve_deps(yui, yui_deps) %]
-    [% SET css_sets = css_files(style_urls, yui, yui_css) %]
 
-    [%# CSS cascade, parts 1 & 2: YUI & Standard Bugzilla stylesheet set (persistent).
-      # Always present. %]
-    
-    [% FOREACH style_url = css_sets.standard %]
-      [% PROCESS format_css_link css_set_name = 'standard' %]
-    [% END %]
-
-    [%# CSS cascade, part 3: Third-party stylesheet set, per user prefs. %]
-    [% FOREACH style_url = css_sets.skin %]
-      [% PROCESS format_css_link css_set_name = user.settings.skin.value %]
+    [% SET css_sets = css_files(style_urls, yui, yui_css) %]
+    [% IF constants.CONCATENATE_ASSETS %]
+      [% PROCESS format_css_link asset_url = css_sets.unified_standard_skin %]
+    [% ELSE %]
+      [% FOREACH asset_url = css_sets.standard %]
+        [% PROCESS format_css_link %]
+      [% END %]
+      [% FOREACH asset_url = css_sets.skin %]
+        [% PROCESS format_css_link %]
+      [% END %]
     [% END %]
 
-    [%# CSS cascade, part 4: page-specific styles. %]
     [% IF style %]
       
     [% END %]
 
-    [%# CSS cascade, part 5: Custom Bugzilla stylesheet set (persistent).
-      # Always present. Site administrators may override all other style
-      # definitions, including skins, using custom stylesheets.
-      #%]
-    [% FOREACH style_url = css_sets.custom %]
-      [% PROCESS format_css_link css_set_name = 'standard' %]
+    [% IF css_sets.unified_custom %]
+      [% IF constants.CONCATENATE_ASSETS %]
+        [% PROCESS format_css_link asset_url = css_sets.unified_custom %]
+      [% ELSE %]
+        [% FOREACH asset_url = css_sets.custom %]
+          [% PROCESS format_css_link %]
+        [% END %]
+      [% END %]
     [% END %]
 
     [%# YUI Scripts %]
@@ -130,7 +123,7 @@
     [% END %]
     [% starting_js_urls.push('js/global.js') %]
 
-    [% FOREACH javascript_url = starting_js_urls %]
+    [% FOREACH asset_url = concatenate_js(starting_js_urls) %]
       [% PROCESS format_js_link %]
     [% END %]
 
@@ -174,16 +167,19 @@
                 [%# Please keep these in alphabetical order. %]
 
                 attach_desc_required:
-                    'You must enter a Description for this attachment.',
+                    "You must enter a Description for this attachment.",
                 component_required:
-                    'You must select a Component for this [% terms.bug %].',
+                    "You must select a Component for this [% terms.bug %].",
                 description_required:
-                    'You must enter a Description for this [% terms.bug %].',
+                    "You must enter a Description for this [% terms.bug %].",
                 short_desc_required:
-                    'You must enter a Summary for this [% terms.bug %].',
+                    "You must enter a Summary for this [% terms.bug %].",
                 version_required:
-                    'You must select a Version for this [% terms.bug %].'
+                    "You must select a Version for this [% terms.bug %]."
             }
+            [% IF generate_api_token %]
+              , api_token: '[% get_api_token FILTER js FILTER html %]'
+            [% END %]
         };
 
         [% FOREACH yui_name = yui %]
@@ -197,7 +193,7 @@
     // -->
     
 
-    [% FOREACH javascript_url = javascript_urls %]
+    [% FOREACH asset_url = concatenate_js(javascript_urls) %]
       [% PROCESS format_js_link %]
     [% END %]
 
@@ -215,99 +211,64 @@
     [% Hook.process("additional_header") %]
   
 
-[%# Migration note: contents of the old Param 'bodyhtml' go in the body tag,
-  # but set the onload attribute in the DEFAULT directive above.
-  #%]
-
-  
 
-[%# Migration note: the following file corresponds to the old Param
-  # 'bannerhtml'
-  #%]
-
- [%# header %]
-
-
    
-
-[% IF Param('announcehtml') %]
-[% Param('announcehtml') FILTER none %]
-[% END %]
 
-[% IF message %]
-  
    [% message %]
    
-[% END %]
+    
+  
    
 
-[% BLOCK format_css_link %]
-  [% IF style_url.match('/IE-fixes\.css') %]
-    ' IF style_url.match('/IE-fixes\.css') %]
+[% BLOCK format_css_link %]
+  
 [% END %]
 
 [% BLOCK format_js_link %]
-  
+  
 [% END %]
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index ba961c392..3a8aa1ada 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -26,14 +26,12 @@
     canceled.
 
   [% ELSIF message_tag == "account_updated" %]
-    [% IF changed_fields.size
-          + groups_added_to.size + groups_removed_from.size
-          + groups_granted_rights_to_bless.size + groups_denied_rights_to_bless.size %]
+    [% IF changes.size %]
       [% title = "User $loginold updated" %]
       The following changes have been made to the user account
       [%+ loginold FILTER html %]:
       
      
-        [% FOREACH field = changed_fields %]
+        [% FOREACH field = changes.keys %]
           
    • 
             [% IF    field == 'login_name' %]
               The login is now [% otheruser.login FILTER html %].
@@ -53,35 +51,31 @@
               [% ELSE %]
                 [% terms.Bug %]mail has been enabled.
               [% END %]
+            [% ELSIF field == 'groups' %]
+              [% IF changes.groups.1.size %]
+                The account has been added to the
+                [%+ changes.groups.1.join(', ') FILTER html %]
+                group[% 's' IF changes.groups.1.size > 1 %].
+              [% END %]
+              [% IF changes.groups.0.size %]
+                The account has been removed from the
+                [%+ changes.groups.0.join(', ') FILTER html %]
+                group[% 's' IF changes.groups.0.size > 1 %].
+              [% END %]
+            [% ELSIF field == 'bless_groups' %]
+              [% IF changes.bless_groups.1.size %]
+                The account has been granted rights to bless the
+                [%+ changes.bless_groups.1.join(', ') FILTER html %]
+                group[% 's' IF changes.bless_groups.1.size > 1 %].
+              [% END %]
+              [% IF changes.bless_groups.0.size %]
+                The account has been denied rights to bless the
+                [%+ changes.bless_groups.0.join(', ') FILTER html %]
+                group[% 's' IF changes.bless_groups.0.size > 1 %].
+              [% END %]
             [% END %]
           
      • 
         [% END %]
-        [% IF groups_added_to.size %]
-          
    • 
-            The account has been added to the following group[% 's' IF groups_added_to.size > 1 %]:
-            [%+ groups_added_to.join(', ') FILTER html %]
-          
      • 
-        [% END %]
-        [% IF groups_removed_from.size %]
-          
    • 
-            The account has been removed from the following group[% 's' IF groups_removed_from.size > 1 %]:
-            [%+ groups_removed_from.join(', ') FILTER html %]
-          
      • 
-        [% END %]
-        [% IF groups_granted_rights_to_bless.size %]
-          
    • 
-            The account has been granted rights to bless the
-            [%+ groups_granted_rights_to_bless.join(', ') FILTER html %]
-            group[% 's' IF groups_granted_rights_to_bless.size > 1 %].
-          
      • 
-        [% END %]
-        [% IF groups_denied_rights_to_bless.size %]
-          
    • 
-            The account has been denied rights to bless the
-            [%+ groups_denied_rights_to_bless.join(', ') FILTER html %]
-            group[% 's' IF groups_denied_rights_to_bless.size > 1 %].
-          
      • 
-        [% END %]
       
    
     [% ELSE %]
       [% title = "User $otheruser.login not changed" %]
@@ -569,7 +563,8 @@
 
   [% ELSIF message_tag == "password_change_request" %]
     [% title = "Request to Change Password" %]
-    A token for changing your password has been emailed to you.
+    A token for changing your password has been emailed to
+    [% login_name FILTER html %].
     Follow the instructions in that email to change your password.
 
   [% ELSIF message_tag == "password_changed" %]
@@ -733,7 +728,7 @@
     Renaming the '[% old FILTER html %]' table to '[% new FILTER html %]'...
 
   [% ELSIF message_tag == "install_urlbase_default" %]
-    Now that you have installed [% terms.Bugzilla %], you should visit the
+    Now that you have installed Bugzilla, you should visit the
     'Parameters' page (linked in the footer of the Administrator
     account) to ensure it is set up as you wish - this includes
     setting the 'urlbase' option to the correct URL.
@@ -752,7 +747,7 @@
     other files (including the localconfig file which stores your database
     password) must be world readable. This means that _anyone_ who can obtain
     local access to this machine can do whatever they want to your 
-    [%+ terms.Bugzilla %] installation, and is probably also able to run 
+    Bugzilla installation, and is probably also able to run
     arbitrary Perl code as the user that the web server runs as.
 
     You really, really, really need to change this setting.
@@ -762,7 +757,7 @@
     Warning: you have entered a value for the "webservergroup" parameter in
     localconfig, but you are not either a) running this script as [% constants.ROOT_USER FILTER html %]; 
     or b) a member of this group. This can cause permissions problems and 
-    decreased security.  If you experience problems running [% terms.Bugzilla %]
+    decreased security.  If you experience problems running Bugzilla
     scripts, log in as [% constants.ROOT_USER FILTER html %] and re-run this script, become a 
     member of the group, or remove the value of the "webservergroup" parameter.
 
@@ -770,7 +765,7 @@
     Warning: You have set webservergroup in [% constants.bz_locations.localconfig FILTER html %]
     Please understand that this does not bring you any security when
     running under Windows.
-    Verify that the file permissions in your [% terms.Bugzilla %] directory are
+    Verify that the file permissions in your Bugzilla directory are
     suitable for your system. Avoid unnecessary write access.
 
   [% ELSIF message_tag == "install_workflow_init" %]
@@ -795,6 +790,30 @@
     or you don't have access to it. The following is a list of the
     products you can choose from.
 
+  [% ELSIF message_tag == "quips_added" %]
+    Your quip [% added_quip FILTER html %] has been added.
+    [% IF Param("quip_list_entry_control") == "moderated" AND
+          !user.in_group('bz_quip_moderators') %]
+      It will be used as soon as it gets approved.
+    [% END %]
+
+  [% ELSIF message_tag == "quips_deleted" %]
+    The quip [% deleted_quip FILTER html %] has been deleted.
+
+  [% ELSIF message_tag == "quips_approved_unapproved" %]
+    [% IF approved.size == 1 %]
+      One quip
+    [% ELSE %]
+      [% approved.size %] quips
+    [% END %]
+    approved and
+    [% IF unapproved.size == 1 %]
+      one quip
+    [% ELSE %]
+      [%+ unapproved.size %] quips
+    [% END %]
+    unapproved.
+
   [% ELSIF message_tag == "report_created" %]
     OK, you have a new saved report named [% reportname FILTER html %].
 
@@ -850,6 +869,12 @@
       [%+ series.name FILTER html %]
       has been deleted.
 
+  [% ELSIF message_tag == "series_updated" %]
+    [% title = "Series Updated" %]
+    The series [% default.category FILTER html %] /
+    [%+ default.subcategory FILTER html %] /
+    [%+ default.name FILTER html %] has been updated.
+
   [% ELSIF message_tag == "shutdown" %]
     [% title = "$terms.Bugzilla is Down" %]
     [% Param("shutdownhtml") %]
@@ -917,7 +942,7 @@
 [%# Give sensible error if the message function is used incorrectly. #%]
 [% IF !message %]
   [% message = BLOCK %]
-    You are using [% terms.Bugzilla %]'s messaging functions incorrectly. You
+    You are using Bugzilla's messaging functions incorrectly. You
     passed in the string '[% message_tag FILTER html %]'. The correct use is to pass
     in a tag, and define that tag in the file messages.html.tmpl.
    
     
    
diff --git a/template/en/default/global/product-select.html.tmpl b/template/en/default/global/product-select.html.tmpl
new file mode 100644
index 000000000..23a7b3d58
--- /dev/null
+++ b/template/en/default/global/product-select.html.tmpl
@@ -0,0 +1,92 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[%# INTERFACE:
+  # name: mandatory; field name
+  # id: optional; field id
+  # value: optional; default field value/selection
+  # classes: optional; an array of classes to be added
+  # onchange: optional; onchange attribute value
+  # disabled: optional; if true, the field is disabled
+  # accesskey: optional;  accesskey attribute value
+  # add: optional;  prepend menu option for value specified to start of select
+  # dontchange: optional; prepend menu option for "dontchange" to start of select
+  # multiple: optional; do multiselect box, value is size (height) of box
+  # title: optional; extra information to display as a tooltip
+  # products: optional; an array of custom product names
+  # isselect: optional; whether the product list should be displayed as a 
+    [% IF add %]
+      
+    [% END %]
+    [% IF dontchange %]
+      
+    [% END %]
+
+    [% IF Param('useclassification') %]
+      [% classifications = {} %]
+      [% IF products %]
+        [% FOREACH p = products %]
+          [% IF NOT classifications.${p.classification.name}.defined %]
+            [% classifications.${p.classification.name} = [] %]
+          [% END %]
+          [% classifications.${p.classification.name}.push(p) %]
+        [% END %]
+      [% ELSE %]
+        [% FOREACH c = user.get_selectable_classifications %]
+          [% classifications.${c.name} = [] %]
+          [% FOREACH p = user.get_selectable_products(c.id) %]
+            [% classifications.${c.name}.push(p) %]
+          [% END %]
+        [% END %]
+      [% END %]
+
+      [% FOREACH c = all_classifications %]
+        [% NEXT UNLESS classifications.${c}.size %]
+        
+          [% FOREACH p = classifications.$c %]
+            
+          [% END %]
+        
+      [% END %]
+    [% ELSE %]
+      [% IF NOT products.defined %]
+        [% products = user.get_selectable_products %]
+      [% END %]
+      [% FOREACH p = products %]
+        
+      [% END %]
+    [% END %]
+  
+[% ELSE %]
+  [% value.join(', ') FILTER html %]
+[% END %]
diff --git a/template/en/default/global/setting-descs.none.tmpl b/template/en/default/global/setting-descs.none.tmpl
index d20068306..6e3358782 100644
--- a/template/en/default/global/setting-descs.none.tmpl
+++ b/template/en/default/global/setting-descs.none.tmpl
@@ -43,6 +43,7 @@
    "text_only"                        => "Text Only",
    "requestee_cc"                     => "Automatically add me to the CC list of $terms.bugs I am requested to review",
    "bugmail_new_prefix"               => "Add 'New:' to subject line of email sent when a new $terms.bug is filed",
+   "possible_duplicates"              => "Display possible duplicates when reporting a new $terms.bug", 
                    } 
 %]
 
diff --git a/template/en/default/global/site-navigation.html.tmpl b/template/en/default/global/site-navigation.html.tmpl
deleted file mode 100644
index 5c68ad7f6..000000000
--- a/template/en/default/global/site-navigation.html.tmpl
+++ /dev/null
@@ -1,75 +0,0 @@
-[%# This Source Code Form is subject to the terms of the Mozilla Public
-  # License, v. 2.0. If a copy of the MPL was not distributed with this
-  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-  #
-  # This Source Code Form is "Incompatible With Secondary Licenses", as
-  # defined by the Mozilla Public License, v. 2.0.
-  #%]
-
-[%# INTERFACE:
-  # bug.bug_id: integer. Number of current bug (for navigation purposes)
-  #%]
-
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
-[% IF NOT (cgi.user_agent("MSIE [1-6]") OR cgi.user_agent("Mozilla/4")) %]
-  
-
-  [%# *** Attachment *** %]
-  [% IF attachment && attachment.bug_id %]
-    
-  [% END %]
-
-
-  [%# *** Dependencies, Activity, Print-version *** %]
-  [% IF bug %]
-    
-    [% IF Param('webdotbase') %]
-      
-    [% END %]
-
-      
-      
-  [% END %]
-
-
-  [%# *** Saved Searches *** %]
-  [% IF user.showmybugslink %]
-    [% user_login = user.login FILTER uri %]
-    
-  [% END %]
-
-  [% FOREACH q = user.queries_subscribed %]
-    
-  [% END %]
-
-  [%# *** Bugzilla Administration Tools *** %]
-  [% IF user.login %] 
-    [% '' IF user.in_group('tweakparams') %]
-    [% '' IF user.in_group('editusers') %]
-    [% ''
-       IF user.in_group('editcomponents') || user.get_products_by_permission("editcomponents").size %]
-    [% '' IF user.in_group('editcomponents') %]
-    [% '' IF user.in_group('creategroups') %]
-    [% '' IF user.in_group('editkeywords') %]
-    [% '' IF user.in_group('bz_canusewhines') %]
-    [% '' IF user.in_group('editcomponents') %]
-  [% END %]  
-[% END %]
diff --git a/template/en/default/global/tabs.html.tmpl b/template/en/default/global/tabs.html.tmpl
index 454066889..9cf5a897b 100644
--- a/template/en/default/global/tabs.html.tmpl
+++ b/template/en/default/global/tabs.html.tmpl
@@ -15,7 +15,7 @@
   #%]
 
 
    
-  
+  
    
 
diff --git a/template/en/default/global/textarea.html.tmpl b/template/en/default/global/textarea.html.tmpl
index 216f2ddbf..f3e23dd3f 100644
--- a/template/en/default/global/textarea.html.tmpl
+++ b/template/en/default/global/textarea.html.tmpl
@@ -11,7 +11,6 @@
   # id:             (optional) The "id"-attribute of the textarea.
   # name:           (optional) The "name"-attribute of the textarea.
   # accesskey:      (optional) The "accesskey"-attribute of the textarea.
-  # style:          (optional) The "style"-attribute of the textarea.
   # classes:        (optional) The "class"-attribute of the textarea.
   # wrap:           (deprecated; optional) The "wrap"-attribute of the textarea.
   # disabled:       (optional) Disable the textarea.
@@ -33,7 +32,6 @@