Skip to content

Commit c41a079

Browse files
levkowetzlevkowetz
committed
Merged in [9735] from lars@netapp.com:
 More HTML fixes identified by test-crawl --vnu. - Legacy-Id: 9767 Note: SVN reference [9735] has been migrated to Git commit 08d958e
1 parent 5d8306c commit c41a079

8 files changed

Lines changed: 36 additions & 41 deletions

File tree

‎hold-for-merge‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# -*- conf-mode -*-
22

3+
personal/lars/6.0.5.dev0@9734 # Obsoleted - don't use 'bleach'
34
personal/lars/6.0.5.dev0@9732 # Already fixed in a different merge
45
personal/lars/6.0.5.dev0@9731 # Jquery update; wait with this to the CDN branch comes in
56
personal/lars/6.0.5.dev0@9730 # Jquery update; wait with this to the CDN branch comes in

‎ietf/meeting/views.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ def session_agenda(request, num, session):
437437

438438
if d:
439439
agenda = d[0]
440-
content = read_agenda_file(num, agenda) or "Could not read agenda file"
440+
content = read_agenda_file(num, agenda) or "<!doctype html><html lang=en><head><meta charset=utf-8><title>Error</title></head><body><p>Could not read agenda file</p></body></html>"
441441
_, ext = os.path.splitext(agenda.external_url)
442442
ext = ext.lstrip(".").lower()
443443

‎ietf/templates/doc/document_charter.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</tr>
2828
</thead>
2929

30-
<tbody class="plain">
30+
<tbody>
3131
<tr>
3232
<th rowspan="{{table_rows.doc}}">Document</th>
3333
</tr>
@@ -87,7 +87,7 @@
8787
</tr>
8888

8989
</tbody>
90-
<tbody class="plain">
90+
<tbody>
9191

9292
<tr>
9393
<th rowspan="{{table_rows.wg}}">WG</th>
@@ -100,7 +100,7 @@
100100
</tr>
101101

102102
</tbody>
103-
<tbody class="plain">
103+
<tbody>
104104

105105
<tr>
106106
<th rowspan="{{table_rows.iesg}}">IESG</th>

‎ietf/templates/doc/document_conflict_review.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
<thead id="message-row">
1717
<tr>
1818
{% if doc.rev != latest_rev %}
19-
<th colspan="4" class="alert-warning">&nbsp;The information below is for an old version of the document</th>
19+
<th colspan="4" class="alert-warning">The information below is for an old version of the document</th>
2020
{% else %}
21-
<th colspan="4">&nbsp;</th>
22-
{% endif %}
21+
<th colspan="4"></th>
22+
{% endif %}
2323
</tr>
2424
</thead>
2525

26-
<tbody class="plain">
26+
<tbody>
2727
<tr>
2828
<th rowspan="{{table_rows.doc}}">Document</th>
2929
</tr>
@@ -137,7 +137,8 @@ <h2>Conflict review<br><small>{{ conflictdoc.name }}-{{ conflictdoc.rev }}</smal
137137
{% endif %}
138138

139139
{% if doc.rev %}
140-
<p>{{ content|fill:"80"|safe|linebreaksbr|keep_spacing|sanitize_html|safe }}</p>
140+
<p></p>
141+
{{ content|fill:"80"|safe|linebreaksbr|keep_spacing|sanitize_html|safe }}
141142
{% endif %}
142143

143144
{% endblock %}

‎ietf/templates/doc/document_draft.html‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<meta name="description" content="{{ doc.title }} {% if doc.get_state_slug == "rfc" %}(RFC {{ rfc_number }}{% if published %}, {{ published.time|date:"F Y" }}{% endif %}{% if obsoleted_by %}; obsoleted by {{ obsoleted_by|join:", " }}{% endif %}){% else %}(Internet-Draft, {{ doc.time|date:"Y" }}){% endif %}">
1010
{% endblock %}
1111

