+ {% endfor %}
{% endfor %}
-
{% endblock %}
+{% block js %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/iesg/moderator_charter.html b/ietf/templates/iesg/moderator_charter.html
index 56b648fde..48b1e79d5 100644
--- a/ietf/templates/iesg/moderator_charter.html
+++ b/ietf/templates/iesg/moderator_charter.html
@@ -1,4 +1,7 @@
-{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %}
+{# bs5ok #}
+{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{% load origin %}
+{% origin %}
{% comment %}
Parts Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved. Contact: Pasi Eronen
@@ -31,62 +34,84 @@ 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 %}{% load ietf_filters %}
-{{ doc.group.name }} ({{ doc.group.acronym }})
-
+{% endcomment %}
+{% load ietf_filters %}
+
+ {{ doc.group.name }} ({{ doc.group.acronym }})
+
{% if num|startswith:"4.1.1" %}
- Does anyone have an objection to the charter being sent for
- EXTERNAL REVIEW?
-
- If External Review APPROVED - The Secretariat will send a Working
+
+ Does anyone have an objection to the charter being sent for
+ EXTERNAL REVIEW?
+
+
+ If External Review APPROVED - The Secretariat will send a Working
Group Review Announcement with a separate message to new-work and
- place it back on the agenda for the next telechat.
-
- If NOT APPROVED - The Secretariat will
- * wait for instruction from [Name the AD].
- * OR Back to Internal Review.
- * OR Back on the Agenda next time in the same category.
+ place it back on the agenda for the next telechat.
+
+
+ If NOT APPROVED - The Secretariat will
+
+ * wait for instruction from [Name the AD].
+
+ * OR Back to Internal Review.
+
+ * OR Back on the Agenda next time in the same category.
+
{% endif %}
-
{% if num|startswith:"4.1.2" %}
- Does anyone have an objection to the creation of this working
- group?
-
- IF APPROVED - The Secretariat will send a Working Group Action
- announcement.
-
- If NOT APPROVED - The Secretariat will
- * Place the charter back on the agenda for the next telechat.
- * OR Wait for instructions from the responsible AD.
+
+ Does anyone have an objection to the creation of this working
+ group?
+
+
+ IF APPROVED - The Secretariat will send a Working Group Action
+ announcement.
+
+
+ If NOT APPROVED - The Secretariat will
+
+ * Place the charter back on the agenda for the next telechat.
+
+ * OR Wait for instructions from the responsible AD.
+
{% endif %}
-
{% if num|startswith:"4.2.1" %}
- Does anyone have an objection with just making the changes to the
- charter?
-
- If NO OBJECTION - The Secretariat will send a Working Group
- Action: RECHARTER Announcement.
-
- If MUST GO FOR EXTERNAL REVIEW - The Secretariat will send a
+
+ Does anyone have an objection with just making the changes to the
+ charter?
+
+
+ If NO OBJECTION - The Secretariat will send a Working Group
+ Action: RECHARTER Announcement.
+
+
+ If MUST GO FOR EXTERNAL REVIEW - The Secretariat will send a
Working Group Review: Recharter Announcement with messages to
new-work and the WG Chairs. The Secretariat will place it back on
- the agenda for the next telechat.
-
- If OBJECTION - IESG decides not to move forward with the
+ the agenda for the next telechat.
+
+
+ If OBJECTION - IESG decides not to move forward with the
rechartering of the working group: The Secretariat will await
further instructions regarding the charter of [insert working group
- acronym].
+ acronym].
+
{% endif %}
-
{% if num|startswith:"4.2.2" %}
-
- Does anyone have an objection to the rechartering of this working
- group?
-
- IF APPROVED - The Secretariat will send a Working Group Action:
- RECHARTER announcement.
-
- If NOT APPROVED - The Secretariat will
- * Place the charter back on the agenda for the next telechat.
- * OR Wait for instructions from the responsible AD.
+
+ Does anyone have an objection to the rechartering of this working
+ group?
+
+
+ IF APPROVED - The Secretariat will send a Working Group Action:
+ RECHARTER announcement.
+
+
+ If NOT APPROVED - The Secretariat will
+
+ * Place the charter back on the agenda for the next telechat.
+
+ * OR Wait for instructions from the responsible AD.
+
{% endif %}
\ No newline at end of file
diff --git a/ietf/templates/iesg/moderator_conflict_doc.html b/ietf/templates/iesg/moderator_conflict_doc.html
index 3361e9325..d9de30dbb 100644
--- a/ietf/templates/iesg/moderator_conflict_doc.html
+++ b/ietf/templates/iesg/moderator_conflict_doc.html
@@ -1,5 +1,7 @@
+{# bs5ok #}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}{% origin %}
+{% load origin %}
+{% origin %}
{% comment %}
Some parts
Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
@@ -38,68 +40,83 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
{% endcomment %}
{% load ietf_filters %}
-
- {{ doc.name }}-{{doc.rev}}
+ {{ doc.name }}-{{ doc.rev }}
+
({{ doc.title }})
-
- {{ doc.conflictdoc.name }}-{{ doc.conflictdoc.rev }}
- ({{ doc.conflictdoc.title }})
- Intended status: {{ doc.conflictdoc.intended_std_level }}
+ {{ doc.conflictdoc.name }}-{{ doc.conflictdoc.rev }}
+
+ ({{ doc.conflictdoc.title }})
+
+ Intended status: {{ doc.conflictdoc.intended_std_level }}
+
+
-
- Token: {{ doc.ad.plain_name }}
+ Token: {{ doc.ad.plain_name }}
+
{% if doc.type.slug == "draft" %}
Last call ends: {{ doc.most_recent_ietflc.expires.date|default:"(none)" }}
{% if doc.most_recent_ietflc.expires.date|timesince_days < 3 %}!!!{% endif %}
{% endif %}
-
{% with doc.active_ballot as ballot %}
{% if ballot %}
Yes No-Objection Discuss Abstain Recuse
{% for pos in ballot.all_positions %}{% if pos.is_old_pos %}{{pos.balloter.plain_name|bracket|ljust:"22"}}{%else%}{{pos.balloter.plain_name|ljust:"22"}}{%endif%} {{pos|bracketpos:"yes"}} {{pos|bracketpos:"noobj"}} {{pos|bracketpos:"discuss"}} {{pos|bracketpos:"abstain"}} {{pos|bracketpos:"recuse"}}
{% endfor %}
-
-
- ____ active discusses
- [ ] there are [#] discusses in the tracker on this document. Do we need to talk about them now?
-
+
+
+ ____ active discusses
+
+ [ ] there are [#] discusses in the tracker on this document. Do we need to talk about them now?
+
{% else %}
- (Ballot not issued)
+
+ (Ballot not issued)
+
{% endif %}
{% endwith %}
-
{% if num|startswith:"3.4.1" or num|startswith:"3.4.2" %}
- Does anyone have an objection to the this conflict review response being sent to the {{doc.conflictdoc.stream}}?
+
+ Does anyone have an objection to the this conflict review response being sent to the {{ doc.conflictdoc.stream }}?
+
{% endif %}
{% if num|startswith:"3.4.3" %}
- Who will do the review of this document?
+
+ Who will do the review of this document?
+
{% endif %}
-
-Current State: {{ doc.friendly_state }}
- Next State:
- Sub State:
-
+
+ Current State: {{ doc.friendly_state }}
+
+ Next State:
+
+ Sub State:
+
{% if num|startswith:"3.4.1" or num|startswith:"3.4.2" %}
- If APPROVED - The Secretariat will send a standard no problem
+
+ If APPROVED - The Secretariat will send a standard no problem
message to the RFC Editor. [Name of AD] will you supply the text for
- the IESG Note?
-
- If APPROVED with caveats - The Secretariat will send a standard
+ the IESG Note?
+
+
+ If APPROVED with caveats - The Secretariat will send a standard
no problem message to the RFC Editor that includes the note drafted
- by [Name that AD].
-
- If NOT APPROVED - The Secretariat will send the standard Do Not
- Publish message to the RFC Editor.
-
- If NOT APPROVED with clarifications - The Secretariat will send
+ by [Name that AD].
+
+
+ If NOT APPROVED - The Secretariat will send the standard Do Not
+ Publish message to the RFC Editor.
+
+
+ If NOT APPROVED with clarifications - The Secretariat will send
the Do Not Publish message to the RFC Editor that includes the note
- drafted by[Name the AD].
-{% endif %}
+ drafted by[Name the AD].
+
+{% endif %}
\ No newline at end of file
diff --git a/ietf/templates/iesg/moderator_doc.html b/ietf/templates/iesg/moderator_doc.html
index bf8ecebb5..54289ff73 100644
--- a/ietf/templates/iesg/moderator_doc.html
+++ b/ietf/templates/iesg/moderator_doc.html
@@ -1,3 +1,4 @@
+{# bs5ok #}
{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %}
{% comment %}
Parts copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
@@ -176,5 +177,4 @@ Parts Copyright (c) 2009 The IETF Trust, all rights reserved.
{% endif %}
{% endfor %}
{% endif %}
-{% endif %}
-
+{% endif %}
\ No newline at end of file
diff --git a/ietf/templates/iesg/moderator_package.html b/ietf/templates/iesg/moderator_package.html
index 24fd921b8..f9260f270 100644
--- a/ietf/templates/iesg/moderator_package.html
+++ b/ietf/templates/iesg/moderator_package.html
@@ -148,11 +148,9 @@ Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
{% endif %}
{% if num == "7" %}
{% filter linebreaks_crlf %}
- {% for ad in section.ads %}
- [ ] {{ ad.plain_name }}
- {% endfor %}
+ {% for ad in section.ads %}[ ] {{ ad.plain_name }}
{% endfor %}
{% endfilter %}
{% endif %}
{% endfor %}