diff options
Diffstat (limited to 'template/en')
5 files changed, 65 insertions, 24 deletions
diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl index 2e8739b79..031c2f483 100644 --- a/template/en/default/account/create.html.tmpl +++ b/template/en/default/account/create.html.tmpl @@ -38,19 +38,34 @@ <p> To create a [% terms.Bugzilla %] account, all you need to do is to enter - a legitimate e-mail address. 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 can contact the maintainer of - this [% terms.Bugzilla %] installation +[% IF Param('emailsuffix') == '' %] + a legitimate email address. +[% ELSE %] + an accountname 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 + the maintainer of this [% terms.Bugzilla %] installation at <a href="mailto:[% Param("maintainer") %]">[% Param("maintainer") %]</a>. </p> +[% IF Param('createemailregexp') == '.*' && Param('emailsuffix') == '' %] +<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 the public. 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. +</p> +[% END %] + <form id="account_creation_form" method="get" action="createaccount.cgi"> <table> <tr> <td align="right"> - <b>E-mail address:</b> + <b>Email address:</b> </td> <td> <input size="35" id="login" name="login"> diff --git a/template/en/default/account/created.html.tmpl b/template/en/default/account/created.html.tmpl index 58064f24c..fb6e5ca40 100644 --- a/template/en/default/account/created.html.tmpl +++ b/template/en/default/account/created.html.tmpl @@ -33,10 +33,9 @@ [% PROCESS global/header.html.tmpl title = title %] <p> - To confirm the creation of the user account <tt>[% login FILTER html %]</tt>, - use the URL given in the email you will receive. If you take no action in the - next [% constants.MAX_TOKEN_AGE FILTER html %] days, this request will - automatically be canceled. + 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. </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 45c12b8f5..40ee5ed49 100644 --- a/template/en/default/account/email/confirm-new.html.tmpl +++ b/template/en/default/account/email/confirm-new.html.tmpl @@ -27,11 +27,9 @@ [% expiration_ts = date + (constants.MAX_TOKEN_AGE * 86400) %] <div> - To complete the creation of your user account, you must choose a password in the - form below. You can also enter your real name, which is optional.<p> - If you don't fill this form before - <u>[%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]</u>, - the creation of this account will be automatically canceled. + 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. </div> <form id="confirm_account_form" method="post" action="token.cgi"> @@ -43,7 +41,7 @@ <td>[% email FILTER html %]</td> </tr> <tr> - <th align="right"><label for="realname">Real Name</label>:</th> + <th align="right"><small><i>(OPTIONAL)</i></small> <label for="realname">Real Name</label>:</th> <td><input type="text" id="realname" name="realname" value=""></td> </tr> <tr> @@ -51,7 +49,7 @@ <td><input type="password" id="passwd1" name="passwd1" value=""></td> </tr> <tr> - <th align="right"><label for="passwd1">Re-type your password</label>:</th> + <th align="right"><label for="passwd2">Confirm your password</label>:</th> <td><input type="password" id="passwd2" name="passwd2" value=""></td> </tr> <tr> @@ -61,4 +59,20 @@ </table> </form> +<p> + This account will not be created if this form is not completed by + <u>[%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]</u>. +</p> + +<p> + If you do not wish to create an account with this email click the + cancel account button below and your details will be forgotten. +</p> + +<form id="cancel_account_form" method="post" action="token.cgi"> + <input type="hidden" name="t" value="[% token FILTER html %]"> + <input type="hidden" name="a" value="cancel_new_account"> + <input type="submit" id="confirm" value="Cancel Account"> +</form> + [% PROCESS global/footer.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 3248e4b38..9e609048d 100644 --- a/template/en/default/account/email/request-new.txt.tmpl +++ b/template/en/default/account/email/request-new.txt.tmpl @@ -31,15 +31,28 @@ X-Bugzilla-Type: admin [%+ terms.Bugzilla %] has received a request to create a user account using your email address ([% email %]). -To confirm that you want to create an account using that email address, -visit the following link: +To continue creating an account using this email address, visit the +following link by [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]: [%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=request_new_account -If you are not the person who made this request, or you wish to cancel -this request, visit the following link: +If you did not receive this email before [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %] or +you wish to create an account using a different email address you can begin +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. +[% END %] + +If you do not wish to create an account, or if this request was made in +error you can do nothing or visit the following link: [%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=cancel_new_account -If you do nothing, the request will lapse after [%+ constants.MAX_TOKEN_AGE %] days -(on [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]). +If the above links do not work, or you have any other issues regarding +your account, please contact administration at [% Param('maintainer') %]. diff --git a/template/en/default/account/prefs/account.html.tmpl b/template/en/default/account/prefs/account.html.tmpl index e914ecf6c..5106618ee 100644 --- a/template/en/default/account/prefs/account.html.tmpl +++ b/template/en/default/account/prefs/account.html.tmpl @@ -51,7 +51,7 @@ </tr> <tr> - <th align="right">Re-enter new password:</th> + <th align="right">Confirm new password:</th> <td> <input type="password" name="new_password2"> </td> |