Skip to content

Commit 8e942f4

Browse files
committed
Changed the display of individual item update time on the materials overview page. In practice, having a tooltip on every agenda, minutes, and slides link became intrusive and annoying. Changed to display a bell if the update is within one day of now, and to display the time tooltip when hovering over the bell. Also corrected the colspan numbers for cancelled sessions, for consistency.
- Legacy-Id: 13965
1 parent a5d8cc8 commit 8e942f4

2 files changed

Lines changed: 22 additions & 11 deletions

File tree

ietf/meeting/views.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ def materials(request, num=None):
9999
cut_off_date = meeting.get_submission_cut_off_date()
100100
cor_cut_off_date = meeting.get_submission_correction_date()
101101
now = datetime.date.today()
102+
old = datetime.datetime.now() - datetime.timedelta(days=1)
102103
if settings.SERVER_MODE != 'production' and '_testoverride' in request.GET:
103104
pass
104105
elif now > cor_cut_off_date:
@@ -145,6 +146,7 @@ def materials(request, num=None):
145146
'cut_off_date': cut_off_date,
146147
'cor_cut_off_date': cor_cut_off_date,
147148
'submission_started': now > begin_date,
149+
'old': old,
148150
})
149151

150152
def current_materials(request):

ietf/templates/meeting/group_materials.html

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,23 @@
2020

2121
{% if session.status_id == 'canceled' %}
2222
{% if user|has_role:"Secretariat" or user|managed_groups %}
23-
<td colspan="4"><span class="label label-danger">Session cancelled</span></td>
23+
<td colspan="6"><span class="label label-danger">Session cancelled</span></td>
2424
{% else %}
25-
<td colspan="3"><span class="label label-danger">Session cancelled</span></td>
25+
<td colspan="5"><span class="label label-danger">Session cancelled</span></td>
2626
{% endif %}
2727
{% else %}
2828
<td>
2929
{% if session.all_meeting_agendas %}
30-
{% if session.all_meeting_agendas|length == 1 %}
31-
<a title="Last Update: {{ session.all_meeting_agendas.0.time|utc|date:"Y-m-d H:i:s" }} UTC" href="{{ session.all_meeting_agendas.0|meeting_href:session.meeting }}">Agenda</a><br>
32-
{% else %}
33-
{% for agenda in session.all_meeting_agendas %}
30+
{% for agenda in session.all_meeting_agendas %}
31+
{% if session.all_meeting_agendas|length == 1 %}
32+
{% if agenda.time > old %}
33+
<span class="small fa fa-bell-o" title="Last Update: {{ agenda.time|utc|date:"Y-m-d H:i:s" }}&nbsp;UTC" ></span>
34+
{% endif %}
35+
<a href="{{ session.all_meeting_agendas.0|meeting_href:session.meeting }}">Agenda</a><br>
36+
{% else %}
3437
<a href="{{agenda|meeting_href:session.meeting}}">Agenda {{agenda.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i"}}</a></br>
35-
{% endfor %}
36-
{% endif %}
38+
{% endif %}
39+
{% endfor %}
3740
{% else %}
3841
{% if show_agenda == "True" %}
3942
<span class="label label-warning">No agenda</span>
@@ -58,7 +61,10 @@
5861
<td>
5962
{% with session.all_meeting_slides as slides %}
6063
{% for slide in slides %}
61-
<a title="Last Update: {{ slide.time|utc|date:"Y-m-d H:i:s" }} UTC" href="{{ slide|meeting_href:session.meeting}}">{{ slide.title|clean_whitespace }}</a>
64+
{% if slide.time > old %}
65+
<span class="small fa fa-bell-o" title="Last Update: {{ slide.time|utc|date:"Y-m-d H:i:s" }}&nbsp;UTC" ></span>
66+
{% endif %}
67+
<a href="{{ slide|meeting_href:session.meeting}}">{{ slide.title|clean_whitespace }}</a>
6268
<br>
6369
{% empty %}
6470
<span class="label label-warning">No slides</span>
@@ -68,15 +74,18 @@
6874
<td>
6975
{% with session.all_meeting_drafts as drafts %}
7076
{% for draft in drafts %}
71-
<a title="Last Update: {{ draft.time|utc|date:"Y-m-d H:i:s" }} UTC" href="{{ draft.href }}">{{ draft.name }}</a><br>
77+
{% if draft.time > old %}
78+
<span class="small fa fa-bell-o" title="Last Update: {{ draft.time|utc|date:"Y-m-d H:i:s" }}&nbsp;UTC" ></span>
79+
{% endif %}
80+
<a href="{{ draft.href }}">{{ draft.name }}</a><br>
7281
{% empty %}
7382
<span class="label label-warning">No drafts</span>
7483
{% endfor %}
7584
{% endwith %}
7685
</td>
7786
<td>
7887
{% if session.last_update %}
79-
{{ session.last_update|utc|date:"Y-m-d" }}<br><small>{{ session.last_update|utc|date:"H:i:s" }} UTC</small>
88+
{{ session.last_update|utc|date:"Y-m-d" }}<br><small>{{ session.last_update|utc|date:"H:i:s" }}&nbsp;UTC</small>
8089
{% endif %}
8190
</td>
8291
{% if user|has_role:"Secretariat" or user|managed_groups %}

0 commit comments

Comments
 (0)