From 39d6dee8780a42e2be6bbb6944cef20b1e0d0562 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sun, 8 Apr 2018 15:56:33 +0000 Subject: [PATCH] Fixed various html issues. - Legacy-Id: 15032 --- .../commands/import_mailman_listinfo.py | 4 +- ietf/templates/api/index.html | 80 +++++++++---------- ietf/templates/nomcom/announcements.html | 6 +- ietf/templates/submit/api_submit_info.html | 12 +-- 4 files changed, 51 insertions(+), 51 deletions(-) diff --git a/ietf/mailinglists/management/commands/import_mailman_listinfo.py b/ietf/mailinglists/management/commands/import_mailman_listinfo.py index 458b50ab8..fdb10c083 100644 --- a/ietf/mailinglists/management/commands/import_mailman_listinfo.py +++ b/ietf/mailinglists/management/commands/import_mailman_listinfo.py @@ -21,6 +21,7 @@ except ImportError: pass from ietf.mailinglists.models import List, Subscribed +from ietf.utils.text import decode def import_mailman_listinfo(verbosity=0): def note(msg): @@ -38,14 +39,13 @@ def import_mailman_listinfo(verbosity=0): mlist = MailList.MailList(name, lock=False) note("List: %s" % mlist.internal_name()) - description = mlist.description.decode('latin1')[:256] lists = List.objects.filter(name=mlist.real_name) if lists.count() > 1: # Arbitrary choice; we'll update the remaining item next for item in lists[1:]: item.delete() mmlist, created = List.objects.get_or_create(name=mlist.real_name) - mmlist.description = description + mmlist.description = decode(mlist.description)[:256] mmlist.advertised = mlist.advertised mmlist.save() # The following calls return lowercased addresses diff --git a/ietf/templates/api/index.html b/ietf/templates/api/index.html index ef1cbe3c1..144072efb 100644 --- a/ietf/templates/api/index.html +++ b/ietf/templates/api/index.html @@ -135,30 +135,33 @@

You could either fetch and remember the different state groups of interest to you with queries like +

- 
+    
       $ curl 'https://datatracker.ietf.org/api/v1/doc/state/?format=json&limit=0&type__slug__in=draft-rfceditor'
       $ curl 'https://datatracker.ietf.org/api/v1/doc/state/?format=json&limit=0&type__slug__in=draft-iesg'
       $ curl 'https://datatracker.ietf.org/api/v1/doc/state/?format=json&limit=0&type__slug__in=draft-stream-ietf'
-      

-    

+
+

and then match the listed "resource_uri" of the results to the states listed for each document when you ask for - 

-      $ curl 'https://datatracker.ietf.org/api/v1/doc/document/?limit=0&name__contains=-v6ops-'
-

+ 
+      $ curl 'https://datatracker.ietf.org/api/v1/doc/document/?limit=0&name__contains=-v6ops-'
+
+

Or alternatively you could do a series of queries asking for matches to the RFC Editor state first, then the IESG state, then the Stream state, and exclude earlier hits: - 

+    

+    
       $ curl 'https://datatracker.ietf.org/api/v1/doc/document/?limit=0&name__contains=-v6ops-&states__type__slug__in=draft-rfceditor' ...
       $ curl 'https://datatracker.ietf.org/api/v1/doc/document/?limit=0&name__contains=-v6ops-&states__type__slug__in=draft-iesg' ...
     

-    

+
 
     

       etc.
@@ -179,36 +182,33 @@
     

 
       Personal API keys have some characteristics you should be aware of:
-      

-
-      
-
     

+    
 
     
Signing Keys

     

@@ -244,7 +244,7 @@
     

@@ -252,7 +252,7 @@
       It returns an appropriate http result code, and a brief explanatory text message.
     

     

-      Here is an example:
+      Here is an example:
     

     
       $ 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 @@
       It returns an appropriate http result code, and a brief explanatory text message.
     

     

-      Here is an example:
+      Here is an example:
     

     
       $ 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
diff --git a/ietf/templates/nomcom/announcements.html b/ietf/templates/nomcom/announcements.html
index 0ab70e782..69e9c09ab 100644
--- a/ietf/templates/nomcom/announcements.html
+++ b/ietf/templates/nomcom/announcements.html
@@ -49,7 +49,7 @@
 		{{ m.to_name }}
 	      
 	    {% endfor %}
-	    
+	    
 	
       {% endfor %}
 
@@ -116,7 +116,7 @@
       
References

       
 
@@ -138,4 +138,4 @@
 
 {% block js %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/submit/api_submit_info.html b/ietf/templates/submit/api_submit_info.html
index e43ae6b50..84a789e34 100644
--- a/ietf/templates/submit/api_submit_info.html
+++ b/ietf/templates/submit/api_submit_info.html
@@ -21,12 +21,12 @@
   

     This interface does not provide all the options which the regular submission tool does.
     Some limitations:
-    
    
-      
  • Only xml-only uploads are supported, not text or combined.
    • 
-      
  • Document replacement information cannot be supplied.
    • 
-      
  • The server expects multipart/form-data, supported by curl but not by wget
    • 
-    

   

+  
    
+    
  • Only xml-only uploads are supported, not text or combined.
    • 
+    
  • Document replacement information cannot be supplied.
    • 
+    
  • The server expects multipart/form-data, supported by curl but not by wget
    • 
+  

   

     It takes 2 parameters:
   

@@ -38,7 +38,7 @@
     It returns an appropriate http result code, and a brief explanatory text message.
   

   

-    Here is an example:
+    Here is an example:
   

   
     $ curl -S -F "user=user.name@example.com" -F "xml=@~/draft-user-example.xml" https://datatracker.ietf.org/api/submit