Dzahn has submitted this change and it was merged. Change subject: Copy unchanged files from default to custom as preparation for custom changes ......................................................................
Copy unchanged files from default to custom as preparation for custom changes Bug: 24992 Change-Id: I1dac7f5b5e177ff580e3eacfc179af9a742eaca1 --- A bugzilla-4.2/template/en/custom/account/auth/login-small.html.tmpl A bugzilla-4.2/template/en/custom/account/auth/login.html.tmpl 2 files changed, 252 insertions(+), 0 deletions(-) Approvals: Aklapper: Looks good to me, but someone else must approve Dzahn: Verified; Looks good to me, approved diff --git a/bugzilla-4.2/template/en/custom/account/auth/login-small.html.tmpl b/bugzilla-4.2/template/en/custom/account/auth/login-small.html.tmpl new file mode 100644 index 0000000..cb43354 --- /dev/null +++ b/bugzilla-4.2/template/en/custom/account/auth/login-small.html.tmpl @@ -0,0 +1,129 @@ +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Jacob Steenhagen <j...@bugzilla.org> + #%] + +[% PROCESS global/variables.none.tmpl %] + +[%# Use the current script name. If an empty name is returned, + # then we are accessing the home page. %] + +[% login_target = cgi.url("-relative" => 1, "-query" => 1) %] +[% IF !login_target OR login_target.match("^token.cgi") %] + [% login_target = "index.cgi" %] +[% END %] + +[% login_target = urlbase _ login_target %] + +<li id="mini_login_container[% qs_suffix %]"> + <span class="separator">| </span> + [% connector = "?" %] + [% IF cgi.request_method == "GET" AND cgi.query_string %] + [% connector = "&" %] + [% END %] + [% script_url = login_target _ connector _ "GoAheadAndLogIn=1" %] + <a id="login_link[% qs_suffix %]" href="[% script_url FILTER html %]" + onclick="return show_mini_login_form('[% qs_suffix %]')">Log In</a> + + [% Hook.process('additional_methods') %] + + <form action="[% login_target FILTER html %]" method="POST" + class="mini_login bz_default_hidden" + id="mini_login[% qs_suffix FILTER html %]" + onsubmit="return check_mini_login_fields( '[% qs_suffix FILTER html %]' );" + > + <input id="Bugzilla_login[% qs_suffix FILTER html %]" + class="bz_login" + name="Bugzilla_login" + title="Login" + onfocus="mini_login_on_focus('[% qs_suffix FILTER js %]')" + > + <input class="bz_password" + id="Bugzilla_password[% qs_suffix FILTER html %]" + name="Bugzilla_password" + type="password" + title="Password" + > + <input class="bz_password bz_default_hidden bz_mini_login_help" type="text" + id="Bugzilla_password_dummy[% qs_suffix %]" value="password" + title="Password" + onfocus="mini_login_on_focus('[% qs_suffix FILTER js %]')" + > + [% IF Param('rememberlogin') == 'defaulton' || + Param('rememberlogin') == 'defaultoff' + %] + <input type="checkbox" id="Bugzilla_remember[% qs_suffix %]" + name="Bugzilla_remember" value="on" class="bz_remember" + [%+ "checked" IF Param('rememberlogin') == "defaulton" %]> + <label for="Bugzilla_remember[% qs_suffix %]">Remember</label> + [% END %] + <input type="submit" name="GoAheadAndLogIn" value="Log in" + id="log_in[% qs_suffix %]"> + <script type="text/javascript"> + mini_login_constants = { + "login" : "login", + "warning" : "You must set the login and password before logging in." + }; + [%# We need this event to fire after autocomplete, because it does + # something different depending on whether or not there's already + # data in the login and password box. + # However, autocomplete happens at all sorts of different times in + # different browsers (before or after onDOMReady, before or after + # window.onload, in almost all combinations you can imagine). + # The only good solution I found is to time the event 200 + # milliseconds after window.onload for WebKit (doing it immediately + # at onload works in Chrome but not in Safari, but I can't detect + # them separately using YUI), and right after onDOMReady in Gecko. + # The WebKit solution is also fairly guaranteed to work on any + # browser (it's just strange, since the fields only populate 200 ms + # after the page loads), so it's the default. IE doesn't even + # recognize our forms as login forms, so I made it use the Gecko + # method also (since it's nicer visually). Opera never autocompletes + # forms without user interaction, so it also uses the Gecko method. + #%] + if (YAHOO.env.ua.gecko || YAHOO.env.ua.ie || YAHOO.env.ua.opera) { + YAHOO.util.Event.onDOMReady(function() { + init_mini_login_form('[% qs_suffix FILTER html %]'); + }); + } + else { + YAHOO.util.Event.on(window, 'load', function () { + window.setTimeout(function() { + init_mini_login_form('[% qs_suffix FILTER html %]'); + }, 200); + }); + } + </script> + <a href="#" onclick="return hide_mini_login_form('[% qs_suffix %]')">[x]</a> + </form> +</li> +<li id="forgot_container[% qs_suffix %]"> + <span class="separator">| </span> + <a id="forgot_link[% qs_suffix %]" href="[% script_url FILTER html %]#forgot" + onclick="return show_forgot_form('[% qs_suffix %]')">Forgot Password</a> + <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 type="text" name="loginname" size="20" id="login[% qs_suffix FILTER html %]"> + <input id="forgot_button[% qs_suffix %]" value="Reset Password" + type="submit"> + <input type="hidden" name="a" value="reqpw"> + <input type="hidden" id="token" name="token" value="[% issue_hash_token(['reqpw']) FILTER html %]"> + <a href="#" onclick="return hide_forgot_form('[% qs_suffix %]')">[x]</a> + </form> +</li> diff --git a/bugzilla-4.2/template/en/custom/account/auth/login.html.tmpl b/bugzilla-4.2/template/en/custom/account/auth/login.html.tmpl new file mode 100644 index 0000000..3de52b6 --- /dev/null +++ b/bugzilla-4.2/template/en/custom/account/auth/login.html.tmpl @@ -0,0 +1,123 @@ +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Gervase Markham <g...@gerv.net> + # Toms Baugis <t...@myrealbox.com> + #%] + +[%# INTERFACE: + # target: string. URL to go to after login. + #%] + +[% IF !target %] + [% target = "index.cgi" %] +[% END %] + +[% PROCESS global/variables.none.tmpl %] + +[% PROCESS global/header.html.tmpl + title = "Log in to $terms.Bugzilla", + onload = "document.forms['login'].Bugzilla_login.focus()" +%] + +[% USE Bugzilla %] + +<p> + I need a legitimate login and password to continue. +</p> + +<form name="login" action="[% target FILTER html %]" method="POST" +[%- IF Bugzilla.cgi.param("data") %] enctype="multipart/form-data"[% END %]> + <table> + <tr> + <th align="right"><label for="Bugzilla_login">Login:</label></th> + <td> + <input size="35" id="Bugzilla_login" name="Bugzilla_login"> + [% Param('emailsuffix') FILTER html %] + </td> + </tr> + <tr> + <th align="right"><label for="Bugzilla_password">Password:</label></th> + <td> + <input type="password" size="35" id="Bugzilla_password" name="Bugzilla_password"> + </td> + </tr> + + [% IF Param('rememberlogin') == 'defaulton' || + Param('rememberlogin') == 'defaultoff' %] + <tr> + <th> </th> + <td> + <input type="checkbox" id="Bugzilla_remember" name="Bugzilla_remember" value="on" + [%+ "checked" IF Param('rememberlogin') == "defaulton" %]> + <label for="Bugzilla_remember">Remember my Login</label> + </td> + </tr> + [% END %] + + <tr> + <th> </th> + <td> + <input type="checkbox" id="Bugzilla_restrictlogin" name="Bugzilla_restrictlogin" + checked="checked"> + <label for="Bugzilla_restrictlogin">Restrict this session to this IP address + (using this option improves security)</label> + </td> + </tr> + </table> + + [% PROCESS "global/hidden-fields.html.tmpl" + exclude="^Bugzilla_(login|password|restrictlogin)$" %] + + <input type="submit" name="GoAheadAndLogIn" value="Log in" id="log_in"> + + <p> + (Note: you should make sure cookies are enabled for this site. + Otherwise, you will be required to log in frequently.) + </p> +</form> + +[% 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 %] + <hr> + + <p> + If you don't have a [% terms.Bugzilla %] account, you can + <a href="createaccount.cgi">create a new account</a>. + </p> + [% END %] + + [% IF user.authorizer.can_change_password %] + <hr> + + <form id="forgot" method="get" action="token.cgi"> + <input type="hidden" name="a" value="reqpw"> + If you have an account, but have forgotten your password, + enter your login name below and submit a request + to change your password.<br> + <input size="35" name="loginname"> + <input type="hidden" id="token" name="token" value="[% issue_hash_token(['reqpw']) FILTER html %]"> + <input type="submit" id="request" value="Reset Password"> + </form> + [% END %] + +[% PROCESS global/footer.html.tmpl %] -- To view, visit https://gerrit.wikimedia.org/r/68717 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1dac7f5b5e177ff580e3eacfc179af9a742eaca1 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/bugzilla/modifications Gerrit-Branch: master Gerrit-Owner: Aklapper <aklap...@wikimedia.org> Gerrit-Reviewer: Aklapper <aklap...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
