Skip to content

Commit bb6b3ea

Browse files
levkowetzlevkowetz
committed
Updating the 'text' agenda so the formatting matches the old one.
 - Legacy-Id: 544
1 parent f6b1024 commit bb6b3ea

1 file changed

Lines changed: 17 additions & 39 deletions

File tree

‎ietf/templates/meeting/agenda.txt‎

Lines changed: 17 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,54 +6,32 @@
66
<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US"
77
xml:lang="en-US"><head><title>Agenda of the {{ meeting_num|ordinal }} IETF Meeting</title>
88
</head><body><p>
9-
<pre>
9+
<pre>{# From here on out, horizontal and vertical whitespace is significant... #}
1010
{% filter center:72 %}Agenda of the {{ meeting_num|ordinal }} IETF Meeting{% endfilter %}
1111
{% filter center:72 %}{{ meeting_info.start_date|date:"F j" }}-{% ifnotequal meeting_info.start_date|date:"F" meeting_info.end_date|date:"F" %}{{ meeting_info.end_date|date:"F " }}{% endifnotequal %}{{ meeting_info.end_date|date:"j, Y" }}{% endfilter %}
1212

13-
Updated As of : {% now "F j, Y P (T)" %}
13+
Updated As of {% now "F j, Y, H:i:s (T)" %}
1414

1515
{{ meeting_info.start_date|date:"l"|upper }}, {{ meeting_info.start_date|date:"F j, Y" }}
1616
{{ nonsession_info.0.time_desc }} {{ nonsession_info.0.non_session_ref }} - {{ meetingvenue_info.reg_area_name }}
1717
{% for item in qs_sun %}{{ item.sched_time_id1.time_desc }} {{ item.acronym_name }} - {{ item.sched_room_id1.room_name }}
18-
{% endfor %}</pre>
19-
{% regroup object_list by day_id as days %}
20-
{% for day in days %}
21-
<pre>
18+
{% endfor %}
19+
20+
{% regroup object_list by day_id as days %}{% for day in days %}
2221
{{ day.list.0.meeting_date|date:"l"|upper }}, {{ day.list.0.meeting_date|date:"F j, Y" }}
23-
{% if day.list.0.reg_info %}{{ day.list.0.reg_info }} - {{ meetingvenue_info.reg_area_name }}{% endif %}
24-
{% ifequal day.list.0.day_id "5" %}{{ day.list.0.fbreak_info }} - {{ meetingvenue_info.break_area_name }}{% else %}{{ day.list.0.morning_br_info }} - {{ meetingvenue_info.break_area_name }}{% endifequal %}
25-
</pre>
26-
{% for item in day.list %}
27-
{% ifequal item.session_name_id 3 %}
28-
<pre>{{ day.list.0.lunch_br_info }} Break
29-
</pre>
30-
{% endifequal %}
31-
{% ifequal item.session_name_id 4 %}
32-
<pre>{{ day.list.0.an_br1_info }}
33-
</pre>
34-
{% endifequal %}
35-
{% ifequal item.session_name_id 5 %}
36-
<pre>{{ day.list.0.an_br2_info }}
37-
</pre>
38-
{% endifequal %}
39-
<pre>{{ item.time_desc }} {{ item.session_name }}</pre>
40-
{% ifequal item.sessions.0.acronym "plenaryw" %}
41-
<pre>{{ item.sessions.0.room_id.room_name }}
42-
{{ plenaryw_agenda|escape }}
43-
</pre>
44-
{% else %}
45-
{% ifequal item.sessions.0.acronym "plenaryt" %}
46-
<pre>{{ item.sessions.0.room_id.room_name }}
47-
{{ plenaryt_agenda|escape }}
48-
</pre>
49-
{% else %}
50-
<pre>{% for session in item.sessions|dictsort:"area" %}
51-
{{ session.room_id.room_name|ljust:20 }} {{ session.area|upper|ljust:5 }} {{ session.acronym|lower|ljust:10 }} {{ session.acronym_name }} {{ session.group_type_str }}{% if session.special_agenda_note %} - {{ session.special_agenda_note|upper }}{% endif %}{% endfor %}</pre>
52-
{% endifequal %}
53-
{% endifequal %}
54-
{% endfor %}
22+
{% if day.list.0.reg_info %}{{ day.list.0.reg_info }} - {{ meetingvenue_info.reg_area_name }}
23+
{% endif %}{% ifequal day.list.0.day_id "5" %}{{ day.list.0.fbreak_info }} - {{ meetingvenue_info.break_area_name }}{% else %}{{ day.list.0.morning_br_info }} - {{ meetingvenue_info.break_area_name }}
24+
{% endifequal %}{% for item in day.list %}{% ifequal item.session_name_id 3 %}{{ day.list.0.lunch_br_info }} Break
25+
{% endifequal %}{% ifequal item.session_name_id 4 %}{{ day.list.0.an_br1_info }}
26+
{% endifequal %}{% ifequal item.session_name_id 5 %}{{ day.list.0.an_br2_info }}
27+
{% endifequal %}{{ item.time_desc }} {{ item.session_name }}{% ifequal item.sessions.0.acronym "plenaryw" %}{{ item.sessions.0.room_id.room_name }}
28+
{{ plenaryw_agenda|escape }}{% else %}{% ifequal item.sessions.0.acronym "plenaryt" %}{{ item.sessions.0.room_id.room_name }}
29+
{{ plenaryt_agenda|escape }}{% else %}{% for session in item.sessions|dictsort:"area" %}
30+
{{ session.room_id.room_name|ljust:20 }} {{ session.area|upper|ljust:5 }} {{ session.acronym|lower|ljust:10 }} {{ session.acronym_name }} {{ session.group_type_str }}{% if session.special_agenda_note %} - {{ session.special_agenda_note|upper }}{% endif %}{% endfor %}
31+
{% endifequal %}{% endifequal %}
32+
{% endfor %}
5533
{% endfor %}
56-
<pre>====================================================================
34+
====================================================================
5735
AREA DIRECTORS
5836
{% regroup qs_ads by area as ads %}{% for ad in ads %}
5937
{{ ad.grouper|upper|ljust:5 }}{{ ad.list.0.area.area_acronym.name|ljust:18 }} {% for ad_person in ad.list %}{% ifequal forloop.counter 2 %} & {% endifequal %}{{ ad_person.person }}/{{ ad_person.person.affiliation }}{% endfor %}{% endfor %}

0 commit comments

Comments
 (0)