Vanilla 4.4.9 to 5.0 without history due to massive merge conflicts

5 files changed, 146 insertions, 153 deletions

diff --git a/template/en/default/admin/groups/confirm-remove.html.tmpl b/template/en/default/admin/groups/confirm-remove.html.tmpl
index a9aa7e132..3249ee384 100644
--- a/template/en/default/admin/groups/confirm-remove.html.tmpl
+++ b/template/en/default/admin/groups/confirm-remove.html.tmpl
@@ -19,7 +19,7 @@
 
 [% PROCESS global/header.html.tmpl
   title = title
-  doc_section = "groups.html"
+  doc_section = "administering/groups.html"
 %]
 
 [% IF regexp %]
@@ -32,7 +32,7 @@
 [% END %]
   
 <p>Generally, you will only need to do this when upgrading groups
-  created with [% terms.Bugzilla %] versions 2.16 and earlier. Use
+  created with Bugzilla versions 2.16 and earlier. Use
   this option with <b>extreme care</b> and consult the documentation
   for further information.
 </p>
diff --git a/template/en/default/admin/groups/create.html.tmpl b/template/en/default/admin/groups/create.html.tmpl
index db65629d0..3827fb0e3 100644
--- a/template/en/default/admin/groups/create.html.tmpl
+++ b/template/en/default/admin/groups/create.html.tmpl
@@ -13,30 +13,35 @@
 [% PROCESS global/header.html.tmpl
   title = "Add group"
   subheader = "This page allows you to define a new user group."
-  doc_section = "groups.html#create-groups"
+  style_urls = ['skins/standard/admin.css']
+  doc_section = "administering/groups.html#creating-groups"
 %]
 
 <form method="post" action="editgroups.cgi">
-  <table border="1" cellpadding="4" cellspacing="0"><tr>
-    <th>New Name</th>
-    <th>New Description</th>
-    <th>New User RegExp</th>
-    <th>Use For [% terms.Bugs %]</th>
-  </tr><tr>
-    <td><input size="20" name="name"></td>
-    <td><input size="40" name="desc"></td>
-    <td><input size="30" name="regexp"></td>
-    <td><input type="checkbox" name="isactive" value="1" checked></td>
-  </tr>
-  <tr>
-    <th>Icon URL:</th>
-    <td colspan="3"><input type="text" size="70" maxlength="255" id="icon_url" name="icon_url"></td>
-  </tr>
-  [% Hook.process('field') %]
+  <table id="admin_table_edit">
+    <tr>
+      <th>Group Name:</th>
+      <td><input size="60" maxlength="255" name="name" required></td>
+    </tr>
+    <tr>
+      <th>Description:</th>
+      <td><input size="60" name="desc" required></td>
+    </tr>
+    <tr>
+      <th>User Regexp:</th>
+      <td><input size="60" name="regexp"></td>
+    </tr>
+    <tr>
+      <th>Icon URL:</th>
+      <td><input type="text" size="60" id="icon_url" name="icon_url"></td>
+    </tr>
+    <tr>
+      <th>Use For [% terms.Bugs %]:</th>
+      <td><input type="checkbox" name="isactive" value="1" checked></td>
+    </tr>
+    [% Hook.process('field') %]
   </table>
 
-  <hr>
-
   <input type="checkbox" id="insertnew" name="insertnew" value="1"
     [% IF Param("makeproductgroups") %] checked[% END %]>
   <label for="insertnew">Insert new group into all existing products.</label>
@@ -46,7 +51,9 @@
   <input type="hidden" name="token" value="[% token FILTER html %]">
 </form>
 
-<p><b>Name</b> is what is used with the B<!-- blah -->ugzilla->user->in_group()
+<hr>
+
+<p><b>Group Name</b> is what is used with the B[%%]ugzilla->user->in_group()
 function in any customized cgi files you write that use a given group.
 It can also be used by people submitting [% terms.bugs %] by email to
 limit [% terms.abug %] to a certain set of groups.</p>
@@ -55,15 +62,6 @@ limit [% terms.abug %] to a certain set of groups.</p>
 to members of the group where they can choose whether
 the [% terms.bug %] will be restricted to others in the same group.</p>
 
-<p>The <b>Use For [% terms.Bugs %]</b> flag determines whether or not the
-group is eligible to be used for [% terms.bugs %]. If you clear this, it will
-no longer be possible for users to add [% terms.bugs %] to this group,
-although [% terms.bugs %] already in the group will remain in the group.
-Doing so is a much less drastic way to stop a group from growing
-than deleting the group would be. <b>Note: If you are creating
-a group, you probably want it to be usable for [% terms.bugs %], in which
-case you should leave this checked.</b></p>
-
 <p><b>User RegExp</b> is optional, and if filled in, will 
 automatically grant membership to this group to anyone with an 
 email address that matches this regular expression.</p>
