Refactored/cleaned IESG telechat agenda code (and removed support for ballot sets)

 - Legacy-Id: 1873

Author: pasieronen

ietf/idtracker/templatetags/ietf_filters.py

@@ -294,6 +294,16 @@ def id_index_wrap(text):
     x = x.replace("\n", "\n  ")
     return "  "+x.strip()
 
+@register.filter(name="compress_empty_lines")
+def compress_empty_lines(text):
+    text = re.sub("( *\n){3,}", "\n\n", text)
+    return text
+
+@register.filter(name="remove_empty_lines")
+def remove_empty_lines(text):
+    text = re.sub("( *\n){2,}", "\n", text)
+    return text
+
 @register.filter(name='greater_than')
 def greater_than(x, y):
     return x > int(y)
@@ -306,6 +316,10 @@ def less_than(x, y):
 def equal(x, y):
     return str(x)==str(y)
 
+@register.filter(name='startswith')
+def startswith(x, y):
+    return unicode(x).startswith(y)
+
 # based on http://www.djangosnippets.org/snippets/847/ by 'whiteinge'
 @register.filter
 def in_group(user, groups):

ietf/iesg/urls.py

@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-# Portion Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+# Portion Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
 # 
 # Redistribution and use in source and binary forms, with or without
@@ -48,16 +48,16 @@
 )
 
 urlpatterns += patterns('',
-        (r'^agenda/$', views.telechat_agenda),                        
-        (r'^agenda/documents.txt$', views.telechat_agenda_documents_txt),
-        (r'^agenda/documents/$', views.telechat_agenda_documents),
-        (r'^agenda/scribe_template.html$', views.telechat_agenda_scribe_template),
-        (r'^discusses/$', views.discusses),
         (r'^ann/ind/$',views.inddocs),
         (r'^ann/(?P<cat>[^/]+)/$',views.wgdocs),
+        (r'^agenda/$', views.agenda),                        
+        (r'^agenda/scribe_template.html$', views.agenda_scribe_template),
+        (r'^agenda/documents.txt$', views.agenda_documents_txt),
+        (r'^agenda/documents/$', views.agenda_documents),
+        (r'^discusses/$', views.discusses),
 )
 
 if settings.SERVER_MODE != 'production':
     urlpatterns += patterns('',
-        (r'^agenda/(?P<date>\d{4}-\d\d-\d\d)/$', views.telechat_agenda),                        
+        (r'^agenda/(?P<date>\d{4}-\d\d-\d\d)/$', views.agenda),                        
     )

ietf/iesg/views.py

@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-# Portion Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+# Portion Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
 # 
 # Redistribution and use in source and binary forms, with or without
@@ -124,13 +124,9 @@ def agenda_docs(date, next_agenda):
         section_key = "s"+get_doc_section(id)
         if section_key not in res:
             res[section_key] = []
-        others = id.ballot_others()
         if id.note:
             id.note = str(id.note).replace("\240","&nbsp;")
-        if len(others) > 0:
-            res[section_key].append({'obj':id, 'ballot_set':[id]+list(others)})
-        else:
-            res[section_key].append({'obj':id})
+        res[section_key].append({'obj':id})
     return res
 
 def agenda_wg_actions(date):
@@ -149,7 +145,7 @@ def agenda_management_issues(date):
     matches = TelechatAgendaItem.objects.filter(type=3).order_by('id')
     return [o.title for o in matches]
 
-def telechat_agenda(request, date=None):
+def _agenda_data(request, date=None):
     if not date:
         date = TelechatDates.objects.all()[0].date1
         next_agenda = True
@@ -161,17 +157,25 @@ def telechat_agenda(request, date=None):
     docs = agenda_docs(date, next_agenda)
     mgmt = agenda_management_issues(date)
     wgs = agenda_wg_actions(date)
-    private = 'private' in request.REQUEST
     try:
         f = codecs.open(settings.IESG_TASK_FILE, 'r', 'utf-8', 'replace')
         action_items = f.read().strip()
         f.close()
     except IOError:
         action_items = "(Error reading task.txt)"
