X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=templates%2Fpatchwork%2Fpatch.html;h=f18ee3b789e92de900f4814a79fb90027c693f03;hb=a48f76a2d3a98c21d4b37f19cf84073e77db55c8;hp=2382978162c3e10ecdc6c8b5d8e782d7697dfd08;hpb=f1e089f7736ac8f7b9af784461350c4c169211ad;p=patchwork

diff --git a/templates/patchwork/patch.html b/templates/patchwork/patch.html
index 2382978..f18ee3b 100644
--- a/templates/patchwork/patch.html
+++ b/templates/patchwork/patch.html
@@ -4,7 +4,7 @@
 {% load person %}
 {% load patch %}
 
-{% block title %}{{patch.name}} - Patchwork{% endblock %}
+{% block title %}{{patch.name}}{% endblock %}
 {% block heading %}{{patch.name}}{%endblock%}
 
 {% block body %}
@@ -30,7 +30,7 @@ function toggle_headers(link_id, headers_id)
 <table class="patchmeta">
  <tr>
   <th>Submitter</th>
-  <td>{{ patch.submitter|personify }}</td></tr>
+  <td>{{ patch.submitter|personify:project }}</td>
  </tr>
  <tr>
   <th>Date</th>
@@ -43,10 +43,12 @@ function toggle_headers(link_id, headers_id)
  <tr>
   <th>Download</th>
   <td>
-   <a href="{% url patchwork.views.patch.mbox patch_id=patch.id %}"
-   >mbox</a> |
-   <a href="{% url patchwork.views.patch.content patch_id=patch.id %}"
+   <a href="{% url 'patchwork.views.patch.mbox' patch_id=patch.id %}"
+   >mbox</a>
+{% if patch.content %}|
+   <a href="{% url 'patchwork.views.patch.content' patch_id=patch.id %}"
    >patch</a>
+{% endif %}
    </td>
  </tr>
  <tr>
@@ -54,13 +56,19 @@ function toggle_headers(link_id, headers_id)
   <td><a href="{{ patch.get_absolute_url }}">{{ patch.get_absolute_url }}</a>
  </tr>
   <tr>
-   <th>State</td>
+   <th>State</th>
    <td>{{ patch.state.name }}{% if patch.archived %}, archived{% endif %}</td>
   </tr>
+{% if patch.commit_ref %}
+  <tr>
+   <th>Commit</th>
+   <td>{{ patch.commit_ref }}</td>
+  </tr>
+{% endif %}
 {% if patch.delegate %}
   <tr>
-   <th>Delegated to:</td>
-   <td>{{ patch.delegate.get_profile.name }}</td>
+   <th>Delegated to:</th>
+   <td>{{ patch.delegate.profile.name }}</td>
   </tr>
 {% endif %}
  <tr>
@@ -81,6 +89,7 @@ function toggle_headers(link_id, headers_id)
  <div class="patchform patchform-properties">
   <h3>Patch Properties</h3>
    <form method="post">
+    {% csrf_token %}
     <table class="form">
      <tr>
       <th>Change state:</th>
@@ -90,14 +99,14 @@ function toggle_headers(link_id, headers_id)
       </td>
      </tr>
      <tr>
-      <th>Delegate to:</td>
+      <th>Delegate to:</th>
       <td>
        {{ patchform.delegate }}
        {{ patchform.delegate.errors }}
       </td>
      </tr>
      <tr>
-      <th>Archived:</td>
+      <th>Archived:</th>
       <td>
        {{ patchform.archived }}
        {{ patchform.archived.errors }}
@@ -118,18 +127,6 @@ function toggle_headers(link_id, headers_id)
  <div class="patchform patchform-bundle">
   <h3>Bundling</h3>
    <table class="form">
-   <!--
-    <tr>
-     <td>Ack:</td>
-     <td>
-      <form action="{% url patchwork.views.patch.patch patch_id=patch.id %}"
-       method="post">
-       <input type="hidden" name="action" value="act"/>
-       <input type="submit" value="Ack"/>
-      </form>
-     </td>
-    </tr>
-    -->
     <tr>
      <td>Create bundle:</td>
      <td>
@@ -137,6 +134,7 @@ function toggle_headers(link_id, headers_id)
        <dd class="errors">{{createbundleform.non_field_errors}}</dd>
        {% endif %}
       <form method="post">
+       {% csrf_token %}
        <input type="hidden" name="action" value="createbundle"/>
        {% if createbundleform.name.errors %}
        <dd class="errors">{{createbundleform.name.errors}}</dd>
@@ -151,6 +149,7 @@ function toggle_headers(link_id, headers_id)
      <td>Add to bundle:</td>
      <td>
       <form method="post">
+       {% csrf_token %}
        <input type="hidden" name="action" value="addtobundle"/>
        <select name="bundle_id"/>
         {% for bundle in bundles %}
@@ -163,52 +162,38 @@ function toggle_headers(link_id, headers_id)
     </tr>
 {% endif %}
    </table>
-  </form>
 
  </div>
 {% endif %}
 
-{% if actionsform %}
- <div class="patchform patchform-actions">
-  <h3>Actions</h3>
-   <table class="form">
-    <tr>
-     <td>Ack:</td>
-     <td>
-      <form action="{% url patchwork.views.patch.patch patch_id=patch.id %}"
-       method="post">
-       <input type="hidden" name="action" value="act"/>
-       <input type="submit" value="Ack"/>
-      </form>
-     </td>
-    </tr>
-   </table>
-  </form>
- </div>
-
-{% endif %}
  <div style="clear: both;">
  </div>
 </div>
 
-
-
+{% if patch.pull_url %}
+<h2>Pull-request</h2>
+<a class="patch-pull-url" href="{{patch.pull_url}}"
+ >{{ patch.pull_url }}</a>
+{% endif %}
 
 <h2>Comments</h2>
 {% for comment in patch.comments %}
 <div class="comment">
-<div class="meta">{{ comment.submitter|personify }} - {{comment.date}}</div>
+<div class="meta">{{ comment.submitter|personify:project }} - {{comment.date}}</div>
 <pre class="content">
 {{ comment|commentsyntax }}
 </pre>
 </div>
 {% endfor %}
 
+{% if patch.content %}
 <h2>Patch</h2>
 <div class="patch">
 <pre class="content">
 {{ patch|patchsyntax }}
 </pre>
 </div>
+{% endif %}
+
 
 {% endblock %}