From d3983b668add92aee0aea4057d2c39f5135bb17c Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sun, 13 Oct 2013 17:52:09 +0000 Subject: [PATCH] Reverted html agenda templates to release 4.72 state, except for a jquery version change and moving inline weekview javascript to a separate file. - Legacy-Id: 6435 --- ietf/templates/meeting/agenda.html | 79 +++++++++++----------- ietf/templates/meeting/agenda_utc.html | 90 ++++++++++++++------------ 2 files changed, 89 insertions(+), 80 deletions(-) diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html index 9ca7db711..88867daeb 100644 --- a/ietf/templates/meeting/agenda.html +++ b/ietf/templates/meeting/agenda.html @@ -35,9 +35,15 @@ tr.grouprow > td { padding: 4px; } td.materials { align:right; } span.note { font-style: italic; color:#ff0000; } -{% for area in area_list %} -#{{ area.upcase_acronym }}-groups, #selector-{{ area.upcase_acronym }} { color:{{ area.fg_color }}; background-color: {{ area.bg_color }} } -{% endfor %} +#APP-groups, #selector-APP { color:#008; background-color:#eef } +#GEN-groups, #selector-GEN { color:#080; background-color:#efe } +#INT-groups, #selector-INT { color:#088; background-color:#eff } +#OPS-groups, #selector-OPS { color:#800; background-color:#fee } +#RAI-groups, #selector-RAI { color:#808; background-color:#fef } +#RTG-groups, #selector-RTG { color:#880; background-color:#ffe } +#SEC-groups, #selector-SEC { color:#488; background-color:#dff } +#TSV-groups, #selector-TSV { color:#484; background-color:#dfd } +#IRTF-groups, #selector-IRTF { color:#448; background-color:#ddf } img.hidden { display: none; } @@ -70,8 +76,6 @@ img.hidden { display: none; } {% block pagehead %} - - {% endblock pagehead %} @@ -99,7 +103,7 @@ You can customize the agenda below to show only selected working group sessions. {% for area in area_list %} - + {% endfor %} @@ -129,7 +133,7 @@ You can customize the agenda below to show only selected working group sessions.
Preconfigured .ics links: {% for area in area_list %} - {{area.acronym|upper}} • + {{area|upper}} • {% endfor %} Non-Area Events
@@ -137,59 +141,60 @@ You can customize the agenda below to show only selected working group sessions. {% if meeting.agenda_note %}

{{ meeting.agenda_note|safe }}

{% endif %} -{% for ss in scheduledsessions %} +{% for slot in timeslots %} {% ifchanged %} {% endifchanged %} {% ifchanged %} {% endifchanged %} - {% if ss.timeslot.type.name = 'Session' %} {% if ss.session.group %} - + {% if slot.type.name = 'Session' %} {% if slot.session.group %} + - + + + {% if slot.session.group.charter %}{{slot.session.group.acronym}} + {% else %}{{slot.session.group.acronym}}{% endif %} - + + {% if slot.session.agenda %}{{slot.session.group.name}} + {% else %}{{slot.session.group.name}}{% endif %} + {% if slot.session.group.state.name = "BOF" %} BOF {% endif %} + {% if slot.session.agenda_note %} +
{{slot.session.agenda_note}}{% endif %} + - + {% endif %} {% endif %} - {% if ss.timeslot.type.name = 'Plenary' %} + {% if slot.type.name = 'Plenary' %}
-

{{ ss.timeslot.time|date:"l"|upper }}, {{ ss.timeslot.time|date:"F j, Y" }}

+

{{ slot.time|date:"l"|upper }}, {{ slot.time|date:"F j, Y" }}
- {{ss.timeslot.time|date:"Hi"}}-{{ss.timeslot.end_time|date:"Hi"}} {{ss.timeslot.tzname}} + {{slot.time|date:"Hi"}}-{{slot.end_time|date:"Hi"}} {{slot.tzname}} - {{ss.timeslot.name}} - {% if ss.timeslot.type.name != 'Session' %} - - {% if ss.timeslot.show_location %}{{ss.timeslot.get_location|escape}}{% endif %} + {% if slot.type.name == 'Session' %}{{ slot.time|date:"l"}}{% endif %} + {{slot.name}} + {% if slot.type.name != 'Session' %} - + {% if slot.show_location %}{{slot.get_location|escape}}{% endif %} {% endif %}
- {% if ss.timeslot.show_location %}{{ss.timeslot.get_location|escape}}{% endif %}{{ss.session.group.parent.acronym|upper}}{% if slot.show_location %}{{slot.get_location|escape}}{% endif %}{{slot.session.group.parent.acronym|upper}} - {% if ss.session.group.charter %}{{ss.session.group.acronym}} - {% else %}{{ss.session.group.acronym}}{% endif %} - - {% if ss.session.agenda %}{{ss.session.group.name}} - {% else %}{{ss.session.group.name}}{% endif %} - {% if ss.session.group.state.name = "BOF" %} BOF {% endif %} - {% if ss.session.agenda_note %} -
{{ss.session.agenda_note}}{% endif %}		{% if ss.session.agenda %}drafts: tar|pdf{%endif%}{% if slot.session.agenda %}drafts: tar|pdf{%endif%}
- {% if ss.session.agenda %} - {% if ss.session.agenda.file_extension in show_inline%} - + {% if slot.session.agenda %} + {% if slot.session.agenda.file_extension in show_inline%} + {% else %} - Agenda submitted in {{ss.session.agenda.file_extension|upper}} format + Agenda submitted in {{slot.session.agenda.file_extension|upper}} format {% endif %} {% else %} No Agenda Submitted {% endif %} - {% if ss.session.slides %} + {% if slot.session.slides %}

Slides:

-
    {% for slide in ss.session.slides %} +
      {% for slide in slot.session.slides %}
    1. {{ slide.title|clean_whitespace }} @@ -200,14 +205,14 @@ You can customize the agenda below to show only selected working group sessions.
- - {% if ss.session.slides %} + + {% if slot.session.slides %}

Slides:

-
    {% for slide in ss.session.slides %} +
      {% for slide in slot.session.slides %}
    1. {{ slide.title|clean_whitespace }} diff --git a/ietf/templates/meeting/agenda_utc.html b/ietf/templates/meeting/agenda_utc.html index 46dfb2a09..c2de1c72b 100644 --- a/ietf/templates/meeting/agenda_utc.html +++ b/ietf/templates/meeting/agenda_utc.html @@ -22,7 +22,7 @@ table#wg-selector { border:1px solid black; border-collapse:collapse; } table#ics-preconfig { border:1px solid black; border-collapse:collapse; margin-top:24px; margin-bottom:24px;} #weekview.hidden { display: none; } -#weekview { border: none; margin: 0 0 0 0; overflow: hidden;} +#weekview { border: none; margin: 0 0 0 0;} #ical-link.hidden { display: none; } #ical-link { margin: 10px 0 0 0; padding: 10px; text-align: center; background-color: #2647a0; color: #FFFFFF } #ical-link A:link { color: #FFFFFF; } @@ -35,9 +35,15 @@ tr.grouprow > td { padding: 4px; } td.materials { align:right; } span.note { font-style: italic; color:#ff0000; } -{% for area in area_list %} -#{{ area.upcase_acronym }}-groups, #selector-{{ area.upcase_acronym }} { color:{{ area.fg_color }}; background-color: {{ area.bg_color }} } -{% endfor %} +#APP-groups, #selector-APP { color:#008; background-color:#eef } +#GEN-groups, #selector-GEN { color:#080; background-color:#efe } +#INT-groups, #selector-INT { color:#088; background-color:#eff } +#OPS-groups, #selector-OPS { color:#800; background-color:#fee } +#RAI-groups, #selector-RAI { color:#808; background-color:#fef } +#RTG-groups, #selector-RTG { color:#880; background-color:#ffe } +#SEC-groups, #selector-SEC { color:#488; background-color:#dff } +#TSV-groups, #selector-TSV { color:#484; background-color:#dfd } +#IRTF-groups, #selector-IRTF { color:#448; background-color:#ddf } img.hidden { display: none; } @@ -70,7 +76,7 @@ img.hidden { display: none; } {% block pagehead %} - +