altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [9735] from lars@netapp.com:

Browse source 
More HTML fixes identified by test-crawl --vnu.
 - Legacy-Id: 9767
Note: SVN reference [9735] has been migrated to Git commit 08d958e7cd9cf4949a688e20046bd61855e00361
This commit is contained in:
Henrik Levkowetz 2015-07-18 09:18:54 +00:00
parent 5d8306cfc8
commit c41a079d4f
8 changed files with 36 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hold-for-merge
View file

@ -1,5 +1,6 @@
# -*- conf-mode -*-
personal/lars/6.0.5.dev0@9734 # Obsoleted - don't use 'bleach'
personal/lars/6.0.5.dev0@9732 # Already fixed in a different merge
personal/lars/6.0.5.dev0@9731 # Jquery update; wait with this to the CDN branch comes in
personal/lars/6.0.5.dev0@9730 # Jquery update; wait with this to the CDN branch comes in

2
ietf/meeting/views.py
View file

@ -437,7 +437,7 @@ def session_agenda(request, num, session):
if d:
agenda = d[0]
content = read_agenda_file(num, agenda) or "Could not read agenda file"
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>"
_, ext = os.path.splitext(agenda.external_url)
ext = ext.lstrip(".").lower()

6
ietf/templates/doc/document_charter.html
View file

@ -27,7 +27,7 @@
</tr>
</thead>
<tbody class="plain">
<tbody>
<tr>
<th rowspan="{{table_rows.doc}}">Document</th>
</tr>
@ -87,7 +87,7 @@
</tr>
</tbody>
<tbody class="plain">
<tbody>
<tr>
<th rowspan="{{table_rows.wg}}">WG</th>
@ -100,7 +100,7 @@
</tr>
</tbody>
<tbody class="plain">
<tbody>
<tr>
<th rowspan="{{table_rows.iesg}}">IESG</th>

11
ietf/templates/doc/document_conflict_review.html
View file

@ -16,14 +16,14 @@
<thead id="message-row">
<tr>
{% if doc.rev != latest_rev %}
<th colspan="4" class="alert-warning">&nbsp;The information below is for an old version of the document</th>
<th colspan="4" class="alert-warning">The information below is for an old version of the document</th>
{% else %}
<th colspan="4">&nbsp;</th>
{% endif %}
<th colspan="4"></th>
{% endif %}
</tr>
</thead>
<tbody class="plain">
<tbody>
<tr>
<th rowspan="{{table_rows.doc}}">Document</th>
</tr>
@ -137,7 +137,8 @@
{% endif %}
{% if doc.rev %}
<p>{{ content|fill:"80"|safe|linebreaksbr|keep_spacing|sanitize_html|safe }}</p>
<p></p>
{{ content|fill:"80"|safe|linebreaksbr|keep_spacing|sanitize_html|safe }}
{% endif %}
{% endblock %}

18
ietf/templates/doc/document_draft.html
View file

@ -9,6 +9,10 @@
<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 %}">
{% endblock %}
{% block morecss %}
.inline { display: inline; }
{% endblock %}
{% block title %}
{% if doc.get_state_slug == "rfc" %}
RFC {{ rfc_number }}
@ -34,7 +38,7 @@
</tr>
</thead>
<tbody class="plain">
<tbody>
<tr>
<th rowspan="{{table_rows.doc}}">Document</th>
<th>Type</th>
@ -146,7 +150,7 @@
{% endif %}
</tbody>
<tbody class="plain">
<tbody>
<tr>
<th rowspan="{{table_rows.stream}}">Stream</th>
{% if doc.stream %}
@ -239,7 +243,7 @@
{% endif %}
</tbody>
<tbody class="plain">
<tbody>
<tr>
<th rowspan="{{table_rows.iesg}}">IESG</th>
<th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iesg" %}">IESG state</a></th>
@ -321,7 +325,7 @@
</tbody>
{% if iana_review_state %}
<tbody class="plain">
<tbody>
<tr>
<th rowspan="{{table_rows.iana}}">IANA</th>
<th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iana-review" %}">IANA review state</a></th>
@ -349,7 +353,7 @@
</tbody>
{% endif %}
<tbody class="plain">
<tbody>
{% if rfc_editor_state %}
<tr>
@ -369,7 +373,7 @@
<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>
<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>
<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>
<span class="dropdown">
<div class="dropdown inline">
<button class="btn btn-default btn-xs dropdown-toggle" type="button" id="ddSearchMenu" data-toggle="dropdown" aria-expanded="true">
<span class="fa fa-search"></span> Search lists <span class="caret"></span>
</button>
@ -380,7 +384,7 @@
<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>
{% endif %}
</ul>
</span>
</div>
{% if user.is_authenticated %}
{% if tracking_document %}
<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>

