Bug 478232: Fix HTML validation of pages after index/header UI changes.

Patch by Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit

2 files changed, 21 insertions, 36 deletions

diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
index ba1d671fa..fd651e71d 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 339975d67..558f5a968 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>