From b9206412eeecf3d9048e9b6593f09c6ac47d730f Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Tue, 27 Jan 2015 16:37:11 +0000
Subject: [PATCH] Summary: Make the Updates IPR section look more like the form
  - Legacy-Id: 8929

---
 ietf/templates/ipr/details_view.html | 40 +++++++++++++++-------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/ietf/templates/ipr/details_view.html b/ietf/templates/ipr/details_view.html
index 4e5732bf6..f4e3ea03e 100644
--- a/ietf/templates/ipr/details_view.html
+++ b/ietf/templates/ipr/details_view.html
@@ -66,21 +66,6 @@
       of the original IPR disclosure.</p>
   {% endif %}
 
-  {% if updates_iprs %}
-    <h2>Updates</h2>
-
-    {% for item in updates_iprs %}
-      <p>This IPR disclosure updates IPR disclosure ID #{{ item.target.id }},
-        {% if item.target.state.slug == "removed" %}
-          "{{ item.target.title }}", which was removed at the request of the submitter.
-        {% else %}
-          "<a href="{% url "ietf.ipr.views.show" id=item.target.id %}">{{ item.target.title }}</a>".
-
-        {% endif %}
-      </p>
-    {% endfor %}
-  {% endif %}
-
   {% if updated_by_iprs %}
     <h2>Updated by</h2>
 
@@ -92,6 +77,25 @@
     {% endfor %}
   {% endif %}
 
+  {% if updates_iprs %}
+    <h2>Updates</h2>
+
+      <dl class="dl-horizontal">
+        <dt>Updates</dt>
+        <dd>
+          {% for item in updates_iprs %}
+            <div>
+              IPR Disclosure ID #{{ item.target.id }},
+              {% if item.target.state.slug == "removed" %}
+                "{{ item.target.title }}" (which was removed at the request of the submitter)
+              {% else %}
+                "<a href="{% url "ietf.ipr.views.show" id=item.target.id %}">{{ item.target.title }}</a>"
+              {% endif %}
+            </div>
+          {% endfor %}
+      </dl>
+  {% endif %}
+
   {% if user|has_role:"Secretariat" and ipr.update_notified_date %}
     <div class="alert alert-info">This update was notified to the submitter of the IPR that is being updated on: {{ ipr.update_notified_date|date:"Y-m-d" }}</div>
   {% endif %}
@@ -169,15 +173,15 @@
         <p>A. For granted patents or published pending patent applications, please provide the following information:</p>
 
         <dl class="dl-horizontal">
-          <dt>Patent, Serial, Publication, Registration, or Application/File number(s):</dt>
+          <dt>Patent, Serial, Publication, Registration, or Application/File number(s)</dt>
           <dd>{{ ipr.patent_info|linebreaks }}</dd>
         </dl>
         
         <p>B. Does this disclosure relate to an unpublished pending patent application?:</p>
         
         <dl class="dl-horizontal">
-          <dt>Has patent pending:</dt>
-          <dd>{{ ipr.has_patent_pending|yesno }}</dd>
+          <dt>Has patent pending</dt>
+          <dd>{{ ipr.has_patent_pending|yesno:"Yes,No" }}</dd>
         </dl>
       {% endif %}