diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py index cc83cb9eb..3503dee96 100644 --- a/ietf/doc/views_doc.py +++ b/ietf/doc/views_doc.py @@ -1079,7 +1079,7 @@ def document_ballot_content(request, doc, ballot_id, editable=True): summary = needed_ballot_positions(doc, [p for p in positions if not p.is_old_pos]) text_positions = [p for p in positions if p.discuss or p.comment] - text_positions.sort(key=lambda p: (p.is_old_pos, p.balloter.plain_name())) + text_positions.sort(key=lambda p: (p.is_old_pos, p.balloter.last_name())) ballot_open = not BallotDocEvent.objects.filter(doc=doc, type__in=("closed_ballot", "created_ballot"), diff --git a/ietf/templates/doc/document_ballot_content.html b/ietf/templates/doc/document_ballot_content.html index 2986b5f40..91a537fba 100644 --- a/ietf/templates/doc/document_ballot_content.html +++ b/ietf/templates/doc/document_ballot_content.html @@ -7,7 +7,7 @@ {% for n, positions in position_groups %}

{{ n.name }}

- {% for p in positions|dictsort:"balloter.last_name" %} + {% for p in positions %}
{% if p.is_old_pos %}({% endif %}{% if p.comment or p.discuss %}{% endif %}{{ p.balloter.plain_name }}{% if p.comment or p.discuss %}{% endif %}{% if p.is_old_pos %}){% endif %}
@@ -24,9 +24,7 @@
  • Ballots
    • {% for b in all_ballots %}
  • - - {{ b.ballot_type.name }} ({{ b.rev }}) - + {{ b.ballot_type.name }} ({{ b.rev }})
    • {% endfor %} @@ -73,59 +71,93 @@ {% endif %} {% for n, positions in position_groups %} - {% for p in positions|dictsort:"balloter.last_name" %} -

    - {% if p.is_old_pos %}({% endif %}{{ p.balloter.plain_name }}{% if p.is_old_pos %}){% endif %} + {% for p in positions %} + {% if not p.is_old_pos %} +

    {{ p.balloter.plain_name }} + {{p.pos}} + {% if user|has_role:"Secretariat" %} + Edit + {% endif %} + +

    + {% if p.pos.blocking and p.discuss %} +
    +
    +
    {{ p.pos.name }} ({{ p.discuss_time|date:"Y-m-d" }}{% if not p.for_current_revision %} for -{{ p.get_dochistory.rev }}{% endif %}) + {% if p.send_email %} + + {% elif p.any_email_sent == True %} + + {% elif p.any_email_sent == False %} + + {% else %} + + {% endif %} +
    +
    + 
    {{ p.discuss|linkify }}
    +
    + {% endif %} + + {% if p.comment %} +
    +
    +
    Comment ({{ p.comment_time|date:"Y-m-d" }}{% if not p.for_current_revision %} for -{{ p.get_dochistory.rev }}{% endif %}) + {% if p.send_email %} + + {% elif p.any_email_sent == True %} + + {% elif p.any_email_sent == False %} + + {% else %} +
    No email
    send info
    + {% endif %} +
    +
    + 
    {{ p.comment|linkify }}
    +
    + {% endif %} + {% endif %} + {% endfor %} + {% endfor %} + + {% for n, positions in position_groups %} + {% for p in positions %} + {% if p.is_old_pos %} +

    + ({{ p.balloter.plain_name }}; former steering group member) - {% if p.old_positions %} - (was {{ p.old_positions|join:", " }}) - {% endif %} + {% if p.old_positions %}(was {{ p.old_positions|join:", " }}){% endif %} {{p.pos}} {% if user|has_role:"Secretariat" %} - - Edit + Edit {% endif %} -

    - - {% if p.pos.blocking and p.discuss %} -
    -
    -
    - {{ p.pos.name }} ({{ p.discuss_time|date:"Y-m-d" }}{% if not p.for_current_revision %} for -{{ p.get_dochistory.rev}}{% endif %}) - {% if p.send_email %} - - {% elif p.any_email_sent == True %} - - {% elif p.any_email_sent == False %} - - {% else %} - - - {% endif %} -
    -
    - 
    {{ p.discuss|linkify }}
    -
    - {% endif %} - - {% if p.comment %} +
    -
    - Comment ({{ p.comment_time|date:"Y-m-d" }}{% if not p.for_current_revision %} for -{{ p.get_dochistory.rev}}{% endif %}) - {% if p.send_email %} - - {% elif p.any_email_sent == True %} - - {% elif p.any_email_sent == False %} - - {% else %} -
    No email
    send info
    - {% endif %} -
    +
    {{ p.pos.name }} + {% if p.pos.blocking and p.discuss %} + [Treat as non-blocking comment] ({{ p.discuss_time|date:"Y-m-d" }}{% if not p.for_current_revision %} for -{{ p.get_dochistory.rev }}{% endif %}) + {% else %} + ({{ p.comment_time|date:"Y-m-d" }}{% if not p.for_current_revision %} for -{{ p.get_dochistory.rev }}{% endif %}) + {% endif %} + {% if p.send_email %} + + {% elif p.any_email_sent == True %} + + {% elif p.any_email_sent == False %} + + {% else %} +
    No email
    send info
    + {% endif %} +
    - 
    {{ p.comment|linkify }}
    + {% if p.pos.blocking and p.discuss %} + 
    {{ p.discuss|linkify }}
    + {% else %} + 
    {{ p.comment|linkify }}
    + {% endif %}
    {% endif %} {% endfor %}