X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=templates%2Fpatchwork%2Fpatch.html;h=f18ee3b789e92de900f4814a79fb90027c693f03;hb=a48f76a2d3a98c21d4b37f19cf84073e77db55c8;hp=c716a3341f5a0e75368bd8eff36038ef9c8fdea1;hpb=482ba5ac5e2fb71a8ae26ae9d5c5c72c33c35b23;p=patchwork

diff --git a/templates/patchwork/patch.html b/templates/patchwork/patch.html
index c716a33..f18ee3b 100644
--- a/templates/patchwork/patch.html
+++ b/templates/patchwork/patch.html
@@ -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,19 +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</td>
+   <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>
@@ -97,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 }}
@@ -125,19 +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">
-       {% csrf_token %}
-       <input type="hidden" name="action" value="act"/>
-       <input type="submit" value="Ack"/>
-      </form>
-     </td>
-    </tr>
-    -->
     <tr>
      <td>Create bundle:</td>
      <td>
@@ -173,53 +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">
-       {% csrf_token %}
-       <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 %}