Skip to content

Commit 9d72b65

Browse files
committed
Changed the session details panel to not show icalendar links if the session has been cancelled, and to do show the full set of session agenda links if not cancelled.
- Legacy-Id: 17746
1 parent 9485de6 commit 9d72b65

1 file changed

Lines changed: 16 additions & 2 deletions

File tree

ietf/templates/meeting/session_details_panel.html

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,25 @@
11
{% load origin ietf_filters textfilters tz dateformat %}{% origin %}
22

33
{% for session in sessions %}
4+
{% with item=session.official_timeslotassignment %}
45
<h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1 %}Session {{ forloop.counter }} : {% endif %}
56
{% for time in session.times %}{% if not forloop.first %}, {% endif %} {{time|dateformat:"l Y-m-d H:i T"}} {% if time.tzinfo.zone != "UTC" %}<span class="small">({{time|utc|dateformat:"H:i T"}})</span>{% endif %}{% endfor %}
67
{% if session.cancelled %}<small class="label label-warning">CANCELLED</small>{% else %}{{ session.status }}{% endif %}
78
{% if session.name %} : {{ session.name }}{% endif %}
8-
{% if meeting.date >= thisweek %}
9-
<a class="regular pull-right" title="icalendar entry for {{acronym}} session {{ forloop.counter }}" href="{% url 'ietf.meeting.views.ical_agenda' num=meeting.number session_id=session.id %}"><span class="fa fa-calendar"></span></a>
9+
{% if not session.cancelled %}
10+
<span class="regular pull-right">
11+
{% if meeting.type.slug == 'interim' %}
12+
{% include "meeting/interim_session_buttons.html" with show_agenda=False show_empty=False %}
13+
{% else %}
14+
{% with schedule=meeting.schedule %}
15+
{% include "meeting/session_buttons_include.html" %}
16+
{% endwith %}
17+
{% endif %}
18+
<!-- iCalendar item -->
19+
{% if now < item.timeslot.end_time %}
20+
<a title="icalendar entry for {{acronym}} session {{ forloop.counter }}" href="{% url 'ietf.meeting.views.ical_agenda' num=meeting.number session_id=session.id %}"><span class="fa fa-fw fa-calendar-o"></span> </a>
21+
{% endif %}
22+
</span>
1023
{% endif %}
1124
</h2>
1225
{% if session.agenda_note %}<h3>{{session.agenda_note}}</h3>{% endif %}
@@ -141,4 +154,5 @@ <h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1
141154
{% endif %}
142155
</div>
143156
</div>
157+
{% endwith %}
144158
{% endfor %}

0 commit comments

Comments
 (0)