14
ietf/templates/doc/document_status_change.html
View file

@ -12,18 +12,14 @@
{% include "doc/revisions_list.html" %}
{% if doc.rev != latest_rev %}
<p class="alert alert-warning"> The information below is for an old version of the document</p>
{% endif %}
<table class="table table-condensed">
<thead id="message-row">
<tr>
{% if doc.rev != latest_rev %}
<th colspan="4" class="alert-warning">&nbsp;The information below is for an old version of the document</th>
<th colspan="4" class="alert-warning">The information below is for an old version of the document</th>
{% else %}
<th colspan="4">&nbsp;</th>
{% endif %}
<th colspan="4"></th>
{% endif %}
</tr>
</thead>
@ -82,9 +78,9 @@
</tr>
</tbody>
<tbody class="plain">
<tbody>
<tr>
<th rowspan="{{table_rows.doc}}">IESG</th>
<th rowspan="4">IESG</th>
</tr>
<tr>

2
ietf/templates/group/group_about.html
View file

@ -27,6 +27,8 @@
{% if group.parent and group.parent.type_id == "area" %}
<th>{{ group.parent.type.name }}</th>
<td>{{ group.parent.name }} ({{ group.parent.acronym }})</td>
{% else %}
<th></th><td></td>
{% endif %}
</tr>

23
ietf/templates/meeting/agenda.html
View file

@ -193,16 +193,11 @@
{{item.timeslot.time|date:"G:i"}}-{{item.timeslot.end_time|date:"G:i"}}
{% endif %}
</td>
<td class="hidden-xs" colspan="3">
<td colspan="3">
{% if item.timeslot.show_location and item.timeslot.get_location %}
<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>
{% endif %}
</td>
<td class="visible-xs">
{% if item.timeslot.show_location and item.timeslot.get_location %}
<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>
{% endif %}
</td>
<td colspan="2">
{{item.timeslot.name}}
</td>
@ -223,20 +218,14 @@
{{item.timeslot.time|date:"G:i"}}-{{item.timeslot.end_time|date:"G:i"}}
{% endif %}
</th>
<td class="hidden-xs" colspan="3">
{% if item.timeslot.show_location and item.timeslot.get_location %}
<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>
{% endif %}
</td>
<td class="visible-xs">
<td colspan="3">
{% if item.timeslot.show_location and item.timeslot.get_location %}
<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>
{% endif %}
</td>
{% else %}
<td class="hidden-xs">
</td>
<td></td>
<td>
{% if item.timeslot.show_location and item.timeslot.get_location %}
@ -244,7 +233,7 @@
{% endif %}
</td>
<td class="hidden-xs">{{item.session.group.parent.acronym}}</td>
<td><span class="hidden-xs">{{item.session.group.parent.acronym}}</span></td>
<td>
{% if item.session.group.charter %}
@ -318,12 +307,14 @@
</div>
</div>
</td>
<td class="text-nowrap hidden-xs">
<td class="text-nowrap">
<span class="hidden-xs">
{% if item.session.agenda %}
<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>
<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>
<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>
{% endif %}
</span>
</td>
</tr>
{% endwith %}