From 52a0825985f79f8c13e434ffb3eeff05e28adde0 Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Tue, 17 Dec 2013 11:08:58 +0000
Subject: [PATCH] Take advantage of new include tag that can combine the
 include with a "with foo=bar" instead of having separate "with" tags  -
 Legacy-Id: 6962

---
 ietf/templates/iesg/milestones_needing_review.html | 4 +---
 ietf/templates/wginfo/edit_milestones.html         | 2 +-
 ietf/templates/wginfo/group_charter.html           | 4 +---
 ietf/templates/wginfo/group_documents.html         | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ietf/templates/iesg/milestones_needing_review.html b/ietf/templates/iesg/milestones_needing_review.html
index 7dcd1a21d..3cca9584b 100644
--- a/ietf/templates/iesg/milestones_needing_review.html
+++ b/ietf/templates/iesg/milestones_needing_review.html
@@ -17,9 +17,7 @@ div.milestones-for-group { margin: 0.5em 0; }
 
 <div class="milestones-for-group">{{ g.name }} ({{ g.acronym }}) <a href="{% url "wg_edit_milestones" acronym=g.acronym %}">has new milestones</a>:</div>
 
-{% with g.milestones_needing_review as milestones %}
-{% include "wginfo/milestones.html" %}
-{% endwith %}
+{% include "wginfo/milestones.html" with milestones=g.milestones_needing_review %}
 
 {% endfor %}
 {% endfor %}
diff --git a/ietf/templates/wginfo/edit_milestones.html b/ietf/templates/wginfo/edit_milestones.html
index f8953ddfc..cf37f89eb 100644
--- a/ietf/templates/wginfo/edit_milestones.html
+++ b/ietf/templates/wginfo/edit_milestones.html
@@ -87,7 +87,7 @@ this list</a> to the milestones currently in use for the {{ group.acronym }} {{
 <tr class="edit-milestone{% if form.changed %} changed{% endif %}"><td colspan="2">{% include "wginfo/milestone_form.html" %}</td></tr>
 {% endfor %}
 <tr class="milestone add"><td></td><td>Add {% if milestone_set == "chartering" %}charter{% endif%} milestone {% if needs_review %}for AD review{% endif %}</td></tr>
-<tr class="edit-milestone template"><td colspan="2">{% with empty_form as form %}{% include "wginfo/milestone_form.html" %}{% endwith %}</td></tr>
+<tr class="edit-milestone template"><td colspan="2">{% include "wginfo/milestone_form.html" with form=empty_form %}</td></tr>
 </table>
 
 <div class="actions">
diff --git a/ietf/templates/wginfo/group_charter.html b/ietf/templates/wginfo/group_charter.html
index a2d740ccc..8aaa27317 100644
--- a/ietf/templates/wginfo/group_charter.html
+++ b/ietf/templates/wginfo/group_charter.html
@@ -156,9 +156,7 @@ is occasionally incorrect.</span>
 
 <h2>{% if group.state_id == "proposed" %}Proposed{% endif %} Milestones</h2>
 
-{% with group.milestones as milestones %}
-{% include "wginfo/milestones.html" %}
-{% endwith %}
+{% include "wginfo/milestones.html" with milestones=group.milestones %}
 
 {% if milestones_in_review %}
 <p>+ {{ milestones_in_review|length }} new milestone{{ milestones_in_review|pluralize }}
diff --git a/ietf/templates/wginfo/group_documents.html b/ietf/templates/wginfo/group_documents.html
index a1adc68ef..dfbc2edb3 100644
--- a/ietf/templates/wginfo/group_documents.html
+++ b/ietf/templates/wginfo/group_documents.html
@@ -7,7 +7,7 @@
 
 {% include "doc/search/search_results.html" %}
 
-{% with docs_related as docs %}{% with meta_related as meta %}{% include "doc/search/search_results.html" %}{% endwith %}{% endwith %}
+{% include "doc/search/search_results.html" with docs=docs_related meta=meta_related %}
 
 </div>
 {% endblock group_content %}