Applied ballot popup patch from olau@iola.dk.

 - Legacy-Id: 4629

Author: levkowetz

ietf/idrfc/templatetags/ballot_icon.py

@@ -72,7 +72,7 @@ def render_ballot_icon(user, doc):
     if not ballot:
         return ""
 
-    edit_position_url = urlreverse('doc_edit_position', kwargs=dict(name=doc.name, ballot_id=ballot.pk))
+    edit_position_url = urlreverse('ietf.idrfc.views_ballot.edit_position', kwargs=dict(name=doc.name, ballot_id=ballot.pk))
 
     def sort_key(t):
         _, pos = t

ietf/idrfc/testurlREDESIGN.list

@@ -7,12 +7,12 @@
 200	/doc/draft-ietf-avt-rtp-atrac-family/
 200	/doc/draft-ietf-avt-rtp-atrac-family/doc.json
 200	/doc/draft-ietf-avt-rtp-atrac-family/ballot.json
-200	/doc/draft-ietf-avt-rtp-atrac-family/_ballot.data
+200	/doc/draft-ietf-avt-rtp-atrac-family/ballotpopup/
 
 # replaced draft, never went to IESG
 200	/doc/draft-eronen-mobike-mopo/
 404	/doc/draft-eronen-mobike-mopo/ballot.json
-404	/doc/draft-eronen-mobike-mopo/_ballot.data
+404	/doc/draft-eronen-mobike-mopo/ballotpopup/
 
 # expired draft
 200 	/doc/draft-eronen-eap-sim-aka-80211/
@@ -21,25 +21,25 @@
 200	/doc/rfc4739/
 200	/doc/rfc4739/doc.json
 200	/doc/rfc4739/ballot.json # has ballot from I-D
-200	/doc/rfc4739/_ballot.data
+200	/doc/rfc4739/ballotpopup/
 
 # RFC that's evaluated in IESG
 200	/doc/rfc3852/
 200	/doc/rfc3852/doc.json
 200	/doc/rfc3852/ballot.json
-200	/doc/rfc3852/_ballot.data
+200	/doc/rfc3852/ballotpopup/
 
 # old RFC
 200     /doc/rfc822/
 200     /doc/rfc822/doc.json
 
 # ballot sets
 200	 /doc/rfc3550/ballot.json
-200	 /doc/rfc3550/_ballot.data
+200	 /doc/rfc3550/ballotpopup/
 200	 /doc/rfc3551/ballot.json
-200	 /doc/rfc3551/_ballot.data
+200	 /doc/rfc3551/ballotpopup/
 200	 /doc/draft-irtf-dtnrg-ltp/ballot.json
-200	 /doc/draft-irtf-dtnrg-ltp/_ballot.data
+200	 /doc/draft-irtf-dtnrg-ltp/ballotpopup/
 
 # file formats
 200     /doc/rfc9/ # PDF only
@@ -59,10 +59,10 @@
 
 # ballot exists, but it's not issued
 404	/doc/draft-ietf-aaa-diameter-api/ballot.json
-404	/doc/draft-ietf-aaa-diameter-api/_ballot.data
+404	/doc/draft-ietf-aaa-diameter-api/ballotpopup/
 # ballot does not exist
 404	/doc/draft-zeilenga-cldap/ballot.json
-404	/doc/draft-zeilenga-cldap/_ballot.data
+404	/doc/draft-zeilenga-cldap/ballotpopup/
 # comment with created_by=999
 200	/doc/draft-ietf-l3vpn-2547bis-mcast-bgp/
 # comment with created_by=0 (and no idinternal entry)

ietf/idrfc/urls.py

@@ -50,7 +50,7 @@
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/ballot/(?P<ballot_id>[0-9]+)/$', views_doc.document_ballot, name="doc_ballot"),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/ballot/$', views_doc.document_ballot, name="doc_ballot"),
     (r'^(?P<name>[A-Za-z0-9._+-]+)/doc.json$', views_doc.document_debug),
-    (r'^(?P<name>[A-Za-z0-9._+-]+)/_ballot.data$', views_doc.ballot_html), # why is this url so weird instead of just ballot.html?
+    (r'^(?P<name>[A-Za-z0-9._+-]+)/ballotpopup/$', views_doc.ballot_for_popup),
     (r'^(?P<name>[A-Za-z0-9._+-]+)/ballot.tsv$', views_doc.ballot_tsv),
     (r'^(?P<name>[A-Za-z0-9._+-]+)/ballot.json$', views_doc.ballot_json),
 

ietf/idrfc/views_doc.py

@@ -574,9 +574,9 @@ def get_ballot(name):
 
     return (bw, dw, b, d)
 
-def ballot_html(request, name):
-    bw, dw, ballot, doc = get_ballot(name)
-    return render_to_response('idrfc/doc_ballot.html', {'bw':bw, 'dw':dw, 'ballot':ballot, 'doc':doc}, context_instance=RequestContext(request))
+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_tsv(request, name):
     ballot, doc, b, d = get_ballot(name)

ietf/templates/idrfc/document_ballot_content.html

@@ -25,7 +25,7 @@
 <div class="position-group">
   <div class="heading"><span class="square position-{{ n.slug }}"></span> {{ n.name }}</div>
   {% for p in positions %}
-  <div>{% if p.old_ad %}[{% endif %}<a{% if user|has_role:"Secretariat" %} href="{% url idrfc.views_ballot.edit_position name=doc.name,ballot_id=ballot.pk %}?ad={{ p.ad.pk }}" title="Click to edit the position of {{ p.ad.plain_name }}"{% endif %}>{{ p.ad.plain_name }}</a>{% if p.old_ad %}]{% endif %}{% if p.comment_text or p.discuss_text %}&nbsp;<a href="#{{ p.ad.plain_name|slugify }}"><img src="/images/comment.png" width="14" height="12" alt="*" border="0"/></a>{% endif %}</div>
+  <div>{% if p.old_ad %}[{% endif %}<a{% if user|has_role:"Secretariat" %} href="{% url idrfc.views_ballot.edit_position name=doc.name,ballot_id=ballot.pk %}?ad={{ p.ad.pk }}" title="Click to edit the position of {{ p.ad.plain_name }}"{% endif %}>{{ p.ad.plain_name }}</a>{% if p.old_ad %}]{% endif %}{% if p.comment or p.discuss %}&nbsp;<a href="#{{ p.ad.plain_name|slugify }}"><img src="/images/comment.png" width="14" height="12" alt="*" border="0"/></a>{% endif %}</div>
   {% if p.old_positions %}<div class="was">(was {{ p.old_positions|join:", " }})</div>{% endif %}
   {% empty %}
   <i>none</i>