@@ -75,6 +73,15 @@ email address that matches this regular expression.</p>
   in comments in [% terms.bugs %] besides the name of the author of comments.
 </p>
 
+<p>The <b>Use For [% terms.Bugs %]</b> flag determines whether or not the
+group is eligible to be used for [% terms.bugs %]. If you clear this, it will
+no longer be possible for users to add [% terms.bugs %] to this group,
+although [% terms.bugs %] already in the group will remain in the group.
+Doing so is a much less drastic way to stop a group from growing
+than deleting the group would be. <b>Note: If you are creating
+a group, you probably want it to be usable for [% terms.bugs %], in which
+case you should leave this checked.</b></p>
+
 [% IF Param("makeproductgroups") %]
   <p>By default, the new group will be associated with existing products.
   Unchecking the "Insert new group into all existing products" option will
@@ -87,8 +94,6 @@ email address that matches this regular expression.</p>
   a product.</p>
 [% END %]
 
-<p>Back to the <a href="./">main [% terms.bugs %] page</a>
-
-or to the <a href="editgroups.cgi">group list</a>.
+<p>Back to the <a href="editgroups.cgi">group list</a>.</p>
 
 [% PROCESS global/footer.html.tmpl %] 
diff --git a/template/en/default/admin/groups/delete.html.tmpl b/template/en/default/admin/groups/delete.html.tmpl
index 5ae0ce92d..465860761 100644
--- a/template/en/default/admin/groups/delete.html.tmpl
+++ b/template/en/default/admin/groups/delete.html.tmpl
@@ -13,21 +13,28 @@
   #                 group.
   #%]
 
-
+[% title = BLOCK %]Delete group '[% group.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl
-  title = "Delete group"
-  doc_section = "groups.html"
+  title = title
+  style_urls = ['skins/standard/admin.css']
+  doc_section = "administering/groups.html"
 %]
 
-<table border="1">
-  <tr>
-    <th>Id</th>
-    <th>Name</th>
-    <th>Description</th>
+<table id="admin_table">
+  <tr class="column_header">
+    <th>Field</th>
+    <th>Value</th>
   </tr>
   <tr>
+    <td>Id</td>
     <td>[% group.id FILTER html %]</td>
+  </tr>
+  <tr>
+    <td>Name</td>
     <td>[% group.name FILTER html %]</td>
+  </tr>
+  <tr>
+    <td>Description</td>
     <td>[% group.description FILTER html_light %]</td>
   </tr>
 </table>
@@ -151,7 +158,9 @@
 
   <h2>Confirmation</h2>
 
-  <p>Do you really want to delete this group?</p>
+  <p class="confirmation">
+    Do you really want to delete this group?
+  </p>
   [% IF group.users.size || group.bugs.size || group.products.size 
         || group.flags.size
   %]
diff --git a/template/en/default/admin/groups/edit.html.tmpl b/template/en/default/admin/groups/edit.html.tmpl
index 2f4101a13..3e64fa7c4 100644
--- a/template/en/default/admin/groups/edit.html.tmpl
+++ b/template/en/default/admin/groups/edit.html.tmpl
@@ -18,30 +18,21 @@
 
 [% PROCESS global/header.html.tmpl
   title = title
-  doc_section = "groups.html#edit-groups"
-  style = "
-    .grant_table { border-collapse: collapse; }
-    .grant_table td, .grant_table th {
-        padding-left: .5em;
-    }
-    .grant_table td.one, .grant_table th.one {
-        border-right: 1px solid black;
-        padding-right: .5em;
-    }
-  "
+  style_urls = ['skins/standard/admin.css']
+  doc_section = "administering/groups.html#editing-groups-and-assigning-group-permissions"
 %]
 
 <form method="post" action="editgroups.cgi">
   <input type="hidden" name="action" value="postchanges">
   <input type="hidden" name="group_id" value="[% group.id FILTER html %]">
 
-  <table border="1" cellpadding="4">
+  <table id="admin_table_edit">
     <tr>
       <th>Group:</th>
       <td>
         [% IF group.is_bug_group %]
-          <input type="text" name="name" size="60" 
-                 value="[% group.name FILTER html %]">
+          <input type="text" name="name" size="60" maxlength="255"
+                 value="[% group.name FILTER html %]" required>
         [% ELSE %]
           [% group.name FILTER html %]
         [% END %]
@@ -52,8 +43,8 @@
       <th>Description:</th>
       <td>
         [% IF group.is_bug_group %]
-          <input type="text" name="desc" size="70" 
-                 value="[% group.description FILTER html %]">
+          <input type="text" name="desc" size="60"
+                 value="[% group.description FILTER html %]" required>
         [% ELSE %]
           [% group.description FILTER html %]
         [% END %]
