diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html index 1a4db6b99..bfb744d0a 100644 --- a/ietf/templates/meeting/requests.html +++ b/ietf/templates/meeting/requests.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} -{% load ietf_filters static person_filters %} +{% load ietf_filters static person_filters textfilters %} {% block pagehead %} {% endblock %} @@ -34,10 +34,10 @@ Group - Length - Size - Requester - AD + Length + Size + Requester + AD Constraints Special requests @@ -58,34 +58,39 @@ {{ session.group.acronym }} {% if session.joint_with_groups.count %}joint with {{ session.joint_with_groups_acronyms|join:' ' }}{% endif %} + {% if session.requested_duration %} +
+ {{ session.requested_duration|stringformat:"s"|slice:"0:4" }} +
+ {% endif %} + {% if session.attendees %} +
+ {{ session.attendees }} +
+ {% endif %} - + {% if session.requested_duration %}{{ session.requested_duration|stringformat:"s"|slice:"0:4" }}{% endif %} - {{ session.attendees|default:"" }} - {% person_link session.requested_by_person %} - + {{ session.attendees|default:"" }} + {% person_link session.requested_by_person with_email=False %} + {% if session.group.ad_role %} - {% person_link session.group.ad_role.person %} + {% person_link session.group.ad_role.person with_email=False %} {% endif %} {% if session.requested_duration %} {% regroup session.constraints by name as prioritized_constraints %} {% for grouped_constraint in prioritized_constraints %} - {% if not forloop.first %} - {% ifchanged grouped_constraint.grouper %} -
- {% endifchanged %} - {% endif %} + {{ grouped_constraint.grouper.name }}: {% for constraint in grouped_constraint.list %} {% with constraint.target.parent.id as constraint_target_parent_id %} {% with constraint.source.parent.id as constraint_source_parent_id %} {% with constraint.person as constraint_person %} {% if constraint_target_parent_id == constraint_source_parent_id and not constraint_person %}{% endif %} - {% if constraint.name.slug == "bethere" %}{% person_link constraint_person %} - {% else %} + {% if constraint.name.slug == "bethere" %}{% person_link constraint_person with_email=False %}{% else %} {% with constraint.name.slug as constraint_name_slug %} {% endwith %} @@ -94,11 +99,12 @@ {% endwith %} {% endwith %} {% endfor %} + {% endfor %} {% endif %} - {% if session.comments %}{{ session.comments|linebreaksbr }}{% endif %} + {% if session.comments %}{{ session.comments|urlize_ietf_docs|linkify|linebreaksbr }}{% endif %} {% if forloop.last %}{% endif %} @@ -108,4 +114,4 @@ {% endblock %} {% block js %} -{% endblock %} +{% endblock %} \ No newline at end of file