Skip to content

Commit 637c1a0

Browse files
levkowetzlevkowetz
committed
Added links to dependency graph and tools page to the group metainformation. Reindented consistently.
 - Legacy-Id: 11295
1 parent 7edecae commit 637c1a0

1 file changed

Lines changed: 99 additions & 83 deletions

File tree

‎ietf/templates/group/group_about.html‎

Lines changed: 99 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -12,83 +12,98 @@
1212

1313
<table class="table table-condensed">
1414
<thead><tr><th colspan="3"></th></tr></thead>
15-
<tbody class="meta">
16-
<tr>
17-
<th>{{ group.type.name }}</th>
18-
<th>Name</th>
19-
<td>{{ group.name }}</td>
20-
</tr>
21-
22-
<tr>
23-
<td></td>
24-
<th>Acronym</th>
25-
<td>{{ group.acronym }}</td>
26-
</tr>
27-
28-
<tr>
29-
<td></td>
30-
{% if group.parent and group.parent.type_id == "area" %}
31-
<th>{{ group.parent.type.name }}</th>
32-
<td>{{ group.parent.name }} ({{ group.parent.acronym }})</td>
33-
{% else %}
34-
<th></th><td></td>
35-
{% endif %}
36-
</tr>
37-
38-
<tr>
39-
<td></td>
40-
<th>State</th>
41-
<td>
42-
{{ group.state.name }}
43-
{% if requested_close %}
44-
<div class="label label-info">In the process of being closed</div>
45-
{% endif %}
46-
</td>
47-
</tr>
15+
<tbody class="meta">
16+
<tr>
17+
<th>{{ group.type.name }}</th>
18+
<th>Name</th>
19+
<td>{{ group.name }}</td>
20+
</tr>
4821

49-
{% if group.features.has_chartering_process %}
5022
<tr>
51-
<td></td>
52-
<th>Charter</th>
53-
<td>
54-
{% if group.charter %}
55-
<a href="{% url "doc_view" name=group.charter.name %}">{{ group.charter.name }}-{{ group.charter.rev }}</a>
56-
<span class="label label-info">{{ group.charter.get_state.name }}</span>
57-
{% else %}
58-
(None)
59-
{% if user|has_role:"Area Director,Secretariat" %}
60-
<a class="btn btn-warning btn-xs" href="{% url "ietf.group.views_edit.submit_initial_charter" group_type=group.type_id acronym=group.acronym %}">Submit charter</a>
61-
{% endif %}
62-
{% endif %}
63-
</td>
23+
<td></td>
24+
<th>Acronym</th>
25+
<td>{{ group.acronym }}</td>
6426
</tr>
65-
{% endif %}
6627

67-
{% if can_provide_status_update or status_update %}
68-
<tr id='status_update'>
69-
<td></td>
70-
<th>Status Update</th>
71-
<td>
72-
{% if status_update %}
73-
(last changed {{status_update.time|date:"Y-m-d"}})
74-
{% else %}
75-
(None)
76-
{% endif %}
77-
<a class="btn btn-default btn-xs" href="{% url "ietf.group.views.group_about_status" acronym=group.acronym %}">Show</a>
78-
{% if can_provide_status_update %}
79-
<a class="btn btn-default btn-xs" href="{% url "ietf.group.views.group_about_status_edit" acronym=group.acronym %}">Edit</a>
80-
{% endif %}
81-
</td>
28+
<tr>
29+
<td></td>
30+
{% if group.parent and group.parent.type_id == "area" %}
31+
<th>{{ group.parent.type.name }}</th>
32+
<td>{{ group.parent.name }} ({{ group.parent.acronym }})</td>
33+
{% else %}
34+
<th></th><td></td>
35+
{% endif %}
8236
</tr>
83-
{% endif %}
8437

