Skip to content

Commit a589115

Browse files
OleLaursenOleLaursen
committed
Summary: Reindent all HTML files to follow the previous convention (no
tabs) and kill the scripts block in favour of just using a js block with a script tag (which is easier to understand for context-sensitive modes such as web-mode in Emacs). Also fix a couple of details, e.g. missing semicolons in JS snippets. - Legacy-Id: 9096
1 parent c72d465 commit a589115

File tree

251 files changed

+9913
-9915
lines changed

Some content is hidden

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

251 files changed

+9913
-9915
lines changed

‎ietf/doc/tests_draft.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ def test_request_resurrect(self):
413413
r = self.client.get(url)
414414
self.assertEqual(r.status_code, 200)
415415
q = PyQuery(r.content)
416-
self.assertEqual(len(q('form input[type=submit]')), 1)
416+
self.assertEqual(len(q('form [type=submit]')), 1)
417417

418418

419419
# request resurrect
@@ -448,7 +448,7 @@ def test_resurrect(self):
448448
r = self.client.get(url)
449449
self.assertEqual(r.status_code, 200)
450450
q = PyQuery(r.content)
451-
self.assertEqual(len(q('form input[type=submit]')), 1)
451+
self.assertEqual(len(q('form [type=submit]')), 1)
452452

453453
# complete resurrect
454454
events_before = draft.docevent_set.count()

‎ietf/templates/401.html‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@
33
{% block title %}401 Unauthorized{% endblock %}
44
{% block content %}
55

6-
<img class="ietflogo" src="/images/ietflogo.png" alt="IETF" style="width: 10em">
6+
<img class="ietflogo" src="/images/ietflogo.png" alt="IETF" style="width: 10em">
77

8-
<h2>Authentication Required</h2>
8+
<h2>Authentication Required</h2>
99

10-
<p>The server could not verify that you are authorized to view this page using
11-
the username and password you provided. You can now:</p>
10+
<p>The server could not verify that you are authorized to view this page using
11+
the username and password you provided. You can now:</p>
1212

13-
<ul>
14-
<li><a href="/accounts/login/">Attempt to login again</a></li>
15-
<li><a href="/accounts/reset/">Request a password reset</a></li>
16-
</ul>
13+
<ul>
14+
<li><a href="/accounts/login/">Attempt to login again</a></li>
15+
<li><a href="/accounts/reset/">Request a password reset</a></li>
16+
</ul>
1717

18-
<p>If you think this is a server error, please contact <a
19-
href="mailto:webtools@ietf.org">webtools@ietf.org</a>.</p>
18+
<p>If you think this is a server error, please contact <a href="mailto:webtools@ietf.org">webtools@ietf.org</a>.</p>
2019
{% endblock %}

‎ietf/templates/404.html‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
{% block title %}404 Not Found{% endblock %}
44
{% block content %}
55

6-
<img class="ietflogo" src="/images/ietflogo.png" alt="IETF" style="width: 10em">
6+
<img class="ietflogo" src="/images/ietflogo.png" alt="IETF" style="width: 10em">
77

8-
<h2>The page you were looking for couldn't be found.</h2>
8+
<h2>The page you were looking for couldn't be found.</h2>
99

1010

11-
<p> The requested URL was not found on this server. If you entered the URL
12-
manually please check your spelling and try again.</p>
11+
<p> The requested URL was not found on this server. If you entered the URL
12+
manually please check your spelling and try again.</p>
1313

14-
<p>If you think this is a server error, please contact <a
15-
href="mailto:webtools@ietf.org">webtools@ietf.org</a>.</p>
14+
<p>If you think this is a server error, please contact <a href="mailto:webtools@ietf.org">webtools@ietf.org</a>.</p>
1615
{% endblock %}
1716

‎ietf/templates/500.html‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
{% block title %}500 Internal Server Error{% endblock %}
44
{% block content %}
55

6-
<img class="ietflogo" src="/images/ietflogo.png" alt="IETF" style="width: 10em">
6+
<img class="ietflogo" src="/images/ietflogo.png" alt="IETF" style="width: 10em">
77

8-
<h2>Internal Server Error.</h2>
8+
<h2>Internal Server Error.</h2>
99