@@ -63,7 +54,7 @@
     <tr>
       <th>User Regexp:</th>
       <td>
-        <input type="text" name="regexp" size="40" 
+        <input type="text" name="regexp" size="60"
                value="[% group.user_regexp FILTER html %]">
       </td>
     </tr>
@@ -76,7 +67,7 @@
         [% END %]
       </th>
       <td>
-        <input type="text" name="icon_url" size="70" maxlength="255"
+        <input type="text" name="icon_url" size="60"
                value="[% group.icon_url FILTER html %]">
       </td>
     </tr>
@@ -95,78 +86,72 @@
 
   <h4>Group Permissions</h4>
 
-  <table class="grant_table">
+  <table id="grant_table">
     <tr>
-      <th class="one">Groups That Are a Member of This Group<br>
-        (&quot;Users in <var>X</var> are automatically in  
-         [%+ group.name FILTER html %]&quot;)</th>
-      <th>Groups That This Group Is a Member Of<br>
-        (&quot;If you are in [% group.name FILTER html %], you are 
-         automatically also in...&quot;)</th>
+      <th colspan="2">
+        Groups That Are a Member of This Group<br>
+        ("Users in <var>X</var> are automatically in [% group.name FILTER html %]")
+      </th>
+      <th colspan="2">
+        Groups That This Group Is a Member Of<br>
+        ("If you are in [% group.name FILTER html %], you are automatically also in...")
+      </th>
     </tr>
+
     <tr>
-      <td class="one">
-        [% PROCESS select_pair name = "members" size = 10
-                   items_available = members_available
-                     items_current = members_current %]
-      </td>
-  
-      <td>[% PROCESS select_pair name = "member_of" size = 10
-                     items_available = member_of_available
-                       items_current = member_of_current %]</td>
+      [% PROCESS select_pair name = "members" size = 10
+                 items_available = members_available
+                 items_current = members_current %]
+
+      [% PROCESS select_pair name = "member_of" size = 10
+                 items_available = member_of_available
+                 items_current = member_of_current %]
     </tr>
-  </table>
 
-  <table class="grant_table">
     <tr>
-      <th class="one">
+      <th colspan="2">
         Groups That Can Grant Membership in This Group<br>
-        (&quot;Users in <var>X</var> can add other users to 
-         [%+ group.name FILTER html %]&quot;)
-
+        ("Users in <var>X</var> can add other users to [% group.name FILTER html %]")
+      </th>
+      <th colspan="2">
+        Groups That This Group Can Grant Membership In<br>
+        ("Users in [% group.name FILTER html %] can add users to...")
       </th>
-     <th>Groups That This Group Can Grant Membership In<br>
-       (&quot;Users in [% group.name FILTER html %] can add users to...&quot;)
-     </th>
     </tr>
+
     <tr>
-      <td class="one">
-        [% PROCESS select_pair name = "bless_from" size = 10
-                   items_available = bless_from_available
-                     items_current = bless_from_current %]
-      </td>
-      <td>[% PROCESS select_pair name = "bless_to" size = 10
-                     items_available = bless_to_available
-                       items_current = bless_to_current %]
-      </td>
+      [% PROCESS select_pair name = "bless_from" size = 10
+                 items_available = bless_from_available
+                 items_current = bless_from_current %]
+
+      [% PROCESS select_pair name = "bless_to" size = 10
+                 items_available = bless_to_available
+                 items_current = bless_to_current %]
     </tr>
-  </table>
 
-  [% IF Param('usevisibilitygroups') %]
-    <table class="grant_table">
+    [% IF Param('usevisibilitygroups') %]
       <tr>
-        <th class="one">
+        <th colspan="2">
           Groups That Can See This Group<br>
-          (&quot;Users in <var>X</var> can see users in
-           [%+ group.name FILTER html %]&quot;)
+          ("Users in <var>X</var> can see users in [% group.name FILTER html %]")
+        </th>
+        <th colspan="2">
+          Groups That This Group Can See<br>
+          ("Users in [% group.name FILTER html %] can see users in...")
         </th>
-       <th>Groups That This Group Can See<br>
-         (&quot;Users in [% group.name FILTER html %] can see users in...&quot;)
-       </th>
       </tr>
+
       <tr>
-        <td class="one">
-          [% PROCESS select_pair name = "visible_from" size = 10
-                     items_available = visible_from_available
-                       items_current = visible_from_current %]
-        </td>
-        <td>[% PROCESS select_pair name = "visible_to_me" size = 10
-                       items_available = visible_to_me_available
-                         items_current = visible_to_me_current %]
-        </td>
+        [% PROCESS select_pair name = "visible_from" size = 10
+                   items_available = visible_from_available
+                   items_current = visible_from_current %]
+
+        [% PROCESS select_pair name = "visible_to_me" size = 10
+                   items_available = visible_to_me_available
+                   items_current = visible_to_me_current %]
       </tr>
