altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Reverted to release 4.72 versions of txt, ics, and csv agendas, with minor tweaks.

Browse source 
- Legacy-Id: 6451
This commit is contained in:
Henrik Levkowetz 2013-10-15 17:45:55 +00:00
parent 65d505edf3
commit ff403d07ef
3 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ietf/templates/meeting/agenda.ics
View file

@ -1,19 +1,19 @@
{% load humanize %}{% autoescape off %}{% load ietf_filters %}BEGIN:VCALENDAR {% load humanize %}{% autoescape off %}{% load ietf_filters %}BEGIN:VCALENDAR
VERSION:2.0 VERSION:2.0
METHOD:PUBLISH{% if vtimezone %} METHOD:PUBLISH{% if vtimezone %}
{{vtimezone}}{% endif %}{% for ss in scheduledsessions %} {{vtimezone}}{% endif %}{% for slot in timeslots %}
BEGIN:VEVENT BEGIN:VEVENT
UID:ietf-{{meeting.number}}-{{ss.timeslot.pk}} UID:ietf-{{slot.meeting.number}}-{{slot.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%} 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 ss.timeslot.show_location %}LOCATION:{{ss.timeslot.get_location}} {% if slot.show_location %}LOCATION:{{slot.get_location}}
{% endif %}STATUS:TENTATIVE {% endif %}STATUS:TENTATIVE
CLASS:PUBLIC CLASS:PUBLIC
DTSTART{% if meeting.time_zone %};TZID="{{meeting.time_zone}}"{%endif%}:{{ ss.timeslot.time|date:"Ymd" }}T{{ss.timeslot.time|date:"Hi"}}00 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%}:{{ ss.timeslot.end_time|date:"Ymd" }}T{{ss.timeslot.end_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:{{ ss.timeslot.modified|date:"Ymd" }}T{{ ss.timeslot.modified|date:"His" }}Z DTSTAMP:{{ slot.modified|date:"Ymd" }}T{{ slot.modified|date:"His" }}Z
{% if ss.timeslot.session.agenda %}URL:http://www.ietf.org{{ss.session.agenda.get_absolute_url}} {% if slot.session.agenda %}URL:http://www.ietf.org{{slot.session.agenda.get_absolute_url}}
DESCRIPTION:{{ss.timeslot.name}}\n{% if ss.session.agenda_note %} DESCRIPTION:{{slot.name}}\n{% if slot.session.agenda_note %}
Note: {{ss.session.agenda_note}}\n{% endif %}{% for material in ss.session.materials.all %} Note: {{slot.session.agenda_note}}\n{% endif %}{% for material in slot.session.materials.all %}
\n{{material.type}}{% if material.type.name != "Agenda" %} \n{{material.type}}{% if material.type.name != "Agenda" %}
({{material.title}}){% endif %}: ({{material.title}}){% endif %}:
http://www.ietf.org{{material.get_absolute_url}}\n{% endfor %} http://www.ietf.org{{material.get_absolute_url}}\n{% endfor %}

12
ietf/templates/meeting/agenda.txt
View file

@ -13,15 +13,15 @@
{{ slot.meeting_date|date:"l"|upper }}, {{ slot.meeting_date|date:"F j, Y" }}{% if slot.reg_info %} {{ 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 %} {{ 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 %} {% 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.room_name }}{% endif %}{% if slot.is_plenaryw %} {% 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 %} {{ plenaryt_agenda }}{% endifequal %}{% if not slot.is_plenary %}{% for session in slot.sessions_by_area|dictsort:"area" %}
{{ 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 %} {{ 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 %} {% endfor %}{% endif %}{% endfor %}
==================================================================== ====================================================================
AREA DIRECTORS AREA DIRECTORS

26
ietf/templates/meeting/m_agenda.html
View file

@ -53,7 +53,7 @@
{% ifchanged %} {% ifchanged %}
<tr> <tr>
<td colspan="4"> <td colspan="4">
<a name="{{ss.timeslot.meeting_date|date:"Y-m-d"}}_0000" /> <a name="{{slot.meeting_date|date:"Y-m-d"}}_0000" />
<h4>{{ slot.meeting_date|date:"l"|upper }}, {{ slot.meeting_date|date:"F j, Y" }}</h4> <h4>{{ slot.meeting_date|date:"l"|upper }}, {{ slot.meeting_date|date:"F j, Y" }}</h4>
</td> </td>
</tr> </tr>
@ -95,31 +95,31 @@
</td> </td>
</tr> </tr>
{% if not slot.is_plenary %} {% if not slot.is_plenary %}
{% for ss in slot.scheduledsessions_by_area|dictsort:"area" %} {% for session in slot.sessions_by_area|dictsort:"area" %}
<tr id="{{meeting.num}}-{{slot.meeting_date|date:"D"|lower}}-{{slot.time_desc|slice:":4"}}-{{session.info.acronym|lower}}"> <td><a href="http://tools.ietf.org/agenda/{{meeting.num}}/venue/?room={{session.info.room_id.room_name|slugify}}">{{ session.info.room_id.room_name}}</a></td> <tr id="{{meeting.num}}-{{slot.meeting_date|date:"D"|lower}}-{{slot.time_desc|slice:":4"}}-{{session.info.acronym|lower}}"> <td><a href="http://tools.ietf.org/agenda/{{meeting.num}}/venue/?room={{session.info.room_id.room_name|slugify}}">{{ session.info.room_id.room_name}}</a></td>
{% if ss.info.area %} {% if session.info.area %}
<td> <td>
{% if ss.info.isWG %}<a href="http://www.ietf.org/dyn/wg/charter/{{ session.info.acronym|lower }}-charter.html">{%endif%} {% if session.info.isWG %}<a href="http://www.ietf.org/dyn/wg/charter/{{ session.info.acronym|lower }}-charter.html">{%endif%}
{% ifequal ss.info.group_type_str "BOF" %}<span style="background-color: #6FD">{% endifequal %} {% ifequal session.info.group_type_str "BOF" %}<span style="background-color: #6FD">{% endifequal %}
{{ ss.info.acronym|lower }} {{ session.info.acronym|lower }}
{% ifequal ss.info.group_type_str "BOF" %}</span>{% endifequal %} {% ifequal session.info.group_type_str "BOF" %}</span>{% endifequal %}
{% if ss.info.isWG %}</a>{%endif%} {% if session.info.isWG %}</a>{%endif%}
</td> </td>
<td> <td>
{% if ss.info.agenda_file %}<a href="http://tools.ietf.org/wg/{{session.info.acronym}}/agenda/">{%endif%} {% if session.info.agenda_file %}<a href="http://tools.ietf.org/wg/{{session.info.acronym}}/agenda/">{%endif%}
{{ ss.info.acronym_name|truncate_ellipsis:"20"|safe }} {{ session.info.acronym_name|truncate_ellipsis:"20"|safe }}
{% if ss.info.agenda_file %}</a>{%endif%} {% if session.info.agenda_file %}</a>{%endif%}
</td> </td>
{% endif %} {% endif %}
</tr> </tr>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% else %} {% else %}
{% for scheduledsession in slot.scheduledsessions %} {% for session in slot.sessions %}
<tr> <tr>
<td colspan="4"> <td colspan="4">
<a name="{{slot.meeting_date|date:"Y-m-d"}}_{{slot.time_desc|slice:":4"}}" /> <a name="{{slot.meeting_date|date:"Y-m-d"}}_{{slot.time_desc|slice:":4"}}" />
{{ scheduledsession.session.time_desc }} {{ scheduledsession.session.acronym_name|escape }} - <a href="http://tools.ietf.org/agenda/{{meeting.num}}/venue/?room={{scheduledsession.session.room_id.room_name|slugify}}">{{ scheduledsession.session.room_id.room_name}}</a> {{ slot.time_desc }} {{ session.acronym_name|escape }} - <a href="http://tools.ietf.org/agenda/{{meeting.num}}/venue/?room={{session.room_id.room_name|slugify}}">{{ session.room_id.room_name}}</a>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}