12+
{% block morecss %}
13+
.inline { display: inline; }
14+
{% endblock %}
15+
1216
{% block title %}
1317
{% if doc.get_state_slug == "rfc" %}
1418
RFC {{ rfc_number }}
@@ -34,7 +38,7 @@
3438
</tr>
3539
</thead>
3640

37-
<tbody class="plain">
41+
<tbody>
3842
<tr>
3943
<th rowspan="{{table_rows.doc}}">Document</th>
4044
<th>Type</th>
@@ -146,7 +150,7 @@
146150
{% endif %}
147151

148152
</tbody>
149-
<tbody class="plain">
153+
<tbody>
150154
<tr>
151155
<th rowspan="{{table_rows.stream}}">Stream</th>
152156
{% if doc.stream %}
@@ -239,7 +243,7 @@
239243
{% endif %}
240244

241245
</tbody>
242-
<tbody class="plain">
246+
<tbody>
243247
<tr>
244248
<th rowspan="{{table_rows.iesg}}">IESG</th>
245249
<th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iesg" %}">IESG state</a></th>
@@ -321,7 +325,7 @@
321325
</tbody>
322326

323327
{% if iana_review_state %}
324-
<tbody class="plain">
328+
<tbody>
325329
<tr>
326330
<th rowspan="{{table_rows.iana}}">IANA</th>
327331
<th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iana-review" %}">IANA review state</a></th>
@@ -349,7 +353,7 @@
349353
</tbody>
350354
{% endif %}
351355

352-
<tbody class="plain">
356+
<tbody>
353357

354358
{% if rfc_editor_state %}
355359
<tr>
@@ -369,7 +373,7 @@
369373
<a class="btn btn-default btn-xs" href="{% url "doc_references" doc.canonical_name %}" rel="nofollow"><span class="fa fa-long-arrow-left"></span> References</a>
370374
<a class="btn btn-default btn-xs" href="{% url "doc_referenced_by" doc.canonical_name %}" rel="nofollow"><span class="fa fa-long-arrow-right"></span> Referenced by</a>
371375
<a class="btn btn-default btn-xs" href="https://www.ietf.org/tools/idnits?url=https://www.ietf.org/archive/id/{{ doc.filename_with_rev }}" rel="nofollow" target="_blank"><span class="fa fa-exclamation"></span> Nits</a>
372-
<span class="dropdown">
376+
<div class="dropdown inline">
373377
<button class="btn btn-default btn-xs dropdown-toggle" type="button" id="ddSearchMenu" data-toggle="dropdown" aria-expanded="true">
374378
<span class="fa fa-search"></span> Search lists <span class="caret"></span>
375379
</button>
@@ -380,7 +384,7 @@
380384
<li role="presentation"><a role="menuitem" href="https://www.iesg.org/bin/c5i?mid=6&amp;rid=77&amp;target={{ doc.name }}" rel="nofollow" target="_blank">ARO</a> </li>
381385
{% endif %}
382386
</ul>
383-
</span>
387+
</div>
384388
{% if user.is_authenticated %}
385389
{% if tracking_document %}
386390
<a class="btn btn-default btn-xs community-list-add-remove-doc" href="{% url "community_remove_track_document" doc.name %}" title="Remove from your personal ID list"><span class="fa fa-bookmark-o"></span> Untrack</a>

‎ietf/templates/doc/document_status_change.html‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,14 @@
1212

1313
{% include "doc/revisions_list.html" %}
1414

15-
{% if doc.rev != latest_rev %}
16-
<p class="alert alert-warning"> The information below is for an old version of the document</p>
17-
{% endif %}
18-
1915
<table class="table table-condensed">
2016
<thead id="message-row">
2117
<tr>
2218
{% if doc.rev != latest_rev %}
23-
<th colspan="4" class="alert-warning">&nbsp;The information below is for an old version of the document</th>
19+
<th colspan="4" class="alert-warning">The information below is for an old version of the document</th>
2420
{% else %}
25-
<th colspan="4">&nbsp;</th>
26-
{% endif %}
21+
<th colspan="4"></th>
22+
{% endif %}
2723
</tr>
2824
</thead>
2925

