X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=templates%2Fpatchwork%2Fpatch-list.html;h=675f67ff22885c7738d1b3235c3c360032c236f5;hb=d4a2c1f8792f52fec0c881ab38c91635840a50c0;hp=4c6b8a508f18a60fae3ac5ff1ff60d227b768489;hpb=2087fbfd96a42340e2a9057fe78cac4c3524b424;p=patchwork

diff --git a/templates/patchwork/patch-list.html b/templates/patchwork/patch-list.html
index 4c6b8a5..675f67f 100644
--- a/templates/patchwork/patch-list.html
+++ b/templates/patchwork/patch-list.html
@@ -1,5 +1,6 @@
 {% load person %}
 {% load listurl %}
+{% load static %}
 
 {% include "patchwork/pagination.html" %}
 
@@ -9,6 +10,20 @@
   <td class="patchlistfilters">
  {% include "patchwork/filters.html" %}
   </td>
+ {% if order.editable %}
+  <td class="patchlistreorder">
+   <form method="post" id="reorderform">
+    {% csrf_token %}
+    <input type="hidden" name="form" value="reorderform"/>
+    <input type="hidden" name="order_start" value="0"/>
+    <span id="reorderhelp"></span>
+    <input id="reorder-cancel" type="button" value="Cancel"
+     onClick="order_cancel_click(this)"/>
+    <input id="reorder-change" type="button" value="Change order"
+     onClick="order_button_click(this)"/>
+    </form>
+  </td>
+ {% endif %}
  </tr>
 </table>
 
@@ -20,99 +35,144 @@
 {% endif %}
 
 <form method="post">
+{% csrf_token %}
 <input type="hidden" name="form" value="patchlistform"/>
 <input type="hidden" name="project" value="{{project.id}}"/>
-<table class="patchlist">
- <tr>
-  {% if user.is_authenticated %}
-  <th>
-   <input type="checkbox" onChange="select_all(this)"/>
-  </th>
-  {% endif %}
+<table class="patchlist" id="patchlist">
+ <thead>
+  <tr>
+   {% if user.is_authenticated %}
+   <th>
+    <input type="checkbox" onChange="select_all(this)"/>
+   </th>
+   {% endif %}
 
-  <th>
-   {% ifequal order.name "name" %}
-    <a class="colactive"
-     href="{% listurl order=order.reversed_name %}"><img
-     src="/images/16-arrow-{% if order.reversed %}up{% else %}down{%endif%}.png"
-     width="16" height="16"
-    ></a> <a class="colactive"
-     href="{% listurl order=order.reversed_name %}">Patch</a>
-   {% else %}
-    <a class="colinactive" href="{% listurl order="name" %}">Patch</a>
-   {% endifequal %}
-  </th>
-
-  <th>
-   {% ifequal order.name "date" %}
-    <a class="colactive"
-     href="{% listurl order=order.reversed_name %}"><img
-     src="/images/16-arrow-{% if order.reversed %}up{% else %}down{%endif%}.png"
-     width="16" height="16"
-    ></a> <a class="colactive"
-     href="{% listurl order=order.reversed_name %}">Date</a>
-   {% else %}
-    <a class="colinactive" href="{% listurl order="date" %}">Date</a>
-   {% endifequal %}
-  </th>
-
-  <th>
-   {% ifequal order.name "submitter" %}
-    <a class="colactive"
-     href="{% listurl order=order.reversed_name %}"><img
-     src="/images/16-arrow-{% if order.reversed %}up{% else %}down{%endif%}.png"
-     width="16" height="16"
-    ></a> <a class="colactive"
-     href="{% listurl order=order.reversed_name %}">Submitter</a>
-   {% else %}
-    <a class="colinactive" href="{% listurl order="submitter" %}">Submitter</a>
-   {% endifequal %}
-  </th>
-
-  <th>
-   {% ifequal order.name "delegate" %}
-    <a class="colactive"
-     href="{% listurl order=order.reversed_name %}"><img
-     src="/images/16-arrow-{% if order.reversed %}up{% else %}down{%endif%}.png"
-     width="16" height="16"
-    ></a> <a class="colactive"
-     href="{% listurl order=order.reversed_name %}">Delegate</a>
-   {% else %}
-    <a class="colinactive" href="{% listurl order="delegate" %}">Delegate</a>
-   {% endifequal %}
-  </th>
-
-  <th>
-   {% ifequal order.name "state" %}
-    <a class="colactive"
-     href="{% listurl order=order.reversed_name %}"><img
-     src="/images/16-arrow-{% if order.reversed %}up{% else %}down{%endif%}.png"
-     width="16" height="16"
-    ></a> <a class="colactive"
-     href="{% listurl order=order.reversed_name %}">State</a>
-   {% else %}
-    <a class="colinactive" href="{% listurl order="state" %}">State</a>
-   {% endifequal %}
-  </th>
+   <th>
+    {% ifequal order.name "name" %}
+     <a class="colactive"
+      href="{% listurl order=order.reversed_name %}"><img
+      {% if order.reversed %}
+      src="{% static "images/16-arrow-up.png" %}"
+      {% else %}
+      src="{% static "images/16-arrow-down.png" %}"
+      {%endif%}
+      width="16" height="16"
+     ></a> <a class="colactive"
+      href="{% listurl order=order.reversed_name %}">Patch</a>
+    {% else %}
+     {% if not order.editable %}
+     <a class="colinactive" href="{% listurl order="name" %}">Patch</a>
+     {% else %}
+     <span class="colinactive">Patch</span>
+     {% endif %}
+    {% endifequal %}
+   </th>
 
