Integrate 'django.contrib.staticfiles'

[patchwork] / templates / patchwork / patch-list.html

diff --git a/templates/patchwork/patch-list.html b/templates/patchwork/patch-list.html
index bc9abe943e62364bd1a5fbcea698e9e52c79467b..675f67ff22885c7738d1b3235c3c360032c236f5 100644 (file)
--- 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" %}
 
@@ -12,6 +13,7 @@
  {% 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>
@@ -33,6 +35,7 @@
 {% endif %}
 
 <form method="post">
+{% csrf_token %}
 <input type="hidden" name="form" value="patchlistform"/>
 <input type="hidden" name="project" value="{{project.id}}"/>
 <table class="patchlist" id="patchlist">
@@ -48,7 +51,11 @@
     {% 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"
+      {% 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>
@@ -65,7 +72,11 @@
     {% 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"
+      {% 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>
@@ -82,7 +93,11 @@
     {% 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"
+      {% 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>
@@ -99,7 +114,11 @@
     {% 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"
+      {% 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>
@@ -116,7 +135,11 @@
     {% 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"
+      {% 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>
@@ -132,7 +155,7 @@
   </tr>
  </thead>
 
-{% if page %}
+{% if page.paginator.count %}
  <tbody>
  {% for patch in page.object_list %}
   <tr id="patch_row:{{patch.id}}" class="{% cycle 'odd' 'even' %}">
@@ -141,10 +164,10 @@
     <input type="checkbox" name="patch_id:{{patch.id}}"/>
     </td>
     {% endif %}
-   <td><a href="{% url patchwork.views.patch.patch patch_id=patch.id %}"
+   <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>
@@ -184,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>
@@ -196,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>