diff options
Diffstat (limited to 'template/en/default/account')
11 files changed, 37 insertions, 37 deletions
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl index 8cf5e85ef..84e5bd62a 100644 --- a/template/en/default/account/auth/login.html.tmpl +++ b/template/en/default/account/auth/login.html.tmpl @@ -26,7 +26,7 @@ [% IF !target %] [% target = "index.cgi" %] [% END %] - + [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl @@ -57,7 +57,7 @@ <input type="password" id="Bugzilla_password" name="Bugzilla_password" required> </div> - [% IF Param('rememberlogin') == 'defaulton' || + [% IF Param('rememberlogin') == 'defaulton' || Param('rememberlogin') == 'defaultoff' %] <div class="field-remember"> <input type="checkbox" id="Bugzilla_remember" name="Bugzilla_remember" value="on" diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl index 914fe05b4..f557d05db 100644 --- a/template/en/default/account/create.html.tmpl +++ b/template/en/default/account/create.html.tmpl @@ -20,7 +20,7 @@ [%# INTERFACE # none - # + # # Param("maintainer") is used to display the maintainer's email. # Param("emailsuffix") is used to pre-fill the email field. #%] diff --git a/template/en/default/account/created.html.tmpl b/template/en/default/account/created.html.tmpl index d794198bc..539fb44c2 100644 --- a/template/en/default/account/created.html.tmpl +++ b/template/en/default/account/created.html.tmpl @@ -37,4 +37,4 @@ created within [% constants.MAX_TOKEN_AGE FILTER html %] days. </p> -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/account/email/confirm.html.tmpl b/template/en/default/account/email/confirm.html.tmpl index 39add3238..c0f094366 100644 --- a/template/en/default/account/email/confirm.html.tmpl +++ b/template/en/default/account/email/confirm.html.tmpl @@ -21,7 +21,7 @@ [%# INTERFACE: # token: string. The token to be used in this address change. #%] - + [% title = "Confirm Change Email" %] [% PROCESS global/header.html.tmpl %] diff --git a/template/en/default/account/email/request-new.txt.tmpl b/template/en/default/account/email/request-new.txt.tmpl index 8fb36926f..45f5ab11f 100644 --- a/template/en/default/account/email/request-new.txt.tmpl +++ b/template/en/default/account/email/request-new.txt.tmpl @@ -29,7 +29,7 @@ X-Bugzilla-Type: admin [%+ terms.Bugzilla %] has received a request to create a user account using your email address ([% email %]). -To continue creating an account using this email address, visit the +To continue creating an account using this email address, visit the following link by [% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z") %]: [%+ urlbase %]token.cgi?t=[% token FILTER uri %]&a=request_new_account diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl index e014658dc..70373f52b 100644 --- a/template/en/default/account/password/forgotten-password.txt.tmpl +++ b/template/en/default/account/password/forgotten-password.txt.tmpl @@ -25,7 +25,7 @@ To: [% emailaddress %] Subject: [% terms.Bugzilla %] Change Password Request X-Bugzilla-Type: admin -You have (or someone impersonating you has) requested to change your +You have (or someone impersonating you has) requested to change your [%+ terms.Bugzilla %] password. To complete the change, visit the following link: [%+ urlbase %]token.cgi?t=[% token FILTER uri %]&a=cfmpw diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl index 014bf4f3d..132625368 100644 --- a/template/en/default/account/prefs/email.html.tmpl +++ b/template/en/default/account/prefs/email.html.tmpl @@ -78,7 +78,7 @@ document.write('<input type="button" value="Disable All Bugmail" onclick="SetChe <td width="150"></td> <td> [% prefname = "email-$constants.REL_ANY-$constants.EVT_FLAG_REQUESTED" %] - <input type="checkbox" name="[% prefname %]" id="[% prefname %]" + <input type="checkbox" name="[% prefname %]" id="[% prefname %]" value="1" [% " checked" IF user.mail_settings.${constants.REL_ANY}.${constants.EVT_FLAG_REQUESTED} %]> @@ -90,7 +90,7 @@ document.write('<input type="button" value="Disable All Bugmail" onclick="SetChe <td width="150"></td> <td> [% prefname = "email-$constants.REL_ANY-$constants.EVT_REQUESTED_FLAG" %] - <input type="checkbox" name="[% prefname %]" id="[% prefname %]" + <input type="checkbox" name="[% prefname %]" id="[% prefname %]" value="1" [% " checked" IF user.mail_settings.${constants.REL_ANY}.${constants.EVT_REQUESTED_FLAG} %]> @@ -159,7 +159,7 @@ document.write('<input type="button" value="Disable All Bugmail" onclick="SetChe ] %] [% IF Param('useqacontact') %] - [% relationships.push({ id = constants.REL_QA, + [% relationships.push({ id = constants.REL_QA, description = "QA Contact" }) %] [% END %] @@ -188,18 +188,18 @@ document.write('<input type="button" value="Disable All Bugmail" onclick="SetChe </th> [% END %] </tr> - - [% FOREACH event = events %] + + [% FOREACH event = events %] [% count = loop.count() %] <tr class="bz_row_[% count % 2 == 1 ? "odd" : "even" %]"> [% FOREACH relationship = relationships %] <td align="center"> - <input type="checkbox" + <input type="checkbox" name="email-[% relationship.id %]-[% event.id %]" value="1" [%# The combinations don't always make sense; disable a couple %] - [% IF event.id == constants.EVT_ADDED_REMOVED AND - no_added_removed.contains(relationship.id) + [% IF event.id == constants.EVT_ADDED_REMOVED AND + no_added_removed.contains(relationship.id) %] disabled [% ELSIF user.mail_settings.${relationship.id}.${event.id} %] @@ -212,9 +212,9 @@ document.write('<input type="button" value="Disable All Bugmail" onclick="SetChe </td> </tr> [% END %] - + <tr> - <td colspan="[% num_columns FILTER html %]" + <td colspan="[% num_columns FILTER html %]" align="center" width="50%"> </td> @@ -223,12 +223,12 @@ document.write('<input type="button" value="Disable All Bugmail" onclick="SetChe </td> </tr> - [% FOREACH event = neg_events %] + [% FOREACH event = neg_events %] [% count = loop.count() %] <tr class="bz_row_[% count % 2 == 1 ? "odd" : "even" %]"> [% FOREACH relationship = relationships %] <td align="center"> - <input type="checkbox" + <input type="checkbox" name="neg-email-[% relationship.id %]-[% event.id %]" value="1" [% " checked" IF NOT user.mail_settings.${relationship.id}.${event.id} %]> @@ -239,16 +239,16 @@ document.write('<input type="button" value="Disable All Bugmail" onclick="SetChe </td> </tr> [% END %] - + </table> <hr> <b>User Watching</b> <p> -If you watch a user, it is as if you are standing in their shoes for the +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 <u>your</u> -preferences for <u>their</u> relationship to the [% terms.bug %] +preferences for <u>their</u> relationship to the [% terms.bug %] (e.g. Assignee). </p> @@ -277,7 +277,7 @@ You are currently not watching any users. size => 60 multiple => 5 %] -</p> +</p> <p id="watching_you">Users watching you:<br> [% IF watchers.size %] @@ -294,7 +294,7 @@ You are currently not watching any users. <p> 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 + list. Removing [% terms.abug %] by selecting it from the current ignored list will re-enable email notifications for the [% terms.bug %]. </p> [% IF user.bugs_ignored.size %] @@ -324,5 +324,5 @@ You are currently not watching any users. [% END %] <p>Add [% terms.bugs %]:<br> - <input type="text" id="add_ignored_bugs" + <input type="text" id="add_ignored_bugs" name="add_ignored_bugs" size="60"></p> diff --git a/template/en/default/account/prefs/permissions.html.tmpl b/template/en/default/account/prefs/permissions.html.tmpl index d3c787b07..a4597205c 100644 --- a/template/en/default/account/prefs/permissions.html.tmpl +++ b/template/en/default/account/prefs/permissions.html.tmpl @@ -85,7 +85,7 @@ [% IF user.in_group('bz_sudoers') %] <br> - You are a member of the <b>bz_sudoers</b> group, so you can + You are a member of the <b>bz_sudoers</b> group, so you can <a href="relogin.cgi?action=prepare-sudo">impersonate someone else</a>. [% END %] </td> diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl index ec24eb100..631b08a10 100644 --- a/template/en/default/account/prefs/prefs.html.tmpl +++ b/template/en/default/account/prefs/prefs.html.tmpl @@ -25,11 +25,11 @@ # 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, + # 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 + # 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). # dont_show_button: boolean. Prevent the display of the "Submit Changes" button. @@ -134,7 +134,7 @@ <input type="hidden" name="token" value="[% token FILTER html %]"> [% END %] -[% PROCESS "account/prefs/${current_tab.name}.html.tmpl" +[% PROCESS "account/prefs/${current_tab.name}.html.tmpl" IF current_tab.name.defined %] [% IF current_tab.saveable %] diff --git a/template/en/default/account/prefs/saved-searches.html.tmpl b/template/en/default/account/prefs/saved-searches.html.tmpl index 426b593dc..e611aa682 100644 --- a/template/en/default/account/prefs/saved-searches.html.tmpl +++ b/template/en/default/account/prefs/saved-searches.html.tmpl @@ -43,7 +43,7 @@ <p>Your saved searches are as follows:</p> <blockquote> - <table border="1" cellpadding="3"> + <table border="1" cellpadding="3"> <tr> <th> Search @@ -82,7 +82,7 @@ </td> <td align="center"> - <input type="checkbox" + <input type="checkbox" name="showmybugslink" value="1" [% " checked" IF user.showmybugslink %]> @@ -114,7 +114,7 @@ [% END %] </td> <td align="center"> - <input type="checkbox" + <input type="checkbox" name="link_in_footer_[% q.id FILTER html %]" value="1" alt="[% q.name FILTER html %]" @@ -127,7 +127,7 @@ <option value="">Don't share</option> [% FOREACH group = queryshare_groups %] <option value="[% group.id %]" - [% ' selected="selected"' + [% ' selected="selected"' IF q.shared_with_group.id == group.id %] >[% group.name FILTER html %]</option> [% END %] @@ -160,7 +160,7 @@ [% IF user.queries_available.size %] <p>You may use these searches saved and shared by others:</p> - <table border="1" cellpadding="3"> + <table border="1" cellpadding="3"> <tr> <th> Search @@ -197,7 +197,7 @@ [% q.name FILTER uri %]">Edit</a> </td> <td align="center"> - <input type="checkbox" + <input type="checkbox" name="link_in_footer_[% q.id FILTER html %]" value="1" alt="[% q.name FILTER html %]" diff --git a/template/en/default/account/profile-activity.html.tmpl b/template/en/default/account/profile-activity.html.tmpl index aa6a63e85..64a950e86 100644 --- a/template/en/default/account/profile-activity.html.tmpl +++ b/template/en/default/account/profile-activity.html.tmpl @@ -26,7 +26,7 @@ # listselectionvalues: selection values to recreate the current user list. # # profile_changes: An array of hashes containing the following fields: - # + # # who: string; login name of who made the change # activity_when: string; when the change was made # what: string; the description of the field which was changed @@ -83,4 +83,4 @@ [% END %] </p> -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] |