-    </table>
-  [% END %]
+    [% END %]
+  </table>
 
   <input type="submit" id="update-group" value="Update Group">
   <input type="hidden" name="token" value="[% token FILTER html %]">
@@ -175,12 +160,11 @@
 <h4>Mass Remove</h4>
 
 <p>You can use this form to do mass-removal of users from groups.
-  This is often very useful if you upgraded from [% terms.Bugzilla %] 
+  This is often very useful if you upgraded from Bugzilla
   2.16.</p>
 
-<table><tr><td>
 <form method="post" action="editgroups.cgi">
-  <fieldset>
+  <fieldset id="mass-remove">
     <legend>Remove all explicit memberships from users whose login names
       match the following regular expression:</legend>
     <input type="text" size="20" name="regexp">
@@ -193,41 +177,35 @@
     <input type="hidden" name="group_id" value="[% group.id FILTER html %]">
   </fieldset>
 </form>
-</td></tr></table>
- 
+
 <p>Back to the <a href="editgroups.cgi">group list</a>.</p>
 
 [% PROCESS global/footer.html.tmpl %] 
 
 [% BLOCK select_pair %]
-  <table class="select_pair">
-    <tr>
-      <th><label for="[% "${name}_add" FILTER html %]">Add<br>
-        (select to add)</label></th>
-      <th><label for="[% "${name}_remove" FILTER html %]">Current<br>
-        (select to remove)</label></th>
-    </tr>
-    <tr>
-      <td>
-        <select multiple="multiple" size="[% size FILTER html %]"
-                name="[% "${name}_add" FILTER html %]"
-                id="[% "${name}_add" FILTER html %]">
-          [% FOREACH item = items_available %]
-            <option value="[% item.id FILTER html %]">
-              [% item.name FILTER html %]</option>
-          [% END %]
-        </select>
-      </td>
-      <td>
-        <select multiple="multiple" size="[% size FILTER html %]"
-                name="[% "${name}_remove" FILTER html %]"
-                id="[% "${name}_remove" FILTER html %]">
-          [% FOREACH item = items_current %]
-            <option value="[% item.id FILTER html %]">
-              [% item.name FILTER html %]</option>
-          [% END %]
-        </select>
-      </td>
-    </tr>
-  </table>
+  <td>
+    <label for="[% "${name}_add" FILTER html %]">Add<br>(select to add)</label>
+    <br>
+    <select multiple="multiple" size="[% size FILTER html %]"
+            name="[% "${name}_add" FILTER html %]"
+            id="[% "${name}_add" FILTER html %]">
+      [% FOREACH item = items_available %]
+        <option value="[% item.id FILTER html %]">
+          [% item.name FILTER html %]</option>
+      [% END %]
+    </select>
+  </td>
+
+  <td>
+    <label for="[% "${name}_remove" FILTER html %]">Current<br>(select to remove)</label>
+    <br>
+    <select multiple="multiple" size="[% size FILTER html %]"
+            name="[% "${name}_remove" FILTER html %]"
+            id="[% "${name}_remove" FILTER html %]">
+      [% FOREACH item = items_current %]
+        <option value="[% item.id FILTER html %]">
+          [% item.name FILTER html %]</option>
+      [% END %]
+    </select>
+  </td>
 [% END %]
diff --git a/template/en/default/admin/groups/list.html.tmpl b/template/en/default/admin/groups/list.html.tmpl
index 859f26205..673c053cb 100644
--- a/template/en/default/admin/groups/list.html.tmpl
+++ b/template/en/default/admin/groups/list.html.tmpl
@@ -19,7 +19,8 @@
 [% PROCESS global/header.html.tmpl
   title = "Edit Groups"
   subheader = "This lets you edit the groups available to put users in."
-  doc_section = "groups.html"
+  style_urls = ['skins/standard/admin.css']
+  doc_section = "administering/groups.html"
 %]
 
 [% edit_contentlink = "editgroups.cgi?action=changeform&amp;group=%%id%%" %]
@@ -74,8 +75,8 @@
    } 
 %]
 
-[% FOREACH group IN ["chartgroup", "insidergroup", "timetrackinggroup",
-                     "querysharegroup", "debug_group"] %]
+[% FOREACH group IN ["chartgroup", "comment_taggers_group", "debug_group",
+                     "insidergroup", "querysharegroup", "timetrackinggroup"] %]
   [% special_group = Param(group) %]
 
   [% IF special_group %]