diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index 15a8c2a15c5..515bbd1e788 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -9328 \ No newline at end of file +9329 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev index d56b741eaff..07fe6c70222 100644 --- a/mozilla/webtools/bugzilla/.gitrev +++ b/mozilla/webtools/bugzilla/.gitrev @@ -1 +1 @@ -c3b984aa204bdb318b05302ab50702b789c305b0 \ No newline at end of file +cd00796d216adf82d18ed3b3a6bbcaa7b99b4619 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/createaccount.cgi b/mozilla/webtools/bugzilla/createaccount.cgi index a1539638473..cd5309f0557 100755 --- a/mozilla/webtools/bugzilla/createaccount.cgi +++ b/mozilla/webtools/bugzilla/createaccount.cgi @@ -27,10 +27,15 @@ my $vars = { doc_section => 'using/creating-an-account.html' }; print $cgi->header(); -$user->check_account_creation_enabled; my $login = $cgi->param('login'); +my $request_new_password = $cgi->param('request_new_password'); -if (defined($login)) { +if ($request_new_password) { + $template->process('account/request-new-password.html.tmpl', $vars) + || ThrowTemplateError($template->error()); +} +elsif (defined($login)) { + $user->check_account_creation_enabled; # Check the hash token to make sure this user actually submitted # the create account form. my $token = $cgi->param('token'); @@ -41,9 +46,9 @@ if (defined($login)) { $template->process("account/created.html.tmpl", $vars) || ThrowTemplateError($template->error()); - exit; } - -# Show the standard "would you like to create an account?" form. -$template->process("account/create.html.tmpl", $vars) - || ThrowTemplateError($template->error()); +else { + # Show the standard "would you like to create an account?" form. + $template->process('account/create.html.tmpl', $vars) + || ThrowTemplateError($template->error()); +} diff --git a/mozilla/webtools/bugzilla/skins/standard/global.css b/mozilla/webtools/bugzilla/skins/standard/global.css index 6d0e64a865b..6e3b41fd757 100644 --- a/mozilla/webtools/bugzilla/skins/standard/global.css +++ b/mozilla/webtools/bugzilla/skins/standard/global.css @@ -254,6 +254,23 @@ } /* generic (end) */ +#login_form { + border: solid; + margin: 2em auto; + padding: 1em; + width: 35em; +} + +#login_form #Bugzilla_login, #login_form #Bugzilla_password, +#forgot_password #loginname { + width: 25em; +} + +#login_form .links { + text-align: center; + padding: 1em; +} + /* Links that control whether or not something is visible. */ a.controller { font-size: 115%; diff --git a/mozilla/webtools/bugzilla/template/en/default/account/auth/login-small.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/account/auth/login-small.html.tmpl index 790c135bfae..50815124175 100644 --- a/mozilla/webtools/bugzilla/template/en/default/account/auth/login-small.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/account/auth/login-small.html.tmpl @@ -58,7 +58,7 @@
  • | - Forgot Password
    diff --git a/mozilla/webtools/bugzilla/template/en/default/account/auth/login.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/account/auth/login.html.tmpl index 0af84542d3b..85b3be8fbf8 100644 --- a/mozilla/webtools/bugzilla/template/en/default/account/auth/login.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/account/auth/login.html.tmpl @@ -20,12 +20,12 @@ [% USE Bugzilla %] -

    - [% terms.Bugzilla %] needs a legitimate login and password to continue. -

    +

    + [% terms.Bugzilla %] needs a legitimate login and password to continue +

    - + + [% IF Param('rememberlogin') == 'defaulton' || Param('rememberlogin') == 'defaultoff' %] - - + [% END %] - - + + + + + +
    @@ -33,44 +33,54 @@ [% IF Param('emailsuffix') %] Login: [% ELSE %] - Your Email Address: + Email Address: [% END %] - [% Param('emailsuffix') FILTER html %]
    - +
      + - + +
      + +
      + +
    [% PROCESS "global/hidden-fields.html.tmpl" @@ -78,49 +88,42 @@ - -

    - (Note: you should make sure cookies are enabled for this site. - Otherwise, you will be required to log in frequently.) -

    + [% Hook.process('additional_methods') %] + +
    + [% can_create_account = 0 %] + [% IF Param("createemailregexp") && user.authorizer.user_can_create_account %] + Create a New Account + [% can_create_account = 1 %] + [% END %] + + [% IF user.authorizer.can_change_password %] + [% "|" IF can_create_account %] + Forgot Password + [% END %] +
    + +
    +
    +

    + Note: you should make sure cookies are enabled for this site. + Otherwise, you will be required to log in frequently. +

    + + [% IF can_create_account %] +

    + [% IF Param("requirelogin") %] + A user account is required because this Bugzilla + installation is only accessible to authenticated users. + [% ELSIF target.match("_bug\.cgi$") %] + A user account is required to file a new [% terms.bug %] or to comment + into existing ones so that you can be contacted if more information is + needed. + [% END %] +

    + [% END %] +
    -[% Hook.process('additional_methods') %] - -[%# Allow the user to create a new account, or request a token to change - # their password, assuming that our auth method allows that. - #%] - - [% IF Param("createemailregexp") && user.authorizer.user_can_create_account %] -
    - -

    - If you don't have a [% terms.Bugzilla %] account, you can - create a new account. - [% IF Param("requirelogin") %] - A user account is required because this Bugzilla - installation is only accessible to authenticated users. - [% ELSIF target.match("_bug\.cgi$") %] - A user account is required to file a new [% terms.bug %] or to comment - into existing ones so that you can be contacted if more information is - needed. - [% END %] -

    - [% END %] - - [% IF user.authorizer.can_change_password %] -
    - -
    - - If you have an account, but have forgotten your password, - enter your login name below and submit a request - to change your password.
    - - - -
    - [% END %] - [% PROCESS global/footer.html.tmpl %] diff --git a/mozilla/webtools/bugzilla/template/en/default/account/request-new-password.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/account/request-new-password.html.tmpl new file mode 100644 index 00000000000..a94b3a11484 --- /dev/null +++ b/mozilla/webtools/bugzilla/template/en/default/account/request-new-password.html.tmpl @@ -0,0 +1,35 @@ +[%# This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. + #%] + +[% PROCESS global/header.html.tmpl title = "Reset Password" %] + +[% IF user.authorizer.can_change_password %] +

    + 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. +

    + +
    + + + + +
    +[% ELSE %] +

    Sorry, but you cannot reset your password.

    +[% END %] + +[% PROCESS global/footer.html.tmpl %]