Skip to content

Commit 5d8306c

Browse files
levkowetzlevkowetz
committed
Merged in [9733] from lars@netapp.com:
 First round of HTML fixes identified by test-crawl --vnu. - Legacy-Id: 9764 Note: SVN reference [9733] has been migrated to Git commit 205df71
1 parent ed66e24 commit 5d8306c

104 files changed

Lines changed: 120 additions & 118 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎hold-for-merge‎

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

3+
personal/lars/6.0.5.dev0@9732 # Already fixed in a different merge
4+
personal/lars/6.0.5.dev0@9731 # Jquery update; wait with this to the CDN branch comes in
5+
personal/lars/6.0.5.dev0@9730 # Jquery update; wait with this to the CDN branch comes in
6+
personal/lars/6.0.5.dev0@9729 # Jquery update; wait with this to the CDN branch comes in
37
personal/rjs/v6.0.4.dev0@9647 # Commit contained too much. Later corrected commit will be marked for merge
48
personal/rcross/v5.7.3-dev0@8640 # Rework: make the check_permissions() decorator handle the case where the user isn't logged in
59
personal/rcross/v5.6.3-dev0@8237 # Includes other merges; merge personal/rcross/v5.6.2-dev0@8216 instead

‎ietf/templates/base.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
<body {% block bodyAttrs %}{%endblock%} data-group-menu-data-url="{% url "group_menu_data" %}">
4343
{% with debug_server_mode="production" %}
44-
<nav class="navbar {% if server_mode and server_mode == "production" %}navbar-inverse{% else %}navbar-default{% endif %} navbar-fixed-top" role="navigation">
44+
<nav class="navbar {% if server_mode and server_mode == "production" %}navbar-inverse{% else %}navbar-default{% endif %} navbar-fixed-top">
4545
<div class="container-fluid">
4646
<div class="navbar-header">
4747
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse">
@@ -146,6 +146,7 @@
146146
</div>
147147
</div>
148148
</footer>
149+
{% include "debug.html" %}
149150
</div>
150151
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
151152
<script>window.jQuery || document.write('<script src="/js/lib/jquery-1.11.2.min.js"><\/script>')</script>
@@ -159,7 +160,6 @@
159160
<script src="/js/lib/bootstrap.min.js"></script>
160161
<script src="/js/ietf.js"></script>
161162
{% block js %}{% endblock %}
162-
{% include "debug.html" %}
163163
</body>
164164
</html>
165165

‎ietf/templates/community/customize_display.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
{% bootstrap_messages %}
66

7-
<form role="form" method="post" action="#custom">
7+
<form method="post" action="#custom">
88
{% csrf_token %}
99
{% bootstrap_form display_form %}
1010

‎ietf/templates/community/manage_clist.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ <h1>{{ cl.long_name }}</h1>
7676

7777
<h3>Add a new rule</h3>
7878

79-
<form role="form" method="post">
79+
<form method="post">
8080
{% csrf_token %}
8181
{% bootstrap_form rule_form %}
8282

‎ietf/templates/community/public/subscribe.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h1>Subscribe to {{ cl.long_name }}</h1>
2020

2121
<p>Subscribe to the email list for notifications of {% if significant %}significant {% endif %}changes on {{ cl.long_name }}.</p>
2222

23-
<form role="form" method="post">
23+
<form method="post">
2424
{% csrf_token %}
2525
{% bootstrap_form form %}
2626

‎ietf/templates/community/public/unsubscribe.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h1>Cancel subscription to {{ cl.long_name }}</h1>
2424
Cancel your subscription to the email list for notifications of {% if significant %}significant {% endif %}changes on {{ cl.long_name }}.
2525
</p>
2626

27-
<form role="form" method="post">
27+
<form method="post">
2828
{% csrf_token %}
2929
{% bootstrap_form form %}
3030

‎ietf/templates/debug.html‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,21 @@
44
{% load ietf_filters %}
55
{% load future %}
66

7-
<div id="debug" style="clear: left;">
8-
<h3>SQL Queries</h3>
7+
<div id="debug">
8+
<hr>
99
<p>
1010
{{ sql_queries|length }} queries ({{ sql_queries|timesum }}s)
1111
{% if sql_queries|length != 0 %}
12-
<a class="btn btn-default btn-sm" onclick="document.getElementById('debug-query-table').style.display='table';">Show</a>
12+
<a class="btn btn-default btn-xs"
13+
onclick="$('#debug-query-table').toggleClass('hide');">Show</a>
1314
{% endif %}
1415
</p>
15-
<table class="table table-condensed table-striped" id="debug-query-table" style="display: none;">
16-
<col width="1"></col>
17-
<col></col>
18-
<col width="1"></col>
16+
<table class="table table-condensed table-striped hide" id="debug-query-table">
1917
<thead>
2018
<tr>
21-
<th scope="col">#</th>
22-
<th scope="col">SQL</th>
23-
<th scope="col">Time</th>
19+
<th>#</th>
20+
<th>SQL</th>
21+
<th>Time</th>
2422
</tr>
2523
</thead>
2624
<tbody>

‎ietf/templates/doc/add_comment.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ <h1>Add comment<br><small>{{ doc }}</small></h1>
1212

1313
{% bootstrap_messages %}
1414

15-
<form role="form" method="post">
15+
<form method="post">
1616
{% csrf_token %}
1717
{% bootstrap_form form %}
1818
<p class="help-block">The comment will be added to the history trail.</p>

‎ietf/templates/doc/ballot/approvaltext.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ <h1>Approval announcement writeup<br><small>{{ doc }}</small></h1>
1313

1414
{% bootstrap_messages %}
1515

16-
<form role="form" method="post">
16+
<form method="post">
1717
{% csrf_token %}
1818
{% bootstrap_form approval_text_form %}
1919

‎ietf/templates/doc/ballot/approve_ballot.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{% origin %}
1111
<h1>Approve ballot<br><small>{{ doc }}</small></h1>
1212

13-
<form role="form" method="post">
13+
<form method="post">
1414
{% csrf_token %}
1515
<pre>{{ announcement }}</pre>
1616

0 commit comments

Comments
 (0)