Revamp the ballot popup view

- Legacy-Id: 5609

ietf/doc/tests.py

@@ -134,7 +134,7 @@ class DocTestCase(django.test.TestCase):
         self.assertEqual(r.status_code, 200)
 
         # test popup too while we're at it
-        r = self.client.get(urlreverse("ietf.doc.views_doc.ballot_for_popup", kwargs=dict(name=doc.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.ballot_popup", kwargs=dict(name=doc.name, ballot_id=ballot.pk)))
         self.assertEqual(r.status_code, 200)
         
     def test_document_json(self):

ietf/doc/views_doc.py

@@ -220,7 +220,7 @@ def document_main(request, name, rev=None):
 
         # ballot
         ballot_summary = None
-        if iesg_state and iesg_state.slug in ("lc", "writeupw", "goaheadw", "iesg-eva", "defer"):
+        if iesg_state and iesg_state.slug in IESG_BALLOT_ACTIVE_STATES:
             active_ballot = doc.active_ballot()
             if active_ballot:
                 ballot_summary = needed_ballot_positions(doc, active_ballot.active_ad_positions().values())
@@ -588,6 +588,17 @@ def document_ballot(request, name, ballot_id=None):
                                    ),
                               context_instance=RequestContext(request))
 
+def ballot_popup(request, name, ballot_id):
+    doc = get_object_or_404(Document, docalias__name=name)
+    c = document_ballot_content(request, doc, ballot_id=ballot_id, editable=False)
+    return render_to_response("doc/ballot_popup.html",
+                              dict(doc=doc,
+                                   ballot_content=c,
+                                   ballot_id=ballot_id,
+                                   ),
+                              context_instance=RequestContext(request))
+
+
 def document_json(request, name):
     doc = get_object_or_404(Document, docalias__name=name)
 
@@ -634,11 +645,6 @@ def document_json(request, name):
 
     return HttpResponse(json.dumps(data, indent=2), mimetype='text/plain')
 
-def ballot_for_popup(request, name):
-    doc = get_object_or_404(Document, docalias__name=name)
-    return HttpResponse(document_ballot_content(request, doc, ballot_id=None, editable=False))
-
-
 def ballot_json(request, name):
     # REDESIGN: this view needs to be deleted or updated
     def get_ballot(name):

ietf/templates/doc/ballot_popup.html

@@ -0,0 +1,14 @@
+{% load ietf_filters %}
+<div class="ballot-popup">
+  <div class="content">
+    {{ ballot_content }}
+  </div>
+  <div class="actions">
+
+    {% if request.user|has_role:"Area Director" %}
+    <a href="{% url ietf.idrfc.views_ballot.edit_position name=doc.name ballot_id=ballot_id %}" class="button" style="margin-right: 1em;">Edit Position</a>
+    {% endif %}
+
+    <a href="" class="button close">Close</a>
+  </div>
+</div>