diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html index ce30296e3..342045280 100644 --- a/ietf/templates/meeting/agenda.html +++ b/ietf/templates/meeting/agenda.html @@ -31,33 +31,17 @@ {% origin %}
-
- - {% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=updated %} - -

- {% if "-utc" in request.path %} - Agenda in local timezone | - {% else %} - {% comment %}Agenda in UTC timezone | {% endcomment %} - Agenda in UTC timezone | - {% endif %} - Plaintext agenda | - Tools-style agenda - {% if user|has_role:"Secretariat,Area Director,IAB" %} - | - {% if schedule != meeting.agenda %} - List by Room | - List by Type | - Room Grid - {% else %} - List by Room | - List by Type | - Room Grid - {% endif %} - {% 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 %} +
+
+
+
{# cache this part for 5 minutes -- it takes 3-6 seconds to generate #} {% load cache %} {% cache 300 ietf_meeting_agenda_utc schedule.meeting.number request.path %} diff --git a/ietf/templates/meeting/agenda_by_room.html b/ietf/templates/meeting/agenda_by_room.html index 344c25016..f17ec7988 100644 --- a/ietf/templates/meeting/agenda_by_room.html +++ b/ietf/templates/meeting/agenda_by_room.html @@ -1,13 +1,13 @@ {% extends "base.html" %} {% block morecss %} ul.daylist { list-style:none; padding-left:0; } -li.daylistentry { font-size:162%; font-weight:700; } +li h2 { font-weight: 600; margin-top: 0.5em; } +li h3 { font-weight: 400; margin-top: 0.5em; } li.even { background-color:#EDF5FF; } li.odd { background-color:white; } -ul.roomlist {list-style:none; padding-left:0; margin-bottom:20px;} +ul.roomlist {list-style:none; margin-top: 0.5em; } li.roomlistentry { font-weight: 400; } ul.sessionlist { list-style:none; padding-left:2em; margin-bottom:10px;} -li.sessionlistentry { font-size:62%; } .type-lead:after { content: " (DO NOT POST)"; color:red; } .type-offagenda:after { content:" (not published on agenda)"; } @@ -17,25 +17,26 @@ li.sessionlistentry { font-size:62%; } {% block title %}Agenda for {{meeting}} by Room{% endblock %} {% block content %} -{% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=meeting.updated %} -

Agenda for {{meeting}} by Room

-
    -{% for day,sessions in ss_by_day.items %} -
  • {{day|date:'l, j F Y'}} -{% regroup sessions by timeslot.get_functional_location as room_list %} -
      -{% for room in room_list %} -
    • {{room.grouper|default:"Location Unavailable"}} -
        -{% for ss in room.list %} -
      • {{ss.timeslot.time|date:"H:i"}}-{{ss.timeslot.end_time|date:"H:i"}} {{ss.session.short_name}}
        • -{% endfor %} -
      -
      • -{% endfor %} -
    -
    • -{% endfor %} -
+ + {% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=meeting.updated selected="by-room" title_extra="by Room" %} + +
    + {% for day,sessions in ss_by_day.items %} +

  • {{day|date:'l, j F Y'}}

    + {% regroup sessions by timeslot.get_functional_location as room_list %} +
      + {% for room in room_list %} +

    • {{room.grouper|default:"Location Unavailable"}}

      +
        + {% for ss in room.list %} +
      • {{ss.timeslot.time|date:"H:i"}}-{{ss.timeslot.end_time|date:"H:i"}} {{ss.session.short_name}}
        • + {% endfor %} +
      +
      • + {% endfor %} +
    +
    • + {% endfor %} +
{% endblock %} diff --git a/ietf/templates/meeting/agenda_by_type.html b/ietf/templates/meeting/agenda_by_type.html index 128cf1177..32882f739 100644 --- a/ietf/templates/meeting/agenda_by_type.html +++ b/ietf/templates/meeting/agenda_by_type.html @@ -2,13 +2,15 @@ {% block morecss %} ul.typelist { list-style:none; padding-left:0; } -li.typelistentry { font-size:162%; font-weight:700; } +li h2 { font-weight: 600; margin-top: 0.5em; } +li h3 { font-weight: 400; margin-top: 0.5em; } li.even { background-color:#EDF5FF; } li.odd { background-color:white; } ul.daylist {list-style:none; padding-left:0; margin-bottom:20px;} li.daylistentry { margin-left:2em; font-weight: 400; } -.sessiontable {margin-left:2em; font-size:62%;} + +.sessiontable {margin-left: 2em; } .sessiontable td {padding-right: 1em;} .typelabel { font-size:162%; font-weight:700; } @@ -25,18 +27,18 @@ li.daylistentry { margin-left:2em; font-weight: 400; } {% block title %}Agenda for {{meeting}} by Session Type{% endblock %} {% block content %} -{% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=meeting.updated %} -

Agenda for {{meeting}} by Session Type

+{% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=meeting.updated selected="by-type" title_extra="by Session Type" %} + {% regroup assignments by session.type.slug as type_list %}
    {% for type in type_list %}
  • - {{type.grouper}} {% if schedule == meeting.agenda %}Download to Calendar{% endif %} +

    {{type.grouper|title}}

    {% if schedule == meeting.agenda %}Download to Calendar{% endif %}
      {% regroup type.list by timeslot.time|date:"l Y-M-d" as daylist %} {% for day in daylist %}
    • - {{ day.grouper }} +

      {{ day.grouper }}

      {% for ss in day.list %} diff --git a/ietf/templates/meeting/floor-plan.html b/ietf/templates/meeting/floor-plan.html new file mode 100644 index 000000000..1237f9e07 --- /dev/null +++ b/ietf/templates/meeting/floor-plan.html @@ -0,0 +1,106 @@ +{% extends "base.html" %} +{# Copyright The IETF Trust 2015, All Rights Reserved #} +{% load origin %} + +{% load ietf_filters %} +{% load staticfiles %} + +{% block title %} + IETF {{ schedule.meeting.number }} meeting agenda + {% if "-utc" in request.path %} + (UTC) + {% endif %} +{% endblock %} + +{% block morecss %} +.floor-plan { + position: relative; + top: 0; + left: 0; +} +.rooms a { + text-decoration: underline; +} +{% endblock %} + +{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %} + +{% block content %} + {% origin %} + +
      +
      + + {% include "meeting/meeting_heading.html" with meeting=schedule.meeting selected="floor-plan" title_extra="Floor Plan" %} + +
      +
      + + +
      +
      + {% for floor in floors %} +
      +

      {{ floor.name }}

      +
      + + + + + + +
      +
      + {% for room in floor.room_set.all %} + {#{{ room.name|nbsp }}#} + {{ room.name|nbsp }} + {% endfor %} +
      +
      + {% endfor %} +
      +
      + +
      +
      +{% endblock %} + +{% block js %} +{% with meeting=schedule.meeting %} + + +{% endwith %} +{% endblock %} diff --git a/ietf/templates/meeting/meeting_heading.html b/ietf/templates/meeting/meeting_heading.html index e756afd96..0d0aab7ec 100644 --- a/ietf/templates/meeting/meeting_heading.html +++ b/ietf/templates/meeting/meeting_heading.html @@ -1,24 +1,57 @@ {# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %} {# assumes meeting is in context #} -{% if schedule != meeting.agenda %} -

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

      -{% endif %} +{% load origin %} +{% load ietf_filters %} -

      - IETF {{ meeting.number }} Meeting Agenda -
      - - {{ meeting.city }}, {{ 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" }} - - Updated {{ updated|date:"Y-m-d \a\t G:i:s (T)" }} - + {% origin %} - + {% if schedule != meeting.agenda %} +

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

      + {% endif %} - +

      + IETF {{ meeting.number }} Meeting Agenda {{ title_extra }} +
      + + {{ meeting.city }}, {{ 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 %} + +

      + + diff --git a/ietf/templates/meeting/no-agenda.html b/ietf/templates/meeting/no-agenda.html index 658fa5a3b..2961ba9f2 100644 --- a/ietf/templates/meeting/no-agenda.html +++ b/ietf/templates/meeting/no-agenda.html @@ -6,7 +6,7 @@ {% block content %} {% origin %} - {% include "meeting/meeting_heading.html" %} + {% include "meeting/meeting_heading.html" with title_extra="" selected="" %}

      There is no agenda available yet.

      diff --git a/ietf/templates/meeting/room-view.html b/ietf/templates/meeting/room-view.html index 647e8833d..3c6692460 100644 --- a/ietf/templates/meeting/room-view.html +++ b/ietf/templates/meeting/room-view.html @@ -582,7 +582,7 @@ -
      {% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=schedule.meeting.updated %}
      +
      {% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=schedule.meeting.updated selected="room-view" title_extra="Room Grid" %}