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

 - Legacy-Id: 8826

Author: levkowetz

ietf/templates/community/manage_clist.html

@@ -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 @@ <h2>Documents explicitly included, from a document search.</a></h2>
 <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 @@ <h2>Rules added to this list</h2>
  <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>

ietf/templates/community/raw_view.html

@@ -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 @@ <h2>Drafts</h2>
   {% 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 @@ <h2>RFCs</h2>
   {% 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 %}

ietf/templates/debug.html

@@ -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 @@ <h2>Queries</h2>
     </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>

ietf/templates/doc/document_history.html

@@ -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 @@ <h2>Document history</h2>
   <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>

ietf/templates/group/history.html

@@ -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 @@ <h2>Group History</h2>
   <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>

ietf/templates/help/index.html

@@ -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 @@ <h1>Document State Index</h1>
 
 {% 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 %}

ietf/templates/help/states.html

@@ -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 @@ <h1>{{type.label|cut:"state"|cut:"State"}} States</h1>
 </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>

ietf/templates/ipr/details.txt

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

ietf/templates/ipr/details_edit.html

@@ -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 @@ <h1>The Patent Disclosure and Licensing Declaration Template for Generic IPR Dis
       <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 @@ <h1>The Patent Disclosure and Licensing Declaration Template for Generic IPR Dis
       <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 @@ <h1>The Patent Disclosure and Licensing Declaration Template for Generic IPR Dis
 
    {% 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 @@ <h1>The Patent Disclosure and Licensing Declaration Template for Generic IPR Dis
 
    {% 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 @@ <h1>The Patent Disclosure and Licensing Declaration Template for Generic IPR Dis
         <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 @@ <h1>The Patent Disclosure and Licensing Declaration Template for Generic IPR Dis
 
     <!-- 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 @@ <h1>The Patent Disclosure and Licensing Declaration Template for Generic IPR Dis
       {% 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 @@ <h1>The Patent Disclosure and Licensing Declaration Template for Generic IPR Dis
 
       {% 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 @@ <h1>The Patent Disclosure and Licensing Declaration Template for Generic IPR Dis
       {% 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 @@ <h1>The Patent Disclosure and Licensing Declaration Template for Generic IPR Dis
      </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:

ietf/templates/ipr/details_history.html

@@ -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 @@ <h2>Disclosure history</h2>
   <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 %}