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

Fix django 1.7 deprecation warnings: quote arguments to the 'cycle' template tag.

Browse source 
- Legacy-Id: 8826
This commit is contained in:
Henrik Levkowetz 2014-12-22 17:36:09 +00:00
parent a0ceff3a14
commit 971a631ea3
18 changed files with 71 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ietf/templates/community/manage_clist.html
View file

@ -1,4 +1,6 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "base.html" %}
{% load future %}
{% block title %}{{ cl.long_name }}{% endblock %}
@ -35,7 +37,7 @@ In order to add some individual documents to your list you have to:
<table class="ietf-table">
<tr><th>Name</th><th>State</th><th>Title</th><th>Remove from list</th></tr>
{% for doc in cl.added_ids.all %}
<tr class="{% cycle oddrow,evenrow %}">
<tr class="{% cycle 'oddrow','evenrow' %}">
<td>{{ doc.display_name }}</td>
<td>{{ doc.get_state }}</td>
<td><a href="{{ doc.get_absolute_url }}"</a>{{ doc.title }}</td>
@ -51,7 +53,7 @@ In order to add some individual documents to your list you have to:
<tr><th>Rule</th><th>Value</th><th>Documents</th><th>Remove from list</th></tr>
{% for rule in cl.rule_set.all %}
{% with rule.get_callable_rule as callable %}
<tr class="{% cycle oddrow,evenrow %}">
<tr class="{% cycle 'oddrow','evenrow' %}">
<td>{{ callable.description }}</td>
<td>{{ callable.show_value }}</td>
<td>{% with rule.cached_ids.count as count %}{{ count }} document{{ count|pluralize }}{% endwith %}</td>

6
ietf/templates/community/raw_view.html
View file

@ -1,4 +1,6 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% load community_tags %}
{% load future %}
{% with cl.get_rfcs_and_drafts as documents %}
{% with dc.get_active_fields as fields %}
@ -10,7 +12,7 @@
{% endfor %}
</tr>
{% for doc in documents.1 %}
<tr class="{% cycle oddrow,evenrow %}">
<tr class="{% cycle 'oddrow','evenrow' %}">
{% for field in fields %}
<td>
{% show_field field doc %}
@ -30,7 +32,7 @@
{% endfor %}
</tr>
{% for doc in documents.0 %}
<tr class="{% cycle oddrow,evenrow %}">
<tr class="{% cycle 'oddrow','evenrow' %}">
{% for field in fields %}
<td>
{% show_field field doc %}

4
ietf/templates/debug.html
View file

@ -1,6 +1,8 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% if debug %}
{% load ietf_filters %}
{% load future %}
<div id="debug" style="clear: left;">
<h2>Queries</h2>
<p>
@ -22,7 +24,7 @@
</thead>
<tbody>
{% for query in sql_queries %}
<tr class="{% cycle odd,even %}">
<tr class="{% cycle 'odd','even' %}">
<td>{{ forloop.counter }}</td>
<td>{{ query.sql|expand_comma|escape }}</td>
<td>{{ query.time }}</td>

5
ietf/templates/doc/document_history.html
View file

@ -1,6 +1,7 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "base.html" %}
{% load ietf_filters %}
{% load future %}
{% block title %}History for {{ doc.name }}-{{ doc.rev }}{% endblock %}
@ -65,7 +66,7 @@
<tr><th>Date</th><th>Version</th><th>By</th><th>Text</th></tr>
{% for e in events %}
<tr class="{% cycle oddrow,evenrow %}" id="history-{{ e.pk }}">
<tr class="{% cycle 'oddrow','evenrow' %}" id="history-{{ e.pk }}">
<td>{{ e.time|date:"Y-m-d" }}</td>
<td>{{ e.rev }}</td>
<td>{{ e.by }}</td>

4
ietf/templates/group/history.html
View file

