Skip to content

Commit cbf4cc7

Browse files
larseggertlarseggert
committed
Fix more HTML bugs. Commit ready for merge.
 - Legacy-Id: 9738
1 parent 4c0d7c3 commit cbf4cc7

4 files changed

Lines changed: 48 additions & 43 deletions

File tree

‎ietf/templates/doc/ballot_popup.html‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
<!DOCTYPE html>{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %}
1+
<!doctype html>
2+
{# Copyright The IETF Trust 2015, All Rights Reserved #}
3+
{% load origin %}{% origin %}
24
{% load ietf_filters %}
5+
<html lang=en>
6+
<head>
7+
<meta charset=utf-8>
8+
<title>Ballot for {{ doc.name }}</title>
9+
</head>
10+
11+
<body>
312
<div class="modal-header">
413
<button type="button" class="close" data-dismiss="modal">
514
<span aria-hidden="true">&times;</span>
@@ -35,3 +44,5 @@ <h4 class="modal-title" id="modal-title-{{ ballot_id }}">Ballot for {{ doc.name
3544
{% endif %}
3645
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
3746
</div>
47+
</body>
48+
</html>

‎ietf/templates/doc/document_charter.html‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@
2828
</thead>
2929

3030
<tbody>
31-
<tr>
32-
<th rowspan="{{table_rows.doc}}">Document</th>
33-
</tr>
3431

3532
<tr>
33+
<th>Document</th>
3634
<th>
3735
{% if doc.get_state_slug != "approved" %}
3836
Proposed charter
@@ -52,6 +50,7 @@
5250
</tr>
5351

5452
<tr>
53+
<td class="plain"></td>
5554
<th>Title</th>
5655
<td class="edit">
5756
{% if not snapshot and can_manage %}
@@ -62,12 +61,14 @@
6261
</tr>
6362

6463
<tr>
64+
<td class="plain"></td>
6565
<th>Last updated</th>
6666
<td class="edit"></td>
6767
<td>{{ doc.time|date:"Y-m-d" }}</td>
6868
</tr>
6969

7070
<tr>
71+
<td class="plain"></td>
7172
<th><a href="/doc/help/state/charter/">State</a></th>
7273
<td class="edit">
7374
{% if not snapshot and can_manage %}
@@ -87,27 +88,33 @@
8788
</tr>
8889

8990
</tbody>
90-
<tbody>
91-
92-
<tr>
93-
<th rowspan="{{table_rows.wg}}">WG</th>
94-
</tr>
9591

92+
<tbody>
9693
<tr>
94+
<th>WG</th>
9795
<th>State</th>
9896
<td class="edit"></td>
9997
<td>{{ group.state.name }}</td>
10098
</tr>
101-
10299
</tbody>
103-
<tbody>
104100

101+
<tbody>
105102
<tr>
106-
<th rowspan="{{table_rows.iesg}}">IESG</th>
103+
<th>IESG</th>
104+
<th>Responsible AD</th>
105+
<td class="edit">
106+
{% if can_manage %}
107+
{% doc_edit_button "charter_edit_ad" name=doc.name %}
108+
{% endif %}
109+
</td>
110+
<td>
111+
{{ doc.ad|default:"(None)" }}
112+
</td>
107113
</tr>
108114

109115
{% if not snapshot and chartering %}
110116
<tr>
117+
<td class="plain"></td>
111118
<th>Telechat date</th>
112119
<td class="edit">
113120
{% if can_manage %}
@@ -125,21 +132,11 @@
125132
<br><i>{{ ballot_summary }}</i>
126133
{% endif %}
127134
</td>
128-
{% endif %}
129-
130-
<tr>
131-
<th>Responsible AD</th>
132-
<td class="edit">
133-
{% if can_manage %}
134-
{% doc_edit_button "charter_edit_ad" name=doc.name %}
135-
{% endif %}
136-
</td>
137-
<td>
138-
{{ doc.ad|default:"(None)" }}
139-
</td>
140135
</tr>
136+
{% endif %}
141137

142138
<tr>
139+
<td class="plain"></td>
143140
<th>Send notices to</th>
144141
<td class="edit">
145142
{% if can_manage %}

‎ietf/templates/doc/document_conflict_review.html‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@
2525

2626
<tbody>
2727
<tr>
28-
<th rowspan="{{table_rows.doc}}">Document</th>
29-
</tr>
30-
31-
<tr>
28+
<th>Document</th>
3229
<th>
3330
{% if doc.get_state_slug not in approved_states %}
3431
Proposed conflict review
@@ -50,12 +47,14 @@
5047
</tr>
5148

5249
<tr>
50+
<td class="plain"></td>
5351
<th>Last updated</th>
5452
<td class="edit"></td>
5553
<td>{{ doc.time|date:"Y-m-d" }}</td>
5654
</tr>
5755

5856
<tr>
57+
<td class="plain"></td>
5958
<th><a href="/doc/help/state/conflict-review/">State</a></th>
6059
<td class="edit">
6160
{% if not snapshot and user|has_role:"Area Director,Secretariat" %}
@@ -70,12 +69,21 @@
7069
</tbody>
7170
<tbody>
7271
<tr>
73-
<th rowspan="{{table_rows.iesg}}">IESG</th>
72+
<th>IESG</th>
73+
<th>Shepherding AD</th>
74+
<td class="edit">
75+
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
76+
<a class="btn btn-default btn-xs pull-right" href="{% url "conflict_review_ad" name=doc.name %}">Edit</a>
77+
{% endif %}
78+
</td>
79+
<td>
80+
{{doc.ad}}
81+
</td>
7482
</tr>
7583

76-
7784
{% if not snapshot %}
7885
<tr>
86+
<td class="plain"></td>
7987
<th>Telechat date</th>
8088
<td class="edit">
8189
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
@@ -98,18 +106,7 @@
98106
{% endif %}
99107

100108
<tr>
101-
<th>Shepherding AD</th>
102-
<td class="edit">
103-
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
104-
<a class="btn btn-default btn-xs pull-right" href="{% url "conflict_review_ad" name=doc.name %}">Edit</a>
105-
{% endif %}
106-
</td>
107-
<td>
108-
{{doc.ad}}
109-
</td>
110-
</tr>
111-
112-
<tr>
109+
<td class="plain"></td>
113110
<th>Send notices to</th>
114111
<td class="edit">
115112
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}

‎ietf/templates/meeting/agenda.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ <h2>
184184
{% endif %}
185185

186186
{% if item.timeslot.type.slug == 'break' or item.timeslot.type.slug == 'reg' or item.timeslot.type.slug == 'other' %}
187-
{% with session_id=item.timeslot.time|date:"D-Hi"|lower|add:"-"|add:item.session.group.acronym|lower %}
187+
{% with session_id=item.timeslot.time|date:"D-Hi"|lower|add:"-"|add:item.session.group.acronym|lower|add:"-"|add:item.timeslot.get_location|slugify %}
188188
<tr id="row-{{session_id}}">
189189
<td class="text-nowrap text-right">
190190
{% if "-utc" in request.path %}

0 commit comments

Comments
 (0)