Skip to content

Commit 0c2c5a7

Browse files
OleLaursenOleLaursen
committed
Rewrite url tags in Secretariat templates to new syntax
 - Legacy-Id: 6936
1 parent 7aa3737 commit 0c2c5a7

49 files changed

Lines changed: 143 additions & 143 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ietf/secr/templates/areas/list.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2>Areas <span class="unlocked"><a href="add/" class="addlink">Add</a></span></
2525
<tbody>
2626
{% for item in results %}
2727
<tr class="{% cycle 'row1' 'row2' %} {{ item.state|lower }}">
28-
<td><a href="{% url areas_view name=item.acronym %}">{{ item.name }}</a></td>
28+
<td><a href="{% url "areas_view" name=item.acronym %}">{{ item.name }}</a></td>
2929
<td>{{ item.acronym }}</td>
3030
<td>{{ item.state }}</td>
3131
</tr>

‎ietf/secr/templates/areas/view.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h2>Area - View</h2>
3030
<h2>Directors</h2>
3131
<table class="full-width">
3232
{% for director in directors %}
33-
<tr><td><a href="{% url rolodex_view id=director.person.id %}">{{ director.person.name }}</a>{% if director.name.slug == "pre-ad" %} (Incoming){% endif %}</td></tr>
33+
<tr><td><a href="{% url "rolodex_view" id=director.person.id %}">{{ director.person.name }}</a>{% if director.name.slug == "pre-ad" %} (Incoming){% endif %}</td></tr>
3434
{% endfor %}
3535
</table>
3636
</div> <!-- inline-group -->
@@ -44,7 +44,7 @@ <h2>Directors</h2>
4444
<!-- <li><button onclick="window.location='../../'">Back</button></li> -->
4545
<li><button onclick="window.location='edit/'">Edit</button></li>
4646
<li><button onclick="window.location='people/'">People</button></li>
47-
<li><button onclick="window.location='{% url groups_search %}?primary_area={{ area.id }}'">Groups</button></li>
47+
<li><button onclick="window.location='{% url "groups_search" %}?primary_area={{ area.id }}'">Groups</button></li>
4848
</ul>
4949
</div> <!-- button-group -->
5050
</div> <!-- module -->

‎ietf/secr/templates/drafts/authors.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h2>Authors</h2>
3434
<td>{{ author.author.person }}</td>
3535
<td>{{ author.author }}</td>
3636
<td>{{ author.order }}</td>
37-
<td><a href="{% url drafts_author_delete id=draft.pk oid=author.id %}">Delete</a></td>
37+
<td><a href="{% url "drafts_author_delete" id=draft.pk oid=author.id %}">Delete</a></td>
3838
</tr>
3939
{% endfor %}
4040
</tbody>

‎ietf/secr/templates/drafts/makerfc.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ <h2>Draft - Make RFC</h2>
5353
<h2>Author(s)</h2>
5454
<table>
5555
{% for author in draft.authors.all %}
56-
<tr><td><a href="{% url sec.rolodex.views.view id=author.person.pk %}">{{ author.person.name }}</a></td></tr>
56+
<tr><td><a href="{% url "sec.rolodex.views.view" id=author.person.pk %}">{{ author.person.name }}</a></td></tr>
5757
{% endfor %}
5858
</table>
5959
</div> <!-- inline-related -->

