From b4ab958823eaf0cddb1ce15f8af9ed7539b300cf Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Sun, 1 Mar 2009 23:39:37 +0000
Subject: [PATCH] Bug 478232: Fix HTML validation of pages after index/header
 UI changes. Patch by Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit,
 a=LpSolit

---
 skins/contrib/Dusk/global.css                 |  9 ++--
 skins/standard/global.css                     |  8 +--
 skins/standard/index.css                      | 43 +++++-----------
 .../account/auth/login-small.html.tmpl        |  8 +--
 template/en/default/index.html.tmpl           | 49 +++++++------------
 5 files changed, 40 insertions(+), 77 deletions(-)

diff --git a/skins/contrib/Dusk/global.css b/skins/contrib/Dusk/global.css
index f76557cf97..fd90993687 100644
--- a/skins/contrib/Dusk/global.css
+++ b/skins/contrib/Dusk/global.css
@@ -62,8 +62,7 @@ body {
     -moz-border-radius: 5px;
 }
 
-a:link,
-a:link:hover {
+a, a:hover {
     color: #6169c0;
 }
 
@@ -71,13 +70,11 @@ a:visited {
     color: #3d4a68;
 }
 
-a:link,
-a:visited {
+a, a:visited {
     text-decoration: none;
 }
 
-a:link:hover,
-a:visited:hover {
+a:hover {
     text-decoration: underline;
 }
 
diff --git a/skins/standard/global.css b/skins/standard/global.css
index a18378d4b7..def4e82d21 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -202,19 +202,19 @@
 /* tabs (end) */
 
 /* generic (begin) */
-    :link {
+    a {
         color: #039;
     }
 
-    :visited {
+    a:visited {
         color: #636;
     }
 
-    :link:hover, :visited:hover {
+    a:hover {
         color: #333;
     }
 
-    :link:active, :link:active {
+    a:active {
         color: #000;
     }
 
diff --git a/skins/standard/index.css b/skins/standard/index.css
index 61837f4912..a3413bb7ea 100644
--- a/skins/standard/index.css
+++ b/skins/standard/index.css
@@ -42,34 +42,30 @@
         font-weight: bold;
     }
     
-    div.bz_common_actions
-    {
+    .bz_common_actions {
+        display: block;
         height: 190px;
         width: 195px;
-        background-color: blue;
         float: left;
-        margin: 0 3ex;
+        margin: 0 3ex 3em 0;
         text-align: center;
-        margin-bottom: 3em;
     }
-    div.bz_common_actions span 
-    {
+    .bz_common_actions span {
         position: relative;
         top: 95%;
         font-weight: bold;
     }
     
-    div.bz_common_actions,
-    div.bz_common_actions a,
-    div.bz_common_actions a div,
-    div.bz_common_actions a:visited,
-    div.bz_common_actions a:hover {
-        text-decoration: none;
-    }
-    
-    a.bz_common_actions {
+    .bz_common_actions,
+    .bz_common_actions:visited,
+    .bz_common_actions:hover
+    {
         text-decoration: none;
     }
+
+    #enter_bug { background: url(index/bug.gif)     no-repeat; }
+    #query     { background: url(index/search.gif)  no-repeat; }
+    #account   { background: url(index/account.gif) no-repeat; }
     
     #quicksearchForm
     {
@@ -102,21 +98,6 @@
         padding: 0;
     }
     
-    #enter_bug 
-    {
-        background: url(index/bug.gif) no-repeat;
-    }
-    
-    #query
-    {
-        background: url(index/search.gif) no-repeat;
-    }
-    
-    #account
-    {
-        background: url(index/account.gif) no-repeat;
-    }
-    
     ul.additional_links 
     {
         list-style: none;
diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
index ba1d671fa7..fd651e71d7 100644
--- a/template/en/default/account/auth/login-small.html.tmpl
+++ b/template/en/default/account/auth/login-small.html.tmpl
@@ -30,9 +30,8 @@
 
 [% target = urlbase _ target %]
 <li>
-  <form name="login" action="[% target FILTER html %]" 
-        class="mini_login"
-        method="POST" id="mini_login[% qs_suffix FILTER html %]"
+  <form action="[% target FILTER html %]" method="POST" class="mini_login"
+        id="mini_login[% qs_suffix FILTER html %]"
         onsubmit="return check_mini_login_fields( '[% qs_suffix FILTER html %]' );"
   >
     <span class="separator">| </span>
@@ -58,7 +57,8 @@
                  [%+ "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">
+    <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)$" %]
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 339975d67b..558f5a9685 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -128,37 +128,22 @@ YAHOO.util.Event.onDOMReady(onLoadActions);
     <tr>
       <td>
         <h1 id="welcome"> Welcome to [% terms.Bugzilla %]</h1>
-        <a href="enter_bug.cgi" class="bz_common_actions">
-          <div class="bz_common_actions" id="enter_bug">
-            <span>File [% terms.aBug %]</span>
-          </div>
-        </a>
-        
-        <a href="query.cgi" class="bz_common_actions">
-          <div class="bz_common_actions" id="query">
-            <span>Search</span>
-          </div>
-        </a>
-        
-          <a class="bz_common_actions quicksearch_help_text" href="
-            [% IF user.id %]
-              userprefs.cgi
-            [% ELSIF Param('createemailregexp') && user.authorizer.user_can_create_account %]
-              createaccount.cgi
-            [% ELSE %]
-              ?GoAheadAndLogIn=1
-            [% END %]">
-            <div class="bz_common_actions" id="account">
-              <span>
-                [% IF user.id %]
-                  User Preferences
-                [% ELSIF Param('createemailregexp') && user.authorizer.user_can_create_account %]
-                  Open a New Account
-                [% ELSE %]
-                  Log In
-                [% END%]</span>
-            </div>
-          </a>
+        <a id="enter_bug" class="bz_common_actions"
+           href="enter_bug.cgi"><span>File [% terms.aBug %]</span></a>
+      
+        <a id="query" class="bz_common_actions" 
+           href="query.cgi"><span>Search</span></a>
+      
+        <a id="account" class="bz_common_actions quicksearch_help_text"
+          [% IF user.id %]
+            href="userprefs.cgi"><span>User Preferences</span></a>
+          [% ELSIF Param('createemailregexp')
+                   && user.authorizer.user_can_create_account 
+          %]
+            href="createaccount.cgi"><span>Open a New Account</span></a>
+          [% ELSE %]
+            href="?GoAheadAndLogIn=1"><span>Log In</span></a>
+          [% END %]
         <form id="quicksearchForm" name="quicksearchForm" action="buglist.cgi"
               onsubmit="return checkQuicksearch(this);">
           <div>
@@ -188,7 +173,7 @@ YAHOO.util.Event.onDOMReady(onLoadActions);
               <li>
                 <a href="page.cgi?id=release-notes.html" > Release Notes</a>
               </li>
-            </div>
+            </ul>
           </div>
         </form>
       </td>
-- 
2.47.3