altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Fix some {% url %} tags with commas between arguments, which is not valid with the new url syntax

Browse source 
- Legacy-Id: 6925
This commit is contained in:
Ole Laursen 2013-12-13 17:00:12 +00:00
parent 3ba9424845
commit e324f5551e
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/secr/templates/proceedings/convert.html
View file

@ -32,7 +32,7 @@
<td>{{ slide.slide_name }}</td>
<td>{{ slide.group_name }}</td>
<td><a href="{{ MEDIA_URL }}proceedings/{{ meeting.meeting_num }}/slides/{{ slide.filename }}">Download</a></td>
<td><a href="{% url sec.proceedings.views.upload_presentation id=meeting.meeting_num, slide_id=slide.id %}">Upload</a></td>
<td><a href="{% url sec.proceedings.views.upload_presentation id=meeting.meeting_num slide_id=slide.id %}">Upload</a></td>
</tr>
{% endfor %}
</tbody>

6
ietf/templates/doc/document_ballot_content.html
View file

@ -4,7 +4,7 @@
{% if editable and user|has_role:"Area Director,Secretariat" %}
<div class="ballot-actions">
{% if user|has_role:"Area Director" %}
<div class="action"><a href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name,ballot_id=ballot.pk %}">Edit position</a></div>
<div class="action"><a href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot.pk %}">Edit position</a></div>
{% endif %}
{% if doc.type_id == "draft" or doc.type_id == "conflrev" %}
@ -28,7 +28,7 @@
<div class="position-group">
<div class="heading"><span class="square position-{{ n.slug }}"></span> {{ n.name }}</div>
{% for p in positions %}
<div>{% if p.old_ad %}[{% endif %}<a{% if user|has_role:"Secretariat" %} href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name,ballot_id=ballot.pk %}?ad={{ p.ad.pk }}" title="Click to edit the position of {{ p.ad.plain_name }}"{% endif %}>{{ p.ad.plain_name }}</a>{% if p.old_ad %}]{% endif %}{% if p.comment or p.discuss %}&nbsp;<a href="#{{ p.ad.plain_name|slugify }}"><img src="/images/comment.png" width="14" height="12" alt="*" border="0"/></a>{% endif %}</div>
<div>{% if p.old_ad %}[{% endif %}<a{% if user|has_role:"Secretariat" %} href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot.pk %}?ad={{ p.ad.pk }}" title="Click to edit the position of {{ p.ad.plain_name }}"{% endif %}>{{ p.ad.plain_name }}</a>{% if p.old_ad %}]{% endif %}{% if p.comment or p.discuss %}&nbsp;<a href="#{{ p.ad.plain_name|slugify }}"><img src="/images/comment.png" width="14" height="12" alt="*" border="0"/></a>{% endif %}</div>
{% if p.old_positions %}<div class="was">(was {{ p.old_positions|join:", " }})</div>{% endif %}
{% empty %}
<i>none</i>
@ -44,7 +44,7 @@
<div class="other-ballots">
Available ballots:
{% for b in all_ballots %}
<a{% if b != ballot %} href="{% url "doc_ballot" name=doc.name,ballot_id=b.pk %}"{% endif %}>{{ b.ballot_type.name }} ({{ b.rev }})</a>
<a{% if b != ballot %} href="{% url "doc_ballot" name=doc.name ballot_id=b.pk %}"{% endif %}>{{ b.ballot_type.name }} ({{ b.rev }})</a>
{% endfor %}
</div>
{% endif %}

2
ietf/templates/wgcharter/approve.html
View file

@ -31,7 +31,7 @@ form.approve .announcement {
<div class="actions">
<a href="{% url "doc_view" name=charter.name %}">Back</a>
<a href="{% url "charter_edit_announcement" name=charter.canonical_name,ann="action" %}?next=approve">Go to edit/regenerate announcement page</a>
<a href="{% url "charter_edit_announcement" name=charter.canonical_name ann="action" %}?next=approve">Go to edit/regenerate announcement page</a>
<input type="submit" value="Send out the announcement, close ballot and update revision"/>
</div>
</form>