‎ietf/secr/templates/drafts/view.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<h2>Draft - View</h2>
2121
<table class="full-width">
2222
<tr><td>Document Name:</td><td>{{ draft.title }}</td></tr>
23-
<tr><td>Area:</td><td>{% if draft.group.parent %}<a href="{% url areas_view name=draft.group.parent.acronym %}">{{ draft.group.parent }}{% endif %}</td></tr>
24-
<tr><td>Group:</td><td>{% if draft.group %}<a href="{% url groups_view acronym=draft.group.acronym %}">{{ draft.group.acronym }}{% endif %}</td></tr>
23+
<tr><td>Area:</td><td>{% if draft.group.parent %}<a href="{% url "areas_view" name=draft.group.parent.acronym %}">{{ draft.group.parent }}{% endif %}</td></tr>
24+
<tr><td>Group:</td><td>{% if draft.group %}<a href="{% url "groups_view" acronym=draft.group.acronym %}">{{ draft.group.acronym }}{% endif %}</td></tr>
2525
<tr><td>Area Director:</td><td>{{ draft.ad }}</td></tr>
2626
<tr><td>Shepherd:</td><td>{{ draft.shepherd }}</td></tr>
2727
<tr><td>Notify:</td><td>{{ draft.notify }}</td></tr>
@@ -48,15 +48,15 @@ <h2>Draft - View</h2>
4848
<tr><td>Start Date:</td><td>{{ draft.start_date }}</td></tr>
4949
<tr><td>Number of Pages:</td><td>{{ draft.pages }}</td></tr>
5050
{% comment %}<tr><td>Local Path:</td><td>/ftp/internet-drafts/{{ draft.local_path|default_if_none:"" }}</td></tr>{% endcomment %}
51-
<tr><td>Abstract:</td><td><a href="{% url drafts_abstract id=draft.name %}">Click here to view the abstract</td></tr>
51+
<tr><td>Abstract:</td><td><a href="{% url "drafts_abstract" id=draft.name %}">Click here to view the abstract</td></tr>
5252
<tr><td>Expiration Date:</td><td>{{ draft.expires|date:"M. d, Y" }}</td></tr>
5353
<tr><td>Intended Status:</td><td>{{ draft.intended_std_level|default_if_none:"" }}</td></tr>
5454
<tr><td>Standardization Level:</td><td>{{ draft.std_level|default_if_none:"" }}</td></tr>
5555
<tr><td>RFC Number:</td><td>{{ draft.rfc_number|default_if_none:"" }}</td></tr>
5656
<tr><td>Comments:</td><td>{{ draft.internal_comments|default_if_none:"" }}</td></tr>
5757
<tr><td>Last Modified Date:</td><td>{{ draft.time }}</td></tr>
58-
<tr><td>Replaced by:</td><td>{% if draft.replaced_by %}<a href="{% url drafts_view id=draft.replaced_by.name %}">{{ draft.replaced_by.name }}{% endif %}</td></tr>
59-
<tr><td>Related Documents:</td><td>{% for item in draft.relateddocument_set.all %}{% if not forloop.first %}, {% endif %}{{ item.relationship }} <a href="{% url drafts_view id=item.target.document.pk %}">{{ item.target.name }}</a>{% endfor %}</td></tr>
58+
<tr><td>Replaced by:</td><td>{% if draft.replaced_by %}<a href="{% url "drafts_view" id=draft.replaced_by.name %}">{{ draft.replaced_by.name }}{% endif %}</td></tr>
59+
<tr><td>Related Documents:</td><td>{% for item in draft.relateddocument_set.all %}{% if not forloop.first %}, {% endif %}{{ item.relationship }} <a href="{% url "drafts_view" id=item.target.document.pk %}">{{ item.target.name }}</a>{% endfor %}</td></tr>
6060
<tr><td>Tags:</td>
6161
<td>{% for tag in draft.tags.all %}
6262
{% if not forloop.first %}, {% endif %}
@@ -72,7 +72,7 @@ <h2>Draft - View</h2>
7272
<h2>Author(s)</h2>
7373
<table class="full-width">
7474
{% for author in draft.documentauthor_set.all %}
75-
<tr><td><a href="{% url rolodex_view id=author.author.person.id %}">{{ author.author.person.name }}</a></td></tr>
75+
<tr><td><a href="{% url "rolodex_view" id=author.author.person.id %}">{{ author.author.person.name }}</a></td></tr>
7676
{% endfor %}
7777
</table>
7878
</div> <!-- inline-related -->
@@ -96,8 +96,8 @@ <h2>Actions</h2>
9696
<li><button onclick="window.location='edit/'">Edit</button></li>
9797
<li><button onclick="window.location='authors/'">Authors</button></li>
9898
{% comment %}
99-
<li><button onclick="window.location='{% url sec.ids.views.search id=group.group_acronym.acronym_id %}'">Drafts</button></li>
100-
<li><button onclick="window.location='{% url sec.rfcs.views.search id=group.group_acronym.acronym_id %}'">RFCs</button></li>
99+
<li><button onclick="window.location='{% url "sec.ids.views.search" id=group.group_acronym.acronym_id %}'">Drafts</button></li>
100+
<li><button onclick="window.location='{% url "sec.rfcs.views.search" id=group.group_acronym.acronym_id %}'">RFCs</button></li>
101101
{% endcomment %}
102102
</ul>
103103
</div> <!-- button-group -->

