From 4fa178ae3f0f612cf91b26a2dea498602794be3b Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Tue, 31 Dec 2013 13:48:41 +0100
Subject: Bug 920681: Remove the cellspacing and cellpadding attributes from
 tables r/a=justdave

---
 template/en/default/admin/groups/edit.html.tmpl | 184 +++++++++++-------------
 1 file changed, 81 insertions(+), 103 deletions(-)

(limited to 'template/en/default/admin/groups/edit.html.tmpl')

diff --git a/template/en/default/admin/groups/edit.html.tmpl b/template/en/default/admin/groups/edit.html.tmpl
index 2f4101a13..de243b9a5 100644
--- a/template/en/default/admin/groups/edit.html.tmpl
+++ b/template/en/default/admin/groups/edit.html.tmpl
@@ -18,29 +18,20 @@
 
 [% PROCESS global/header.html.tmpl
   title = title
+  style_urls = ['skins/standard/admin.css']
   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;
-    }
-  "
 %]
 
 <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" 
+          <input type="text" name="name" size="60" maxlength="255"
                  value="[% group.name FILTER html %]">
         [% ELSE %]
           [% group.name FILTER html %]
@@ -52,7 +43,7 @@
       <th>Description:</th>
       <td>
         [% IF group.is_bug_group %]
-          <input type="text" name="desc" size="70" 
+          <input type="text" name="desc" size="60"
                  value="[% group.description FILTER html %]">
         [% ELSE %]
           [% group.description FILTER html %]
@@ -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 %]">
@@ -178,9 +163,8 @@
   This is often very useful if you upgraded from [% terms.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 %]
-- 
cgit v1.2.3-24-g4f1b