Skip to content

Commit 39d6dee

Browse files
levkowetzlevkowetz
committed
Fixed various html issues.
 - Legacy-Id: 15032
1 parent 33e7be3 commit 39d6dee

4 files changed

Lines changed: 45 additions & 45 deletions

File tree

‎ietf/mailinglists/management/commands/import_mailman_listinfo.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
pass
2222

2323
from ietf.mailinglists.models import List, Subscribed
24+
from ietf.utils.text import decode
2425

2526
def import_mailman_listinfo(verbosity=0):
2627
def note(msg):
@@ -38,14 +39,13 @@ def note(msg):
3839
mlist = MailList.MailList(name, lock=False)
3940
note("List: %s" % mlist.internal_name())
4041

41-
description = mlist.description.decode('latin1')[:256]
4242
lists = List.objects.filter(name=mlist.real_name)
4343
if lists.count() > 1:
4444
# Arbitrary choice; we'll update the remaining item next
4545
for item in lists[1:]:
4646
item.delete()
4747
mmlist, created = List.objects.get_or_create(name=mlist.real_name)
48-
mmlist.description = description
48+
mmlist.description = decode(mlist.description)[:256]
4949
mmlist.advertised = mlist.advertised
5050
mmlist.save()
5151
# The following calls return lowercased addresses

‎ietf/templates/api/index.html‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -135,30 +135,33 @@ <h3>Documents</h3>
135135
<p>
136136
You could either fetch and remember the different state groups of interest to you
137137
with queries like
138+
</p>
138139

139-
<pre>
140+
<pre>
140141
$ curl 'https://datatracker.ietf.org/api/v1/doc/state/?format=json&limit=0&type__slug__in=draft-rfceditor'
141142
$ curl 'https://datatracker.ietf.org/api/v1/doc/state/?format=json&limit=0&type__slug__in=draft-iesg'
142143
$ curl 'https://datatracker.ietf.org/api/v1/doc/state/?format=json&limit=0&type__slug__in=draft-stream-ietf'
143-
</pre>
144-
</p>
144+
</pre>
145+
145146

146147
<p>
147148
and then match the listed "resource_uri" of the results to the states listed for each
148149
document when you ask for
149-
<pre>
150-
$ curl 'https://datatracker.ietf.org/api/v1/doc/document/?limit=0&name__contains=-v6ops-'
151-
</pre>
152150
</p>
153151

152+
<pre>
153+
$ curl 'https://datatracker.ietf.org/api/v1/doc/document/?limit=0&name__contains=-v6ops-'
154+
</pre>
155+
154156
<p>
155157
Or alternatively you could do a series of queries asking for matches to the RFC Editor
156158
state first, then the IESG state, then the Stream state, and exclude earlier hits:
157-
<pre>
159+
</p>
160+
<pre>
158161
$ curl 'https://datatracker.ietf.org/api/v1/doc/document/?limit=0&name__contains=-v6ops-&states__type__slug__in=draft-rfceditor' ...
159162
$ curl 'https://datatracker.ietf.org/api/v1/doc/document/?limit=0&name__contains=-v6ops-&states__type__slug__in=draft-iesg' ...
160163
</pre>
161-
</p>
164+
162165

163166
<p>
164167
etc.
@@ -179,36 +182,33 @@ <h3 id="personal-api-keys" class="anchor-target">Personal API Keys</h3>
179182
<p>
180183

181184
Personal API keys have some characteristics you should be aware of:
182-
<ul>
183-
<li>
184-
185-
Each API key is valid only for a specific endpoint. If you try to use a key for
186-
a different API endpoint than it's created for, it will not work.
185+
</p>
186+
<ul>
187+
<li>
187188

188-
</li>
189-
<li>
189+
Each API key is valid only for a specific endpoint. If you try to use a key for
190+
a different API endpoint than it's created for, it will not work.
190191

191-
The API keys will cause you to be given access with the datatracker
192-
roles you have, thus giving you appropriate access to the various
193-
API endpoints according to the role limitations indicated for each
194-
endpoint.
192+
</li>
193+
<li>
195194

196-
</li>
197-
<li>
195+
The API keys will cause you to be given access with the datatracker
196+
roles you have, thus giving you appropriate access to the various
197+
API endpoints according to the role limitations indicated for each
198+
endpoint.
198199

199-
An API key will only give you access to its related endpoint if you have logged
200-
in to the datatracker using your regular login and password during the last
201-
{{ settings.UTILS_APIKEY_GUI_LOGIN_LIMIT_DAYS }} days. If you receive the
202-
error message "<code>Too long since last regular login</code>" you should do
203-
a regular login in order to activate access.
200+
</li>
201+
<li>
204202

205-
</li>
206-
207-
</ul>
203+
An API key will only give you access to its related endpoint if you have logged
204+
in to the datatracker using your regular login and password during the last
205+
{{ settings.UTILS_APIKEY_GUI_LOGIN_LIMIT_DAYS }} days. If you receive the
206+
error message "<code>Too long since last regular login</code>" you should do
207+
a regular login in order to activate access.
208208

209-
209+
</li>
210210

211-
</p>
211+
</ul>
212212

