From c09a9a46b4c20a99a046b8ad67dbae76910e1256 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Thu, 12 Feb 2009 06:29:08 +0000
Subject: Bug 476090: Allow users to log-in from toolbar Patch By Guy Pyrzak
 <guy.pyrzak@gmail.com> r=mkanat, a=mkanat

---
 template/en/default/global/common-links.html.tmpl | 34 ++++-------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

(limited to 'template/en/default/global/common-links.html.tmpl')

diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index 3fce543d1..6f2c46f46 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -20,7 +20,6 @@
   #%]
 
 [% DEFAULT qs_suffix = "" %]
-
 <ul class="links">
   <li><a href="./">Home</a></li>
   <li><span class="separator">| </span><a href="enter_bug.cgi">New</a></li>
@@ -82,41 +81,20 @@
       [% END %]
     [%-# Work around FF bug: keep this on one line %]</li>
   [% ELSE %]
+  
+    [% PROCESS link_to_documentation %]
+    
     [% IF Param('createemailregexp')
           && user.authorizer.user_can_create_account %]
       <li><span class="separator">| </span><a href="createaccount.cgi">New&nbsp;Account</a></li>
     [% END %]
 
-    [% PROCESS link_to_documentation %]
-
-    [% IF user.authorizer.can_login %]
-      [%# Use the current script name. If an empty name is returned,
-        # then we are accessing the home page. %]
-
-      [% script_name = cgi.url(Relative => 1) %]
-
-      [% IF cgi.request_method == "POST" OR script_name.match("relogin") %]
-        [% script_name = "" %]
-      [% END %]
-
-      [%# If SSL is in use, use 'sslbase', else use 'urlbase'. %]
-      [% IF Param("sslbase") != "" && Param("ssl") != "never" %]
-        [% script_name = Param("sslbase") _ script_name %]
-      [% ELSE %]
-        [% script_name = Param("urlbase") _ script_name %]
-      [% END %]
-
-      [% IF cgi.request_method == "GET" AND cgi.query_string %]
-        [% script_name = script_name _ "?" _ cgi.query_string %]
-        [% script_name = script_name _ "&GoAheadAndLogIn=1" IF !cgi.query_string.match("GoAheadAndLogIn") %]
-      [% ELSE %]
-        [% script_name = script_name _ "?GoAheadAndLogIn=1" %]
-      [% END %]
-        
-      <li><span class="separator">| </span><a href="[% script_name FILTER html %]">Log&nbsp;In</a></li>
+    [% IF user.authorizer.can_login %]        
+      [% PROCESS "account/auth/login-small.html.tmpl" %]
     [% END %]
   [% END %]
 </ul>
+
 [% Hook.process("link-row") %]
 [% BLOCK link_to_documentation %]
     [% IF doc_section && Param('docs_urlbase') %]
-- 
cgit v1.2.3-24-g4f1b