From ff403d07efcb3da99cb1a5a7625cae6ac59e110a Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 15 Oct 2013 17:45:55 +0000 Subject: [PATCH] Reverted to release 4.72 versions of txt, ics, and csv agendas, with minor tweaks. - Legacy-Id: 6451 --- ietf/templates/meeting/agenda.ics | 20 ++++++++++---------- ietf/templates/meeting/agenda.txt | 12 ++++++------ ietf/templates/meeting/m_agenda.html | 26 +++++++++++++------------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ietf/templates/meeting/agenda.ics b/ietf/templates/meeting/agenda.ics index 544867b5d..1e8ea14c2 100644 --- a/ietf/templates/meeting/agenda.ics +++ b/ietf/templates/meeting/agenda.ics @@ -1,19 +1,19 @@ {% load humanize %}{% autoescape off %}{% load ietf_filters %}BEGIN:VCALENDAR VERSION:2.0 METHOD:PUBLISH{% if vtimezone %} -{{vtimezone}}{% endif %}{% for ss in scheduledsessions %} +{{vtimezone}}{% endif %}{% for slot in timeslots %} BEGIN:VEVENT -UID:ietf-{{meeting.number}}-{{ss.timeslot.pk}} -SUMMARY:{% if ss.session.name %}{{ss.session.name}}{% else %}{% if ss.timeslot.type.name == "Break" %}{{ss.timeslot.name}}{% else %}{{ss.session.group.acronym|upper}} - {{ss.session.group.name}}{% endif%}{%endif%} -{% if ss.timeslot.show_location %}LOCATION:{{ss.timeslot.get_location}} +UID:ietf-{{slot.meeting.number}}-{{slot.pk}} +SUMMARY:{% if slot.session.name %}{{slot.session.name}}{% else %}{% if slot.type.name == "Break" %}{{slot.name}}{% else %}{{slot.session.group.acronym|upper}} - {{slot.session.group.name}}{% endif%}{%endif%} +{% if slot.show_location %}LOCATION:{{slot.get_location}} {% endif %}STATUS:TENTATIVE CLASS:PUBLIC -DTSTART{% if meeting.time_zone %};TZID="{{meeting.time_zone}}"{%endif%}:{{ ss.timeslot.time|date:"Ymd" }}T{{ss.timeslot.time|date:"Hi"}}00 -DTEND{% if meeting.time_zone %};TZID="{{meeting.time_zone}}"{%endif%}:{{ ss.timeslot.end_time|date:"Ymd" }}T{{ss.timeslot.end_time|date:"Hi"}}00 -DTSTAMP:{{ ss.timeslot.modified|date:"Ymd" }}T{{ ss.timeslot.modified|date:"His" }}Z -{% if ss.timeslot.session.agenda %}URL:http://www.ietf.org{{ss.session.agenda.get_absolute_url}} -DESCRIPTION:{{ss.timeslot.name}}\n{% if ss.session.agenda_note %} - Note: {{ss.session.agenda_note}}\n{% endif %}{% for material in ss.session.materials.all %} +DTSTART{% if meeting.time_zone %};TZID="{{meeting.time_zone}}"{%endif%}:{{ slot.time|date:"Ymd" }}T{{slot.time|date:"Hi"}}00 +DTEND{% if meeting.time_zone %};TZID="{{meeting.time_zone}}"{%endif%}:{{ slot.end_time|date:"Ymd" }}T{{slot.end_time|date:"Hi"}}00 +DTSTAMP:{{ slot.modified|date:"Ymd" }}T{{ slot.modified|date:"His" }}Z +{% if slot.session.agenda %}URL:http://www.ietf.org{{slot.session.agenda.get_absolute_url}} +DESCRIPTION:{{slot.name}}\n{% if slot.session.agenda_note %} + Note: {{slot.session.agenda_note}}\n{% endif %}{% for material in slot.session.materials.all %} \n{{material.type}}{% if material.type.name != "Agenda" %} ({{material.title}}){% endif %}: http://www.ietf.org{{material.get_absolute_url}}\n{% endfor %} diff --git a/ietf/templates/meeting/agenda.txt b/ietf/templates/meeting/agenda.txt index 2cf6a01ec..5686602c1 100644 --- a/ietf/templates/meeting/agenda.txt +++ b/ietf/templates/meeting/agenda.txt @@ -13,15 +13,15 @@ {{ slot.meeting_date|date:"l"|upper }}, {{ slot.meeting_date|date:"F j, Y" }}{% if slot.reg_info %} {{ slot.registration.time_desc }} {{ slot.registration.name }}{% if venue.reg_area_name %} - {{ venue.reg_area_name }}{% endif %}{% endif %} -{% endifchanged %}{% if slot.session_name %}{% if slot.break_info %}{{ slot.break_info.time_desc }} {{ slot.break_info.name }}{% if venue.break_area_name and slot.break_info.show_location %} - {{ venue.break_area_name }}{% endif %} -{% endif %}{{ slot.time_desc }} {{ slot.session_name }}{% if slot.is_plenary %} - {{ slot.room_name }}{% endif %}{% if slot.is_plenaryw %} +{% endifchanged %}{% if slot.session_name %}{% if slot.break_info %}{{ slot.break_info.time_desc }} {{ slot.break_info.name }}{% if venue.break_area_name and slot.break_info.show_break_location %} - {{ venue.break_area_name }}{% endif %} +{% endif %}{{ slot.time_desc }} {{ slot.session_name }}{% if slot.is_plenary %} - {{ slot.sessions.0.room_id.room_name }}{% endif %}{% ifequal slot.sessions.0.acronym "plenaryw" %} -{{ plenaryw_agenda }}{% endif %}{% if slot.is_plenaryt %} +{{ plenaryw_agenda }}{% endifequal %}{% ifequal slot.sessions.0.acronym "plenaryt" %} -{{ plenaryt_agenda }}{% endif %}{% if not slot.is_plenary %}{% for ss in slot.scheduledsessions_by_area|dictsort:"area" %}{% if ss.info.session %} -{{ ss.info.room_name|ljust:14 }} {% if ss.info.area %}{{ ss.info.area|upper|ljust:4 }} {{ ss.info.acronym|ljust:10 }} {% endif %}{{ ss.info.acronym_name }} {{ ss.info.group_type_str }}{% if ss.info.special_agenda_note %} - {{ ss.info.special_agenda_note }}{% endif %}{% endif %}{% endfor %}{% endif %} +{{ plenaryt_agenda }}{% endifequal %}{% if not slot.is_plenary %}{% for session in slot.sessions_by_area|dictsort:"area" %} +{{ session.info.room_id.room_name|ljust:14 }} {% if session.info.area %}{{ session.info.area|upper|ljust:4 }} {{ session.info.acronym|ljust:10 }} {% endif %}{{ session.info.acronym_name }} {{ session.info.group_type_str }}{% if session.info.special_agenda_note %} - {{ session.info.special_agenda_note }}{% endif %}{% endfor %}{% endif %} -{% else %}{% for ss in slot.scheduledsessions_at_same_time %}{{ ss.timeslot.time_desc }} {{ ss.acronym_name }} - {{ ss.room_name }} +{% else %}{% for session in slot.sessions %}{{ slot.time_desc }} {{ session.acronym_name }} - {{ session.room_id.room_name }} {% endfor %}{% endif %}{% endfor %} ==================================================================== AREA DIRECTORS diff --git a/ietf/templates/meeting/m_agenda.html b/ietf/templates/meeting/m_agenda.html index fc0ebcc66..eccc661e8 100644 --- a/ietf/templates/meeting/m_agenda.html +++ b/ietf/templates/meeting/m_agenda.html @@ -53,7 +53,7 @@ {% ifchanged %} - +

