X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=templates%2Fpatchwork%2Fpatch.html;h=b9addc626d5c30036ad0802d91c1404b15eb2d9a;hb=c6d26672a7ecb8973b361770668661eec2fa24a2;hp=6ca676162fe0494e3e42a28b3c7f6537270696c6;hpb=c561ebe710d6e6a43aa4afc6c2036a215378ce87;p=patchwork

diff --git a/templates/patchwork/patch.html b/templates/patchwork/patch.html
index 6ca6761..b9addc6 100644
--- a/templates/patchwork/patch.html
+++ b/templates/patchwork/patch.html
@@ -1,10 +1,10 @@
-{% extends "patchwork/base.html" %}
+{% extends "base.html" %}
 
 {% load syntax %}
 {% load person %}
 {% load patch %}
 
-{% block title %}{{patch.name}} - Patchwork{% endblock %}
+{% block title %}{{patch.name}}{% endblock %}
 {% block heading %}{{patch.name}}{%endblock%}
 
 {% block body %}
@@ -44,9 +44,11 @@ function toggle_headers(link_id, headers_id)
   <th>Download</th>
   <td>
    <a href="{% url patchwork.views.patch.mbox patch_id=patch.id %}"
-   >mbox</a> |
+   >mbox</a>
+{% if patch.content %}|
    <a href="{% url patchwork.views.patch.content patch_id=patch.id %}"
    >patch</a>
+{% endif %}
    </td>
  </tr>
  <tr>
@@ -57,6 +59,12 @@ function toggle_headers(link_id, headers_id)
    <th>State</td>
    <td>{{ patch.state.name }}{% if patch.archived %}, archived{% endif %}</td>
   </tr>
+{% if patch.commit_ref %}
+  <tr>
+   <th>Commit</td>
+   <td>{{ patch.commit_ref }}</td>
+  </tr>
+{% endif %}
 {% if patch.delegate %}
   <tr>
    <th>Delegated to:</td>
@@ -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>
@@ -122,8 +131,9 @@ function toggle_headers(link_id, headers_id)
     <tr>
      <td>Ack:</td>
      <td>
-      <form action="{% url patchwork.views.patch patch=patch.id %}"
+      <form action="{% url patchwork.views.patch.patch patch_id=patch.id %}"
        method="post">
+       {% csrf_token %}
        <input type="hidden" name="action" value="act"/>
        <input type="submit" value="Ack"/>
       </form>
@@ -137,6 +147,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 +162,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 %}
@@ -175,8 +187,9 @@ function toggle_headers(link_id, headers_id)
     <tr>
      <td>Ack:</td>
      <td>
-      <form action="{% url patchwork.views.patch patch=patch.id %}"
+      <form action="{% url patchwork.views.patch.patch patch_id=patch.id %}"
        method="post">
+       {% csrf_token %}
        <input type="hidden" name="action" value="act"/>
        <input type="submit" value="Ack"/>
       </form>
@@ -191,8 +204,11 @@ function toggle_headers(link_id, headers_id)
  </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 %}
@@ -204,11 +220,14 @@ function toggle_headers(link_id, headers_id)
 </div>
 {% endfor %}
 
+{% if patch.content %}
 <h2>Patch</h2>
 <div class="patch">
 <pre class="content">
 {{ patch|patchsyntax }}
 </pre>
 </div>
+{% endif %}
+
 
 {% endblock %}