Skip to content

Commit e3987a6

Browse files
pasieronenpasieronen
committed
Added narrative minutes template
 - Legacy-Id: 1683
1 parent 8a49007 commit e3987a6

4 files changed

Lines changed: 189 additions & 0 deletions

File tree

‎ietf/iesg/urls.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
(r'^agenda/$', views.telechat_agenda),
5252
(r'^agenda/documents.txt$', views.telechat_agenda_documents_txt),
5353
(r'^agenda/documents/$', views.telechat_agenda_documents),
54+
(r'^agenda/scribe_template.html$', views.telechat_agenda_scribe_template),
5455
(r'^discusses/$', views.discusses),
5556
(r'^ann/ind/$',views.inddocs),
5657
(r'^ann/(?P<cat>[^/]+)/$',views.wgdocs),

‎ietf/iesg/views.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,3 +228,9 @@ def telechat_agenda_documents(request):
228228
telechats.append({'date':date, 'docs':res})
229229
return direct_to_template(request, 'iesg/agenda_documents.html', {'telechats':telechats})
230230

231+
def telechat_agenda_scribe_template(request):
232+
date = TelechatDates.objects.all()[0].date1
233+
docs = agenda_docs(date, True)
234+
return render_to_response('iesg/scribe_template.html', {'date':str(date), 'docs':docs}, context_instance=RequestContext(request) )
235+
236+

