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

Reverted html agenda templates to release 4.72 state, except for a jquery

Browse source 
version change and moving inline weekview javascript to a separate file.
 - Legacy-Id: 6435
This commit is contained in:
Henrik Levkowetz 2013-10-13 17:52:09 +00:00
parent 256e033be3
commit d3983b668a
2 changed files with 89 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
ietf/templates/meeting/agenda.html
View file

@ -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 %}
<script type="text/javascript" src='/js/agenda2.js'></script>
<script type="text/javascript" src='/js/lib/jquery-1.8.2.min.js'></script>
<script type="text/javascript" src='/js/browsertime.js'></script>
<script type="text/javascript" src='/js/weekview.js'></script>
{% endblock pagehead %}
@ -99,7 +103,7 @@ You can customize the agenda below to show only selected working group sessions.
<table id="wg-selector" width="100%" class="hidden">
<tr>
{% for area in area_list %}
<th><div id='selector-{{area.acronym|upper}}' class="unselected" onclick="toggle(this)">{{area.acronym|upper}}</div></th>
<th><div id='selector-{{area|upper}}' class="unselected" onclick="toggle(this)">{{area|upper}}</div></th>
{% endfor %}
</tr>
<tr>
@ -129,7 +133,7 @@ You can customize the agenda below to show only selected working group sessions.
<table width="100%" id="ics-preconfig"><tr><td align="center">
Preconfigured .ics links:
{% for area in area_list %}
<a href="{% url ietf.meeting.views.ical_agenda num=meeting.number %}?{{area|upper}},-~Other,-~Plenary">{{area.acronym|upper}}</a> &#8226;
<a href="{% url ietf.meeting.views.ical_agenda num=meeting.number %}?{{area|upper}},-~Other,-~Plenary">{{area|upper}}</a> &#8226;
{% endfor %}
<a href="{% url ietf.meeting.views.ical_agenda num=meeting.number %}">Non-Area Events</a>
</td></tr></table>
@ -137,59 +141,60 @@ You can customize the agenda below to show only selected working group sessions.
{% if meeting.agenda_note %}<h2 class="ietf-divider" style="background-color: #C00; margin-top: 2em; margin-bottom: 0;">{{ meeting.agenda_note|safe }}</h2>{% endif %}
<table id="agenda" width="100%">
{% for ss in scheduledsessions %}
{% for slot in timeslots %}
{% ifchanged %}
<tr class="meeting-date">
<td colspan="6">
<h2 class="ietf-divider">{{ ss.timeslot.time|date:"l"|upper }}, {{ ss.timeslot.time|date:"F j, Y" }}</h2>
<h2 class="ietf-divider">{{ slot.time|date:"l"|upper }}, {{ slot.time|date:"F j, Y" }}</h2>
</td>
</tr>
{% endifchanged %}
{% ifchanged %}
<tr class="time-title">
<td colspan="1" class="timecolumn">
{{ss.timeslot.time|date:"Hi"}}-{{ss.timeslot.end_time|date:"Hi"}}&nbsp;<span class="ietf-tiny">{{ss.timeslot.tzname}}</span>
{{slot.time|date:"Hi"}}-{{slot.end_time|date:"Hi"}}&nbsp;<span class="ietf-tiny">{{slot.tzname}}</span>
</td>
<td colspan="5">
{{ss.timeslot.name}}
{% if ss.timeslot.type.name != 'Session' %} -
{% if ss.timeslot.show_location %}<a href="http://tools.ietf.org/agenda/{{meeting.number}}/venue/?room={{ ss.timeslot.get_location|slugify }}">{{ss.timeslot.get_location|escape}}</a>{% endif %}
{% if slot.type.name == 'Session' %}{{ slot.time|date:"l"}}{% endif %}
{{slot.name}}
{% if slot.type.name != 'Session' %} -
{% if slot.show_location %}<a href="http://tools.ietf.org/agenda/{{meeting.number}}/venue/?room={{ slot.get_location|slugify }}">{{slot.get_location|escape}}</a>{% endif %}
{% endif %}
</td>
</tr>
{% endifchanged %}
{% if ss.timeslot.type.name = 'Session' %} {% if ss.session.group %}
<tr id="{{meeting.number}}-{{ss.timeslot.time|date:"D-Hi"|lower}}-{{ss.session.group.parent.acronym|upper}}-{{ss.session.group.acronym|lower}}" class="grouprow">
{% if slot.type.name = 'Session' %} {% if slot.session.group %}
<tr id="{{meeting.number}}-{{slot.time|date:"D-Hi"|lower}}-{{slot.session.group.parent.acronym|upper}}-{{slot.session.group.acronym|lower}}" class="grouprow">
<td>
<td>{% if ss.timeslot.show_location %}<a href="http://tools.ietf.org/agenda/{{meeting.number}}/venue/?room={{ ss.timeslot.get_location|slugify }}">{{ss.timeslot.get_location|escape}}</a>{% endif %}</td>
<td>{{ss.session.group.parent.acronym|upper}}</td>
<td>{% if slot.show_location %}<a href="http://tools.ietf.org/agenda/{{meeting.number}}/venue/?room={{ slot.get_location|slugify }}">{{slot.get_location|escape}}</a>{% endif %}</td>
<td>{{slot.session.group.parent.acronym|upper}}</td>
<td>
{% if ss.session.group.charter %}<a href="{{ss.session.group.charter.get_absolute_url}}">{{ss.session.group.acronym}}</a>
{% else %}{{ss.session.group.acronym}}{% endif %}</td>
{% if slot.session.group.charter %}<a href="{{slot.session.group.charter.get_absolute_url}}">{{slot.session.group.acronym}}</a>
{% else %}{{slot.session.group.acronym}}{% endif %}</td>
<td>
<img src="/images/color-palette-4x4.gif" alt="" onclick="pickAgendaColor('{{meeting.number}}-{{ss.timeslot.time|date:"D-Hi"|lower}}-{{ss.session.group.parent.acronym|upper}}-{{ss.session.group.acronym|lower}}',this);" title="color tag this line"/ class="noprint">
{% if ss.session.agenda %}<a href="/meeting/{{ meeting.number }}/agenda/{{ ss.session.group.acronym }}/">{{ss.session.group.name}}</a>
{% else %}{{ss.session.group.name}}{% endif %}
{% if ss.session.group.state.name = "BOF" %} BOF {% endif %}
{% if ss.session.agenda_note %}
<br/><span class="note">{{ss.session.agenda_note}}</span>{% endif %}</td>
<td class="materials">{% if ss.session.agenda %}drafts:&nbsp;<a href="/meeting/{{meeting.number}}/agenda/{{ss.session.group.acronym}}-drafts.tgz">tar</a>|<a href="/meeting/{{ meeting.number }}/agenda/{{ss.session.group.acronym}}-drafts.pdf">pdf</a>{%endif%}</td>
<img src="/images/color-palette-4x4.gif" alt="" onclick="pickAgendaColor('{{meeting.number}}-{{slot.time|date:"D-Hi"|lower}}-{{slot.session.group.parent.acronym|upper}}-{{slot.session.group.acronym|lower}}',this);" title="color tag this line"/ class="noprint">
{% if slot.session.agenda %}<a href="/meeting/{{ meeting.number }}/agenda/{{ slot.session.group.acronym }}/">{{slot.session.group.name}}</a>
{% else %}{{slot.session.group.name}}{% endif %}
{% if slot.session.group.state.name = "BOF" %} BOF {% endif %}
{% if slot.session.agenda_note %}
<br/><span class="note">{{slot.session.agenda_note}}</span>{% endif %}</td>
<td class="materials">{% if slot.session.agenda %}drafts:&nbsp;<a href="/meeting/{{meeting.number}}/agenda/{{slot.session.group.acronym}}-drafts.tgz">tar</a>|<a href="/meeting/{{ meeting.number }}/agenda/{{slot.session.group.acronym}}-drafts.pdf">pdf</a>{%endif%}</td>
</tr>
<tr id="{{meeting.number}}-{{ss.timeslot.time|date:"D-Hi"|lower}}-{{ss.session.group.parent.acronym|upper}}-{{ss.session.group.acronym|lower}}" class="groupagenda">
<tr id="{{meeting.number}}-{{slot.time|date:"D-Hi"|lower}}-{{slot.session.group.parent.acronym|upper}}-{{slot.session.group.acronym|lower}}" class="groupagenda">
<td></td>
<td colspan="5">
{% if ss.session.agenda %}
{% if ss.session.agenda.file_extension in show_inline%}
<iframe width="100%" height="1px" src="about:blank" xsrc="{{ss.session.agenda.href}}" onload="r(this)"></iframe>
{% if slot.session.agenda %}
{% if slot.session.agenda.file_extension in show_inline%}
<iframe width="100%" height="1px" src="about:blank" xsrc="{{slot.session.agenda.href}}" onload="r(this)"></iframe>
{% else %}
<b><i>Agenda submitted in {{ss.session.agenda.file_extension|upper}} format</i></b>
<b><i>Agenda submitted in {{slot.session.agenda.file_extension|upper}} format</i></b>
{% endif %}
{% else %}
<b><i>No Agenda Submitted</i></b>
{% endif %}
{% if ss.session.slides %}
{% if slot.session.slides %}
<h3>Slides:</h3>
<ol>{% for slide in ss.session.slides %}
<ol>{% for slide in slot.session.slides %}
<li>
<img src="/images/{{slide.file_extension|upper}}_icon.png">
<a href="{{ slide.href }}">{{ slide.title|clean_whitespace }}</a>
@ -200,14 +205,14 @@ You can customize the agenda below to show only selected working group sessions.
</tr>
{% endif %} {% endif %}
{% if ss.timeslot.type.name = 'Plenary' %}
{% if slot.type.name = 'Plenary' %}
<tr>
<td></td>
<td colspan="5">
<iframe width="100%" height="1px" src="{{ss.session.agenda.href}}" onload="r(this)"></iframe>
{% if ss.session.slides %}
<iframe width="100%" height="1px" src="{{slot.session.agenda.href}}" onload="r(this)"></iframe>
{% if slot.session.slides %}
<h3>Slides:</h3>
<ol>{% for slide in ss.session.slides %}
<ol>{% for slide in slot.session.slides %}
<li>
<img src="/images/{{slide.file_extension|upper}}_icon.png">
<a href="{{ slide.href }}">{{ slide.title|clean_whitespace }}</a>