@ -1,5 +1,7 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "group/group_base.html" %}
{% load ietf_filters %}
{% load future %}
{% block group_subtitle %}History{% endblock %}
@ -12,7 +14,7 @@
<tr><th>Date</th><th>By</th><th>Text</th></tr>
{% for e in events %}
<tr class="{% cycle oddrow,evenrow %}">
<tr class="{% cycle 'oddrow','evenrow' %}">
<td>{{ e.time|date:"Y-m-d"}}</td>
<td>{{ e.by.plain_name }}</td>
<td>{{ e.desc|format_history_text }}</td>

5
ietf/templates/help/index.html
View file

@ -1,5 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "base.html" %}
{% load future %}
{% block title %} Document State Index{% endblock %}
@ -17,7 +18,7 @@
{% for type in types %}
{% if type.stategroups != None %}
<tr class="{% cycle oddrow,evenrow as cycle1 %}">
<tr class="{% cycle 'oddrow','evenrow' as cycle1 %}">
<td><a href='{{ type.slug }}/'>{{type.slug}}</td>
<td>
{% for group in type.stategroups %}

5
ietf/templates/help/states.html
View file

@ -1,5 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "base.html" %}
{% load future %}
{% block title %} {{type.label|cut:"state"|cut:"State"}} Statess{% endblock %}
@ -16,7 +17,7 @@
</tr>
{% for state in states %}
<tr class="{% cycle oddrow,evenrow as cycle1 %}">
<tr class="{% cycle 'oddrow','evenrow' as cycle1 %}">
<td>{{ state.name }}</td>
<td>{{ state.desc|safe }}</td>
<td><ul>{% for s in state.next_states.all %}<li>{{ s.name }}</li>{%endfor%}</ul></td>

4
ietf/templates/ipr/details.txt
View file

@ -1,6 +1,6 @@
{% autoescape off %}{% load ietf_filters %}{% load ipr_filters %}IPR Title: {{ ipr.title|safe }}
{% autoescape off %}{% load ietf_filters %}{% load ipr_filters %}{% load future %}IPR Title: {{ ipr.title|safe }}
Section {% cycle I,II,III,IV,V,VI,VII,VIII as section %}. {% if ipr|to_class_name == "ThirdPartyIprDisclosure" %}Possible {% endif %}Patent Holder/Applicant ("Patent Holder")
Section {% cycle 'I','II','III','IV','V','VI','VII','VIII' as section %}. {% if ipr|to_class_name == "ThirdPartyIprDisclosure" %}Possible {% endif %}Patent Holder/Applicant ("Patent Holder")
Legal Name: {{ ipr.holder_legal_name|safe }}

26
ietf/templates/ipr/details_edit.html
View file

