Bug 1426685 - Fix regressions from fixed-positioning global header

7 files changed, 10 insertions, 13 deletions

diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl
index 50c777063..120bd74ad 100644
--- a/template/en/default/bug/summarize-time.html.tmpl
+++ b/template/en/default/bug/summarize-time.html.tmpl
@@ -282,7 +282,7 @@
   <b><label accesskey="s" 
              for="start_date">Period <u>s</u>tarting</label></b>: 
 </td><td colspan="3">
-  <input type="text" id="start_date" name="start_date" size="11"
+  <input type="text" id="start_date" name="start_date" size="11" autofocus
          align="right" value="[% start_date FILTER html %]" maxlength="10"
          onchange="updateCalendarFromField(this)">
   <button type="button" class="calendar_button"
@@ -345,7 +345,6 @@
 <!--
   createCalendar('start_date');
   createCalendar('end_date');
-  document.forms['summary'].start_date.focus();
 //--></script>
 <hr noshade size=1>
 [% END %]
diff --git a/template/en/default/global/footer.html.tmpl b/template/en/default/global/footer.html.tmpl
index 7922e494b..f1ad69fc9 100644
--- a/template/en/default/global/footer.html.tmpl
+++ b/template/en/default/global/footer.html.tmpl
@@ -19,7 +19,9 @@
   #                 Svetlana Harisova <light@rathedg.com>
   #%]
 
+</div> [%# main-inner %]
 </main> [%# bugzilla-body %]
+</div> [%# wrapper %]
 
 [% Hook.process("end") %]
 
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index f339b80b1..5d00b7216 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -234,6 +234,7 @@
   # 'bannerhtml'
   #%]
 
+<div id="wrapper">
 <header id="header" role="banner">
   <div class="inner">
     <h1 id="header-title" class="title"><a href="./" title="Go to home page">[% terms.Bugzilla %]</a></h1>
@@ -376,7 +377,8 @@
   </aside>
 [% END %]
 
-<main id="bugzilla-body">
+<main id="bugzilla-body" tabindex="-1">
+<div id="main-inner">
 
 [%# in most cases the "header" variable provides redundant information, however
   # there are exceptions where not displaying this text is problematic. %]
diff --git a/template/en/default/search/field.html.tmpl b/template/en/default/search/field.html.tmpl
index a2ff5718b..0d10d4f6b 100644
--- a/template/en/default/search/field.html.tmpl
+++ b/template/en/default/search/field.html.tmpl
@@ -43,6 +43,7 @@
     %]    
     <input name="[% field.name FILTER html %]" 
            id="[% field.name FILTER html %]" size="40"
+           [% IF autofocus %] autofocus[% END %]
            [% IF onchange %] onchange="[% onchange FILTER html %]"[% END %]
            value="[% value FILTER html %]">              
   [% CASE constants.FIELD_TYPE_KEYWORDS %]
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index 02357e473..49c311806 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -141,11 +141,8 @@ TUI_hide_default('information_query');
          value = default.short_desc.0
          type_selected = default.short_desc_type.0 
          accesskey = "s"
+         autofocus = 1
          %]
-      <script> <!--
-          document.forms[queryform].short_desc.focus(); 
-      // -->
-      </script>
 
       [% IF button_name %]
         <input type="submit" id="[% button_name FILTER css_class_quote %]_top"
diff --git a/template/en/default/search/search-instant.html.tmpl b/template/en/default/search/search-instant.html.tmpl
index 8e4298654..01af804fc 100644
--- a/template/en/default/search/search-instant.html.tmpl
+++ b/template/en/default/search/search-instant.html.tmpl
@@ -71,7 +71,7 @@ YAHOO.bugzilla.instantSearch.setLabels( {
       <b><label for="content">Words:</label></b>
     </td>
     <td>
-      <input id="content" spellcheck="true" size="60"
+      <input id="content" spellcheck="true" size="60" autofocus
              value="[% default.content.0 FILTER html %]">
     </td>
   </tr>
diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl
index 79b5b2932..3b4cc3514 100644
--- a/template/en/default/search/search-specific.html.tmpl
+++ b/template/en/default/search/search-specific.html.tmpl
@@ -98,12 +98,8 @@ for "crash secure SSL flash".
       <label for="content">Words:</label>
     </th>
     <td>
-      <input name="content" size="60" id="content"
+      <input name="content" size="60" id="content" autofocus
              value="[% default.content.0 FILTER html %]">
-      <script> <!--
-          document.forms['queryform'].content.focus(); 
-      // -->
-      </script>
     </td>
   </tr>
   <tr>