From 31570d1a282a92dd2f9f745414c2c40dbd4bdff1 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Thu, 4 Jun 2009 22:54:38 +0000
Subject: Bug 493642: Never include hidden_fields in the header/footer login
 form, and when a REQUIRE_LOGIN page shows a login form, hide the
 header/footer login form. Patch by Max Kanat-Alexander <mkanat@bugzilla.org>
 r=LpSolit, a=LpSolit

---
 template/en/default/account/auth/login-small.html.tmpl | 4 ----
 template/en/default/account/auth/login.html.tmpl       | 2 +-
 template/en/default/global/common-links.html.tmpl      | 9 ++++++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'template')

diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
index dd55a72bd..63f6d50d0 100644
--- a/template/en/default/account/auth/login-small.html.tmpl
+++ b/template/en/default/account/auth/login-small.html.tmpl
@@ -68,10 +68,6 @@
     [% END %]
     <input type="submit" name="GoAheadAndLogIn" value="Log in" 
             id="log_in[% qs_suffix %]">
-    <div class="bz_default_hidden">
-      [% PROCESS "global/hidden-fields.html.tmpl"
-                exclude="^Bugzilla_(login|password|restrictlogin|remember)$" %]
-    </div>
     <script type="text/javascript">
       mini_login_constants = {
           "login" : "login",
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index e8f8fa14c..e4adfdcb6 100644
--- a/template/en/default/account/auth/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -116,7 +116,7 @@
       enter your login name below and submit a request
       to change your password.<br>
       <input size="35" name="loginname">
-      <input type="submit" id="request" value="Submit Request">
+      <input type="submit" id="request" value="Reset Password">
     </form>
   [% END %]
 
diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index 8ab2a2b02..b775da3e8 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -89,7 +89,14 @@
       </li>
     [% END %]
 
-    [% IF user.authorizer.can_login %]        
+    [%# Only display one login form when we're on a LOGIN_REQUIRED page. That
+      # way, we're guaranteed that the user will use the form that has 
+      # hidden_fields in it (the center form) instead of this one. Also, it's
+      # less confusing to have one form (as opposed to  three) when you're 
+      # required to log in.
+      #%]
+    [% USE Bugzilla %]
+    [% IF user.authorizer.can_login && !Bugzilla.page_requires_login %]
       [% PROCESS "account/auth/login-small.html.tmpl" %]
     [% END %]
   [% END %]
-- 
cgit v1.2.3-24-g4f1b