From d033109bdc8729e9ef46fc82ad200c7d2cda5a1a Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" <> Date: Fri, 19 Apr 2002 01:56:11 +0000 Subject: Bug 135707 - rearrange templates to normalise filenames, and create directory structure which allows for localised versions of the templates. Earlier versions of these templates can be found, cvs removed, scattered around bugzilla/template/default; but there are no substantial changes between their initial checkin there and here. --- template/en/default/account/cancel-token.txt.tmpl | 39 +++++ template/en/default/account/create.html.tmpl | 58 ++++++++ template/en/default/account/created.html.tmpl | 38 +++++ .../en/default/account/email/change-new.txt.tmpl | 36 +++++ .../en/default/account/email/change-old.txt.tmpl | 35 +++++ .../en/default/account/email/confirm.html.tmpl | 44 ++++++ template/en/default/account/exists.html.tmpl | 34 +++++ .../en/default/account/prefs/account.html.tmpl | 99 +++++++++++++ template/en/default/account/prefs/email.html.tmpl | 157 +++++++++++++++++++++ template/en/default/account/prefs/footer.html.tmpl | 76 ++++++++++ .../en/default/account/prefs/permissions.html.tmpl | 57 ++++++++ template/en/default/account/prefs/prefs.html.tmpl | 113 +++++++++++++++ 12 files changed, 786 insertions(+) create mode 100644 template/en/default/account/cancel-token.txt.tmpl create mode 100644 template/en/default/account/create.html.tmpl create mode 100644 template/en/default/account/created.html.tmpl create mode 100644 template/en/default/account/email/change-new.txt.tmpl create mode 100644 template/en/default/account/email/change-old.txt.tmpl create mode 100644 template/en/default/account/email/confirm.html.tmpl create mode 100644 template/en/default/account/exists.html.tmpl create mode 100644 template/en/default/account/prefs/account.html.tmpl create mode 100644 template/en/default/account/prefs/email.html.tmpl create mode 100644 template/en/default/account/prefs/footer.html.tmpl create mode 100644 template/en/default/account/prefs/permissions.html.tmpl create mode 100644 template/en/default/account/prefs/prefs.html.tmpl (limited to 'template/en/default/account') diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl new file mode 100644 index 000000000..b37d0da2d --- /dev/null +++ b/template/en/default/account/cancel-token.txt.tmpl @@ -0,0 +1,39 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): John Vandenberg + #%] +From: bugzilla-admin-daemon +To: [% emailaddress %] +Subject: [% tokentype %] token cancelled + +A token was cancelled from [% remoteaddress %]. +If you did not request this, it could be either an honest +mistake or the result of a malicious hack attempt. + +Take a look at the information below and forward this email +to [% maintainer %] if you suspect foul play. + + Token: [% token %] + Token Type: [% tokentype %] + User: [% emailaddress %] + Issue Date: [% issuedate %] + Event Data: [% eventdata %] +Cancelled Because: [% cancelaction %] + + diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl new file mode 100644 index 000000000..e39d6ff5e --- /dev/null +++ b/template/en/default/account/create.html.tmpl @@ -0,0 +1,58 @@ + +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Gervase Markham + #%] + +[% INCLUDE global/header + title = "Create a new Bugzilla account" +%] + +

+ To create a Bugzilla account, all that you need to do is to enter a + legitimate e-mail address. The account will be created, and its + password will be mailed to you. Optionally you may enter your real name + as well. +

+ +
+ + + + + + + + + + +
+ E-mail address: + + + [% Param('emailsuffix') FILTER html %] +
+ Real name: + + +
+
+ +
+ +[% INCLUDE global/footer %] diff --git a/template/en/default/account/created.html.tmpl b/template/en/default/account/created.html.tmpl new file mode 100644 index 000000000..46bc82ad2 --- /dev/null +++ b/template/en/default/account/created.html.tmpl @@ -0,0 +1,38 @@ + +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Gervase Markham + #%] + +[% INCLUDE global/header + title = "Account Created" +%] + +

+ A new account, + [% login FILTER html %], + has been created and a randomly-generated password has been e-mailed + to that address. +

+ +

+ When the e-mail arrives, + log in here. +