213213
<h3 id="signing-keys" class="anchor-target">Signing Keys</h3>
214214
<p>
@@ -244,15 +244,15 @@ <h3 id="iesg-position-api" class="anchor-target">IESG ballot position API</h3>
244244
<ul>
245245
<li><code>apikey</code> (required) which is the personal API key hash</li>
246246
<li><code>doc</code> (required) which is the balloted document name</li>
247-
<li><code>position</code> (required) which is the position slug, one of: <tt>yes, noobj, block, discuss, abstain, recuse, norecord</tt>. </li>
247+
<li><code>position</code> (required) which is the position slug, one of: <span class="samp">yes, noobj, block, discuss, abstain, recuse, norecord</span>. </li>
248248
<li><code>discuss</code> (required if position is 'discuss') which is the discuss text</li>
249249
<li><code>comment</code> (optional) which is comment text</li>
250250
</ul>
251251
<p>
252252
It returns an appropriate http result code, and a brief explanatory text message.
253253
</p>
254254
<p>
255-
Here is an example:</li>
255+
Here is an example:
256256
</p>
257257
<pre>
258258
$ curl -S -F "apikey=AwAAABVR3D5GHkVMhspKSxBCVknGMmqikNIhT85kSnghjaV_pYy26WV92mm-jpdi" -F "doc=draft-ietf-lamps-eai-addresses" -F "position=noobj" -F "comment=Comment text" https://datatracker.ietf.org/api/iesg/position
@@ -289,7 +289,7 @@ <h3 id="session-video-url-api" class="anchor-target">Set session video URL</h3>
289289
It returns an appropriate http result code, and a brief explanatory text message.
290290
</p>
291291
<p>
292-
Here is an example:</li>
292+
Here is an example:
293293
</p>
294294
<pre>
295295
$ curl -S -F "apikey=DgAAAMLSi3coaE5TjrRs518xO8eBRlCmFF3eQcC8_SjUTtRGLGiJh7-1SYPT5WiS" -F "meeting=101" -F "group=mptcp" -F "item=1" -F "url=https://foo.example/beer/mptcp" https://datatracker.ietf.org/api/meeting/session/video/url

‎ietf/templates/nomcom/announcements.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ <h2 class="anchor-target" id="{{ regime.group.start_year }}">Messages from {{ re
4949
<td>{{ m.to_name }}</td>
5050
</tr>
5151
{% endfor %}
52-
</<tbody>
52+
</tbody>
5353
</table>
5454
{% endfor %}
5555

@@ -116,7 +116,7 @@ <h2 class="anchor-target" id="historical">Historical information</h2>
116116
<h2 class="anchor-target" id="references">References</h2>
117117
<ul>
118118
<li><a href="https://www.ietf.org/rfc/rfc2026.txt">The Internet Standards Process (RFC 2026)</a></li>
119-
<li><a href="https://www.ietf.org/rfc/rfc3777.txt">IAB and IESG Selection, Confirmation, and Recall Process: Operation of the Nominating and Recall </a>Committees (RFC 3777) (Also BCP10)</a>
119+
<li><a href="https://www.ietf.org/rfc/rfc3777.txt">IAB and IESG Selection, Confirmation, and Recall Process: Operation of the Nominating and Recall </a>Committees (RFC 3777) (Also BCP10)
120120
<li><a href="https://www.ietf.org/rfc/rfc3797.txt">Publicly Verifiable Nominations Committee (NomCom) Random Selection (RFC 3797)</a></li>
121121
</ul>
122122

@@ -138,4 +138,4 @@ <h2 class="anchor-target" id="references">References</h2>
138138

139139
{% block js %}
140140
<script src="{% static "jquery.tablesorter/js/jquery.tablesorter.combined.min.js" %}"></script>
141-
{% endblock %}
141+
{% endblock %}

‎ietf/templates/submit/api_submit_info.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ <h2>Draft submission API instructions</h2>
2121
<p>
2222
This interface does not provide all the options which the regular submission tool does.
2323
Some limitations:
24-
<ul>
25-
<li>Only xml-only uploads are supported, not text or combined.</li>
26-
<li>Document replacement information cannot be supplied.</li>
27-
<li>The server expects <code>multipart/form-data</code>, supported by <code>curl</code> but <b>not</b> by <code>wget</code></li>
28-
</ul>
2924
</p>
25+
<ul>
26+
<li>Only xml-only uploads are supported, not text or combined.</li>
27+
<li>Document replacement information cannot be supplied.</li>
28+
<li>The server expects <code>multipart/form-data</code>, supported by <code>curl</code> but <b>not</b> by <code>wget</code></li>
29+
</ul>
3030
<p>
3131
It takes 2 parameters:
3232
</p>
@@ -38,7 +38,7 @@ <h2>Draft submission API instructions</h2>
3838
It returns an appropriate http result code, and a brief explanatory text message.
3939
</p>
4040
<p>
41-
Here is an example:</li>
41+
Here is an example:
4242
</p>
4343
<pre>
4444
$ curl -S -F "user=user.name@example.com" -F "xml=@~/draft-user-example.xml" https://datatracker.ietf.org/api/submit

0 commit comments

Comments
 (0)