Changeset 42


Ignore:
Timestamp:
Feb 23, 2010 3:58:55 AM (14 years ago)
Author:
retracile
Message:

Mergebot: fix html validation errors

File:
1 edited

Legend:

Unmodified
Added
Removed

  • mergebot/trunk/mergebot/templates/mergebot.html

    r17 r42  
    1717  <div id="content" class="mergebot">
    1818
    19   <div id="content" class="query">
     19  <div class="query">
    2020    <h1>Queued</h1>
     21
    2122    <table class="listing tickets">
    22       <thead><tr>
    23         <th>Ticket</th>
    24         <th>Summary</th>
     23      <thead>
     24        <tr>
     25          <th>Ticket</th>
     26          <th>Summary</th>
    2527
    26         <th>Requestor</th>
    27         <th>Action</th>
    28         <th>Task ID</th>
    29         <th>Task Status</th>
     28          <th>Requestor</th>
     29          <th>Action</th>
     30          <th>Task ID</th>
     31          <th>Task Status</th>
    3032
    31         <th>Component</th>
    32         <th>Version</th>
    33         <th>Actions</th>
    34       </tr></thead>
     33          <th>Component</th>
     34          <th>Version</th>
     35          <th>Actions</th>
     36        </tr>
     37      </thead>
    3538
    36       <tr py:for="task_id, task_status, ticket_id, action, component, version, requestor, summary in queue">
    37         <td><a href="${href.ticket(ticket_id)}">#${ticket_id}</a></td>
    38         <td><a href="${href.ticket(ticket_id)}">${summary}</a></td>
     39      <tbody>
     40        <tr py:for="task_id, task_status, ticket_id, action, component, version, requestor, summary in queue">
     41          <td><a href="${href.ticket(ticket_id)}">#${ticket_id}</a></td>
     42          <td><a href="${href.ticket(ticket_id)}">${summary}</a></td>
    3943
    40         <td>${requestor}</td>
    41         <td>${action}</td>
    42         <td>${task_id}</td>
    43         <td>${task_status}</td>
     44          <td>${requestor}</td>
     45          <td>${action}</td>
     46          <td>${task_id}</td>
     47          <td>${task_status}</td>
    4448
    45         <td>${component}</td>
    46         <td>${version}</td>
    47         <td>
    48           <form id="cancel_tasks" method="post" name="cancel-task-%{task_id}" action="">
    49             <input type="hidden" name="task" value="${task_id}"/>
    50             <input type="submit" name="action" value="Cancel" py:if="task_status in ['Waiting', 'Pending']"/>
    51           </form>
    52         </td>
    53       </tr>
     49          <td>${component}</td>
     50          <td>${version}</td>
     51          <td>
     52            <form id="cancel_task-${task_id}" method="post" action="">
     53              <div>
     54                <input type="hidden" name="task" value="${task_id}"/>
     55                <input type="submit" name="action" value="Cancel" py:if="task_status in ['Waiting', 'Pending']"/>
     56              </div>
     57            </form>
     58          </td>
     59        </tr>
     60        <tr py:if="not queue">
     61          <td>Nothing in the queue</td>
     62        </tr>
     63      </tbody>
    5464    </table>
    5565  </div>
    5666
    5767  <!-- Tickets that are not in an activity queue: -->
    58   <div id="content" class="query">
     68  <div class="query">
    5969    <h1>Unqueued</h1>
    6070
    … …  
    6979        <th>Actions</th>
    7080      </tr></thead>
    71       <tr py:for="ticket in unqueued">
    72         <td><a href="${href.ticket(ticket.info.id)}">${ticket.info.id}</a></td>
    73         <td><a href="${href.ticket(ticket.info.id)}">${ticket.info.summary}</a></td>
    74         <td>${ticket.info.component}</td>
    75         <td>${ticket.info.version}</td>
    76         <td>${ticket.info.status}</td>
    77         <td>${ticket.info.mergebotstate}</td>
    78         <td>
    79           <form id="ops" method="post" name="ops-${ticket.info.id}" action="">
    80             <input type="hidden" name="ticket" value="${ticket.info.id}" />
    81             <input type="hidden" name="component" value="${ticket.info.component}" />
    82             <input type="hidden" name="version" value="${ticket.info.version}" />
    83             <input type="submit" name="action" value="Branch" py:if="ticket.branch"/>
    84             <input type="submit" name="action" value="Rebranch" py:if="ticket.rebranch"/>
    85             <input type="submit" name="action" value="Merge" py:if="ticket.merge"/>
    86             <input type="submit" name="action" value="CheckMerge" py:if="ticket.checkmerge"/>
    87           </form>
    88         </td>
    89       </tr>
     81      <tbody>
     82        <tr py:for="ticket in unqueued">
     83          <td><a href="${href.ticket(ticket.info.id)}">${ticket.info.id}</a></td>
     84          <td><a href="${href.ticket(ticket.info.id)}">${ticket.info.summary}</a></td>
     85          <td>${ticket.info.component}</td>
     86          <td>${ticket.info.version}</td>
     87          <td>${ticket.info.status}</td>
     88          <td>${ticket.info.mergebotstate}</td>
     89          <td>
     90            <form id="ops-${ticket.info.id}" method="post" action="">
     91              <div>
     92                <input type="hidden" name="ticket" value="${ticket.info.id}" />
     93                <input type="hidden" name="component" value="${ticket.info.component}" />
     94                <input type="hidden" name="version" value="${ticket.info.version}" />
     95                <input type="submit" name="action" value="Branch" py:if="ticket.branch"/>
     96                <input type="submit" name="action" value="Rebranch" py:if="ticket.rebranch"/>
     97                <input type="submit" name="action" value="Merge" py:if="ticket.merge"/>
     98                <input type="submit" name="action" value="CheckMerge" py:if="ticket.checkmerge"/>
     99              </div>
     100            </form>
     101          </td>
     102        </tr>
     103        <tr py:if="not unqueued">
     104          <td>No tickets available for MergeBot operations</td>
     105        </tr>
     106      </tbody>
    90107    </table>
    91108  </div>
Note: See TracChangeset for help on using the changeset viewer.