{{ slot.meeting_date|date:"l"|upper }}, {{ slot.meeting_date|date:"F j, Y" }}

@@ -95,31 +95,31 @@ {% if not slot.is_plenary %} - {% for ss in slot.scheduledsessions_by_area|dictsort:"area" %} + {% for session in slot.sessions_by_area|dictsort:"area" %} {{ session.info.room_id.room_name}} - {% if ss.info.area %} + {% if session.info.area %} - {% if ss.info.isWG %}{%endif%} - {% ifequal ss.info.group_type_str "BOF" %}{% endifequal %} - {{ ss.info.acronym|lower }} - {% ifequal ss.info.group_type_str "BOF" %}{% endifequal %} - {% if ss.info.isWG %}{%endif%} + {% if session.info.isWG %}{%endif%} + {% ifequal session.info.group_type_str "BOF" %}{% endifequal %} + {{ session.info.acronym|lower }} + {% ifequal session.info.group_type_str "BOF" %}{% endifequal %} + {% if session.info.isWG %}{%endif%} - {% if ss.info.agenda_file %}{%endif%} - {{ ss.info.acronym_name|truncate_ellipsis:"20"|safe }} - {% if ss.info.agenda_file %}{%endif%} + {% if session.info.agenda_file %}{%endif%} + {{ session.info.acronym_name|truncate_ellipsis:"20"|safe }} + {% if session.info.agenda_file %}{%endif%} {% endif %} {% endfor %} {% endif %} {% else %} - {% for scheduledsession in slot.scheduledsessions %} + {% for session in slot.sessions %} - {{ scheduledsession.session.time_desc }} {{ scheduledsession.session.acronym_name|escape }} - {{ scheduledsession.session.room_id.room_name}} + {{ slot.time_desc }} {{ session.acronym_name|escape }} - {{ session.room_id.room_name}} {% endfor %}