@ -1,8 +1,8 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "base.html" %}
{% load ietf_filters %}
{% load ipr_filters %}
{% load future %}
{% block title %}New IPR - Form{% endblock %}
@ -78,7 +78,7 @@ will be posted, but will be marked as "non-compliant".</p>
<p class="formlegend">Fields marked with "*" are required.</p>
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}"><th colspan=2>Updates</th></tr>
<tr class="{% cycle 'dark','light' as row_parity %}"><th colspan=2>Updates</th></tr>
<tr class="{% cycle row_parity %}"><td colspan=2>If this disclosure <b>updates</b> another disclosure(s) identify here which one(s).
Leave this field blank if this disclosure does not update any prior disclosures.
Note: Updates to IPR disclosures must only be made by authorized
@ -103,9 +103,9 @@ will be posted, but will be marked as "non-compliant".</p>
<br>
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}">
<tr class="{% cycle 'dark','light' as row_parity %}">
<th colspan=2>
{% cycle I,II,III,IV,V,VI,VII,VIII as section %}.
{% cycle 'I','II','III','IV','V','VI','VII','VIII' as section %}.
{% if form.instance|to_class_name == "ThirdPartyIprDisclosure" %}Possible{% endif %}
Patent Holder/Applicant ("Patent Holder")
</th>
@ -117,7 +117,7 @@ will be posted, but will be marked as "non-compliant".</p>
{% if form.holder_contact_name %}
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}">
<tr class="{% cycle 'dark','light' as row_parity %}">
<th colspan="2">
{% cycle section %}.
Patent Holder's Contact for License Application
@ -131,7 +131,7 @@ will be posted, but will be marked as "non-compliant".</p>
{% if form.ietfer_name %}
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}">
<tr class="{% cycle 'dark','light' as row_parity %}">
<th colspan="2" >
{% cycle section %}.
Contact Information for the IETF Participant Whose Personal Belief Triggered this Disclosure:
@ -151,7 +151,7 @@ will be posted, but will be marked as "non-compliant".</p>
<col width="15%">
<col width="15%">
<tr class="{% cycle dark,light as row_parity %}">
<tr class="{% cycle 'dark','light' as row_parity %}">
<th colspan="4" >
<span class="required">*</span>
{% cycle section %}.
@ -192,7 +192,7 @@ will be posted, but will be marked as "non-compliant".</p>
<!-- Begin Patent Section -->
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}">
<tr class="{% cycle 'dark','light' as row_parity %}">
<th colspan="2" >
{% cycle section %}.
Disclosure of Patent Information{% if form.instance|to_class_name == "ThirdPartyIprDicslosure" %}, if known{% endif %} (i.e., patents or
@ -228,7 +228,7 @@ will be posted, but will be marked as "non-compliant".</p>
{% if form.licensing %}
<!-- Not to be shown for third-party disclosures -->
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}">
<tr class="{% cycle 'dark','light' as row_parity %}">
<th colspan="2" >
{% cycle section %}.
Licensing Declaration
@ -302,7 +302,7 @@ will be posted, but will be marked as "non-compliant".</p>
{% if form.statement %}
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}">
<tr class="{% cycle 'dark','light' as row_parity %}">
<th colspan="2" >
{% cycle section %}.
Statement
@ -325,7 +325,7 @@ will be posted, but will be marked as "non-compliant".</p>
{% endif %} <!-- form.statement (Generic and NonDocSpecific) -->
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}">
<tr class="{% cycle 'dark','light' as row_parity %}">
<th colspan="2" >
{% cycle section %}.
Contact Information of Submitter of this Form (if different from the Contact Information above)
@ -337,7 +337,7 @@ will be posted, but will be marked as "non-compliant".</p>
</table>
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}">
<tr class="{% cycle 'dark','light' as row_parity %}">
<th colspan="2" >
{% cycle section %}.
Other Notes:

6
ietf/templates/ipr/details_history.html
View file

@ -1,8 +1,8 @@
{% extends "ipr/details_base.html" %}
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "ipr/details_base.html" %}
{% load ietf_filters %}
{% load ipr_filters %}
{% load future %}
{% block pagehead %}
<link rel="stylesheet" type="text/css" href="/css/ipr.css"></link>
@ -23,7 +23,7 @@
<tr><th class="date-column">Date</th><th>Type</th><th>By</th><th>Text</th></tr>
{% for e in events %}
<tr class="{% cycle oddrow,evenrow %}" id="history-{{ e.pk }}">
<tr class="{% cycle 'oddrow','evenrow' %}" id="history-{{ e.pk }}">
<td class="date-column">{{ e.time|date:"Y-m-d" }}</td>
<td>{{ e.type }}
{% if e.response_due %}

24
ietf/templates/ipr/details_view.html
View file