90
ietf/templates/meeting/agenda_utc.html
View file

@ -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 %}
<script type="text/javascript" src='/js/agenda2.js'></script>
<script type="text/javascript" src='/js/lib/jquery-1.8.2.min.js'></script>
<script type="text/javascript" src='/js/jquery-1.5.1.min.js'></script>
<script type="text/javascript" src='/js/browsertime.js'></script>
<script type="text/javascript" src='/js/weekview.js'></script>
<script type="text/javascript" >
@ -92,12 +98,11 @@ Updated {{ modified|date:"Y-m-d H:i:s T" }}</p>
</blockquote>
<div style="text-align: center; margin-bottom: 1em;">
<input type="button" name="displayinbrowsertime" id="displayinbrowsertime" value="Display in browser time"/>
</div>
<div class="noprint">
(There's also a <a href="/meeting/agenda">agenda with local times</a>, a <a href="/meeting/{{meeting.number}}/agenda.txt">plaintext agenda</a> and a <a href="http://tools.ietf.org/agenda/{{meeting.number}}/">tools-style agenda</a> available)</div>
</div>
<p><strong>IETF agendas are subject to change, up to and during the meeting.</strong></p>
@ -114,7 +119,7 @@ You can customize the agenda below to show only selected working group sessions.
<table id="wg-selector" width="100%" class="hidden">
<tr>
{% for area in area_list %}
<th><div id='selector-{{area.acronym|upper}}' class="unselected" onclick="toggle(this)">{{area.acronym|upper}}</div></th>
<th><div id='selector-{{area|upper}}' class="unselected" onclick="toggle(this)">{{area|upper}}</div></th>
{% endfor %}
</tr>
<tr>
@ -139,12 +144,12 @@ You can customize the agenda below to show only selected working group sessions.
<div id="ical-link" class="hidden"><span style="font-size:150%">Week View</span><br/><a id="ical-href" href="{% url ietf.meeting.views.ical_agenda num=meeting.number %}"><em>Download as an .ics file</em></a></div>
<iframe id="weekview" class="hidden" width="100%" height="600px" src="about:blank" scrolling="no"></iframe>
<iframe id="weekview" class="hidden" width="100%" height="600px" src="about:blank"></iframe>
<table width="100%" id="ics-preconfig"><tr><td align="center">
Preconfigured .ics links:
{% for area in area_list %}
<a href="{% url ietf.meeting.views.ical_agenda num=meeting.number %}?{{area|upper}},-~Other,-~Plenary">{{area.acronym|upper}}</a> &#8226;
<a href="{% url ietf.meeting.views.ical_agenda num=meeting.number %}?{{area|upper}},-~Other,-~Plenary">{{area|upper}}</a> &#8226;
{% endfor %}
<a href="{% url ietf.meeting.views.ical_agenda num=meeting.number %}">Non-Area Events</a>
</td></tr></table>
@ -152,60 +157,61 @@ You can customize the agenda below to show only selected working group sessions.
{% if meeting.agenda_note %}<h2 class="ietf-divider" style="background-color: #C00; margin-top: 2em; margin-bottom: 0;">{{ meeting.agenda_note|safe }}</h2>{% endif %}
<table id="agenda" width="100%">
{% for ss in scheduledsessions %}
{% for slot in timeslots %}
{% ifchanged %}
<tr class="meeting-date">
<td colspan="6">
<h2 class="ietf-divider">{{ ss.timeslot.time|date:"l"|upper }}, {{ ss.timeslot.time|date:"F j, Y" }}</h2>
<h2 class="ietf-divider">{{ slot.time|date:"l"|upper }}, {{ slot.time|date:"F j, Y" }}</h2>
</td>
</tr>
{% endifchanged %}
{% ifchanged %}
<tr class="time-title">
<td colspan="1" class="timecolumn">
<span class="ietf-tiny">{{ss.timeslot.utc_start_time|date:"M d"}}&nbsp;&nbsp;</span>
{{ss.timeslot.utc_start_time|date:"Hi"}}-{{ss.timeslot.utc_end_time|date:"Hi"}}&nbsp;<span class="ietf-tiny">UTC</span>
<span class="ietf-tiny">{{slot.utc_start_time|date:"M d"}}&nbsp;&nbsp;</span>
{{slot.utc_start_time|date:"Hi"}}-{{slot.utc_end_time|date:"Hi"}}&nbsp;<span class="ietf-tiny">UTC</span>
</td>
<td colspan="5">
{{ss.timeslot.name}}
{% if ss.timeslot.type.name != 'Session' %} -
{% if ss.timeslot.show_location %}<a href="http://tools.ietf.org/agenda/{{meeting.number}}/venue/?room={{ ss.timeslot.get_location|slugify }}">{{ss.timeslot.get_location|escape}}</a>{% endif %}
{% if slot.type.name == 'Session' %}{{ slot.time|date:"l"}}{% endif %}
{{slot.name}}
{% if slot.type.name != 'Session' %} -
{% if slot.show_location %}<a href="http://tools.ietf.org/agenda/{{meeting.number}}/venue/?room={{ slot.get_location|slugify }}">{{slot.get_location|escape}}</a>{% endif %}
{% endif %}
</td>
</tr>
{% endifchanged %}
{% if ss.timeslot.type.name = 'Session' %} {% if ss.session.group %}
<tr id="{{meeting.number}}-{{ss.timeslot.time|date:"D-Hi"|lower}}-{{ss.session.group.parent.acronym|upper}}-{{ss.session.group.acronym|lower}}" class="grouprow">
{% if slot.type.name = 'Session' %} {% if slot.session.group %}
<tr id="{{meeting.number}}-{{slot.time|date:"D-Hi"|lower}}-{{slot.session.group.parent.acronym|upper}}-{{slot.session.group.acronym|lower}}" class="grouprow">
<td>
<td>{% if ss.timeslot.show_location %}<a href="http://tools.ietf.org/agenda/{{meeting.number}}/venue/?room={{ ss.timeslot.get_location|slugify }}">{{ss.timeslot.get_location|escape}}</a>{% endif %}</td>
<td>{{ss.session.group.parent.acronym|upper}}</td>
<td>{% if slot.show_location %}<a href="http://tools.ietf.org/agenda/{{meeting.number}}/venue/?room={{ slot.get_location|slugify }}">{{slot.get_location|escape}}</a>{% endif %}</td>
<td>{{slot.session.group.parent.acronym|upper}}</td>
<td>
{% if ss.session.group.charter %}<a href="{{ss.session.group.charter.get_absolute_url}}">{{ss.session.group.acronym}}</a>
{% else %}{{ss.session.group.acronym}}{% endif %}</td>
{% if slot.session.group.charter %}<a href="{{slot.session.group.charter.get_absolute_url}}">{{slot.session.group.acronym}}</a>
{% else %}{{slot.session.group.acronym}}{% endif %}</td>
<td>
<img src="/images/color-palette-4x4.gif" alt="" onclick="pickAgendaColor('{{meeting.number}}-{{ss.timeslot.time|date:"D-Hi"|lower}}-{{ss.session.group.parent.acronym|upper}}-{{ss.session.group.acronym|lower}}',this);" title="color tag this line"/ class="noprint">
{% if ss.session.agenda %}<a href="/meeting/{{ meeting.number }}/agenda/{{ ss.session.group.acronym }}/">{{ss.session.group.name}}</a>
{% else %}{{ss.session.group.name}}{% endif %}
{% if ss.session.group.state.name = "BOF" %} BOF {% endif %}
{% if ss.session.agenda_note %}
<br/><span class="note">{{ss.session.agenda_note}}</span>{% endif %}</td>
<td class="materials">{% if ss.session.agenda %}drafts:&nbsp;<a href="/meeting/{{meeting.number}}/agenda/{{ss.session.group.acronym}}-drafts.tgz">tar</a>|<a href="/meeting/{{ meeting.number }}/agenda/{{ss.session.group.acronym}}-drafts.pdf">pdf</a>{%endif%}</td>
<img src="/images/color-palette-4x4.gif" alt="" onclick="pickAgendaColor('{{meeting.number}}-{{slot.time|date:"D-Hi"|lower}}-{{slot.session.group.parent.acronym|upper}}-{{slot.session.group.acronym|lower}}',this);" title="color tag this line"/ class="noprint">
{% if slot.session.agenda %}<a href="/meeting/{{ meeting.number }}/agenda/{{ slot.session.group.acronym }}/">{{slot.session.group.name}}</a>
{% else %}{{slot.session.group.name}}{% endif %}
{% if slot.session.group.state.name = "BOF" %} BOF {% endif %}
{% if slot.session.agenda_note %}
<br/><span class="note">{{slot.session.agenda_note}}</span>{% endif %}</td>
<td class="materials">{% if slot.session.agenda %}drafts:&nbsp;<a href="/meeting/{{meeting.number}}/agenda/{{slot.session.group.acronym}}-drafts.tgz">tar</a>|<a href="/meeting/{{ meeting.number }}/agenda/{{slot.session.group.acronym}}-drafts.pdf">pdf</a>{%endif%}</td>
</tr>
<tr id="{{meeting.number}}-{{ss.timeslot.time|date:"D-Hi"|lower}}-{{ss.session.group.parent.acronym|upper}}-{{ss.session.group.acronym|lower}}" class="groupagenda">
<tr id="{{meeting.number}}-{{slot.time|date:"D-Hi"|lower}}-{{slot.session.group.parent.acronym|upper}}-{{slot.session.group.acronym|lower}}" class="groupagenda">
<td></td>
<td colspan="5">
{% if ss.session.agenda %}
{% if ss.session.agenda.file_extension in show_inline%}
<iframe width="100%" height="1px" src="about:blank" xsrc="{{ss.session.agenda.href}}" onload="r(this)"></iframe>
{% if slot.session.agenda %}
{% if slot.session.agenda.file_extension in show_inline%}
<iframe width="100%" height="1px" src="about:blank" xsrc="{{slot.session.agenda.href}}" onload="r(this)"></iframe>
{% else %}
<b><i>Agenda submitted in {{ss.session.agenda.file_extension|upper}} format</i></b>
<b><i>Agenda submitted in {{slot.session.agenda.file_extension|upper}} format</i></b>
{% endif %}
{% else %}
<b><i>No Agenda Submitted</i></b>
{% endif %}
{% if ss.session.slides %}
{% if slot.session.slides %}
<h3>Slides:</h3>
<ol>{% for slide in ss.session.slides %}
<ol>{% for slide in slot.session.slides %}
<li>
<img src="/images/{{slide.file_extension|upper}}_icon.png">
<a href="{{ slide.href }}">{{ slide.title|clean_whitespace }}</a>
@ -216,16 +222,14 @@ You can customize the agenda below to show only selected working group sessions.
</tr>
{% endif %} {% endif %}
{% if ss.timeslot.type.name = 'Plenary' %}
{% if slot.type.name = 'Plenary' %}
<tr>
<td></td>
<td colspan="5">
{% if ss.session.agenda %}
<iframe width="100%" height="1px" src="{{ss.session.agenda.href}}" onload="r(this)"></iframe>
{% endif %}
{% if ss.session.slides %}
<iframe width="100%" height="1px" src="{{slot.session.agenda.href}}" onload="r(this)"></iframe>
{% if slot.session.slides %}
<h3>Slides:</h3>
<ol>{% for slide in ss.session.slides %}
<ol>{% for slide in slot.session.slides %}
<li>
<img src="/images/{{slide.file_extension|upper}}_icon.png">
<a href="{{ slide.href }}">{{ slide.title|clean_whitespace }}</a>