diff options
Diffstat (limited to 'template/en/default/account')
9 files changed, 159 insertions, 124 deletions
diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl index 97d96a5af..5536d306a 100644 --- a/template/en/default/account/auth/login-small.html.tmpl +++ b/template/en/default/account/auth/login-small.html.tmpl @@ -65,12 +65,8 @@ <form action="token.cgi" method="post" id="forgot_form[% qs_suffix %]" class="mini_forgot bz_default_hidden"> <label for="login[% qs_suffix FILTER html %]">Login:</label> - <input name="loginname" size="20" id="login[% qs_suffix FILTER html %]" required - [% IF login_not_email %] - placeholder="Your Login" - [% ELSE %] - type="email" placeholder="Your Email Address" - [% END %]> + <input name="email" size="20" id="login[% qs_suffix FILTER html %]" required + type="email" placeholder="Your Email Address"> <input id="forgot_button[% qs_suffix %]" value="Reset Password" type="submit"> <input type="hidden" name="a" value="reqpw"> diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl index afa77df7f..ac0fbcb99 100644 --- a/template/en/default/account/auth/login.html.tmpl +++ b/template/en/default/account/auth/login.html.tmpl @@ -40,7 +40,6 @@ <td> <input id="Bugzilla_login" name="Bugzilla_login" [%- ' type="email"' UNLESS login_not_email %] autofocus required> - [% Param('emailsuffix') FILTER html %] </td> </tr> diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl index 384f2cfe0..46e058435 100644 --- a/template/en/default/account/cancel-token.txt.tmpl +++ b/template/en/default/account/cancel-token.txt.tmpl @@ -21,7 +21,7 @@ to [% Param('maintainer') %] if you suspect foul play. Token: [% token %] Token Type: [% tokentype %] - User: [% emailaddress %] + User: [% login %] Issue Date: [% issuedate FILTER time("%Y-%m-%d %H:%M:%S %Z", timezone) %] Event Data: [% eventdata %] Canceled Because: [% PROCESS cancelactionmessage %] diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl index 5711a726f..e67848beb 100644 --- a/template/en/default/account/create.html.tmpl +++ b/template/en/default/account/create.html.tmpl @@ -6,25 +6,16 @@ # defined by the Mozilla Public License, v. 2.0. #%] -[%# INTERFACE - # none - # - # Param("maintainer") is used to display the maintainer's email. - # Param("emailsuffix") is used to pre-fill the email field. - #%] - [% PROCESS global/header.html.tmpl title = "Create a new $terms.Bugzilla account" %] <p> To create a [% terms.Bugzilla %] account, all you need to do is to enter -[% IF Param('emailsuffix') == '' %] + [% IF !Param('use_email_as_login') %] + a login name of your choice and + [% END %] a legitimate email address. -[% ELSE %] - an account name which when combined with [% Param('emailsuffix') %] - corresponds to an address where you receive email. -[% END %] You will receive an email at this address to confirm the creation of your account. <b>You will not be able to log in until you receive the email.</b> If it doesn't arrive within a reasonable amount of time, you may contact @@ -32,50 +23,66 @@ at <a href="mailto:[% Param("maintainer") %]">[% Param("maintainer") %]</a>. </p> -[% IF Param('allowemailchange') %] <p> If you already have an account and want to change your - [% IF Param('emailsuffix') == '' %] - email address, - [% ELSE %] - login name, + [% IF Param('allowemailchange') %] + email address or [% END %] - you can change it from the Preferences page after logging in. + login name, you can change it from the Preferences page after logging in. </p> -[% END %] <p> 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 %]. <b>Note that your email address will - <em>never</em> be displayed to logged out users. Only registered users will be - able to see it.</b> + <em>never</em> be displayed to + [% IF Param('use_email_as_login') %] + logged out users. Only registered users will be able to see it.</b> + [% ELSE %] + other users, unless you decide to use your email address as login. Only + your login is visible to other users.</b> + [% END %] </p> -[% IF Param('createemailregexp') == '.*' && Param('emailsuffix') == '' %] +[% IF Param('createemailregexp') == '.*' %] <p> <b>PRIVACY NOTICE:</b> [% terms.Bugzilla %] is an open [% terms.bug %] - tracking system. Activity on most [% terms.bugs %], including email - addresses, will be visible to registered users. We <b>recommend</b> using a - secondary account or free web email service (such as Gmail, Yahoo, - Hotmail, or similar) to avoid receiving spam at your primary email address. + tracking system. Activity on most [% terms.bugs %] will be visible to + registered users. + [% IF Param('use_email_as_login') %] + That includes email addresses. We <b>recommend</b> using a + secondary account or free web email service (such as Gmail, Yahoo, + Hotmail, or similar) to avoid receiving spam at your primary email address. + [% END %] </p> [% END %] -<form id="account_creation_form" method="get" action="createaccount.cgi"> - <span class="label"> - [% IF Param('emailsuffix') %] - Login: - [% ELSE %] - Email address: - [% END %] - </span> - <input size="35" id="login" name="login" autofocus - [%- ' type="email"' UNLESS Param('emailsuffix') %] required> - [% Param('emailsuffix') FILTER html %] - <input type="hidden" id="token" name="token" value="[% issue_hash_token(['create_account']) FILTER html %]"> - <input type="submit" id="send" value="Send"> +<form id="account_creation_form" action="createaccount.cgi" class="table_layout"> + [% IF !Param('use_email_as_login') %] + <div> + <label for="login">Login</label> + <div class="flex"> + <input size="35" id="login" name="login" autofocus required> + <span class="bz_info"> + (no whitespaces and no @ character, unless it matches your email address) + </span> + </div> + </div> + [% END %] + + <div> + <label for="email">Email Address</label> + <input size="35" id="email" name="email" type="email" + [%~ " autofocus" IF Param('use_email_as_login') %] required> + </div> + + <div> + <label> </label> + <input type="hidden" id="token" name="token" + value="[% issue_hash_token(['create_account']) FILTER html %]"> + <input type="submit" id="send" value="Send"> + </div> </form> [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/account/created.html.tmpl b/template/en/default/account/created.html.tmpl index f35deca83..f87571936 100644 --- a/template/en/default/account/created.html.tmpl +++ b/template/en/default/account/created.html.tmpl @@ -7,7 +7,8 @@ #%] [%# INTERFACE: - # login: string. The user's Bugzilla login email address. + # login: string. The user's Bugzilla login. + # email: string. The user's Bugzilla email address. #%] [% title = BLOCK %] @@ -17,9 +18,9 @@ [% PROCESS global/header.html.tmpl title = title %] <p> - A confirmation email has been sent containing a link to continue - creating an account. The link will expire if an account is not - created within [% constants.MAX_TOKEN_AGE FILTER html %] days. + A confirmation email has been sent to <em>[% email FILTER html %]</em> containing + a link to continue creating an account. The link will expire if an account is + not created within [% constants.MAX_TOKEN_AGE FILTER html %] days. </p> [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/account/email/confirm-new.html.tmpl b/template/en/default/account/email/confirm-new.html.tmpl index 3b9866004..87a1c6440 100644 --- a/template/en/default/account/email/confirm-new.html.tmpl +++ b/template/en/default/account/email/confirm-new.html.tmpl @@ -9,26 +9,40 @@ [%# INTERFACE: # token: string. The token to be used in the user account creation. # email: email address of the user account. + # login: login of the user account. # expiration_ts: expiration date of the token. #%] -[% title = BLOCK %]Create a new user account for '[% email FILTER html %]'[% END %] -[% PROCESS "global/header.html.tmpl" - title = title -%] +[% title = BLOCK %]Create a new user account for '[% login FILTER html %]'[% END %] +[% PROCESS "global/header.html.tmpl" title = title %] [% password_complexity = Param('password_complexity') %] <p> To create your account, you must enter a password in the form below. - Your email address and Real Name (if provided) will be shown with - changes you make. + Your real name is optional, but recommended. </p> <form id="confirm_account_form" method="post" action="token.cgi"> <input type="hidden" name="t" value="[% token FILTER html %]"> <input type="hidden" name="a" value="confirm_new_account"> <table> + [% IF !Param('use_email_as_login') %] + <tr> + <th>Login:</th> + <td> + [% IF login_already_in_use %] + <input id="login" name="login" required value="[% login FILTER html %]"> + <span class="warning"> + The login '[% login FILTER html %]' has been taken by another + user since you requested your account. Please choose another login. + </span> + [% ELSE %] + [% login FILTER html %] + [% END %] + </td> + </tr> + [% END %] <tr> <th>Email Address:</th> <td>[% email FILTER html %]</td> diff --git a/template/en/default/account/email/request-new.txt.tmpl b/template/en/default/account/email/request-new.txt.tmpl index 8ca0ff122..b56bf4f79 100644 --- a/template/en/default/account/email/request-new.txt.tmpl +++ b/template/en/default/account/email/request-new.txt.tmpl @@ -10,6 +10,7 @@ # token: random string used to authenticate the transaction. # expiration_ts: expiration date of the token. # email: email address of the new account. + # login: login name of the new account. #%] From: [% Param('mailfrom') %] @@ -18,7 +19,7 @@ Subject: [% terms.Bugzilla %]: confirm account creation X-Bugzilla-Type: admin [%+ terms.Bugzilla %] has received a request to create a user account -using your email address ([% email %]). +[%+ "($login)" IF !Param('use_email_as_login') %] using your email address ([% email %]). 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") %]: @@ -31,11 +32,14 @@ again by going to: [%+ urlbase %]createaccount.cgi -[% IF Param('createemailregexp') == '.*' && Param('emailsuffix') == '' %] -PRIVACY NOTICE: [% terms.Bugzilla %] is an open [% terms.bug %] tracking system. Activity on most -[%+ terms.bugs %], including email addresses, will be visible to the public. We recommend -using a secondary account or free web email service (such as Gmail, Yahoo, -Hotmail, or similar) to avoid receiving spam at your primary email address. +[% IF Param('createemailregexp') == '.*' %] +PRIVACY NOTICE: [% terms.Bugzilla %] is an open [% terms.bug %] tracking +system. Activity on most [%+ terms.bugs %] will be visible to the public. +[% IF Param('use_email_as_login') %] +This includes email addresses. We recommend using a secondary account or free +web email service (such as Gmail, Yahoo, Hotmail, or similar) to avoid +receiving spam at your primary email address. +[% END %] [% END %] If you do not wish to create an account, or if this request was made in diff --git a/template/en/default/account/prefs/account.html.tmpl b/template/en/default/account/prefs/account.html.tmpl index ddfc79aaf..81eb61f60 100644 --- a/template/en/default/account/prefs/account.html.tmpl +++ b/template/en/default/account/prefs/account.html.tmpl @@ -7,17 +7,17 @@ #%] [%# INTERFACE: - # realname: string. The user's real name, if any. - # 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) + # email_change_date: string. The date the email change will be complete. (optional) + # new_email: string. The user's new email address whilst not confirmed. (optional) #%] <table> [% IF user.authorizer.can_change_password - || (user.authorizer.can_change_email && Param('allowemailchange')) %] + || (user.authorizer.can_change_email && Param('allowemailchange')) + || user.authorizer.can_change_login %] <tr> - <td colspan="3"> - Please enter your existing password to confirm account changes. + <td colspan="2"> + Please enter your current password to confirm any changes in this section. </td> </tr> <tr> @@ -27,9 +27,6 @@ <input type="password" name="old_password" id="old_password"> </td> </tr> - <tr> - <td colspan="2"><hr></td> - </tr> [% END %] [% IF user.authorizer.can_change_password %] @@ -37,6 +34,9 @@ <th><label for="new_password1">New password:</label></th> <td> <input type="password" name="new_password1" id="new_password1"> + <span class="bz_info"> + (Leave empty to keep current password) + </span> </td> </tr> @@ -48,55 +48,75 @@ </tr> [% END %] - <tr> - <th> - <label for="realname">Your real name (optional, but encouraged):</label> - </th> - <td> - <input size="35" name="realname" id="realname" value="[% realname FILTER html %]"> - </td> - </tr> + [% UNLESS Param('use_email_as_login') %] + <tr> + <th><label for="new_login">Your login name:</label></th> + <td> + [% IF user.authorizer.can_change_login %] + <input size="35" name="new_login" id="new_login" + value="[% user.login FILTER html %]"> + [% ELSE %] + [% user.login FILTER html %] + [% END %] + </td> + </tr> + [% END %] - [% IF user.authorizer.can_change_email && Param('allowemailchange') %] - [% IF login_change_date %] - [% IF new_login_name %] - <tr> - <th>Pending email address:</th> - <td>[% new_login_name FILTER html %]</td> - </tr> - <tr> - <th>Change request expires:</th> - <td>[% login_change_date FILTER time %]</td> - </tr> - [% ELSE %] - <tr> - <th>Confirmed email address:</th> - <td>[% user.login FILTER html %]</td> - </tr> - <tr> - <th>Completion date:</th> - <td>[% login_change_date FILTER time %]</td> - </tr> - [% END %] + [% IF user.authorizer.can_change_email + && Param('allowemailchange') + && email_change_date %] + [% IF new_email %] + <tr> + <th><label>Pending email address:</label></th> + <td>[% new_email FILTER html %]</td> + </tr> + <tr> + <th><label>Change request expires:</label></th> + <td>[% email_change_date FILTER time %]</td> + </tr> [% ELSE %] <tr> - <th> - <label for="new_login_name"> - [% IF Param('emailsuffix') %] - New login: - [% ELSE %] - New email address: - [% END %] - </label> - </th> - <td> - <input size="35" id="new_login_name" name="new_login_name" - [%- ' type="email"' UNLESS Param('emailsuffix') %]> - </td> + <th><label>Confirmed email address:</label></th> + <td>[% user.email FILTER html %]</td> + </tr> + <tr> + <th><label>Completion date:</label></th> + <td>[% email_change_date FILTER time %]</td> </tr> [% END %] + [% ELSE %] + <tr> + <th> + <label for="new_email"> + Your email address[% "/login" IF Param('use_email_as_login') %]: + </label> + </th> + <td> + [% IF user.authorizer.can_change_email && Param('allowemailchange') %] + <input size="35" name="new_email" id="new_email" + value="[% user.email FILTER html %]" + [%~ ' type="email"' IF Param('use_email_as_login') %]> + [% ELSE %] + [% user.email FILTER html %] + [% END %] + </td> + </tr> [% END %] + <tr> + <td colspan="2"><hr></td> + </tr> + + <tr> + <th> + <label for="realname">Your real name (optional, but encouraged):</label> + </th> + <td> + <input size="35" name="realname" id="realname" + value="[% user.name FILTER html %]"> + </td> + </tr> + [% Hook.process('field') %] </table> diff --git a/template/en/default/account/request-new-password.html.tmpl b/template/en/default/account/request-new-password.html.tmpl index a94b3a114..73caa6dcb 100644 --- a/template/en/default/account/request-new-password.html.tmpl +++ b/template/en/default/account/request-new-password.html.tmpl @@ -10,20 +10,14 @@ [% IF user.authorizer.can_change_password %] <p> - If you have an account, but have forgotten your password, enter your - [% IF Param('emailsuffix') %] - login name - [% ELSE %] - email address - [% END %] - below and submit a request to change your password. An email with details - on how to reset your password will be sent. + If you have an account, but have forgotten your password, enter your email + address below and submit a request to change your password. An email with + details on how to reset your password will be sent. </p> <form id="forgot_password" method="get" action="token.cgi"> <input type="hidden" name="a" value="reqpw"> - <input id="loginname" [% IF !Param('emailsuffix') %]type="email"[% END %] - name="loginname" autofocus required> + <input id="email" type="email" name="email" autofocus required> <input type="hidden" id="token" name="token" value="[% issue_hash_token(['reqpw']) FILTER html %]"> <input type="submit" id="request" value="Reset Password"> |