Bug 433015: The "Remove Event" and "Update/Commit" buttons in editwhines.cgi are too far on the right - Patch by Frédéric Buclin <LpSolit@gmail.com> r=pyrzak a=LpSolit

1 files changed, 33 insertions, 32 deletions

diff --git a/template/en/default/whine/schedule.html.tmpl b/template/en/default/whine/schedule.html.tmpl
index c60243d42..6fe19957b 100644
--- a/template/en/default/whine/schedule.html.tmpl
+++ b/template/en/default/whine/schedule.html.tmpl
@@ -37,6 +37,7 @@
 [% title = "Set up whining" %]
 [% PROCESS global/header.html.tmpl
   title = title
+  style_urls = ['skins/standard/admin.css']
   doc_section = "whining.html"
 %]
 
@@ -84,13 +85,12 @@
 
 [% FOREACH event = events %]
 
-<table cellspacing="2" cellpadding="2" width="100%"
-       style="border: 1px solid;">
+<table cellspacing="2" cellpadding="2" style="border: 1px solid;">
   <tr>
-    <th align="left" bgcolor="#FFFFFF" colspan="2">
-      Event: 
+    <th align="left">
+      Event:
     </th>
-    <td align="right">
+    <td align="right" colspan="2">
       <input type="submit" value="Remove Event"
              name="remove_event_[% event.key %]"
              id="remove_event_[% event.key %]">
@@ -101,7 +101,7 @@
     <td valign="top" align="right">
       Email subject line:
     </td>
-    <td>
+    <td colspan="2">
       <input type="text" name="event_[% event.key %]_subject"
              size="60" maxlength="128" value="
              [%- event.value.subject FILTER html %]">
@@ -112,7 +112,7 @@
     <td valign="top" align="right">
       Descriptive text sent within whine message:
     </td>
-    <td>
+    <td colspan="2">
       [% INCLUDE global/textarea.html.tmpl
          name           = "event_${event.key}_body"
          minrows        = 3
@@ -130,7 +130,7 @@
       <td valign="top" align="right">
         Schedule:
       </td>
-      <td align="left" bgcolor="#FFEEEE">
+      <td class="unset" colspan="2">
         Not scheduled to run<br>
         <input type="submit" value="Add a new schedule"
                name="add_schedule_[% event.key %]"
@@ -144,18 +144,20 @@
       <td valign="top" align="right">
         Schedule:
       </td>
-      <td align="left" bgcolor="#EEFFEE">
+      <td class="set" colspan="2">
 
         <table>
           <tr>
             <th>
               Interval
             </th>
-            [% IF mail_others %]
-              <th>
+            <th>
+              [% IF mail_others %]
                 Mail to
-              </th>
-            [% END %]
+              [% END %]
+            </th>
+            <th>
+            </th>
           </tr>
           [% FOREACH schedule = event.value.schedule %]
             <tr>
@@ -197,18 +199,16 @@
             </tr>
           [% END %]
 
-        <tr>
-          <td>
-            <input type="submit" value="Add a new schedule"
-                   name="add_schedule_[% event.key %]"
-                   id="add_schedule_[% event.key %]">
-          </td>
-        </tr>
-
+          <tr>
+            <td colspan="3">
+              <input type="submit" value="Add a new schedule"
+                     name="add_schedule_[% event.key %]"
+                     id="add_schedule_[% event.key %]">
+            </td>
+          </tr>
         </table>
 
       </td>
-
     </tr>
 
   [% END %]
@@ -219,7 +219,7 @@
       <td valign="top" align="right">
         Searches:
       </td>
-      <td align="left" colspan="1">
+      <td align="left">
         No searches <br>
         <input type="submit" value="Add a new query"
                name="add_query_[% event.key %]"
@@ -236,13 +236,15 @@
       <td valign="top" align="right">
         Searches:
       </td>
-      <td align="left">
+      <td align="left" colspan="2">
 
         <table>
           <tr>
             <th>Sort</th>
             <th>Search</th>
             <th>Title</th>
+            <th></th>
+            <th></th>
           </tr>
 
           [% FOREACH query = event.value.queries %]
@@ -269,10 +271,10 @@
               <td align="left">
                 <input type="hidden" value="[% query.onemailperbug FILTER html %]"
                        name="orig_query_onemailperbug_[% query.id %]">
-                <input type="checkbox" [% IF query.onemailperbug == 1 %]
-                       checked [% END %]name="query_onemailperbug_
-                       [% query.id %]">
-                One message per [% terms.bug %]
+                <input type="checkbox" [% IF query.onemailperbug == 1 %] checked [% END %]
+                       id="query_onemailperbug_[% query.id %]"
+                       name="query_onemailperbug_[% query.id %]">
+                <label for="query_onemailperbug_[% query.id %]">One message per [% terms.bug %]</label>
               </td>
               <td align="right">
                 <input type="submit" value="Remove"
@@ -289,14 +291,13 @@
                      name="add_query_[% event.key %]"
                      id="add_query_[% event.key %]">
             </td>
+            <td align="right" colspan="2">
+              <input type="submit" value="Update / Commit" name="commit" id="update">
+            </td>
           </tr>
-
         </table>
 
       </td>
-      <td align="right" valign="bottom">
-        <input type="submit" value="Update / Commit" name="commit" id="update">
-      </td>
     </tr>
 
   [% END %]