+ +[% INCLUDE global/footer %] diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl new file mode 100644 index 000000000..5a5ae2535 --- /dev/null +++ b/template/en/default/account/email/change-new.txt.tmpl @@ -0,0 +1,36 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): John Vandenberg + #%] +From: bugzilla-admin-daemon +To: [% emailaddress %] +Subject: Bugzilla Change Email Address Request + +Bugzilla has received a request to change the email address +for the [% oldemailaddress %] account to your address. + +To confirm the change, visit the following link: + +[% Param('urlbase') %]token.cgi?a=cfmem&t=[% token FILTER html %] + +If you are not the person who made this request, or you wish to cancel +this request, visit the following link: + +[% Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER html %] + diff --git a/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl new file mode 100644 index 000000000..82ecf1dfc --- /dev/null +++ b/template/en/default/account/email/change-old.txt.tmpl @@ -0,0 +1,35 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): John Vandenberg + #%] +From: bugzilla-admin-daemon +To: [% emailaddress %] +Subject: Bugzilla Change Email Address Request +Importance: High +X-MSMail-Priority: High +X-Priority: 1 + +Bugzilla has received a request to change the email address +for your account to [% newemailaddress %]. + +If you are not the person who made this request, or you wish to cancel +this request, visit the following link: + +[% Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER html %] + diff --git a/template/en/default/account/email/confirm.html.tmpl b/template/en/default/account/email/confirm.html.tmpl new file mode 100644 index 000000000..4d4102968 --- /dev/null +++ b/template/en/default/account/email/confirm.html.tmpl @@ -0,0 +1,44 @@ + +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): John Vandenberg + #%] + +[% INCLUDE global/header %] + + +

+ To change your email address, please enter the old email address: +

+ +
+ + + + + + + + + + + +
Old Email Address:
+
+ +[% INCLUDE global/footer %] diff --git a/template/en/default/account/exists.html.tmpl b/template/en/default/account/exists.html.tmpl new file mode 100644 index 000000000..a4357a5a0 --- /dev/null +++ b/template/en/default/account/exists.html.tmpl @@ -0,0 +1,34 @@ + +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Gervase Markham + #%] + +[% INCLUDE global/header + title = "Account Exists" +%] + +
+ + + A Bugzilla account for [% login FILTER html %] already exists. If you + are the account holder and have forgotten your password, + . +
+ +[% INCLUDE global/footer %] diff --git a/template/en/default/account/prefs/account.html.tmpl b/template/en/default/account/prefs/account.html.tmpl new file mode 100644 index 000000000..e1675c7fb --- /dev/null +++ b/template/en/default/account/prefs/account.html.tmpl @@ -0,0 +1,99 @@ + +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Gervase Markham + #%] + +[%# INTERFACE: + # realname: string. The user's real name, if any. + # login: string. The user's Bugzilla login email address. + # login_change_date: string. The date the email change will be complete. (optional) + # new_login_name: string. The user's new Bugzilla login whilst not confirmed. (optional) + #%] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [% IF Param('allowemailchange') %] + [% IF login_change_date %] + [% IF new_login_name %] + + + + + + + + + [% ELSE %] + + + + + + + + [% END %] + [% ELSE %] + + + + + [% END %] + [% END %] + +
+ Please enter your existing password to confirm account changes. +
Password: + + +
New password: + +
Re-enter new password: + +
Your real name (optional, but encouraged): + +
Pending email address:[% new_login_name FILTER html %]
Change request expires:[% login_change_date %]
Confirmed email address:[% login FILTER html %] +
Completion date:[% login_change_date %]
New email address: + +
diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl new file mode 100644 index 000000000..f7d529c7c --- /dev/null +++ b/template/en/default/account/prefs/email.html.tmpl @@ -0,0 +1,157 @@ + +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Gervase Markham + #%] + +[%# INTERFACE: + # watchedusers: string. + # Comma-separated list of email addresses this user watches. + # excludeself: boolean. + # True if user is not receiving self-generated mail. + # : Multiple hashes, one for each rolename (e.g. owner; see + # below), keyed by reasonname (e.g. comments; again, see + # below). The value is a boolean - true if the user is + # receiving mail for that reason when in that role. + # Also references the 'supportwatchers' Param. + #%] + + + [% IF Param('supportwatchers') %] + + + + + + + + + + + + + [% END %] + + + + +
+
+
+ If you want to help cover for someone when they're on vacation, or if + you need to do the QA related to all of their bugs, you can tell + Bugzilla to send mail related to their bugs to you also. List the + email addresses of any users you wish to watch here, separated by + commas. +
Users to watch: + +
+

+ If you don't like getting a notification for "trivial" + changes to bugs, you can use the settings below to + filter some (or even all) notifications. +