@ -1,8 +1,8 @@
{% extends "ipr/details_base.html" %}
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "ipr/details_base.html" %}
{% load ietf_filters %}
{% load ipr_filters %}
{% load future %}
{% block tab_content %}
@ -69,9 +69,9 @@
<!-- Begin Sections -->
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}">
<tr class="{% cycle 'dark','light' as row_parity %}">
<th colspan="2">
{% cycle I,II,III,IV,V,VI,VII,VIII as section %}.
{% cycle 'I','II','III','IV','V','VI','VII','VIII' as section %}.
{% if ipr|to_class_name == "ThirdPartyIprDisclosure" %}Possible{% endif %}
Patent Holder/Applicant ("Patent Holder")
</th>
@ -83,7 +83,7 @@
{% if ipr.holder_contact_name or ipr.holder_contact_info %}
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}"><th colspan="2">
<tr class="{% cycle 'dark','light' as row_parity %}"><th colspan="2">
{% cycle section %}.
Patent Holder's Contact for License Application
</th>
@ -97,7 +97,7 @@
{% if ipr.ietfer_name or ipr.ietfer_contact_info %}
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}">
<tr class="{% cycle 'dark','light' as row_parity %}">
<th colspan="2" >
{% cycle section %}.
Contact Information for the IETF Participant Whose Personal Belief Triggered this Disclosure:
@ -116,7 +116,7 @@
{% if ipr.iprdocrel_set.all or ipr.other_designations %}
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}">
<tr class="{% cycle 'dark','light' as row_parity %}">
<th colspan="2" >
{% cycle section %}.
IETF Document or Other Contribution to Which this IPR Disclosure Relates:
@ -136,7 +136,7 @@
{% if ipr.patent_info %}
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}">
<tr class="{% cycle 'dark','light' as row_parity %}">
<th colspan="2" >
{% cycle section %}.
Disclosure of Patent Information (i.e., patents or patent
@ -172,7 +172,7 @@
{% if ipr.licensing %}
<!-- Not to be shown for third-party disclosures -->
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}">
<tr class="{% cycle 'dark','light' as row_parity %}">
<th colspan="2" >
{% cycle section %}.
Licensing Declaration
@ -243,7 +243,7 @@
{% elif ipr.statement %}
<table class="ipr data">
<tr class="{% cycle dark,light as row_parity %}">
<tr class="{% cycle 'dark','light' as row_parity %}">
<th colspan="2" >
{% cycle section %}.
Statement
@ -257,7 +257,7 @@
{% endif %}
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}"><th colspan="2">
<tr class="{% cycle 'dark','light' as row_parity %}"><th colspan="2">
{% cycle section %}.
Contact Information of Submitter of this Form
</th>
@ -268,7 +268,7 @@
{% if ipr.notes %}
<table class="ipr">
<tr class="{% cycle dark,light as row_parity %}">
<tr class="{% cycle 'dark','light' as row_parity %}">
<th colspan="2" >
{% cycle section %}.
Other Notes:

4
ietf/templates/ipr/search_doc_result.html
View file

@ -1,6 +1,8 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "ipr/search_result.html" %}
{% load ietf_filters %}
{% load future %}
{% block search_result %}
<table cellpadding="1" cellspacing="0" border="0">
@ -15,7 +17,7 @@
<tr><td colspan="3"><hr>Total number of documents searched: {{ docs|length }}</td></tr>
{% for doc in docs %}
<tbody bgcolor="#{% cycle dadada,eaeaea as bgcolor %}">
<tbody bgcolor="#{% cycle 'dadada','eaeaea' as bgcolor %}">
<tr >
<td colspan="3">
Search result on {{ doc.name|rfcspace|lstrip:"0"|rfcnospace }}, "{{ doc.document.title }}"{% if not forloop.first %}{% if doc.related %}, that was {{ doc.relation|lower }} {{ doc.related.source|rfcspace|lstrip:"0"|rfcnospace }}, "{{ doc.related.source.title }}"{% endif %}{% endif %}

4
ietf/templates/ipr/search_doctitle_result.html
View file