10-
<p class="error-text">
11-
The server encountered an internal error and was unable to complete
12-
your request. Either the server is overloaded or there was an
13-
error in a script used to generate the requested page. In case this
14-
was an overload problem or other temporary error, you may want to
15-
try again in a little while.
16-
</p>
17-
<p class="error-text">
18-
A failure report with details about what happened has been sent to the
19-
server administrators. It would be helpful if you would file a bug
20-
report with additional information at the
21-
<a href="http://trac.tools.ietf.org/tools/ietfdb/newticket">IETF database issue tracker</a>, too.
22-
</p>
10+
<p class="error-text">
11+
The server encountered an internal error and was unable to complete
12+
your request. Either the server is overloaded or there was an
13+
error in a script used to generate the requested page. In case this
14+
was an overload problem or other temporary error, you may want to
15+
try again in a little while.
16+
</p>
17+
<p class="error-text">
18+
A failure report with details about what happened has been sent to the
19+
server administrators. It would be helpful if you would file a bug
20+
report with additional information at the
21+
<a href="http://trac.tools.ietf.org/tools/ietfdb/newticket">IETF database issue tracker</a>, too.
22+
</p>
2323

2424
{% endblock %}

‎ietf/templates/admin/group/group/change_form.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
{% load i18n %}
33

44
{% block object-tools %}
5-
{% if change %}{% if not is_popup %}
6-
<ul class="object-tools">
7-
{% if original.type_id == "sdo" %}
8-
<li><a href="reminder/">SDO Authorized List Reminder</a></li>
9-
{% endif %}
10-
<li><a href="history/" class="historylink">{% trans "History" %}</a></li>
11-
{% if has_absolute_url %}<li><a href="../../../r/{{ content_type_id }}/{{ object_id }}/" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif%}
12-
</ul>
13-
{% endif %}{% endif %}
5+
{% if change %}{% if not is_popup %}
6+
<ul class="object-tools">
7+
{% if original.type_id == "sdo" %}
8+
<li><a href="reminder/">SDO Authorized List Reminder</a></li>
9+
{% endif %}
10+
<li><a href="history/" class="historylink">{% trans "History" %}</a></li>
11+
{% if has_absolute_url %}<li><a href="../../../r/{{ content_type_id }}/{{ object_id }}/" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif%}
12+
</ul>
13+
{% endif %}{% endif %}
1414
{% endblock %}

‎ietf/templates/admin/group/group/send_sdo_reminder.html‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,37 @@
77
{% block bodyclass %}change-form{% endblock %}
88

99
{% block breadcrumbs %}{% if not is_popup %}
10-
<div class="breadcrumbs">
11-
<a href="../../../">{% trans "Home" %}</a> &rsaquo;
12-
<a href="../../">{{ app_label|capfirst|escape }}</a> &rsaquo;
13-
{% if has_change_permission %}<a href="../">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} &rsaquo;
14-
{% trans "Send reminder" %}
15-
</div>
10+
<div class="breadcrumbs">
11+
<a href="../../../">{% trans "Home" %}</a> &rsaquo;
12+
<a href="../../">{{ app_label|capfirst|escape }}</a> &rsaquo;
13+
{% if has_change_permission %}<a href="../">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} &rsaquo;
14+
{% trans "Send reminder" %}
15+
</div>
1616
{% endif %}{% endblock %}
1717

1818
{% block content %}
19-
<div id="content-main">
20-
<h1>Send a reminder to {% if sdo %}{{ sdo }} SDO Liaison Manager{% else %}all SDO Liaison Managers{% endif %}</h1>
19+
<div id="content-main">
20+
<h1>Send a reminder to {% if sdo %}{{ sdo }} SDO Liaison Manager{% else %}all SDO Liaison Managers{% endif %}</h1>
2121

22-
{% if output %}
23-
<p>Reminder sent successfully. See the output of the command:</p>
24-
<pre>
25-
{{ output }}
26-
</pre>
22+
{% if output %}
23+
<p>Reminder sent successfully. See the output of the command:</p>
24+
<pre>
25+
{{ output }}
26+
</pre>
2727

28-
{% else %}
29-
30-
{% if sdo %}
31-
<p>You can send a reminder to the {{ sdo }} SDO Liaison Manager to request an updated list of persons authorized to send liaison statements on behalf of {{ sdo }}</p>
3228
{% else %}
33-
<p>You can send a reminder to each SDO Liaison Manager to request an updated list of persons authorized to send liaison statements on behalf of the SDO.</p>
3429

35-
<p>By clicking the 'Send' button you will send a request to <b>all</b> the SDO Liaison Managers. In order to send the request to one SDO Liaison Manager go to the SDO edit page.</p>
36-
{% endif %}
30+
{% if sdo %}
31+
<p>You can send a reminder to the {{ sdo }} SDO Liaison Manager to request an updated list of persons authorized to send liaison statements on behalf of {{ sdo }}</p>
32+
{% else %}
33+
<p>You can send a reminder to each SDO Liaison Manager to request an updated list of persons authorized to send liaison statements on behalf of the SDO.</p>
3734