‎ietf/secr/templates/groups/people.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h2>People</h2>
3434
<td>{{ role.name }}</td>
3535
<td>{{ role.person }}</td>
3636
<td>{{ role.email }}</td>
37-
<td><a href="{% url groups_delete_role acronym=group.acronym id=role.id %}">Delete</a></td>
37+
<td><a href="{% url "groups_delete_role" acronym=group.acronym id=role.id %}">Delete</a></td>
3838
</tr>
3939
{% endfor %}
4040
</tbody>

‎ietf/secr/templates/groups/view.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@ <h2>Groups - View</h2>
3232
{% endcomment %}
3333
<tr><td>Primary Area:</td>
3434
<td>{% if not group.parent %}(No Data){% else %}
35-
<a href="{% url areas_view name=group.parent.acronym %}">{{ group.parent }}</a>
35+
<a href="{% url "areas_view" name=group.parent.acronym %}">{{ group.parent }}</a>
3636
{% endif %}
3737
</td>
3838
</tr>
3939
<tr><td>Primary Area Director:</td>
4040
<td>{% if group.ad %}
41-
<a href="{% url rolodex_view id=group.ad.id %}">{{ group.ad }}</a>
41+
<a href="{% url "rolodex_view" id=group.ad.id %}">{{ group.ad }}</a>
4242
{% endif %}
4343
</td></tr>
4444
<tr><td>Meeting Scheduled:</td><td>{{ group.meeting_scheduled}}</td></tr>
4545
<tr><td>Email Address:</td><td>{{ group.list_email }}</td></tr>
4646
<tr><td>Email Subscription:</td><td>{{ group.list_subscribe }}</td></tr>
4747
<tr><td>Email Archive:</td><td>{{ group.list_archive }}</td></tr>
48-
<tr><td>Charter:</td><td><a href="{% url groups_charter acronym=group.acronym %}">View Charter</a></td></tr>
48+
<tr><td>Charter:</td><td><a href="{% url "groups_charter" acronym=group.acronym %}">View Charter</a></td></tr>
4949
<tr><td>Comments:</td><td>{{ group.comments }}</td></tr>
5050
<tr><td>Last Modified Date:</td><td>{{ group.time }}</td></tr>
5151
</table>
@@ -60,7 +60,7 @@ <h2>Groups - View</h2>
6060
<h2>Chairperson(s)</h2>
6161
<table>
6262
{% for role in group.chairs %}
63-
<tr><td><a href="{% url rolodex_view id=role.person.id %}">{{ role.person }}</a></td></tr>
63+
<tr><td><a href="{% url "rolodex_view" id=role.person.id %}">{{ role.person }}</a></td></tr>
6464
{% endfor %}
6565
</table>
6666
</div> <!-- inline-related -->
@@ -69,7 +69,7 @@ <h2>Chairperson(s)</h2>
6969
<h2>Document Editor(s)</h2>
7070
<table>
7171
{% for role in group.editors %}
72-
<tr><td><a href="{% url rolodex_view id=role.person.id %}">{{ role.person }}</a></td></tr>
72+
<tr><td><a href="{% url "rolodex_view" id=role.person.id %}">{{ role.person }}</a></td></tr>
7373
{% endfor %}
7474
</table>
7575
</div> <!-- inline-related -->
@@ -78,7 +78,7 @@ <h2>Document Editor(s)</h2>
7878
<h2>Technical Advisor(s)</h2>
7979
<table>
8080
{% for role in group.techadvisors %}
81-
<tr><td><a href="{% url rolodex_view id=role.person.id %}">{{ role.person }}</a></td></tr>
81+
<tr><td><a href="{% url "rolodex_view" id=role.person.id %}">{{ role.person }}</a></td></tr>
8282
{% endfor %}
8383
</table>
8484
</div> <!-- inline-related -->
@@ -87,7 +87,7 @@ <h2>Technical Advisor(s)</h2>
8787
<h2>Secretary(ies)</h2>
8888
<table>
8989
{% for role in group.secretaries %}
90-
<tr><td><a href="{% url rolodex_view id=role.person.id %}">{{ role.person }}</a></td></tr>
90+
<tr><td><a href="{% url "rolodex_view" id=role.person.id %}">{{ role.person }}</a></td></tr>
9191
{% endfor %}
9292
</table>
9393
</div> <!-- inline-related -->
@@ -100,8 +100,8 @@ <h2>Secretary(ies)</h2>
100100
<li><button onclick="window.location='people/'">People</button></li>
101101
<li><button onclick="window.location='gm/'">G + M</button></li>
102102
{% comment %}
103-
<li><button onclick="window.location='{% url sec.ids.views.search id=group.group_acronym.acronym_id %}'">Drafts</button></li>
104-
<li><button onclick="window.location='{% url sec.rfcs.views.search id=group.group_acronym.acronym_id %}'">RFCs</button></li>
103+
<li><button onclick="window.location='{% url "sec.ids.views.search" id=group.group_acronym.acronym_id %}'">Drafts</button></li>
104+
<li><button onclick="window.location='{% url "sec.rfcs.views.search" id=group.group_acronym.acronym_id %}'">RFCs</button></li>
105105
{% endcomment %}
106106
</ul>
107107
</div> <!-- button-group -->