@ -1,6 +1,8 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "ipr/search_result.html" %}
{% load ietf_filters %}
{% load future %}
{% block search_result %}
<table cellpadding="1" cellspacing="0" border="0">
<tr><td colspan="3"><b>{% block search_header %}Search result on {{ q }}{% endblock %}</b></td></tr>
@ -16,7 +18,7 @@
{% block iprlist %}
{% for alias in docs %}
<tbody bgcolor="#{% cycle dadada,eaeaea as bgcolor %}">
<tbody bgcolor="#{% cycle 'dadada','eaeaea' as bgcolor %}">
<tr >
<td colspan="3">
IPR that is related to <b><i>{{ alias.name|rfcspace|lstrip:"0"|rfcnospace }}, "{{ alias.document.title }}"{% if alias.related %}, that was {{ alias.relation|lower }} {{ alias.related.source.name|rfcspace|lstrip:"0"|rfcnospace }}, "{{ alias.related.source.title }}"{% endif %}

3
ietf/templates/ipr/search_result.html
View file

@ -1,6 +1,7 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "base.html" %}
{% load ietf_filters %}
{% load future %}
{% block doctype %}{% endblock %}
{% block title %}IPR Search Result{% endblock %}
@ -27,7 +28,7 @@
{% block iprlist %}
{% for ipr in iprs %}
{% if user|has_role:"Secretariat" %}{% ifchanged %}<tr><td colspan="3"><h3>{{ ipr.state.name }}</h3></td></tr>{% endifchanged %}{% endif %}
<tbody bgcolor="#{% cycle eeeeee,dddddd as bgcolor %}">
<tbody bgcolor="#{% cycle' eeeeee','dddddd' as bgcolor %}">
<tr valign="top">
<td colspan="3">
{% block intro_prefix %}IPR that was submitted by <b><i>{{ q }}</i></b>, and{% endblock %}

4
ietf/templates/ipr/search_wg_result.html
View file

@ -1,6 +1,8 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "ipr/search_result.html" %}
{% load ietf_filters %}
{% load future %}
{% block search_result %}
<table cellpadding="1" cellspacing="0" border="0">
<tr><td colspan="3"><b>{% block search_header %}Working Group Search Result{% endblock %}</b></td></tr>
@ -17,7 +19,7 @@
{% block iprlist %}
{% for alias in docs %}
<tbody bgcolor="#{% cycle dadada,eaeaea as bgcolor %}">
<tbody bgcolor="#{% cycle 'dadada','eaeaea' as bgcolor %}">
<tr>
<td colspan="3">
IPR that is related to <b><i>{{ alias.name|rfcspace|lstrip:"0"|rfcnospace }}, "{{ alias.document.title }}"{% if alias.related %}, that was {{ alias.relation|lower }} {{ alias.related.source|rfcspace|lstrip:"0"|rfcnospace }}, "{{ alias.related.source.title|escape }}"{% endif %}

1
ietf/templates/ipr/state.html
View file

@ -1,3 +1,4 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "base.html" %}
{% block title %}Change State of {{ ipr.title }}{% endblock %}

4
ietf/templates/liaisons/liaison_table.html
View file

@ -1,4 +1,6 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% load ietf_filters %}
{% load future %}
<table class="ietf-table" width="100%">
<tr>
@ -10,7 +12,7 @@
</tr>
{% for liaison in liaisons %}
<tr class="{% cycle oddrow,evenrow %}">
<tr class="{% cycle 'oddrow','evenrow' %}">
<td style="white-space:nowrap;">{{ liaison.submitted|date:"Y-m-d" }}</td>
<td>{{ liaison.from_name }}</td>
<td>

5
ietf/templates/submit/submission_status.html
View file

@ -1,6 +1,7 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "submit/submit_base.html" %}
{% load ietf_filters submit_tags %}
{% load future %}
{% block title %}Status of submission of {{ submission.name }}-{{ submission.rev }}{% endblock %}
@ -266,7 +267,7 @@
<tr><th>Date</th><th>By</th><th>Text</th></tr>
{% for e in submission.submissionevent_set.all %}
<tr class="{% cycle oddrow,evenrow %}">
<tr class="{% cycle 'oddrow','evenrow' %}">
<td>{{ e.time|date:"Y-m-d" }}</td>
<td>{{ e.by|default:"" }}</td>
<td>{{ e.desc }}