38-
<form action="" method="post">{% csrf_token %}
39-
<input type="submit" name="send" value="Send reminder" />
40-
</form>
41-
{% endif %}
42-
</div>
35+
<p>By clicking the 'Send' button you will send a request to <b>all</b> the SDO Liaison Managers. In order to send the request to one SDO Liaison Manager go to the SDO edit page.</p>
36+
{% endif %}
37+
38+
<form action="" method="post">{% csrf_token %}
39+
<input type="submit" name="send" value="Send reminder" />
40+
</form>
41+
{% endif %}
42+
</div>
4343
{% endblock %}

‎ietf/templates/base/menu.html‎

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -5,100 +5,100 @@
55
{% endif %}
66

77
<li {% if flavor == "top" %}class="dropdown"{% else %}class="nav-header"{% endif %}>
8-
{% if flavor == "top" %}<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% endif %}
9-
{#<span class="fa fa-users"></span>#}
10-
Groups
11-
{% if flavor == "top" %}
12-
</a>
13-
<ul class="dropdown-menu" role="menu">
14-
{% endif %}
8+
{% if flavor == "top" %}<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% endif %}
9+
{#<span class="fa fa-users"></span>#}
10+
Groups
11+
{% if flavor == "top" %}
12+
</a>
13+
<ul class="dropdown-menu" role="menu">
14+
{% endif %}
1515

1616
<li><a href="{% url "ietf.group.info.active_groups" group_type="wg" %}">Active WGs</a></li>
1717
<li><a href="{% url "ietf.group.info.active_groups" group_type="rg" %}">Active RGs</a></li>
1818

19-
{% if flavor == "top" %}<li class="divider visible-lg-block"></li>{% endif %}
20-
<li {%if flavor == "top" %}class="dropdown-header visible-lg-block"{% else %}class="nav-header hidden-nojs"{% endif %}>By area/parent</li>
19+
{% if flavor == "top" %}<li class="divider visible-lg-block"></li>{% endif %}
20+
<li {%if flavor == "top" %}class="dropdown-header visible-lg-block"{% else %}class="nav-header hidden-nojs"{% endif %}>By area/parent</li>
2121
{% wg_menu %}
2222
{# <li class="hidden-lg hidden-nojs"><a href="#" data-toggle="modal" data-target="#navmodal">Jump to group</a></li> #}
2323

24-
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
25-
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>New work</li>
26-
<li><a href="{% url "ietf.group.info.chartering_groups" %}">Chartering WGs</a></li>
27-
<li><a href="{% url "ietf.group.info.bofs" group_type="wg" %}">BOFs</a></li>
24+
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
25+
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>New work</li>
26+
<li><a href="{% url "ietf.group.info.chartering_groups" %}">Chartering WGs</a></li>
27+
<li><a href="{% url "ietf.group.info.bofs" group_type="wg" %}">BOFs</a></li>
2828

29-
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
30-
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>Other groups</li>
31-
<li><a href="{% url "ietf.group.info.concluded_groups" %}">Concluded WGs</a></li>
32-
<li><a href="//www.ietf.org/list/nonwg.html">Non-WG lists</a></li>
29+
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
30+
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>Other groups</li>
31+
<li><a href="{% url "ietf.group.info.concluded_groups" %}">Concluded WGs</a></li>
32+
<li><a href="//www.ietf.org/list/nonwg.html">Non-WG lists</a></li>
3333

3434
{% if flavor == "top" %}</ul>{% endif %}
3535

3636
<li {% if flavor == "top" %}class="dropdown"{% else %}class="nav-header"{% endif %}>
37-
{% if flavor == "top" %}<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% endif %}
38-
{#<span class="fa fa-file-text"></span>#}
39-
Documents
40-
{% if flavor == "top" %}
41-
</a>
42-
<ul class="dropdown-menu" role="menu">
43-
{% endif %}
44-
<li><a href="{% url "submit_upload_submission" %}">Submit a draft</a></li>
45-
46-
{% if user|has_role:"WG Chair" %}
47-
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
48-
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>WG chair</li>
49-
<li><a href="{% url "submit_approvals" %}">Approve a draft</a></li>
50-
{% endif %}
51-
52-
{% get_user_managed_lists user as community_lists %}
53-
{% if community_lists %}
54-
<li><a href="{{ community_lists.personal.get_manage_url }}">My tracked docs</a></li>
55-
{% for cl in community_lists.group %}
56-
<li><a href="{{ cl.get_manage_url }}">WG {{ cl.short_name }} docs</a></li>
57-
{% endfor %}
58-
{% else %}
59-
<li><a rel="nofollow" href="/accounts/login/?next={{request.get_full_path|urlencode}}">Sign in to track docs</a></li>
60-
{% endif %}
61-
62-
{% if user|has_role:"Area Director,Secretariat" %}
63-
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
64-
<li><a href="{% url "rfc_status_changes" %}">RFC status changes</a></li>
65-
{% endif %}
66-
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
67-
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>RFC streams</li>
37+
{% if flavor == "top" %}<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% endif %}
38+
{#<span class="fa fa-file-text"></span>#}
39+
Documents
40+
{% if flavor == "top" %}
41+
</a>
42+
<ul class="dropdown-menu" role="menu">
43+
{% endif %}
44+
<li><a href="{% url "submit_upload_submission" %}">Submit a draft</a></li>
45+
46+
{% if user|has_role:"WG Chair" %}
47+
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
48+
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>WG chair</li>
49+
<li><a href="{% url "submit_approvals" %}">Approve a draft</a></li>
50+
{% endif %}
51+
52+
{% get_user_managed_lists user as community_lists %}
53+
{% if community_lists %}
54+
<li><a href="{{ community_lists.personal.get_manage_url }}">My tracked docs</a></li>
55+
{% for cl in community_lists.group %}
56+
<li><a href="{{ cl.get_manage_url }}">WG {{ cl.short_name }} docs</a></li>
57+
{% endfor %}
58+
{% else %}
59+
<li><a rel="nofollow" href="/accounts/login/?next={{request.get_full_path|urlencode}}">Sign in to track docs</a></li>
60+
{% endif %}
61+
62+
{% if user|has_role:"Area Director,Secretariat" %}
63+
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
64+
<li><a href="{% url "rfc_status_changes" %}">RFC status changes</a></li>
65+
{% endif %}
66+
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
67+
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>RFC streams</li>
6868
<li><a href="{% url "ietf.group.views_stream.stream_documents" acronym="iab" %}">IAB</a></li>
6969
<li><a href="{% url "ietf.group.views_stream.stream_documents" acronym="irtf" %}">IRTF</a></li>
7070
<li><a href="{% url "ietf.group.views_stream.stream_documents" acronym="ise" %}">ISE</a></li>
7171

7272
{% if flavor == "top" %}</ul>{% endif %}
7373

7474
<li {% if flavor == "top" %}class="dropdown"{% else %}class="nav-header"{% endif %}>
75-
{% if flavor == "top" %}<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% endif %}
76-
{#<span class="fa fa-comments"></span>#}
77-
Meetings
78-
{% if flavor == "top" %}
79-
</a>
80-
<ul class="dropdown-menu" role="menu">
81-
{% endif %}
82-
83-
<li><a href="/meeting/agenda/">Agenda</a></li>
84-
<li><a href="/meeting/">Materials</a></li>
85-
<li><a href="//www.ietf.org/meeting/proceedings.html">Past proceedings</a></li>
86-
<li><a href="//www.ietf.org/meeting/upcoming.html">Upcoming</a></li>
87-
<li><a href="/meeting/requests">Session requests</a></li>
75+
{% if flavor == "top" %}<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% endif %}
76+
{#<span class="fa fa-comments"></span>#}
77+
Meetings
78+
{% if flavor == "top" %}
79+
</a>
80+
<ul class="dropdown-menu" role="menu">
81+
{% endif %}
82+
83+
<li><a href="/meeting/agenda/">Agenda</a></li>
84+
<li><a href="/meeting/">Materials</a></li>
85+
<li><a href="//www.ietf.org/meeting/proceedings.html">Past proceedings</a></li>
86+
<li><a href="//www.ietf.org/meeting/upcoming.html">Upcoming</a></li>
87+
<li><a href="/meeting/requests">Session requests</a></li>
8888
{% if flavor == "top" %}</ul>{% endif %}
8989

9090
<li {% if flavor == "top" %}class="dropdown"{% else %}class="nav-header"{% endif %}>
91-
{% if flavor == "top" %}<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% endif %}
92-
{#<span class="fa fa-folder"></span>#}
93-
Other
94-
{% if flavor == "top" %}
95-
</a>
96-
<ul class="dropdown-menu" role="menu">
97-
{% endif %}
98-
99-
<li><a href="/ipr/">IPR disclosures</a></li>
100-
<li><a href="/liaison/">Liaison statements</a></li>
101-
<li><a href="/iesg/agenda/">IESG agenda</a></li>
91+
{% if flavor == "top" %}<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% endif %}
92+
{#<span class="fa fa-folder"></span>#}
93+
Other
94+
{% if flavor == "top" %}
95+
</a>
96+
<ul class="dropdown-menu" role="menu">
97+
{% endif %}
98+
99+
<li><a href="/ipr/">IPR disclosures</a></li>
100+
<li><a href="/liaison/">Liaison statements</a></li>
101+
<li><a href="/iesg/agenda/">IESG agenda</a></li>
102102
{% if flavor == "top" %}</ul>{% endif %}
103103

104104
{% if flavor == "top" %}

0 commit comments

Comments
 (0)