+
+ +
+ + + + + + + + + + +
+ Global options: +
+ Only email me reports of changes made by other people + +
+
+ +
+Field/recipient specific options: +
+
+ + + + + + + + + + + + + + + + + [% FOREACH reason = [ + { name = 'Removeme', + description = 'I\'m added to or removed from this capacity' }, + { name = 'Comments', + description = 'New Comments are added' }, + { name = 'Attachments', + description = 'New Attachments are added' }, + { name = 'Status', + description = 'Priority, status, severity, and/or milestone changes' }, + { name = 'Resolved', + description = 'The bug is resolved or verified' }, + { name = 'Keywords', + description = 'Keywords field changes' }, + { name = 'CC', + description = 'CC field changes' }, + { name = 'Other', + description = 'Any field not mentioned above changes' } ] %] + + [% FOREACH role = [ "Owner", "Reporter", "QAcontact", "CClist", "Voter" ] + %] + + [% END %] + + + [% END %] +
+ When my relationship to this bug is: + + I want to receive mail when: +
+ Reporter + + Assignee + + QA Contact + + CC + + Voter +
+ + + [% reason.description %] +
+ +
diff --git a/template/en/default/account/prefs/footer.html.tmpl b/template/en/default/account/prefs/footer.html.tmpl new file mode 100644 index 000000000..ea5753f0e --- /dev/null +++ b/template/en/default/account/prefs/footer.html.tmpl @@ -0,0 +1,76 @@ + +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Gervase Markham + #%] + +[%# INTERFACE: + # mybugslink: boolean. True if the user wishes the My Bugs link to appear. + # queries: array of hashes. May be empty. Each hash has two members: + # name: string. The name of the query. + # footer: boolean. True if the query appears in the footer. + #%] + + + + + + + + + [% IF queries.size %] + [% FOREACH query = queries %] + + + + + + + [% END %] + + [% ELSE %] + + + + [% END %] + +
The 'My bugs' link: + +
Your query named '[% query.name FILTER html %]': + +
+
+ If you create remembered queries using the + query page, + you can then come to this page and choose to have some of them + appear in the footer of each Bugzilla page. +
+
+
diff --git a/template/en/default/account/prefs/permissions.html.tmpl b/template/en/default/account/prefs/permissions.html.tmpl new file mode 100644 index 000000000..7ab7f1df9 --- /dev/null +++ b/template/en/default/account/prefs/permissions.html.tmpl @@ -0,0 +1,57 @@ + +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Gervase Markham + #%] + +[%# INTERFACE: + # has_bits: array of strings. May be empty. + # Descriptions of the permission bits the user has. + # set_bits: array of strings. May be empty. + # Descriptions of the permission bits the user can set for + # other people. + #%] + + + + + +
+ [% IF has_bits.size %] + You have the following permission bits set on your account: +
    + [% FOREACH bit_description = has_bits %] +
  • [% bit_description %]
    • + [% END %] +
+ [% ELSE %] + There are no permission bits set on your account. + [% END %] + + [% IF set_bits.size %] + And you can turn on or off the following bits for + other users: +

+

    + [% FOREACH bit_description = set_bits %] +
  • [% bit_description %]
    • + [% END %] +
+

+ [% END %] +
diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl new file mode 100644 index 000000000..5d9fc6eb3 --- /dev/null +++ b/template/en/default/account/prefs/prefs.html.tmpl @@ -0,0 +1,113 @@ + +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Gervase Markham + #%] + +[%# INTERFACE: + # login: string. The user's Bugzilla login email address. + # tabs: List of hashes. May not be empty. Each hash has three members: + # name: string. Name of the tab (used internally.) + # description: string. Description of the tab (used in tab title.) + # saveable: boolean. True if tab has a form which can be submitted. + # True if user is not receiving self-generated mail. + # Note: For each tab name, a template "prefs/${tab.name}.tmpl" must exist, + # and its interface must be fulfilled. + # current_tab: A direct reference to one of the hashes in the tabs list. + # This tab will be displayed. + # changes_saved: boolean/string. True if the CGI processed form data before + # displaying anything, and can contain an optional custom + # message if required (which Perl still evaluates as True). + #%] + +[% filtered_login = login FILTER html %] +[% INCLUDE global/header + title = "User Preferences" + h2 = filtered_login + style = "td.selected_tab { + border-width: 2px 2px 0px; + border-style: solid; + } + td.unselected_tab, td.spacer { + border-width: 0px 0px 2px 0px; + border-style: solid; + }" + %] + +
+ + + + + [% FOREACH tab = tabs %] + [% IF tab.name == current_tab.name %] + + [% ELSE %] + + [% END %] + [% END %] + + + +
  + [% tab.description %] + + [% tab.description %] +  
+
+ +[% IF changes_saved %] +

+ + The changes to your + [% current_tab.description FILTER lower %] have been saved. + +

+ [% IF changes_saved != 1 %] +

+ [% changes_saved %] +

+ [% END %] +[% END %] + +

[% current_tab.description %]

+ +
+ + + [% INCLUDE "prefs/${current_tab.name}.tmpl" IF current_tab.name.defined %] + + [% IF current_tab.saveable %] + + + + + + + +
+ +
+ [% END %] + +
+ +[% INCLUDE global/footer %] + + + -- cgit v1.2.3-24-g4f1b