Skip to content

Commit 3c88c01

Browse files
committed
Changed the way ballot discuss/comment texts are displayed to
put the text from current ADs first, and mark ex-ADs with [] following the convention on the left bar. This fixes issue ietf-tools#608 - Legacy-Id: 2947
1 parent fe3189b commit 3c88c01

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

rjs/ietf/idrfc/idrfc_wrapper.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,8 @@ def create_position_object(ballot, position, all_comments):
755755
position=p)
756756
if not position.ad.is_current_ad():
757757
r['is_old_ad'] = True
758+
else:
759+
r['is_old_ad'] = False
758760

759761
was = [v for k,v in positions.iteritems() if position.__dict__[k] < 0]
760762
if len(was) > 0:

rjs/ietf/templates/idrfc/doc_ballot.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ <h2 style="margin-top:12px;">Discusses and other comments</h2>
7777
<p>Summary: <i>{{ doc.ietf_process.iesg_ballot_needed }}</i></p>
7878
{% endif %}
7979

80-
{% for pos in ballot.get_texts %}
81-
<h2 class="ballot_ad"><a name="{{pos.ad_name|slugify}}">{{pos.ad_name|escape}}</a></h2>
80+
{% for pos in ballot.get_texts|dictsort:"is_old_ad" %}
81+
<h2 class="ballot_ad"><a name="{{pos.ad_name|slugify}}">{% if pos.is_old_ad %}[{%endif%}{{pos.ad_name|escape}}{% if pos.is_old_ad %}]{%endif%}</a></h2>
8282

8383
{% ifequal pos.position "Discuss" %}
8484
<p><b>Discuss ({{pos.discuss_date}})</b> <img src="/images/comment.png" width="14" height="12" alt=""/></p>

0 commit comments

Comments
 (0)