-    return render_to_response('iesg/agenda.html', {'date':str(date), 'docs':docs,'mgmt':mgmt,'wgs':wgs, 'action_items':action_items,'private':private}, context_instance=RequestContext(request) )
-    
+    return {'date':str(date), 'docs':docs,'mgmt':mgmt,'wgs':wgs, 'action_items':action_items}
+
+def agenda(request, date=None):
+    data = _agenda_data(request, date)
+    data['private'] = 'private' in request.REQUEST
+    return render_to_response("iesg/agenda.html", data, context_instance=RequestContext(request))
 
-def telechat_agenda_documents_txt(request):
+def agenda_scribe_template(request):
+    date = TelechatDates.objects.all()[0].date1
+    docs = agenda_docs(date, True)
+    return render_to_response('iesg/scribe_template.html', {'date':str(date), 'docs':docs}, context_instance=RequestContext(request) )
+
+def agenda_documents_txt(request):
     dates = TelechatDates.objects.all()[0].dates()
     docs = []
     for date in dates:
@@ -180,6 +184,27 @@ def telechat_agenda_documents_txt(request):
     c = Context({'docs':docs})
     return HttpResponse(t.render(c), mimetype='text/plain')
 
+def agenda_documents(request):
+    dates = TelechatDates.objects.all()[0].dates()
+    telechats = []
+    for date in dates:
+        matches = IDInternal.objects.filter(telechat_date=date,primary_flag=1,agenda=1)
+        idmatches = matches.filter(rfc_flag=0).order_by('ballot')
+        rfcmatches = matches.filter(rfc_flag=1).order_by('ballot')
+        res = {}
+        for id in list(idmatches)+list(rfcmatches):
+            section_key = "s"+get_doc_section(id)
+            if section_key not in res:
+                res[section_key] = []
+            if not id.rfc_flag:
+                w = IdWrapper(draft=id)
+            else:
+                ri = RfcIndex.objects.get(rfc_number=id.draft_id)
+                w = RfcWrapper(ri)
+            res[section_key].append(w)
+        telechats.append({'date':date, 'docs':res})
+    return direct_to_template(request, 'iesg/agenda_documents.html', {'telechats':telechats})
+
 def discusses(request):
     positions = Position.objects.filter(discuss=1)
     res = []
@@ -213,30 +238,3 @@ def discusses(request):
             pass
     return direct_to_template(request, 'iesg/discusses.html', {'docs':res})
 
-def telechat_agenda_documents(request):
-    dates = TelechatDates.objects.all()[0].dates()
-    telechats = []
-    for date in dates:
-        matches = IDInternal.objects.filter(telechat_date=date,primary_flag=1,agenda=1)
-        idmatches = matches.filter(rfc_flag=0).order_by('ballot')
-        rfcmatches = matches.filter(rfc_flag=1).order_by('ballot')
-        res = {}
-        for id in list(idmatches)+list(rfcmatches):
-            section_key = "s"+get_doc_section(id)
-            if section_key not in res:
-                res[section_key] = []
-            if not id.rfc_flag:
-                w = IdWrapper(draft=id)
-            else:
-                ri = RfcIndex.objects.get(rfc_number=id.draft_id)
-                w = RfcWrapper(ri)
-            res[section_key].append(w)
-        telechats.append({'date':date, 'docs':res})
-    return direct_to_template(request, 'iesg/agenda_documents.html', {'telechats':telechats})
-                                                                                                        
-def telechat_agenda_scribe_template(request):
-    date = TelechatDates.objects.all()[0].date1
-    docs = agenda_docs(date, True)
-    return render_to_response('iesg/scribe_template.html', {'date':str(date), 'docs':docs}, context_instance=RequestContext(request) )
-    
-    

ietf/templates/iesg/agenda.html

@@ -1,5 +1,5 @@
 {% comment %}
-Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com> 
 
 Redistribution and use in source and binary forms, with or without
@@ -42,10 +42,9 @@
 .agenda h3 { margin-left: 30px; }
 .agenda h4 { margin-left: 60px; margin-top: 0; margin-bottom: 0; }
 .agenda table { margin-left: 90px; margin-top:0em; margin-bottom: 1em;}
-.agenda #section2 p, #section3 p, #section4 p { margin-left:90px; margin-top: 0; margin-bottom:0; font-style:italic;}
+.agenda #section23 p, #section4 p { margin-left:90px; margin-top: 0; margin-bottom:0; font-style:italic;}
 .agenda #section1 pre { margin-left: 60px; }
 .agenda blockquote { margin-left: 30px; width: 70ex;}
