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

Author: OleLaursen

ietf/templates/iesg/milestones_needing_review.html

@@ -17,9 +17,7 @@ <h3 class="ad">{{ ad.plain_name }}</h4>
 
 <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 %}

ietf/templates/wginfo/edit_milestones.html

@@ -87,7 +87,7 @@ <h1>{{ title }}</h1>
 <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">

ietf/templates/wginfo/group_charter.html

@@ -156,9 +156,7 @@ <h2>Charter for {% if group.state_id == "proposed" %}Proposed{% endif %} Working
 
 <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 }}

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 %}