summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2015-03-10 06:07:56 +0100
committerByron Jones <glob@mozilla.com>2015-03-10 06:07:56 +0100
commitef96ae157223b3309f7703798b32b0b386b2edff (patch)
treecd0f3c6f234d40998fa6e85ad32c3cac025b610a /template
parent9250c96075fda4a6a11b0f09e42423c650debcec (diff)
downloadbugzilla-ef96ae157223b3309f7703798b32b0b386b2edff.tar.gz
bugzilla-ef96ae157223b3309f7703798b32b0b386b2edff.tar.xz
Bug 1003701: add the ability for users to prevent review/feedback/needinfo requests
Diffstat (limited to 'template')
-rw-r--r--template/en/default/account/prefs/account.html.tmpl129
-rw-r--r--template/en/default/account/prefs/email.html.tmpl4
2 files changed, 74 insertions, 59 deletions
diff --git a/template/en/default/account/prefs/account.html.tmpl b/template/en/default/account/prefs/account.html.tmpl
index 95819e451..0c8f0807f 100644
--- a/template/en/default/account/prefs/account.html.tmpl
+++ b/template/en/default/account/prefs/account.html.tmpl
@@ -24,83 +24,98 @@
# new_login_name: string. The user's new Bugzilla login whilst not confirmed. (optional)
#%]
+[%# BMO - add hook for displaying user-profile link %]
+[% Hook.process('start') %]
+
<table>
<tr>
- <td colspan="3">
- Please enter your existing password to confirm account changes.
- </td>
- </tr>
- <tr>
- <th align="right">Password:</th>
+ <th align="right">Your real name:</th>
<td>
- <input type="hidden" name="old_login" value="[% user.login FILTER html %]">
- <input type="password" name="old_password">
+ <input size="35" name="realname" value="[% realname FILTER html %]">
+ <i>optional, but encouraged</i>
</td>
</tr>
- <tr>
- <td colspan="2"><hr></td>
- </tr>
+
+ [%# BMO - moved field hook from end of file to here to group with other account fields %]
+ [% Hook.process('field') %]
+
+ [% SET can_change = [] %]
[% IF user.authorizer.can_change_password %]
+ [% can_change.push('password') %]
+ [% END %]
+ [% IF user.authorizer.can_change_email && Param('allowemailchange') %]
+ [% can_change.push('email address') %]
+ [% END %]
+
+ [% IF can_change.size %]
<tr>
- <th align="right">New password:</th>
- <td>
- <input type="password" name="new_password1">
+ <td></td>
+ <td><hr></td>
+ </tr>
+ <tr>
+ <td colspan="3">
+ Your current password is required to
+ confirm [% can_change.join(' or ') FILTER html %]
+ changes.
</td>
</tr>
-
<tr>
- <th align="right">Confirm new password:</th>
+ <th align="right">Current password:</th>
<td>
- <input type="password" name="new_password2">
+ <input type="hidden" name="old_login" value="[% user.login FILTER html %]">
+ <input type="password" name="old_password">
</td>
</tr>
- [% END %]
+ [% IF user.authorizer.can_change_password %]
+ <tr>
+ <th align="right">New password:</th>
+ <td>
+ <input type="password" name="new_password1">
+ </td>
+ </tr>
- <tr>
- <th align="right">Your real name (optional, but encouraged):</th>
- <td>
- <input size="35" name="realname" value="[% realname FILTER html %]">
- </td>
- </tr>
+ <tr>
+ <th align="right">Confirm new password:</th>
+ <td>
+ <input type="password" name="new_password2">
+ </td>
+ </tr>
+ [% END %]
- [% IF user.authorizer.can_change_email && Param('allowemailchange') %]
- [% IF login_change_date %]
- [% IF new_login_name %]
- <tr>
- <th align="right">Pending email address:</th>
- <td>[% new_login_name FILTER html %]</td>
- </tr>
- <tr>
- <th align="right">Change request expires:</th>
- <td>[% login_change_date FILTER time %]</td>
- </tr>
+ [% IF user.authorizer.can_change_email && Param('allowemailchange') %]
+ [% IF login_change_date %]
+ [% IF new_login_name %]
+ <tr>
+ <th align="right">Pending email address:</th>
+ <td>[% new_login_name FILTER html %]</td>
+ </tr>
+ <tr>
+ <th align="right">Change request expires:</th>
+ <td>[% login_change_date FILTER time %]</td>
+ </tr>
+ [% ELSE %]
+ <tr>
+ <th align="right">Confirmed email address:</th>
+ <td>[% user.login FILTER html %]</td>
+ </tr>
+ <tr>
+ <th align="right">Completion date:</th>
+ <td>[% login_change_date FILTER time %]</td>
+ </tr>
+ [% END %]
[% ELSE %]
<tr>
- <th align="right">Confirmed email address:</th>
- <td>[% user.login FILTER html %]</td>
- </tr>
- <tr>
- <th align="right">Completion date:</th>
- <td>[% login_change_date FILTER time %]</td>
+ <th align="right">New email address:</th>
+ <td>
+ <input size="35" name="new_login_name">
+ </td>
</tr>
[% END %]
- [% ELSE %]
- <tr>
- <th>
- [% IF Param('emailsuffix') %]
- New login:
- [% ELSE %]
- New email address:
- [% END %]
- </th>
- <td>
- <input size="35" id="new_login_name" name="new_login_name"
- [%- ' type="email"' UNLESS Param('emailsuffix') %]>
- </td>
- </tr>
[% END %]
+ <tr>
+ <td></td>
+ <td><hr></td>
+ </tr>
[% END %]
- [% Hook.process('field') %]
-
</table>
diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl
index ffb153785..80185b503 100644
--- a/template/en/default/account/prefs/email.html.tmpl
+++ b/template/en/default/account/prefs/email.html.tmpl
@@ -60,8 +60,8 @@ function SetCheckboxes(setting) {
}
}
-document.write('<input type="button" value="Enable All Mail" onclick="SetCheckboxes(true); return false;">\n');
-document.write('<input type="button" value="Disable All Mail" onclick="SetCheckboxes(false); return false;">\n');
+document.write('<input type="button" value="Enable All Bugmail" onclick="SetCheckboxes(true); return false;">\n');
+document.write('<input type="button" value="Disable All Bugmail" onclick="SetCheckboxes(false); return false;">\n');
// -->
</script>