Skip to content

Commit b662393

Browse files
rjsparksrjsparks
committed
refactor columns
 - Legacy-Id: 11745
1 parent c3718c8 commit b662393

2 files changed

Lines changed: 71 additions & 15 deletions

File tree

‎ietf/templates/meeting/group_proceedings.html‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %}
2+
{% load ietf_filters %}
3+
<tr>
4+
<td>
5+
{% comment %}
6+
<a name="{{ session.group.acronym }}"></a>
7+
<a name="wg-{{ session.group.acronym }}"></a>
8+
<a name="session.group-{{ session.group.acronym }}"></a>
9+
{% endcomment %}
10+
{% if session.name %}
11+
<div class="anchor-target" id="{{ session.name|slugify }}">{{ session.name }}</div>
12+
{% else %}
13+
<div class="anchor-target" id="{{session.group.acronym}}"><a href="{% url 'ietf.group.views.group_home' acronym=session.group.acronym %}">{{session.group.acronym}}</a></div>
14+
{% if session.group.state.slug == "bof" %}
15+
<span class="label label-success">{{ session.group.state.slug|upper }}</span>
16+
{% endif %}
17+
{% endif %}
18+
</td>
19+
20+
{% if session.status_id == 'canceled' %}
21+
<td colspan="3"><span class="label label-danger">Session cancelled</span></td>
22+
{% else %}
23+
<td>
24+
{% if session.agenda %}
25+
<a href="https://www.ietf.org/proceedings/{{meeting_num}}/agenda/{{ session.agenda }}">Agenda</a><br>
26+
{% else %}
27+
{% if show_agenda == "True" %}
28+
<span class="label label-warning">No agenda</span><br>
29+
{% endif %}
30+
{% endif %}
31+
{% if session.minutes %}
32+
<a href="https://www.ietf.org/proceedings/{{ meeting_num }}/minutes/{{ session.minutes }}">Minutes</a><br>
33+
{% else %}
34+
{% if show_agenda == "True" %}
35+
<span class="label label-warning">No minutes</span><br>
36+
{% endif %}
37+
{% endif %}
38+
39+
</td>
40+
<td>
41+
{% with session.slides as slides %}
42+
{% for slide in slides %}
43+
<a href="https://www.ietf.org/proceedings/{{meeting_num}}/slides/{{ slide.external_url }}">{{ slide.title|clean_whitespace }}</a>
44+
<br>
45+
{% empty %}
46+
<span class="label label-warning">No slides</span>
47+
{% endfor %}
48+
{% endwith %}
49+
</td>
50+
<td>
51+
{% with session.all_meeting_drafts as drafts %}
52+
{% for draft in drafts %}
53+
<a href="{% url "doc_view" name=draft.canonical_name %}">{{ draft.canonical_name }}</a><br>
54+
{% empty %}
55+
<span class="label label-warning">No drafts</span>
56+
{% endfor %}
57+
{% endwith %}
58+
</td>
59+
{% endif %}
60+
</tr>
61+

‎ietf/templates/meeting/proceedings.html‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,15 @@ <h2 class="anchor-target" id="plenaries">Plenaries</h2>
3535
<thead>
3636
<tr>
3737
<th class="col-md-1">Group</th>
38-
<th class="col-md-1">Agenda</th>
39-
<th class="col-md-1">Minutes</th>
38+
<th class="col-md-1">Artifacts</th>
4039
<th class="col-md-6">Slides</th>
4140
<th class="col-md-3">Drafts</th>
4241
</tr>
4342
</thead>
4443

4544
<tbody>
4645
{% for session in plenaries %}
47-
{% include "meeting/group_materials.html" %}
46+
{% include "meeting/group_proceedings.html" %}
4847
{% endfor %}
4948
</tbody>
5049
</table>
@@ -58,8 +57,7 @@ <h2 class="anchor-target" id="{{sessions.list.0.group.parent.acronym}}">{{sessio
5857
<thead>
5958
<tr>
6059
<th class="col-md-1">Group</th>
61-
<th class="col-md-1">Agenda</th>
62-
<th class="col-md-1">Minutes</th>
60+
<th class="col-md-1">Artifacts</th>
6361
<th class="col-md-6">Slides</th>
6462
<th class="col-md-3">Drafts</th>
6563
</tr>
@@ -68,7 +66,7 @@ <h2 class="anchor-target" id="{{sessions.list.0.group.parent.acronym}}">{{sessio
6866
<tbody>
6967
{% for session in sessions.list|dictsort:"group.acronym" %}
7068
{% ifchanged session.group.acronym %}
71-
{% include "meeting/group_materials.html" %}
69+
{% include "meeting/group_proceedings.html" %}
7270
{% endifchanged %}
7371
{% endfor %}
7472
</tbody>
@@ -83,8 +81,7 @@ <h2 class="anchor-target" id="training">Training</h2>
8381
<thead>
8482
<tr>
8583
<th class="col-md-1">Group</th>
86-
<th class="col-md-1">Agenda</th>
87-
<th class="col-md-1">Minutes</th>
84+
<th class="col-md-1">Artifacts</th>
8885
<th class="col-md-6">Slides</th>
8986
<th class="col-md-3">Drafts</th>
9087
</tr>
@@ -93,7 +90,7 @@ <h2 class="anchor-target" id="training">Training</h2>
9390
<tbody>
9491
{% for session in training %}
9592
{% ifchanged %}
96-
{% include "meeting/group_materials.html" %}
93+
{% include "meeting/group_proceedings.html" %}
9794
{% endifchanged %}
9895
{% endfor %}
9996
</tbody>
@@ -108,8 +105,7 @@ <h2 class="anchor-target" id="iab">IAB <small>Internet Architecture Board</small
108105
<thead>
109106
<tr>
110107
<th class="col-md-1">Group</th>
111-
<th class="col-md-1">Agenda</th>
112-
<th class="col-md-1">Minutes</th>
108+
<th class="col-md-1">Artifacts</th>
113109
<th class="col-md-6">Slides</th>
114110
<th class="col-md-3">Drafts</th>
115111
</tr>
@@ -118,7 +114,7 @@ <h2 class="anchor-target" id="iab">IAB <small>Internet Architecture Board</small
118114
<tbody>
119115
{% for session in iab %}
120116
{% ifchanged %}
121-
{% include "meeting/group_materials.html" %}
117+
{% include "meeting/group_proceedings.html" %}
122118
{% endifchanged %}
123119
{% endfor %}
124120
</tbody>
@@ -132,8 +128,7 @@ <h2 class="anchor-target" id="irtf">IRTF <small>Internet Research Task Force</sm
132128
<thead>
133129
<tr>
134130
<th class="col-md-1">Group</th>
135-
<th class="col-md-1">Agenda</th>
136-
<th class="col-md-1">Minutes</th>
131+
<th class="col-md-1">Artifacts</th>
137132
<th class="col-md-6">Slides</th>
138133
<th class="col-md-3">Drafts</th>
139134
</tr>
@@ -142,7 +137,7 @@ <h2 class="anchor-target" id="irtf">IRTF <small>Internet Research Task Force</sm
142137
<tbody>
143138
{% for session in irtf|dictsort:"group.acronym" %}
144139
{% ifchanged %}
145-
{% include "meeting/group_materials.html" %}
140+
{% include "meeting/group_proceedings.html" %}
146141
{% endifchanged %}
147142
{% endfor %}
148143
</tbody>

0 commit comments

Comments
 (0)