38+
<tr>
39+
<td></td>
40+
<th>State</th>
41+
<td>
42+
{{ group.state.name }}
43+
{% if requested_close %}
44+
<div class="label label-info">In the process of being closed</div>
45+
{% endif %}
46+
</td>
47+
</tr>
48+
49+
{% if group.features.has_chartering_process %}
50+
<tr>
51+
<td></td>
52+
<th>Charter</th>
53+
<td>
54+
{% if group.charter %}
55+
<a href="{% url "doc_view" name=group.charter.name %}">{{ group.charter.name }}-{{ group.charter.rev }}</a>
56+
<span class="label label-info">{{ group.charter.get_state.name }}</span>
57+
{% else %}
58+
(None)
59+
{% if user|has_role:"Area Director,Secretariat" %}
60+
<a class="btn btn-warning btn-xs" href="{% url "ietf.group.views_edit.submit_initial_charter" group_type=group.type_id acronym=group.acronym %}">Submit charter</a>
61+
{% endif %}
62+
{% endif %}
63+
</td>
64+
</tr>
65+
{% endif %}
66+
67+
{% if can_provide_status_update or status_update %}
68+
<tr id='status_update'>
69+
<td></td>
70+
<th>Status Update</th>
71+
<td>
72+
{% if status_update %}
73+
(last changed {{status_update.time|date:"Y-m-d"}})
74+
{% else %}
75+
(None)
76+
{% endif %}
77+
<a class="btn btn-default btn-xs" href="{% url "ietf.group.views.group_about_status" acronym=group.acronym %}">Show</a>
78+
{% if can_provide_status_update %}
79+
<a class="btn btn-default btn-xs" href="{% url "ietf.group.views.group_about_status_edit" acronym=group.acronym %}">Edit</a>
80+
{% endif %}
81+
</td>
82+
</tr>
83+
{% endif %}
84+
85+
{% if group.features.has_documents %}
86+
<tr id='dependency_graph'>
87+
<td></td>
88+
<th>Dependencies</th>
89+
<td>
90+
<a href="{% url 'ietf.group.views.dependencies' group_type=group.type_id acronym=group.acronym output_type='svg' %}">
91+
Document dependency graph (SVG)
92+
</a>
93+
</td>
94+
</tr>
95+
{% endif %}
8596

8697
{% with group.groupurl_set.all as urls %}
8798
{% if urls %}
8899
<tr>
89100
<td></td>
90101
<th>More info</th>
91102
<td>
103+
{% if group.has_tools_page %}
104+
<a href="https://tools.ietf.org/{{ group.type_id }}/{{ group.acronym }}/">Tools page</a>
105+
{% if urls %}<br>{% endif %}
106+
{% endif %}
92107
{% for url in urls %}
93108
<a href="{{ url.url }}">{% firstof url.name url.url %}</a>{% if not forloop.last %}<br>{% endif %}
94109
{% endfor %}
@@ -97,28 +112,29 @@
97112
{% endif %}
98113
{% endwith %}
99114
</tbody>
100-
<tbody class="meta">
101-
{% for slug, label, roles in group.personnel %}
102-
<tr>
103-
{% if forloop.first %}
104-
<th>Personnel</th>
105-
{% else %}
106-
<td></td>
107-
{% endif %}
108-
<th>{{ label }}</th>
109-
<td>
110-
{% for r in roles %}
111-
<span class="fa fa-envelope-o"></span>
112-
<a href="mailto:{{ r.email.address }}">{{ r.person.plain_name }}</a>
113-
<br>
114-
{% endfor %}
115-
</td>
116-
</tr>
117-
{% endfor %}
118115

116+
<tbody class="meta">
117+
{% for slug, label, roles in group.personnel %}
118+
<tr>
119+
{% if forloop.first %}
120+
<th>Personnel</th>
121+
{% else %}
122+
<td></td>
123+
{% endif %}
124+
<th>{{ label }}</th>
125+
<td>
126+
127+
128+
{% for r in roles %}
129+
<span class="fa fa-envelope-o"></span>
130+
<a href="mailto:{{ r.email.address }}">{{ r.person.plain_name }}</a>
131+
<br>
132+
{% endfor %}
133+
</td>
134+
</tr>
135+
{% endfor %}
119136
</tbody>
120137

121-
122138
{% if group.list_email %}
123139
<tbody class="meta">
124140
<tr>

0 commit comments

Comments
 (0)