diff options
Diffstat (limited to 'template/en/default/account/email')
-rw-r--r-- | template/en/default/account/email/confirm-new.html.tmpl | 26 | ||||
-rw-r--r-- | template/en/default/account/email/request-new.txt.tmpl | 16 |
2 files changed, 30 insertions, 12 deletions
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 |