- </tr>
+   <th>
+    {% ifequal order.name "date" %}
+     <a class="colactive"
+      href="{% listurl order=order.reversed_name %}"><img
+      {% if order.reversed %}
+      src="{% static "images/16-arrow-up.png" %}"
+      {% else %}
+      src="{% static "images/16-arrow-down.png" %}"
+      {%endif%}
+      width="16" height="16"
+     ></a> <a class="colactive"
+      href="{% listurl order=order.reversed_name %}">Date</a>
+    {% else %}
+     {% if not order.editable %}
+     <a class="colinactive" href="{% listurl order="date" %}">Date</a>
+     {% else %}
+     <span class="colinactive">Date</span>
+     {% endif %}
+    {% endifequal %}
+   </th>
+
+   <th>
+    {% ifequal order.name "submitter" %}
+     <a class="colactive"
+      href="{% listurl order=order.reversed_name %}"><img
+      {% if order.reversed %}
+      src="{% static "images/16-arrow-up.png" %}"
+      {% else %}
+      src="{% static "images/16-arrow-down.png" %}"
+      {%endif%}
+      width="16" height="16"
+     ></a> <a class="colactive"
+      href="{% listurl order=order.reversed_name %}">Submitter</a>
+    {% else %}
+     {% if not order.editable %}
+     <a class="colinactive" href="{% listurl order="submitter" %}">Submitter</a>
+     {% else %}
+     <span class="colinactive">Submitter</span>
+     {% endif %}
+    {% endifequal %}
+   </th>
+
+   <th>
+    {% ifequal order.name "delegate" %}
+     <a class="colactive"
+      href="{% listurl order=order.reversed_name %}"><img
+      {% if order.reversed %}
+      src="{% static "images/16-arrow-up.png" %}"
+      {% else %}
+      src="{% static "images/16-arrow-down.png" %}"
+      {%endif%}
+      width="16" height="16"
+     ></a> <a class="colactive"
+      href="{% listurl order=order.reversed_name %}">Delegate</a>
+    {% else %}
+     {% if not order.editable %}
+     <a class="colinactive" href="{% listurl order="delegate" %}">Delegate</a>
+     {% else %}
+     <span class="colinactive">Delegate</span>
+     {% endif %}
+    {% endifequal %}
+   </th>
 
-{% if page %}
+   <th>
+    {% ifequal order.name "state" %}
+     <a class="colactive"
+      href="{% listurl order=order.reversed_name %}"><img
+      {% if order.reversed %}
+      src="{% static "images/16-arrow-up.png" %}"
+      {% else %}
+      src="{% static "images/16-arrow-down.png" %}"
+      {%endif%}
+      width="16" height="16"
+     ></a> <a class="colactive"
+      href="{% listurl order=order.reversed_name %}">State</a>
+    {% else %}
+     {% if not order.editable %}
+     <a class="colinactive" href="{% listurl order="state" %}">State</a>
+     {% else %}
+     <span class="colinactive">State</span>
+     {% endif %}
+    {% endifequal %}
+   </th>
+
+  </tr>
+ </thead>
+
+{% if page.paginator.count %}
+ <tbody>
  {% for patch in page.object_list %}
-  <tr class="{% cycle 'odd' 'even' %}">
+  <tr id="patch_row:{{patch.id}}" class="{% cycle 'odd' 'even' %}">
     {% if user.is_authenticated %}
     <td>
     <input type="checkbox" name="patch_id:{{patch.id}}"/>
     </td>
     {% endif %}
-   <td><a href="{% url patchwork.views.patch.patch patch_id=patch.id %}"
-     >{{ patch.name }}</a></td>
+   <td><a href="{% url 'patchwork.views.patch.patch' patch_id=patch.id %}"
+     >{{ patch.name|default:"[no subject]" }}</a></td>
    <td>{{ patch.date|date:"Y-m-d" }}</td>
-   <td>{{ patch.submitter|personify }}</td>
+   <td>{{ patch.submitter|personify:project }}</td>
    <td>{{ patch.delegate.username }}</td>
    <td>{{ patch.state }}</td>
   </tr>
  {% endfor %}
+ </tbody>
 </table>
 
 {% include "patchwork/pagination.html" %}
@@ -147,7 +207,7 @@
      <tr>
       <td></td>
       <td>
-       <input type="submit" name="action" value="Update"/>
+       <input type="submit" name="action" value="{{patchform.action}}"/>
       </td>
      </tr>
     </table>
@@ -159,15 +219,6 @@
  <div class="patchform patchform-bundle">
   <h3>Bundling</h3>
    <table class="form">
-   <!--
-    <tr>
-     <td>Ack:</td>
-     <td>
-       <input type="submit" name="action" value="Ack"/>
-      </form>
-     </td>
-    </tr>
-    -->
     <tr>
      <td>Create bundle:</td>
      <td>