Bug 165075 - A login form is now included by default on the main Index page.

r=wurblzap, a= justdave

3 files changed, 78 insertions, 1 deletions

diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
new file mode 100644
index 000000000..85802a771
--- /dev/null
+++ b/template/en/default/account/auth/login-small.html.tmpl
@@ -0,0 +1,76 @@
+[%# 1.0@bugzilla.org %]
+[%# 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 <jake@bugzilla.org>
+  #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
+<form name="login" action="[% cgi.script_name FILTER html %]" method="POST">
+  <table>
+    <tr>
+      <td align="right"><b>Login:</b></td>
+      <td><input size="20" name="Bugzilla_login"></td>
+    </tr>
+    <tr>
+      <td align="right"><b>Password:</b></td>
+      <td><input type="password" size="20" name="Bugzilla_password"></td>
+    </tr>
+
+    [% IF Param('rememberlogin') == 'defaulton' || 
+          Param('rememberlogin') == 'defaultoff' %]
+      <tr>
+        <td>&nbsp;</td>
+        <td>
+          <input type="checkbox" name="Bugzilla_remember" value="on"
+                 [% "checked" IF Param('rememberlogin') == "defaulton" %]>
+          Remember my Login
+        </td>
+      </tr>
+    [% END %]
+
+    [% IF Param('loginnetmask') < 32 %]
+      <tr>
+        <td align="right">
+          <b>
+             Restrict this session<br>
+             to this IP address:
+          </b>
+        </td>
+        <td>
+          <input type="checkbox" name="Bugzilla_restrictlogin"
+                 checked="checked">
+          (Using this option improves security)
+        </td>
+      </tr>
+    [% END %]
+
+    <tr>
+      <td><input type="submit" name="GoAheadAndLogIn" value="Login"></td>
+
+      [%# For now, password change requests only apply to the DB
+        # verification method #%]
+
+      [% IF has_db != 0 %]
+        <td>[ <a href="index.cgi?GoAheadAndLogIn=1#forgot">Forgot my Password</a> ]</td>
+      [% END %]
+    </tr>
+  </table>
+
+</form>
+
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index ec017534a..37c79e1ec 100644
--- a/template/en/default/account/auth/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -116,6 +116,7 @@
   [% IF has_db != 0 %]
     <hr>
 
+    <a name="forgot"></a>
     <form method="get" action="token.cgi">
       <input type="hidden" name="a" value="reqpw">
       If you have an account, but have forgotten your password,
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index e0d941372..eb1cbbd58 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -72,7 +72,7 @@ function addSidebar() {
     <li id="logout"><a href="relogin.cgi">Log out [% user.login FILTER html %]</a></li>
   [% END %]
 [% ELSE %]
-    <li id="login"><a href="index.cgi?GoAheadAndLogIn=1">Log in to an existing account</a></li>
+    [% PROCESS "account/auth/login-small.html.tmpl" %]
   [% IF Param('createemailregexp') %]
     <li id="account"><a href="createaccount.cgi">Open a new [% terms.Bugzilla %] account</a></li>
   [% END %]