altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

More tweaks and fixes to the IESG scribe template templates.

Browse source 
- Legacy-Id: 5087
This commit is contained in:
Henrik Levkowetz 2012-12-03 13:16:10 +00:00
parent e38f738851
commit 158f501653
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ietf/templates/iesg/scribe_conflict_doc.html
View file

@ -45,37 +45,37 @@ Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
{% for doc in section_docs %}
<li>
{{ doc.obj.title|escape }}
<br/><a href="{% url doc_view name=doc.obj.canonical_name %}">{{doc.obj.canonical_name}}</a>
<br><a href="{% url doc_view name=doc.obj.canonical_name %}">{{doc.obj.canonical_name}}</a>
<a href="http://www.ietf.org/id/{{doc.obj.canonical_name}}-{{doc.obj.rev}}.txt">[txt]</a>
<div style="padding-left:20px">
{{ doc.obj.conflictdoc.title|escape }} ({{doc.obj.conflictdoc.stream}}: {{ doc.obj.conflictdoc.intended_std_level }})
<br/><a href="{% url doc_view name=doc.obj.conflictdoc.canonical_name %}">{{doc.obj.conflictdoc.canonical_name}}</a>
<br><a href="{% url doc_view name=doc.obj.conflictdoc.canonical_name %}">{{doc.obj.conflictdoc.canonical_name}}</a>
<a href="http://www.ietf.org/id/{{doc.obj.conflictdoc.canonical_name}}-{{doc.obj.conflictdoc.rev}}.txt">[txt]</a>
{% if doc.obj.conflictdoc.note %}{# note: note is not escaped #}
<br/>Note: {{ doc.obj.conflictdoc.note|safe }}
<br>Note: {{ doc.obj.conflictdoc.note|safe }}
{% endif %}
{% for ipr in doc.obj.conflictdoc.ipr %}
{% ifequal ipr.ipr.status 1 %}
<br/>IPR: <a href="http://datatracker.ietf.org/ipr/{{ ipr.ipr.ipr_id }}/">{{ ipr.ipr.title|escape }}</a>
<br>IPR: <a href="http://datatracker.ietf.org/ipr/{{ ipr.ipr.ipr_id }}/">{{ ipr.ipr.title|escape }}</a>
{% endifequal %}
{% endfor %}
</div>
Token: {{ doc.obj.ad.plain_name|escape }}
{% if doc.obj.active_ballot %}
<br/><b>Discusses/comments</b> <a href="http://datatracker.ietf.org/idtracker/ballot/{{doc.obj.canonical_name}}/">[ballot]</a>:
<br><b>Discusses/comments</b> <a href="http://datatracker.ietf.org/idtracker/ballot/{{doc.obj.canonical_name}}/">[ballot]</a>:
<ul>
{% for p in doc.obj.active_ballot.active_ad_positions.values %}
{% if p.pos %}
{% if p.discuss %}
<li>
<a href="#{{doc.obj.name}}+{{p.ad|slugify}}+discuss">{{ p.ad }}: Discuss [{{ p.discuss_time }}]</a>:
<br/>{{ p.discuss }}
<br>{{ p.discuss }}
</li>
{% endif %}
{% if p.comment %}
<li>
<a href="#{{doc.obj.name}}+{{p.ad|slugify}}+comment">{{ p.ad }}: Comment [{{ p.comment_time }}]</a>:
<br/>{{ p.comment }}
<br>{{ p.comment }}
</li>
{% endif %}
{% endif %}

7
ietf/templates/iesg/scribe_doc2.html
View file

@ -42,18 +42,11 @@ Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
<ul>
{% for p in doc.obj.active_ballot.active_ad_positions.values %}
{% if p.pos and p.discuss %}
<li>
<a name="{{doc.obj.name}}+{{p.ad|slugify}}+discuss">{{ p.ad }}: Discuss [{{ p.discuss_time }}]</a>:
<br>{{ p.discuss|escape }}
<li>
<a name="{{doc.obj.name}}+{{p.ad.plain_name|slugify}}+discuss">{{ p.ad.plain_name }}: Discuss [{{ p.discuss_time }}]</a>:
<br><pre>{{ p.discuss|wrap_text:80|escape }}</pre>
{% endif %}
{% if p.pos and p.comment %}
<li>
<a name="{{doc.obj.name}}+{{p.ad|slugify}}+comment">{{ p.ad }}: Comment [{{ p.comment_time }}]</a>:
<br>{{ p.comment|escape }}
<li>
<a name="{{doc.obj.name}}+{{p.ad.plain_name|slugify}}+comment">{{ p.ad.plain_name }}: Comment [{{ p.comment_time }}]</a>:
<br><pre>{{ p.comment|wrap_text:80|escape }}</pre>