diff --git a/ietf/idrfc/templatetags/ballot_icon.py b/ietf/idrfc/templatetags/ballot_icon.py index 3161ab897..8f72d54c4 100644 --- a/ietf/idrfc/templatetags/ballot_icon.py +++ b/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 diff --git a/ietf/idrfc/testurlREDESIGN.list b/ietf/idrfc/testurlREDESIGN.list index 9ceaecd00..5b9b6a930 100644 --- a/ietf/idrfc/testurlREDESIGN.list +++ b/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,13 +21,13 @@ 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/ @@ -35,11 +35,11 @@ # 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) diff --git a/ietf/idrfc/urls.py b/ietf/idrfc/urls.py index c70c45e30..b378d5865 100644 --- a/ietf/idrfc/urls.py +++ b/ietf/idrfc/urls.py @@ -50,7 +50,7 @@ urlpatterns = patterns('', url(r'^(?P[A-Za-z0-9._+-]+)/ballot/(?P[0-9]+)/$', views_doc.document_ballot, name="doc_ballot"), url(r'^(?P[A-Za-z0-9._+-]+)/ballot/$', views_doc.document_ballot, name="doc_ballot"), (r'^(?P[A-Za-z0-9._+-]+)/doc.json$', views_doc.document_debug), - (r'^(?P[A-Za-z0-9._+-]+)/_ballot.data$', views_doc.ballot_html), # why is this url so weird instead of just ballot.html? + (r'^(?P[A-Za-z0-9._+-]+)/ballotpopup/$', views_doc.ballot_for_popup), (r'^(?P[A-Za-z0-9._+-]+)/ballot.tsv$', views_doc.ballot_tsv), (r'^(?P[A-Za-z0-9._+-]+)/ballot.json$', views_doc.ballot_json), diff --git a/ietf/idrfc/views_doc.py b/ietf/idrfc/views_doc.py index 75389f89d..e822a9838 100644 --- a/ietf/idrfc/views_doc.py +++ b/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) diff --git a/ietf/templates/idrfc/document_ballot_content.html b/ietf/templates/idrfc/document_ballot_content.html index 7660f59e5..1df67c417 100644 --- a/ietf/templates/idrfc/document_ballot_content.html +++ b/ietf/templates/idrfc/document_ballot_content.html @@ -25,7 +25,7 @@
{{ n.name }}
{% for p in positions %} -
{% if p.old_ad %}[{% endif %}{{ p.ad.plain_name }}{% if p.old_ad %}]{% endif %}{% if p.comment_text or p.discuss_text %} *{% endif %}
+
{% if p.old_ad %}[{% endif %}{{ p.ad.plain_name }}{% if p.old_ad %}]{% endif %}{% if p.comment or p.discuss %} *{% endif %}
{% if p.old_positions %}
(was {{ p.old_positions|join:", " }})
{% endif %} {% empty %} none