‎ietf/templates/iesg/scribe_doc.html‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{% comment %}
2+
Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
3+
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions
7+
are met:
8+
9+
* Redistributions of source code must retain the above copyright
10+
notice, this list of conditions and the following disclaimer.
11+
12+
* Redistributions in binary form must reproduce the above
13+
copyright notice, this list of conditions and the following
14+
disclaimer in the documentation and/or other materials provided
15+
with the distribution.
16+
17+
* Neither the name of the Nokia Corporation and/or its
18+
subsidiary(-ies) nor the names of its contributors may be used
19+
to endorse or promote products derived from this software
20+
without specific prior written permission.
21+
22+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
25+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
26+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
27+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
28+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
32+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33+
{% endcomment %}{% comment %}
34+
Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
35+
{% endcomment %}{% load ietf_filters %}{% if forloop.first %}
36+
<ol>
37+
{% endif %}
38+
<li>{{ doc.obj.document.title|escape }} ({{ doc.obj.document.intended_status }}){% if doc.obj.rfc_flag %}
39+
<br><a href="{{ doc.obj.document.doclink }}">{{ doc.obj.document.doclink }}</a>
40+
{% else %}
41+
<br><a href="http://tools.ietf.org/html/{{doc.obj.document.filename}}-{{doc.obj.document.revision}}.html">{{doc.obj.document.filename}}-{{doc.obj.document.revision}}</a>
42+
{% endif %} <br>Token: {{ doc.obj.token_name|escape }}
43+
{% if doc.obj.note %}{# note: note is not escaped #} <br>Note: {{ doc.obj.note }}
44+
{% endif %}{% for ipr in doc.obj.draft.ipr.all %}{% ifequal ipr.ipr.status 1 %} <br>IPR: <a href="http://datatracker.ietf.org/ipr/{{ ipr.ipr.ipr_id }}/">{{ ipr.ipr.title }}</a>{% endifequal %}
45+
{% endfor %} {% if doc.obj.ballot.active %}<br>Extracted from <a href="http://datatracker.ietf.org/idtracker/ballot/{{ doc.obj.ballot.ballot}}/">ballot {{doc.obj.ballot.ballot }}</a>:
46+
<ol>
47+
{% for position in doc.obj.ballot.positions.all|dictsort:"ad.last_name" %}{% ifequal position.discuss 1 %} <li>{{ position.ad }}:{% for item in doc.obj.ballot.discusses.all %}{% ifequal position.ad item.ad %} Discuss [{{ item.date }}]:<br>
48+
{{ item.text|text_to_html }}
49+
{% endifequal %}{% endfor %}{% endifequal %}{% for item in doc.obj.ballot.comments.all %}{% ifequal position.ad item.ad %} <li>{{ position.ad }}: Comment [{{ item.date }}]:<br>
50+
{{ item.text|text_to_html }}
51+
{% endifequal %}{% endfor %}{% endfor %} </ol>
52+
{%endif %} <p><b>Telechat</b>:
53+
<ul>
54+
<li>
55+
<li>
56+
<li>
57+
<li>
58+
<li>
59+
</ul><p>{% if forloop.last %}
60+
</ol>{% endif %}

‎ietf/templates/iesg/scribe_template.html‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
{% comment %}
2+
Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
3+
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions
7+
are met:
8+
9+
* Redistributions of source code must retain the above copyright
10+
notice, this list of conditions and the following disclaimer.
11+
12+
* Redistributions in binary form must reproduce the above
13+
copyright notice, this list of conditions and the following
14+
disclaimer in the documentation and/or other materials provided
15+
with the distribution.
16+
17+
* Neither the name of the Nokia Corporation and/or its
18+
subsidiary(-ies) nor the names of its contributors may be used
19+
to endorse or promote products derived from this software
20+
without specific prior written permission.
21+
22+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
25+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
26+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
27+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
28+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
32+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33+
{% endcomment %}{% comment %}
34+
Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
35+
{% endcomment %}<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
36+
<html>
37+
<head>
38+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
39+
<title></title>
40+
</head>
41+
<body>
42+
<h1>Scribe template for IESG Narrative Minutes, {{date}}</h1>
43+
44+
<p><b>2 Protocol Actions</b></p>
45+
<p><b>2.1 WG Submissions</b></p>
46+
47+
<p><b>2.1.1 New Item</b></p>
48+
{% if not docs.s211 %}<li>(none)</li>{% endif %}
49+
{% for doc in docs.s211 %}{% include "iesg/scribe_doc.html" %}{%endfor%}
50+
51+
<p><b>2.1.2 Returning Item</b></p>
52+
{% if not docs.s212 %}<li>(none)</li>{% endif %}
53+
{% for doc in docs.s212 %}{% include "iesg/scribe_doc.html" %}{%endfor%}
54+
55+
{% if docs.s213 %}
56+
<p><b>2.1.3 For Action</b></p>
57+
{% for doc in docs.s213 %}{% include "iesg/scribe_doc.html" %}{%endfor%}
58+
{% endif %}
59+
60+
<p><b>2.2 Individual Submissions</b></p>
61+
62+
<p><b>2.2.1 New Item</b></p>
63+
{% if not docs.s221 %}<li>(none)</li>{% endif %}
64+
{% for doc in docs.s221 %}{% include "iesg/scribe_doc.html" %}{%endfor%}
65+
66+
<p><b>2.2.2 Returning Item</b></p>
67+
{% if not docs.s222 %}<li>(none)</li>{% endif %}
68+
{% for doc in docs.s222 %}{% include "iesg/scribe_doc.html" %}{%endfor%}
69+
70+
{% if docs.s223 %}
71+
<p><b>2.2.3 For Action</b></p>
72+
{% for doc in docs.s223 %}{% include "iesg/scribe_doc.html" %}{%endfor%}
73+
{% endif %}
74+
75+
<p><b>3. Document Actions</b></p>
76+
<p><b>3.1 WG Submissions</b></p>
77+
78+
<p><b>3.1.1 New Item</b></p>
79+
{% if not docs.s311 %}<li>(none)</li>{% endif %}
80+
{% for doc in docs.s311 %}{% include "iesg/scribe_doc.html" %}{%endfor%}
81+
82+
<p><b>3.1.2 Returning Item</b></p>
83+
{% if not docs.s312 %}<li>(none)</li>{% endif %}
84+
{% for doc in docs.s312 %}{% include "iesg/scribe_doc.html" %}{%endfor%}
85+
86+
{% if docs.s313 %}
87+
<p><b>3.1.3 For Action</b></p>
88+
{% for doc in docs.s313 %}{% include "iesg/scribe_doc.html" %}{%endfor%}
89+
{% endif %}
90+
91+
<p><b>3.2 Individual Submissions Via AD</b></p>
92+
93+
<p><b>3.2.1 New Item</b></p>
94+
{% if not docs.s321 %}<li>(none)</li>{% endif %}
95+
{% for doc in docs.s321 %}{% include "iesg/scribe_doc.html" %}{%endfor%}
96+
97+
<p><b>3.2.2 Returning Item</b></p>
98+
{% if not docs.s322 %}<li>(none)</li>{% endif %}
99+
{% for doc in docs.s322 %}{% include "iesg/scribe_doc.html" %}{%endfor%}
100+
101+
{% if docs.s323 %}
102+
<p><b>3.2.3 For Action</b></p>
103+
{% for doc in docs.s323 %}{% include "iesg/scribe_doc.html" %}{%endfor%}
104+
{% endif %}
105+
106+
<p><b>3.3 Independent Submissions Via RFC Editor</b></p>
107+
108+
<p><b>3.3.1 New Item</b></p>
109+
{% if not docs.s331 %}<li>(none)</li>{% endif %}
110+
{% for doc in docs.s331 %}{% include "iesg/scribe_doc.html" %}{%endfor%}
111+
112+
<p><b>3.3.2 Returning Item</b></p>
113+
{% if not docs.s332 %}<li>(none)</li>{% endif %}
114+
{% for doc in docs.s332 %}{% include "iesg/scribe_doc.html" %}{%endfor%}
115+
116+
{% if docs.s333 %}
117+
<p><b>3.3.3 For Action</b></p>
118+
{% for doc in docs.s333 %}{% include "iesg/scribe_doc.html" %}{%endfor%}
119+
{% endif %}
120+
121+
</body>
122+
</html>

0 commit comments

Comments
 (0)