Port all still relevant changes between trunk before migration and charter branch to new trunk (mostly various minor template fixes), except 0.24 version of draft.py tool which has some interfaces changes that requires changes in the submit tool
- Legacy-Id: 4341
This commit is contained in:
Ole Laursen
parent
8972ef7917
commit
9f880a3aab
|
|
@ -361,7 +361,7 @@ class OutgoingLiaisonForm(LiaisonForm):
|
|||
person = self.fake_person or self.person
|
||||
for i in self.hm.get_entities_for_person(person):
|
||||
all_entities += i[1]
|
||||
# If the from entity is one in wich the user has full privileges the to entity could be anyone
|
||||
# If the from entity is one in which the user has full privileges the to entity could be anyone
|
||||
if from_code in [i[0] for i in all_entities]:
|
||||
return to_code
|
||||
sdo_codes = ['sdo_%s' % i.sdo.pk for i in person.liaisonmanagers_set.all().distinct()]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
|
||||
{% autoescape off %}
|
||||
Technical Summary
|
||||
|
||||
Relevant content can frequently be found in the abstract
|
||||
|
|
@ -47,4 +47,4 @@ IESG Note
|
|||
IANA Note
|
||||
|
||||
(Insert IANA Note here or remove section)
|
||||
|
||||
{% endautoescape%}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{% autoescape off %}
|
||||
Please DO NOT reply to this email.
|
||||
|
||||
I-D: {{ doc.file_tag|safe }}
|
||||
ID Tracker URL: {{ url }}
|
||||
|
||||
{{ text }}
|
||||
{% endautoescape%}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{% comment %}
|
||||
{% comment %}<!--
|
||||
Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
|
||||
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
|
||||
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
|
|
@ -30,7 +30,7 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
{% endcomment %}
|
||||
-->{% endcomment %}
|
||||
{% load ietf_filters %}
|
||||
<table class="ietf-ballot"><tr valign="top"><td class="left">
|
||||
|
||||
|
|
@ -86,12 +86,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
|
||||
{% ifequal pos.position "Discuss" %}
|
||||
<p><b>Discuss ({{pos.discuss_date}})</b> <img src="/images/comment.png" width="14" height="12" alt=""/></p>
|
||||
<pre>{{pos.discuss_text|fill:"80"|escape }}</pre>
|
||||
<pre>{{pos.discuss_text|wrap_text:80|escape }}</pre>
|
||||
{% endifequal %}
|
||||
|
||||
{% if pos.comment_text %}
|
||||
<p><b>Comment ({{pos.comment_date}})</b> <img src="/images/comment.png" width="14" height="12" alt=""/></p>
|
||||
<pre>{{pos.comment_text|fill:"80"|escape }}</pre>
|
||||
<pre>{{pos.comment_text|wrap_text:80|escape }}</pre>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</td></tr></table>
|
||||
|
|
|
|||
|
|
@ -62,13 +62,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
<div id="commentS{{c.comment.id}}">{{ c.info.textSnippet|safe }}</div>
|
||||
<span class="comment_toggle" onclick="toggleComment({{c.comment.id}})" id="commentT{{c.comment.id}}">[show all]</span>
|
||||
<div id="commentF{{c.comment.id}}" style="display:none;">
|
||||
{{ c.info.text|fill:"80"|safe|urlize|linebreaksbr|keep_spacing|sanitize_html|safe }}
|
||||
{{ c.info.text|safe|urlize|linebreaksbr|keep_spacing|sanitize_html|safe }}
|
||||
</div>
|
||||
{% else %}
|
||||
{% if c.info.dontmolest %}
|
||||
{{ c.info.text|safe }}
|
||||
{% else %}
|
||||
{{ c.info.text|fill:"80"|safe|urlize|linebreaksbr|keep_spacing|sanitize_html|safe }}
|
||||
{{ c.info.text|safe|urlize|linebreaksbr|keep_spacing|sanitize_html|safe }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{{ doc.file_tag|safe }} was just expired.
|
||||
{% autoescape off %}{{ doc.file_tag|safe }} was just expired.
|
||||
This draft is in the state "{{ state }}" in the ID Tracker.
|
||||
|
||||
|
||||
Thanks,
|
||||
IETF Secretariat.
|
||||
{% endautoescape %}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{% autoescape off %}
|
||||
Last Call Request has been submitted for
|
||||
{% for d in docs %}{{ d.file_tag|safe }}
|
||||
{% endfor %}
|
||||
{{ doc_url|safe }}
|
||||
{% endautoescape %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% comment %}
|
||||
{% comment %}<!--
|
||||
Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
|
||||
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
{% endcomment %}{% comment %}
|
||||
-->{% endcomment %}{% comment %}
|
||||
Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
|
||||
{% endcomment %}{% load ietf_filters %}
|
||||
|
||||
|
|
@ -38,37 +38,21 @@ Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
|
|||
<p><b>{{ doc.obj.document.filename }}</b></p>
|
||||
{% if doc.obj.ballot.active %}
|
||||
<ol>
|
||||
{% if USE_DB_REDESIGN_PROXY_CLASSES %}
|
||||
|
||||
{% for p in doc.obj.active_positions|dictsort:"ad.last_name" %}
|
||||
|
||||
{% if p.pos and p.pos.pos_id == "discuss" %}
|
||||
<li><a name="{{doc.obj.document.filename}}+{{p.ad.plain_name|slugify}}+discuss">{{ p.ad.plain_name }}</a>: Discuss [{{ p.pos.discuss_time|date:"Y-m-d" }}]:<br>
|
||||
<pre>
|
||||
{{ p.pos.orig.discuss|fill:"80"|escape }}
|
||||
</pre>
|
||||
<pre>{{ p.pos.orig.discuss|wrap_text:80|escape }}</pre>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
{% if p.pos and p.pos.comment %}
|
||||
<li><a name="{{doc.obj.document.filename}}+{{p.ad.plain_name|slugify}}+comment">{{ p.ad.plain_name }}</a>: Comment [{{ p.pos.comment_time|date:"Y-m-d" }}]:<br>
|
||||
<pre>{{ p.pos.comment|fill:"80"|escape }}</pre>
|
||||
<pre>{{ p.pos.comment|wrap_text:80|escape }}</pre>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
{% else %}
|
||||
|
||||
{% for position in doc.obj.ballot.positions.all|dictsort:"ad.last_name" %}{% ifequal position.discuss 1 %} <li><a name="{{doc.obj.document.filename}}+{{position.ad|slugify}}+discuss">{{ position.ad }}</a>:{% for item in doc.obj.ballot.discusses.all %}{% ifequal position.ad item.ad %} Discuss [{{ item.date }}]:<br>
|
||||
<pre>
|
||||
{{ item.text|fill:"80"|escape }}
|
||||
</pre>
|
||||
{% endifequal %}{% endfor %}{% endifequal %}{% for item in doc.obj.ballot.comments.all %}{% ifequal position.ad item.ad %} <li><a name="{{doc.obj.document.filename}}+{{position.ad|slugify}}+comment">{{ position.ad }}</a>: Comment [{{ item.date }}]:<br>
|
||||
<pre>{{ item.text|fill:"80"|escape }}</pre>
|
||||
{% endifequal %}{% endfor %}{% endfor %}
|
||||
|
||||
{%endif %}
|
||||
|
||||
</ol>
|
||||
|
||||
{% endif%}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
{% autoescape off %}
|
||||
The annotation tags of document {{ doc }} have been updated. See more information below.
|
||||
|
||||
Annotation tags set: {{ entry.setted }}
|
||||
|
|
@ -7,3 +8,4 @@ Author of the change: {{ entry.person }}
|
|||
|
||||
Comment:
|
||||
{{ entry.comment }}
|
||||
{% endautoescape %}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
{% autoescape off %}
|
||||
The state of document {{ doc }} has been updated. See more information below.
|
||||
|
||||
Previous state: {{ entry.from_state }}
|
||||
|
|
@ -7,3 +8,4 @@ Author of the change: {{ entry.person }}
|
|||
|
||||
Comment:
|
||||
{{ entry.comment }}
|
||||
{% endautoescape %}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
{% autoescape off %}
|
||||
The stream of document {{ doc }} has been updated. See more information below.
|
||||
|
||||
Previous stream: {{ entry.from_stream }}
|
||||
|
|
@ -7,3 +8,4 @@ Author of the change: {{ entry.person }}
|
|||
|
||||
Comment:
|
||||
{{ entry.comment }}
|
||||
{% endautoescape %}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% load ietf_filters %}IPR Title: {{ ipr.title|safe }}
|
||||
{% autoescape off %}{% load ietf_filters %}IPR Title: {{ ipr.title|safe }}
|
||||
|
||||
|
||||
Section I: Patent Holder/Applicant ("Patent Holder")
|
||||
|
|
@ -76,3 +76,4 @@ Section VII: Contact Information of Submitter of this Form (if different from IE
|
|||
|
||||
Section VIII: Other Note(s)
|
||||
{{ ipr.other_notes|safe }}
|
||||
{% endautoescape %}
|
||||
|
|
@ -1,4 +1,7 @@
|
|||
A new version of I-D, {{ submission.filename }}-{{ submission.revision }}.txt has been successfully submitted by {{ submitter }} and posted to the IETF repository.
|
||||
{% autoescape off %}
|
||||
A new version of I-D, {{ submission.filename }}-{{ submission.revision }}.txt
|
||||
has been successfully submitted by {{ submitter }} and posted to the
|
||||
IETF repository.
|
||||
|
||||
Filename: {{ submission.filename }}
|
||||
Revision: {{ submission.revision }}
|
||||
|
|
@ -6,6 +9,10 @@ Title: {{ submission.id_document_name }}
|
|||
Creation date: {{ submission.creation_date|date:"Y-m-d" }}
|
||||
WG ID: {{ wg }}
|
||||
Number of pages: {{ submission.txt_page_count }}
|
||||
URL: http://www.ietf.org/internet-drafts/{{ submission.filename }}-{{ submission.revision }}.txt
|
||||
Status: http://datatracker.ietf.org/doc/{{ submission.filename }}
|
||||
Htmlized: http://tools.ietf.org/html/submission.filename }}-{{ submission.revision }}
|
||||
{% ifnotequal submission.revision "00" %}Diff: http://tools.ietf.org/rfcdiff?url2={{ submission.filename }}-{{ submission.revision }}{% endifnotequal %}
|
||||
|
||||
Abstract:
|
||||
{{ submission.abstract }}
|
||||
|
|
@ -13,3 +20,4 @@ Abstract:
|
|||
{{ submission.comment_to_sec|default:"" }}
|
||||
|
||||
The IETF Secretariat
|
||||
{% endautoescape %}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
{% autoescape off %}
|
||||
A New Internet-Draft is available from the on-line Internet-Drafts directories.{% if submission.group_acronym %} This draft is a work item of the {{ submission.group_acronym.group_acronym.name }} Working Group of the IETF.{% endif %}
|
||||
A New Internet-Draft is available from the on-line Internet-Drafts directories.
|
||||
{% if submission.group_acronym %} This draft is a work item of the {{ submission.group_acronym.group_acronym.name }} Working Group of the IETF.{% endif %}
|
||||
|
||||
Title : {{ submission.id_document_name }}
|
||||
Author(s) : {% for author in authors %}{{ author }}{% if not forloop.last %}
|
||||
|
|
@ -8,17 +9,19 @@ A New Internet-Draft is available from the on-line Internet-Drafts directories.{
|
|||
Pages : {{ submission.txt_page_count }}
|
||||
Date : {{ submission.submission_date|date:"Y-m-d" }}
|
||||
|
||||
Abstract:
|
||||
{{ submission.abstract }}
|
||||
|
||||
A URL for this Internet-Draft is:
|
||||
http://www.ietf.org/internet-drafts/{{ submission.filename }}-{{ submission.revision }}.txt
|
||||
The IETF datatracker status page for this draft is:
|
||||
https://datatracker.ietf.org/doc/{{ submission.filename }}
|
||||
|
||||
There's also a htmlized version available at:
|
||||
http://tools.ietf.org/html/submission.filename }}-{{ submission.revision }}
|
||||
{% if submission.revision != "00" %}
|
||||
A diff from previous version is available at:
|
||||
http://tools.ietf.org/rfcdiff?url2={{ submission.filename }}-{{ submission.revision }}
|
||||
{% endif %}
|
||||
|
||||
Internet-Drafts are also available by anonymous FTP at:
|
||||
ftp://ftp.ietf.org/internet-drafts/
|
||||
|
||||
This Internet-Draft can be retrieved at:
|
||||
ftp://ftp.ietf.org/internet-drafts/{{ submission.filename }}-{{ submission.revision }}.txt
|
||||
|
||||
The IETF datatracker page for this Internet-Draft is:
|
||||
https://datatracker.ietf.org/doc/{{ submission.filename }}/
|
||||
{% endautoescape %}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
Follow this link to confirm your Auto-Post of
|
||||
I-D {{ draft.filename }}-{{ draft.revision }}:
|
||||
{% autoescape off %}Follow this link to confirm your Auto-Post of
|
||||
{{ draft.filename }}-{{ draft.revision }}:
|
||||
|
||||
I-D Submission Tool URL: {{ confirm_url|safe }}
|
||||
|
||||
Remember that you can cancel the submission from:
|
||||
{{ status_url|safe }}
|
||||
{% endautoescape %}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
Follow this link to get full access to the submission of
|
||||
I-D {{ submission.filename }}-{{ submission.revision }}:
|
||||
{% autoescape off %}Follow this link to get full access to the submission of
|
||||
{{ submission.filename }}-{{ submission.revision }}:
|
||||
|
||||
{{ url|safe }}
|
||||
{% endautoescape %}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
WG chair approval is needed for posting of {{ draft.filename }}-{{ draft.revision }}.
|
||||
{% autoescape off %}WG chair approval is needed for posting of {{ draft.filename }}-{{ draft.revision }}.
|
||||
|
||||
Go to this URL to approve the draft (note: you need to login to be
|
||||
able to approve):
|
||||
|
|
@ -21,3 +21,4 @@ Submitter: {{ submitter.get_full_name }} <{{ submitter.email_address }}>
|
|||
Authors:
|
||||
{% for author in authors %}{{ author.get_full_name }} <{{ author.email.1 }}>
|
||||
{% endfor %}
|
||||
{% endautoescape %}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{{ chair }} as a WG Chair of {{ wg }} wants to add you as a {{ wg }} {% if shepherd %}shepherd of document {{ shepherd }}{% else %}WG Delegate{% endif %}.
|
||||
{% autoescape off %}{{ chair }} as a WG Chair of {{ wg }} wants to add you as a {{ wg }} {% if shepherd %}shepherd of document {{ shepherd }}{% else %}WG Delegate{% endif %}.
|
||||
|
||||
You don't have an user/password to log into the datatracker so you must contact
|
||||
the Secretariat at iesg-secretary@ietf.org in order to get your credentials.
|
||||
|
|
@ -7,3 +7,4 @@ When you get your credentials, please inform {{ chair }} at
|
|||
{{ chair.email.1 }} so he/she can finish the designate process.
|
||||
|
||||
Thank you.
|
||||
{% endautoescape %}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{{ chair }} as a WG Chair of {{ wg }} wants to add a person with email
|
||||
{% autoescape off %}{{ chair }} as a WG Chair of {{ wg }} wants to add a person with email
|
||||
{{ delegate_email }} as a {% if shepherd %}shepherd of document {{ shepherd }}{% else %}WG Delegate{% endif %}.
|
||||
|
||||
This person don't have an user/password to log into the datatracker so
|
||||
|
|
@ -12,3 +12,4 @@ already exists in the system but they can not log in.
|
|||
{{ person.pk }} - {{ person }}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% endautoescape %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{{ chair }} as a WG Chair of {{ wg }} wants to add a person with email
|
||||
{% autoescape off %}{{ chair }} as a WG Chair of {{ wg }} wants to add a person with email
|
||||
{{ delegate_email }} as a {% if shepherd %}shepherd of document {{ shepherd }}{% else %}WG Delegate{% endif %}.
|
||||
|
||||
This person don't have an user/password to log into the datatracker so
|
||||
|
|
@ -9,3 +9,4 @@ When he/she gets her credentials then he/she will send an email to
|
|||
{{ chair }} at {{ chair.email.1 }}.
|
||||
|
||||
{{ chair }} could then assign this person as {% if shepherd %}shepherd of document {{ shepherd }}{% else %}WG Delegate{% endif %}.
|
||||
{% endautoescape%}
|
||||
Loading…
Reference in a new issue