diff --git a/.eslintrc.js b/.eslintrc.js index 9ea6f3872..000d6bd40 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -2,7 +2,7 @@ module.exports = { extends: ["eslint:recommended"], rules: { indent: ["error", 4], - quotes: ["error", "double", { avoidEscape: true, allowTemplateLiterals: true }], + quotes: "off", "no-multiple-empty-lines": ["error", { max: 2, maxEOF: 0 }], "quote-props": ["error", "as-needed"], "brace-style": ["error", "1tbs", { allowSingleLine: true }], diff --git a/ietf/templates/base.html b/ietf/templates/base.html index c2d732e37..b8f6812c8 100644 --- a/ietf/templates/base.html +++ b/ietf/templates/base.html @@ -73,7 +73,7 @@ {% endif %} -
+
{% comment %} {% bootstrap_messages %} {% endcomment %} {% for message in messages %}
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html index f0893a09a..a31809f0e 100644 --- a/ietf/templates/meeting/agenda.html +++ b/ietf/templates/meeting/agenda.html @@ -7,48 +7,14 @@ {% load htmlfilters agenda_custom_tags%} {% block title %} - IETF {{ schedule.meeting.number }} meeting agenda + IETF {{ schedule.meeting.number }} Meeting Agenda {% if "-utc" in request.path %} (UTC) {% endif %} {% endblock %} {% block morecss %} - iframe#weekview { height: 600px; width: 100%; } - tr:not(:first-child) th.gap { - height: 3em !important; - background-color: inherit !important; - border: none !important; - } - tr:first-child th.gap { - height: 0 !important; - background-color: inherit !important; - border: none !important; - } - .session-materials .agenda-frame,.minutes-frame { - white-space: normal; - } - div.tz-display { - margin-bottom: 0.5em; - margin-top: 1em; - text-align: right; - } - .tz-display a { - cursor: pointer; - } - .tz-display label { - font-weight: normal; - } - .tz-display select { - min-width: 15em; - } - #affix .nav li.tz-display { - padding: 4px 20px; - } - #affix .nav li.tz-display a { - display: inline; - padding: 0; - } + iframe#weekview { height: 25em; } {% endblock %} {% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %} @@ -57,14 +23,12 @@ {% origin %}
-
- {% if "-utc" in request.path %} - {% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=updated selected="agenda-utc" title_extra="(UTC)" %} - {% else %} - {% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=updated selected="agenda" title_extra="" %} - {% endif %} + {% if "-utc" in request.path %} + {% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=updated selected="agenda-utc" title_extra="(UTC)" %} + {% else %} + {% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=updated selected="agenda" title_extra="" %} + {% endif %} -
@@ -72,22 +36,25 @@ {% load cache %} {% cache cache_time ietf_meeting_agenda_utc schedule.meeting.number request.path %}
-

Agenda

-
-
-
- - Meeting | - Local | - UTC -
- {# Avoid blank while loading. JavaScript replaces the option list after init. #}
+ +
+ {% if is_current_meeting %}

Note: IETF agendas are subject to change, up to and during a meeting. @@ -100,23 +67,22 @@

{% endif %} - {% include "meeting/agenda_filter.html" with filter_categories=filter_categories customize_button_text="Customize the agenda view..." %} - +

+ {% include "meeting/agenda_filter.html" with filter_categories=filter_categories customize_button_text="Customize the agenda view..." %} +

Download as .ics

-

+

{% for fc in filter_categories %} {% if not forloop.last %} {# skip the last group, it's the office hours/misc #} -

- {% for p in fc|dictsort:"label" %} - {{p.label}} - {% endfor %} -
+ {% for p in fc|dictsort:"label" %} + {{p.label}} + {% endfor %} {% endif %} {% endfor %} - + + Non-area events + +

@@ -127,18 +93,19 @@ {% endif %}

- + + +

Detailed Agenda

{% for item in filtered_assignments %} {% ifchanged item.timeslot.time|date:"Y-m-d" %} - {% endifchanged %} @@ -165,7 +132,7 @@ {% if item.timeslot.location.floorplan %} {% endif %} {% endwith %} @@ -179,7 +146,7 @@ {% if item.session.current_status == 'canceled' %} CANCELLED {% else %} -
+
{% if item.slot_type.slug == 'other' %} {% if item.session.agenda or item.session.remote_instructions or item.session.agenda_note %} {% include "meeting/session_buttons_include.html" with show_agenda=True item=item schedule=schedule %} @@ -249,7 +216,7 @@ {% if item.timeslot.location.floorplan %} {% endif %} {% endwith %} @@ -285,7 +252,7 @@ {% endif %} {% if item.session.historic_group.state_id == "bof" %} - BOF + BOF {% endif %} {% if item.session.current_status == 'resched' %} diff --git a/ietf/templates/meeting/agenda_filter.html b/ietf/templates/meeting/agenda_filter.html index e394eb732..65f710122 100644 --- a/ietf/templates/meeting/agenda_filter.html +++ b/ietf/templates/meeting/agenda_filter.html @@ -10,85 +10,64 @@ Optional parameters:
+

-

-
- -
-
+
+
+ -

- You can customize the agenda view to show only selected sessions, - by clicking on groups and areas in the table below. - To be able to return to the customized view later, bookmark the resulting URL. -

+

+ You can customize the agenda view to show only selected sessions, + by clicking on groups and areas in the table below. + To be able to return to the customized view later, bookmark the resulting URL. +

- {% if filter_categories|length %} -

Groups displayed in italics are BOFs.

+ {% if filter_categories|length %} +

Groups displayed in italics are BOFs.

- {% with spacer_scale=5 %} - {% with width_scale=filter_categories|agenda_width_scale:spacer_scale %} -
{# The anchor here needs to be in a div, not in the th, in order for the anchor-target margin hack to work #}
- {{ item.timeslot.time|date:"l, F j, Y" }} +
{{ item.timeslot.time|date:"l, F j, Y" }}
- - - {% for fc in filter_categories %} - {% if not forloop.first %} - - {% endif %} - {% for area in fc %} - - {% endfor %} + + {% endfor %} - - - - - {% for fc in filter_categories %} - {% if not forloop.first %} {% endif %} - {% for p in fc %} - - {% endfor %} - {% endfor %} - - -
- {% if area.keyword %} - +
+ {% for fc in filter_categories %} + {% for area in fc %} +
+
+ {% if area.label or area.keyword %} + + {% endif %} +
+
+
+ {% for group in area.children %} +
-
- {% for button in p.children %} -
- -
- {% endfor %} -
-
- {% endwith %} - {% endwith %} - {% else %} -
No WG / RG data available -- no WG / RG sessions have been scheduled yet. -
- {% endif %} -
+
+
+
+ {% endfor %} + {% endfor %} + +
+ {% else %} +
No WG / RG data available -- no WG / RG sessions have been scheduled yet. +
+ {% endif %} diff --git a/ietf/templates/meeting/meeting_heading.html b/ietf/templates/meeting/meeting_heading.html index 4253f3fb1..73a95bff3 100644 --- a/ietf/templates/meeting/meeting_heading.html +++ b/ietf/templates/meeting/meeting_heading.html @@ -7,75 +7,76 @@ {% if schedule != meeting.schedule %}

- This is schedule {{schedule.owner.email}}/{{ schedule.name }}, not the official schedule. + This is schedule {{ schedule.owner.email }}/{{ schedule.name }}, not the official schedule.

{% endif %}

IETF {{ meeting.number }} Meeting Agenda {{ title_extra }} -
- - {{ meeting.city|default:"Location TBD" }}, {{ meeting.date|date:"F j" }} - - {% if meeting.date.month != meeting.end_date.month %} - {{ meeting.end_date|date:"F " }} - {% endif %} - {{ meeting.end_date|date:"j, Y" }} - {% if updated %} - - Updated {{ updated|date:"Y-m-d \a\t G:i:s (T)" }} - - {% endif %} -

- -{# tags with the agenda-link filterable classes will be updated with show/hide parameters #} - + {{ meeting.end_date|date:"j, Y" }} + {% if updated %} + + Updated: {{ updated|date:"Y-m-d \a\t G:i:s (T)" }} + + {% endif %} + + +

+ {# a tags with the agenda-link filterable classes will be updated with show/hide parameters #} +

+

\ No newline at end of file