Skip to content

Commit 84a07d7

Browse files
committed
Selectively removed the agenda and minutes warnings from the meeting materials page, for educational sessions where agenda and minutes aren't expected. Fixes issue ietf-tools#1115.
- Legacy-Id: 6078
1 parent 37e69a0 commit 84a07d7

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

ietf/templates/meeting/group_materials.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
</b>
1616
</td>
1717
<td>
18-
{% if session.agenda %}<a href="http://www.ietf.org/proceedings/{{meeting_num}}/agenda/{{ session.agenda }}">Agenda</a>{% else %}<span style="background:#ff8888;padding:0 2px;">No agenda received</span> {% endif %}<br/>
19-
{% if session.minutes %}<a href="http://www.ietf.org/proceedings/{{ meeting_num }}/minutes/{{ session.minutes }}">Minutes</a>{% else %}No minutes received{% endif %}<br/>
18+
{% if session.agenda %}<a href="http://www.ietf.org/proceedings/{{meeting_num}}/agenda/{{ session.agenda }}">Agenda</a>{% else %}{% if show_agenda == "True" %}<span style="background:#ff8888;padding:0 2px;">No agenda received</span> {% endif %}{% endif %}<br/>
19+
{% if session.minutes %}<a href="http://www.ietf.org/proceedings/{{ meeting_num }}/minutes/{{ session.minutes }}">Minutes</a>{% else %}{% if show_agenda == "True" %}No minutes received{% endif %}{% endif %}<br/>
2020
{% for slide in session.slides %}
2121
<a href="http://www.ietf.org/proceedings/{{meeting_num}}/slides/{{ slide.external_url }}">{{ slide.title|clean_whitespace }}</a><br/>
2222
{% endfor %}

ietf/templates/meeting/materials.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ <h1>IETF {{ meeting_num }} Meeting Materials</h1>
5050
{% load cache %}
5151
{% cache 900 ietf_meeting_materials meeting_num cache_version %}
5252

53+
{% with "True" as show_agenda %}
5354
<!-- Plenaries -->
5455
{% if plenaries %}
5556
<a name="plenaries"></a>
@@ -73,13 +74,15 @@ <h2 class="ietf-divider">{{ sessions.grouper }}</h2>
7374

7475
<!-- Training Sessions -->
7576
{% if training %}
77+
{% with "False" as show_agenda %}
7678
<a name="training"></a>
7779
<h2 class="ietf-divider">Training</h2>
7880
{% for session in training %}
7981
{% ifchanged %}
8082
{% include "meeting/group_materials.html" %}
8183
{% endifchanged %}
8284
{% endfor %}
85+
{% endwith %}
8386
{% endif %}
8487
<!-- End of Training Sessions -->
8588

@@ -106,6 +109,7 @@ <h2 class="ietf-divider">IRTF</h2>
106109
{% endfor %}
107110
{% endif %}
108111
<!-- End of IRTF Sessions -->
112+
{% endwith %}
109113

110114
{% endcache %}
111115

0 commit comments

Comments
 (0)