diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 5da471d2b..8232e11ab 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -128,6 +128,13 @@ def materials(request, num=None): training = sessions.filter(group__acronym__in=['edu','iaoc'], type_id__in=['session', 'other', ]) iab = sessions.filter(group__parent__acronym = 'iab') + for topic in [plenaries, ietf, training, irtf, iab]: + for event in topic: + date_list = [] + for slide_event in event.all_meeting_slides(): date_list.append(slide_event.time) + for agenda_event in event.all_meeting_agendas(): date_list.append(agenda_event.time) + if date_list: setattr(event, 'last_update', sorted(date_list, reverse=True)[0]) + return render(request, "meeting/materials.html", { 'meeting_num': meeting.number, 'plenaries': plenaries, diff --git a/ietf/templates/meeting/group_materials.html b/ietf/templates/meeting/group_materials.html index ac8cf330d..79159d1f0 100644 --- a/ietf/templates/meeting/group_materials.html +++ b/ietf/templates/meeting/group_materials.html @@ -1,5 +1,6 @@ {# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %} {% load ietf_filters proceedings_filters managed_groups %} +{% load tz %} {% comment %} @@ -27,7 +28,7 @@ {% if session.all_meeting_agendas %} {% if session.all_meeting_agendas|length == 1 %} - Agenda
+ Agenda
{% else %} {% for agenda in session.all_meeting_agendas %} Agenda {{agenda.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i"}}
@@ -57,7 +58,7 @@ {% with session.all_meeting_slides as slides %} {% for slide in slides %} - {{ slide.title|clean_whitespace }} + {{ slide.title|clean_whitespace }}
{% empty %} No slides @@ -67,12 +68,17 @@ {% with session.all_meeting_drafts as drafts %} {% for draft in drafts %} - {{ draft.name }}
+ {{ draft.name }}
{% empty %} No drafts {% endfor %} {% endwith %} + + {% if session.last_update %} + {{ session.last_update|utc|date:"Y-m-d" }}
{{ session.last_update|utc|date:"H:i:s" }} UTC + {% endif %} + {% if user|has_role:"Secretariat" or user|managed_groups %}
{% include "meeting/edit_materials_button.html" %}
diff --git a/ietf/templates/meeting/materials.html b/ietf/templates/meeting/materials.html index 320063afc..f03e6d2e8 100644 --- a/ietf/templates/meeting/materials.html +++ b/ietf/templates/meeting/materials.html @@ -40,20 +40,22 @@ - {% if user|has_role:"Secretariat" or user|managed_groups %} + {% if user|has_role:"Secretariat" or user|managed_groups %} - - - - {% else %} + + + + + {% else %} - - - {% endif %} + + + + {% endif %} @@ -72,20 +74,22 @@
Group Agenda MinutesSlidesDrafts SlidesDraftsUpdated Group Agenda MinutesSlidesDraftsSlidesDraftsUpdated
- {% if user|has_role:"Secretariat" or user|managed_groups %} + {% if user|has_role:"Secretariat" or user|managed_groups %} - - - - {% else %} + + + + + {% else %} - - - {% endif %} + + + + {% endif %} @@ -106,20 +110,22 @@
Group Agenda MinutesSlidesDrafts SlidesDraftsUpdated Group Agenda MinutesSlidesDraftsSlidesDraftsUpdated
- {% if user|has_role:"Secretariat" or user|managed_groups %} - - - - - - - {% else %} - - - - - - {% endif %} + {% if user|has_role:"Secretariat" or user|managed_groups %} + + + + + + + + {% else %} + + + + + + + {% endif %} @@ -140,20 +146,22 @@
GroupAgendaMinutesSlidesDrafts GroupAgendaMinutesSlidesDraftsGroupAgendaMinutesSlidesDraftsUpdated GroupAgendaMinutesSlidesDraftsUpdated
- {% if user|has_role:"Secretariat" or user|managed_groups %} + {% if user|has_role:"Secretariat" or user|managed_groups %} - - - - {% else %} + + + + + {% else %} - - - {% endif %} + + + + {% endif %} @@ -173,20 +181,22 @@
Group Agenda MinutesSlidesDrafts SlidesDraftsUpdated Group Agenda MinutesSlidesDraftsSlidesDraftsUpdated
- {% if user|has_role:"Secretariat" or user|managed_groups %} + {% if user|has_role:"Secretariat" or user|managed_groups %} - - - - {% else %} + + + + + {% else %} - - - {% endif %} + + + + {% endif %}
Group Agenda MinutesSlidesDrafts SlidesDraftsUpdated Group Agenda MinutesSlidesDraftsSlidesDraftsUpdated