@@ -82,9 +78,9 @@
8278
</tr>
8379

8480
</tbody>
85-
<tbody class="plain">
81+
<tbody>
8682
<tr>
87-
<th rowspan="{{table_rows.doc}}">IESG</th>
83+
<th rowspan="4">IESG</th>
8884
</tr>
8985

9086
<tr>

‎ietf/templates/group/group_about.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
{% if group.parent and group.parent.type_id == "area" %}
2828
<th>{{ group.parent.type.name }}</th>
2929
<td>{{ group.parent.name }} ({{ group.parent.acronym }})</td>
30+
{% else %}
31+
<th></th><td></td>
3032
{% endif %}
3133
</tr>
3234

‎ietf/templates/meeting/agenda.html‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -193,16 +193,11 @@ <h2>
193193
{{item.timeslot.time|date:"G:i"}}-{{item.timeslot.end_time|date:"G:i"}}
194194
{% endif %}
195195
</td>
196-
<td class="hidden-xs" colspan="3">
196+
<td colspan="3">
197197
{% if item.timeslot.show_location and item.timeslot.get_location %}
198198
<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_location|slugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
199199
{% endif %}
200200
</td>
201-
<td class="visible-xs">
202-
{% if item.timeslot.show_location and item.timeslot.get_location %}
203-
<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_location|slugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
204-
{% endif %}
205-
</td>
206201
<td colspan="2">
207202
{{item.timeslot.name}}
208203
</td>
@@ -223,28 +218,22 @@ <h2>
223218
{{item.timeslot.time|date:"G:i"}}-{{item.timeslot.end_time|date:"G:i"}}
224219
{% endif %}
225220
</th>
226-
<td class="hidden-xs" colspan="3">
227-
{% if item.timeslot.show_location and item.timeslot.get_location %}
228-
<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_location|slugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
229-
{% endif %}
230-
</td>
231-
<td class="visible-xs">
221+
<td colspan="3">
232222
{% if item.timeslot.show_location and item.timeslot.get_location %}
233223
<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_location|slugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
234224
{% endif %}
235225
</td>
236226

237227
{% else %}
238-
<td class="hidden-xs">
239-
</td>
228+
<td></td>
240229

241230
<td>
242231
{% if item.timeslot.show_location and item.timeslot.get_location %}
243232
<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_location|slugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
244233
{% endif %}
245234
</td>
246235

247-
<td class="hidden-xs">{{item.session.group.parent.acronym}}</td>
236+
<td><span class="hidden-xs">{{item.session.group.parent.acronym}}</span></td>
248237

249238
<td>
250239
{% if item.session.group.charter %}
@@ -318,12 +307,14 @@ <h4>Slides</h4>
318307
</div>
319308
</div>
320309
</td>
321-
<td class="text-nowrap hidden-xs">
310+
<td class="text-nowrap">
311+
<span class="hidden-xs">
322312
{% if item.session.agenda %}
323313
<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#modal-{{session_id}}"><span class="fa fa-arrows-alt" title="Show meeting materials"></span></button>
324314
<a class="btn btn-default btn-xs" href="/meeting/{{schedule.meeting.number}}/agenda/{{item.session.group.acronym}}-drafts.tgz" title="Download meeting materials as .tar archive"><span class="fa fa-file-archive-o"></span></a>
325315
<a class="btn btn-default btn-xs" href="/meeting/{{ schedule.meeting.number }}/agenda/{{item.session.group.acronym}}-drafts.pdf" title="Download meeting materials as PDF file"><span class="fa fa-file-pdf-o"></span></a>
326316
{% endif %}
317+
</span>
327318
</td>
328319
</tr>
329320
{% endwith %}

0 commit comments

Comments
 (0)