Bug 321556: Prepare Bugzilla to ship with at least 2 skins.

Patch by Marc Schumann <wurblzap@gmail.com>;
r=myk, a=justdave

11 files changed, 45 insertions, 34 deletions

diff --git a/template/en/default/bug/activity/show.html.tmpl b/template/en/default/bug/activity/show.html.tmpl
index 91743247a..2acaf3af8 100644
--- a/template/en/default/bug/activity/show.html.tmpl
+++ b/template/en/default/bug/activity/show.html.tmpl
@@ -30,8 +30,8 @@
 
 [% PROCESS global/header.html.tmpl
   title = "Changes made to $terms.bug $bug_id"
-  h1 = "Activity log"
-  h2 = "$terms.Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>"
+  header = "Activity log"
+  subheader = "$terms.Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>"
  %]
 
 <br>
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index a4671d89d..5add6d54f 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -26,11 +26,15 @@
   <script type="text/javascript">
   <!--
   function updateCommentPrivacy(checkbox, id) {
-    var text_elem = document.getElementById('comment_text_'+id);
+    var comment_elem = document.getElementById('comment_text_'+id).parentNode;
     if (checkbox.checked) {
-        text_elem.parentNode.className='bz_private';
-    } else {
-        text_elem.parentNode.className='';
+      if (!comment_elem.className.match('bz_private')) {
+        comment_elem.className = comment_elem.className.concat(' bz_private');
+      }
+    }
+    else {
+      comment_elem.className =
+        comment_elem.className.replace(/(\s*|^)bz_private(\s*|$)/, '$2');
     }
   }
   //-->
@@ -85,12 +89,12 @@
 
 [% BLOCK a_comment %]
   [% IF NOT comment.isprivate || isinsider %]
-    <div [% "class=\"bz_private\" " IF comment.isprivate %]
-         [% "class=\"bz_comment_hilite\" " IF marks.$count %]>
+    <div class="bz_comment[% " bz_private" IF comment.isprivate %]
+                [% " bz_comment_hilite" IF marks.$count %]">
       [% IF count == description %]
         <table>
           <tr>
-            <td align="left">
+            <th align="left">
               <b><a name="c0" href="show_bug.cgi?id=[% bug.bug_id %]#c0">
                 Description</a>:</b>&nbsp;&nbsp;
                 [% IF mode == "edit" %]
@@ -98,16 +102,15 @@
                     addReplyLink(0);
                   //--></script>
                 [% END %]
-            </td>
+            </th>
             <td align="left" width="30%">
               <b>Opened:</b> [% bug.creation_ts FILTER time %]
             </td>
           </tr>
         </table>
       [% ELSE %]
-        <br>
-        <span class="bz_comment">
-          ------- <i>Comment
+        <span class="bz_comment_head">
+          <span class="comment_rule">-------</span> <i>Comment
           <a name="c[% count %]" href="show_bug.cgi?id=[% bug.bug_id %]#c[% count %]">
             #[% count %]</a> From 
           <a href="mailto:[% comment.email FILTER html %]">
@@ -118,7 +121,7 @@
           <script type="text/javascript"><!-- 
             addReplyLink([% count %]); //--></script>
           [% END %]
-          -------
+          <span class="comment_rule">-------</span>
         </span>
       [% END %]
         
diff --git a/template/en/default/bug/create/make-template.html.tmpl b/template/en/default/bug/create/make-template.html.tmpl
index bf1e743c0..6a7ea6a3b 100644
--- a/template/en/default/bug/create/make-template.html.tmpl
+++ b/template/en/default/bug/create/make-template.html.tmpl
@@ -29,7 +29,7 @@
 
 [% PROCESS global/header.html.tmpl
   title = "Bookmarks are your friend"
-  h1 = "Template constructed"
+  header = "Template constructed"
 %]
 
 <p>
diff --git a/template/en/default/bug/dependency-graph.html.tmpl b/template/en/default/bug/dependency-graph.html.tmpl
index 48ca456c9..5c1eb8471 100644
--- a/template/en/default/bug/dependency-graph.html.tmpl
+++ b/template/en/default/bug/dependency-graph.html.tmpl
@@ -35,14 +35,14 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% title = "Dependency Graph"
-   h1 = title
+   header = title
  %]
 
 [% IF NOT multiple_bugs AND NOT doall %]
   [% filtered_desc = short_desc FILTER html %]
   [% title = "$title for $terms.bug $bug_id"
-     h1 = "$h1 for $terms.bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>"
-     h2 = filtered_desc
+     header = "$header for $terms.bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>"
+     subheader = filtered_desc
    %]
 [% END %]
 
diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl
index b9f2cde39..e01352a57 100644
--- a/template/en/default/bug/dependency-tree.html.tmpl
+++ b/template/en/default/bug/dependency-tree.html.tmpl
@@ -26,12 +26,12 @@
 
 [% filtered_desc = blocked_tree.$bugid.short_desc FILTER html %]
 [% PROCESS global/header.html.tmpl
-   title = "Dependency tree for $terms.Bug $bugid"
-   h1    = "Dependency tree for 
-            <a href=\"show_bug.cgi?id=$bugid\">$terms.Bug $bugid</a>"
+   title           = "Dependency tree for $terms.Bug $bugid"
+   header          = "Dependency tree for 
+                      <a href=\"show_bug.cgi?id=$bugid\">$terms.Bug $bugid</a>"
    javascript_urls = ["js/expanding-tree.js"]
-   style_urls = ["skins/standard/dependency-tree.css"]
-   h2    = filtered_desc
+   style_urls      = ["skins/standard/dependency-tree.css"]
+   subheader      = filtered_desc
 %]
 
 [% PROCESS depthControlToolbar %]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 12fcb05c8..c829a71f4 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -665,10 +665,12 @@
 
 <hr>
 
+<div id="comments">
 [% PROCESS bug/comments.html.tmpl
    comments = bug.longdescs
    mode = "edit"
  %]
+</div>
 
 </form>
 
diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index 02b5bed8a..8aa118adc 100644
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -24,7 +24,9 @@
 
 [%# *** Knob *** %]
 
-  <br>
+<br>
+<div id="knob">
+  <div id="knob-options">
 
   [% knum = 1 %]
   [% initial_action_shown = 0 %]
@@ -155,7 +157,9 @@
       [% END %]
     [% END %]
   [% END %]
+  </div>
 
+  <div id="knob-buttons">
   <input type="submit" value="Commit" id="commit">
   <p>
     <font size="+1">
@@ -179,6 +183,8 @@
              value="[% Param("move-button-text") %]">
     [% END %]
   </p>
+  </div>
+</div>
 
 [%# Common actions %]
 
diff --git a/template/en/default/bug/show.html.tmpl b/template/en/default/bug/show.html.tmpl
index 07b71c8fa..8e877c8f2 100644
--- a/template/en/default/bug/show.html.tmpl
+++ b/template/en/default/bug/show.html.tmpl
@@ -31,10 +31,10 @@
   [% filtered_desc = bug.short_desc FILTER html %]
   [% filtered_timestamp = bug.delta_ts FILTER time %]
   [% PROCESS global/header.html.tmpl
-    title = "$terms.Bug $bug.bug_id - $filtered_desc"
-    h1 = "$terms.Bug&nbsp;$bug.bug_id"
-    h2 = filtered_desc
-    h3 = "Last modified: $filtered_timestamp"
+    title = "$terms.Bug $bug.bug_id &ndash; $filtered_desc"
+    header = "$terms.Bug&nbsp;$bug.bug_id"
+    subheader = filtered_desc
+    header_addl_info = "Last modified: $filtered_timestamp"
     bodyclasses = ['bz_bug',
                    "bz_status_$bug.bug_status",
                    "bz_component_$bug.component",
diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl
index 8090aa319..535b486e7 100644
--- a/template/en/default/bug/summarize-time.html.tmpl
+++ b/template/en/default/bug/summarize-time.html.tmpl
@@ -21,17 +21,17 @@
 [% title = "Time Summary " %]
 [% IF do_depends %]
     [% title = title _ "for " %]
-    [% h1 = title _ "$terms.Bug $ids.0" FILTER bug_link(ids.0) FILTER none %]
+    [% header = title _ "$terms.Bug $ids.0" FILTER bug_link(ids.0) FILTER none %]
     [% title = title _ "$terms.Bug $ids.0: " %]
-    [% h1 = (h1 _ " (and $terms.bugs blocking it)") IF do_depends %]
+    [% header = (header _ " (and $terms.bugs blocking it)") IF do_depends %]
 [% ELSE %]
     [% title = title _ "($ids.size $terms.bugs selected)" %]    
-    [% h1 = title %]
+    [% header = title %]
 [% END %]
 
 [% PROCESS global/header.html.tmpl 
     title = title 
-    h1 = h1 
+    header = header 
     style_urls = ["skins/standard/summarize-time.css"]
     %]
 
diff --git a/template/en/default/bug/votes/list-for-bug.html.tmpl b/template/en/default/bug/votes/list-for-bug.html.tmpl
index 4b4514a90..d23205f1e 100644
--- a/template/en/default/bug/votes/list-for-bug.html.tmpl
+++ b/template/en/default/bug/votes/list-for-bug.html.tmpl
@@ -30,7 +30,7 @@
 
 [% PROCESS global/header.html.tmpl
            title = "Show Votes"
-           h2 = "$terms.Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>"
+           subheader = "$terms.Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>"
  %]
 
 [% total = 0 %]
diff --git a/template/en/default/bug/votes/list-for-user.html.tmpl b/template/en/default/bug/votes/list-for-user.html.tmpl
index 82d8cb658..6a0e90ebb 100644
--- a/template/en/default/bug/votes/list-for-user.html.tmpl
+++ b/template/en/default/bug/votes/list-for-user.html.tmpl
@@ -39,7 +39,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% IF !header_done %]
-  [% h2 = voting_user.login FILTER html %]
+  [% subheader = voting_user.login FILTER html %]
   [% IF canedit %]
     [% title = "Change Votes" %]
     [% IF bug_id %]