From d415d8658c05ade340af1fbaff6213bb98f19584 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Thu, 7 Dec 2017 21:12:56 +0000
Subject: [PATCH] Fixed a typo in the milestones under review view. Added
 bootstrap panels. Fixes #2427, Commit ready for merge.  - Legacy-Id: 14403

---
 ietf/iesg/tests.py                            |  6 ++++++
 ietf/iesg/views.py                            |  2 +-
 .../iesg/milestones_needing_review.html       | 20 +++++++++++++------
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ietf/iesg/tests.py b/ietf/iesg/tests.py
index 8ca5d80f01..6f48589a8f 100644
--- a/ietf/iesg/tests.py
+++ b/ietf/iesg/tests.py
@@ -53,6 +53,12 @@ def test_milestones_needing_review(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         self.assertTrue(m.desc in unicontent(r))
+        draft.group.state_id = 'conclude'
+        draft.group.save()
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertFalse(m.desc in unicontent(r))
+        
 
     def test_review_decisions(self):
         draft = make_test_data()
diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py
index 64f3098f1c..ee3a82ff21 100644
--- a/ietf/iesg/views.py
+++ b/ietf/iesg/views.py
@@ -498,7 +498,7 @@ def discusses(request):
 def milestones_needing_review(request):
     # collect milestones, grouped on AD and group
     ads = {}
-    for m in GroupMilestone.objects.filter(state="review").exclude(group__state="concluded").distinct().select_related("group"):
+    for m in GroupMilestone.objects.filter(state="review").exclude(group__state="conclude").distinct().select_related("group"):
         if m.group.ad_role():
             groups = ads.setdefault(m.group.ad_role().person, {})
             milestones = groups.setdefault(m.group, [])
diff --git a/ietf/templates/iesg/milestones_needing_review.html b/ietf/templates/iesg/milestones_needing_review.html
index 3a4545354c..e2d6ee01ce 100644
--- a/ietf/templates/iesg/milestones_needing_review.html
+++ b/ietf/templates/iesg/milestones_needing_review.html
@@ -2,6 +2,10 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 
+{% block morecss %}
+.panel-heading {font-size:150%; }
+{% endblock morecss %}
+
 {% block title %}Milestones under review{% endblock %}
 
 {% block content %}
@@ -9,12 +13,16 @@
   <h1>Milestones under review</h1>
 
   {% for ad in ads %}
-    <h2>{{ ad.plain_name }}</h2>
-    {% for g in ad.groups_needing_review %}
-      <h3>{{ g.name }} ({{ g.acronym }})</h3>
-      {% include "group/milestones.html" with milestones=g.milestones_needing_review %}
-      <a class="btn btn-default" href="{% url 'ietf.group.milestones.edit_milestones;current' group_type=g.type_id acronym=g.acronym %}">All {{ g.acronym }} milestones</a>
-    {% endfor %}
+    <div class="panel panel-default">
+      <div class="panel-heading">{{ ad.plain_name }}</div>
+      <div class="panel-body">
+        {% for g in ad.groups_needing_review %}
+          <h3>{{ g.name }} ({{ g.acronym }})</h3>
+          {% include "group/milestones.html" with milestones=g.milestones_needing_review %}
+          <a class="btn btn-default" href="{% url 'ietf.group.milestones.edit_milestones;current' group_type=g.type_id acronym=g.acronym %}">All {{ g.acronym }} milestones</a>
+        {% endfor %}
+      </div>
+    </div>
   {% endfor %}
 
 {% endblock %}