-.agenda #section3 blockquote { margin-left: 60px; }
 </style>
 
 <title>IESG Agenda</title>
@@ -65,162 +64,23 @@ <h3>1.1 {% if private %}<a href="https://www.ietf.org/iesg/internal/rollcall.txt
 
    <h3>1.2 Bash the Agenda</h3>
 
-   <h3>1.3 Approval of the {% if private %}<a href="https://www.ietf.org/iesg/internal/minutes.txt">Minutes</a>{%else%}Minutes{%endif%} of the past telechat</h3>
+   <h3>1.3 Approval of the {% if private %}<a href="https://www.ietf.org/iesg/internal/minutes.txt">Minutes</a>{%else%}Minutes{%endif%} of Past Telechats</h3>
    <h3>1.4 List of Remaining Action Items from Last Telechat</h3>
 <pre>
 {{ action_items }}
 </pre>
 </div>
 
-<h2>2. Protocol Actions</h2>
-<div id="section2">
-
-    <blockquote>
-    Reviews should focus on these questions: "Is this document a
-    reasonable basis on which to build the salient part of the Internet
-    infrastructure? If not, what changes would make it so?"
-    </blockquote>
-
-<h3>2.1 WG Submissions</h3>
-
-    <h4>2.1.1 New Item</h4>
-    {% if not docs.s211 %}<p>NONE</p>{% endif %}
-    {% for doc in docs.s211 %}{% include "iesg/agenda_doc.html" %}{%endfor%}
-
-    <h4>2.1.2 Returning Item</h4>
-    {% if not docs.s212 %}<p>NONE</p>{% endif %}
-    {% for doc in docs.s212 %}{% include "iesg/agenda_doc.html" %}{%endfor%}
-
-    {% if docs.s213 %}
-    <h4>2.1.3 For Action</h4>
-    {% for doc in docs.s213 %}{% include "iesg/agenda_doc.html" %}{%endfor%}
-    {% endif %}
-
-<h3>2.2 Individual Submissions</h3>
-
-    <h4>2.2.1 New Item</h4>
-    {% if not docs.s221 %}<p>NONE</p>{% endif %}
-    {% for doc in docs.s221 %}{% include "iesg/agenda_doc.html" %}{%endfor%}
-
-    <h4>2.2.2 Returning Item</h4>
-    {% if not docs.s222 %}<p>NONE</p>{% endif %}
-    {% for doc in docs.s222 %}{% include "iesg/agenda_doc.html" %}{%endfor%}
-
-    {% if docs.s223 %}
-    <h4>2.2.3 For Action</h4>
-    {% for doc in docs.s223 %}{% include "iesg/agenda_doc.html" %}{%endfor%}
-    {% endif %}
-
-</div> <!-- section2 -->
-
-<h2>3. Document Actions</h2>
-<div id="section3">
-
-<h3>3.1 WG Submissions</h3>
-
-    <blockquote>
-    Reviews should focus on these questions: "Is this document a
-    reasonable contribution to the area of Internet engineering
-    which it covers? If not, what changes would make it so?"
-    </blockquote>
-
-    <h4>3.1.1 New Item</h4>
-    {% if not docs.s311 %}<p>NONE</p>{% endif %}
-    {% for doc in docs.s311 %}{% include "iesg/agenda_doc.html" %}{%endfor%}
-
-    <h4>3.1.2 Returning Item</h4>
-    {% if not docs.s312 %}<p>NONE</p>{% endif %}
-    {% for doc in docs.s312 %}{% include "iesg/agenda_doc.html" %}{%endfor%}
-
-    {% if docs.s313 %}
-    <h4>3.1.3 For Action</h4>
-    {% for doc in docs.s313 %}{% include "iesg/agenda_doc.html" %}{%endfor%}
-    {% endif %}
-
-<h3>3.2 Individual Submissions Via AD</h3>
-
-    <blockquote>
-    Reviews should focus on these questions: "Is this document a
-    reasonable contribution to the area of Internet engineering
-    which it covers? If not, what changes would make it so?"
-    </blockquote>
-
-    <h4>3.2.1 New Item</h4>
-    {% if not docs.s321 %}<p>NONE</p>{% endif %}
-    {% for doc in docs.s321 %}{% include "iesg/agenda_doc.html" %}{%endfor%}
-
-    <h4>3.2.2 Returning Item</h4>
-    {% if not docs.s322 %}<p>NONE</p>{% endif %}
-    {% for doc in docs.s322 %}{% include "iesg/agenda_doc.html" %}{%endfor%}
-
-    {% if docs.s323 %}
-    <h4>3.2.3 For Action</h4>
-    {% for doc in docs.s323 %}{% include "iesg/agenda_doc.html" %}{%endfor%}
-    {% endif %}
-
-<h3>3.3 Independent Submissions Via RFC Editor</h3>
-
-    <blockquote>
-    The IESG will use RFC 3932 responses: 1) The IESG has not
-    found any conflict between this document and IETF work; 2) The
-    IESG thinks that this work is related to IETF work done in WG
-    &lt;X&gt;, but this does not prevent publishing; 3) The IESG thinks
-    that publication is harmful to work in WG &lt;X&gt; and recommends
-    not publishing at this time; 4) The IESG thinks that this
-    document violates the IETF procedures for &lt;X&gt; and should
-    therefore not be published without IETF review and IESG
-    approval; 5) The IESG thinks that this document extends an
-    IETF protocol in a way that requires IETF review and should
-    therefore not be published without IETF review and IESG approval.<br />
-    <br />
-    The document shepherd must propose one of these responses in
-    the Data Tracker note and supply complete text in the IESG
-    Note portion of the write-up. The Area Director ballot positions
-    indicate consensus with the response proposed by the
-    document shepherd.<br />
-    <br />
-    Other matters may be recorded in comments, and the comments will
-    be passed on to the RFC Editor as community review of the document.
-    </blockquote>
-
-    <h4>3.3.1 New Item</h4>
-    {% if not docs.s331 %}<p>NONE</p>{% endif %}
-    {% for doc in docs.s331 %}{% include "iesg/agenda_doc.html" %}{%endfor%}
-
-    <h4>3.3.2 Returning Item</h4>
-    {% if not docs.s332 %}<p>NONE</p>{% endif %}
-    {% for doc in docs.s332 %}{% include "iesg/agenda_doc.html" %}{%endfor%}
-
-    {% if docs.s333 %}
-    <h4>3.3.3 For Action</h4>
-    {% for doc in docs.s333 %}{% include "iesg/agenda_doc.html" %}{%endfor%}
-    {% endif %}
-
-</div> <!-- section3 -->
-
-<h2>4. Working Group Actions</h2>
-<div id="section4">
-
-<h3>4.1 WG Creation</h3>
-
-    <h4>4.1.1 Proposed for IETF Review</h4>
-    {% if not wgs.s411 %}<p>NONE</p>{% endif %}
-    {% for wg in wgs.s411 %}{% include "iesg/agenda_wg.html" %}{%endfor%}
-
-    <h4>4.1.2 Proposed for Approval</h4>
-    {% if not wgs.s412 %}<p>NONE</p>{% endif %}
-    {% for wg in wgs.s412 %}{% include "iesg/agenda_wg.html" %}{%endfor%}
-
-<h3>4.2 WG Rechartering</h3>
-
-    <h4>4.2.1 Under evaluation for IETF Review</h4>
-    {% if not wgs.s421 %}<p>NONE</p>{% endif %}
-    {% for wg in wgs.s421 %}{% include "iesg/agenda_wg.html" %}{%endfor%}
-
-    <h4>4.2.2 Proposed for Approval</h4>
-    {% if not wgs.s422 %}<p>NONE</p>{% endif %}
-    {% for wg in wgs.s422 %}{% include "iesg/agenda_wg.html" %}{%endfor%}
+<div id="section23">
+{% with "iesg/agenda_doc.html" as doc_template %}
+{% include "iesg/agenda_outline_23.html" %}
+{% endwith %}
+</div>
 
+<div id="section4">
+{% with "iesg/agenda_wg.html" as wg_template %}
+{% include "iesg/agenda_outline_4.html" %}
+{% endwith %}
 </div>
 
 <h2>5. IAB News We Can Use</h2>