‎ietf/secr/templates/includes/draft_search_results.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<tbody>
1111
{% for item in results %}
1212
<tr class="{% cycle 'row1' 'row2' %}">
13-
<td><a href="{% url drafts_view id=item.name %}">{{ item.name }}</a></td>
13+
<td><a href="{% url "drafts_view" id=item.name %}">{{ item.name }}</a></td>
1414
<td>{{item.group.acronym}}</td>
1515
<td>{{item.get_state}}</td>
1616
<td>{{item.intended_std_level}}</td>

‎ietf/secr/templates/includes/group_search_results.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<tbody>
1212
{% for item in results %}
1313
<tr class="{% cycle 'row1' 'row2' %}">
14-
<td><a href="{% url groups_view acronym=item.acronym %}">{{item.name}}</a></td>
14+
<td><a href="{% url "groups_view" acronym=item.acronym %}">{{item.name}}</a></td>
1515
<td>{{item.acronym}}</td>
1616
<td>{{item.state}}</td>
1717
<td>{{item.type}}</td>

‎ietf/secr/templates/includes/proceedings_functions.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
<p>Use this to process meeting materials files that have been converted to PDF and uploaded to the server.</p>
1515
<ul class="none">
1616
<li>
17-
<button onclick="window.location='{% url proceedings_process_pdfs meeting_num=meeting.number %}'">Process PDFs</button>
17+
<button onclick="window.location='{% url "proceedings_process_pdfs" meeting_num=meeting.number %}'">Process PDFs</button>
1818
&nbsp;&nbsp;<span class="{% if ppt_count > 0 %}alert{% endif %}">{{ ppt_count }} PowerPoint files waiting to be converted</span>
1919
</li>
2020
</ul>
2121
<p>Use this to generate the progress report for the plenary.</p>
2222
<ul class="none">
23-
<li><button onclick="window.location='{% url proceedings_progress_report meeting_num=meeting.number %}'">Generate Progress Report</button>
23+
<li><button onclick="window.location='{% url "proceedings_progress_report" meeting_num=meeting.number %}'">Generate Progress Report</button>
2424
&nbsp;&nbsp;<a href="{{ MEDIA_URL }}proceedings/{{ meeting.number }}/progress-report.html">Progress Report</a>
2525
</li>
2626
</ul>

0 commit comments

Comments
 (0)