{% cycle section %}.
- {% if section_list.form_legend %}
{% if section_list.generic %}
Disclosure of Patent Information (i.e., patents or patent
applications required to be disclosed by Section 6 of RFC3979)
@@ -296,10 +263,6 @@
Disclosure of Patent Information, if known (i.e., patents or
patent applications required to be disclosed by Section 6 of RFC3979)
{% endif %}
- {% else %}
- Disclosure of Patent Information (i.e., patents or patent
- applications required to be disclosed by Section 6 of RFC 3979)
- {% endif %}
{% if ipr.patents or ipr.notes %}
@@ -310,19 +273,15 @@
please provide the following information:
Patent, Serial, Publication, Registration,
- or Application/File number(s):
- {% if section_list.form_legend %}
B. Does your disclosure relate to an unpublished pending patent application?:
- {% else %}
- B. Does this disclosure relate to an unpublished pending patent application?:
- {% endif %}
- {{ ipr.is_pending }}
+ {{ ipr.is_pending.errors }} {{ ipr.is_pending }}
@@ -331,7 +290,7 @@
C. Does this disclosure apply to all IPR owned by
the submitter?:
- {{ ipr.applies_to_all }}
+ {{ ipr.applies_to_all.errors }} {{ ipr.applies_to_all }}
- {% if section_list.form_legend %}
{% if section_list.generic %}
The Patent Holder states that its position with respect
to licensing any patent claims contained in the patent(s) or patent
@@ -399,46 +357,33 @@
("Necessary Patent Claims"), for the purpose of implementing such
specification, is as follows(select one licensing declaration option only):
{% endif %}
- {% else %}
- The Patent Holder states that its position with respect
- to licensing any patent claims contained in the patent(s) or patent
- application(s) disclosed above that would necessarily be infringed by
- implementation of the technology required by the relevant IETF specification
- ("Necessary Patent Claims"), for the purpose of implementing such
- specification, is as follows(select one licensing declaration option only):
- {% endif %}
{{ ipr.stdonly_license.errors }}
{{ ipr.stdonly_license }}
Above licensing declaration is limited solely to standards-track IETF documents.
- {% endif %}
Licensing information, comments, notes, or URL for further information:
- {% if ipr.comments %}
-
{{ ipr.comments }}
- {% else %}
-
No information submitted
- {% endif %}
+
{{ ipr.comments.errors }} {{ ipr.comments }}
{% if ipr.lic_checkbox %}
+ {{ ipr.lic_checkbox.errors }}
{% ifnotequal ipr.lic_checkbox 1 %}{{ ipr.lic_checkbox }}{% endifnotequal %}
The individual submitting this template represents and warrants that all
terms and conditions that must be satisfied for implementers of any
@@ -481,7 +426,6 @@
Contact Information above)
- {% if ipr.submitter.name %}
{% if ipr.ietf_contact_is_submitter %}
{% if section_list.holder_contact %}
@@ -502,17 +446,11 @@
{% endif %}
{% endif %}
-
Name:
{{ ipr.submitter.name }}
-
Title:
{{ ipr.submitter.title }}
-
Department:
{{ ipr.submitter.department }}
-
Address1:
{{ ipr.submitter.address1 }}
-
Address2:
{{ ipr.submitter.address2 }}
-
Telephone:
{{ ipr.submitter.telephone }}
-
Fax:
{{ ipr.submitter.fax }}
-
Email:
{{ ipr.submitter.email }}
- {% else %}
-
No information submitted
- {% endif %}
+ {% for field in ipr.submitter %}
+ {% ifnotequal field.name "update_auth" %}
+
{{field.label }}:
{{ field.errors }} {% if field.field.required %}*{%endif%} {{ field }}
- {% endif %}
{% endblock %}
diff --git a/ietf/templates/ipr/formfield.html b/ietf/templates/ipr/formfield.html
deleted file mode 100644
index d12d66707..000000000
--- a/ietf/templates/ipr/formfield.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{# Copyright The IETF Trust 2007, All Rights Reserved #}
- {% if errors %}
-
- {% for error in errors %}
-
{{ error }}
- {% endfor %}
-
- {% endif %}
- {% if field.required %}*{% endif %}{{ text }}
- {{ help_text }}
\ No newline at end of file
diff --git a/ietf/templates/ipr/update.html b/ietf/templates/ipr/update.html
index aee1140c3..396e4060a 100644
--- a/ietf/templates/ipr/update.html
+++ b/ietf/templates/ipr/update.html
@@ -27,17 +27,16 @@
Contact Information for Submitter of this Update.
-
Name:
{{ form.name }}
-
Title:
{{ form.title }}
-
Department:
{{ form.department }}
-
Address1:
{{ form.address1 }}
-
Address2:
{{ form.address2 }}
-
Telephone:
{{ form.telephone }}
-
Fax:
{{ form.fax }}
-
Email:
{{ form.email }}
+ {% for field in form %}
+ {% ifnotequal field.name "update_auth" %}
+
{{field.label }}:
{{ field.errors }} {% if field.field.required %}*{%endif%} {{ field }}
+ {% endifnotequal %}
+ {% endfor %}
+ {{ form.update_auth.errors }}
+ *
{{ form.update_auth }}
I am authorized to update this IPR disclosure, and I understand that notification of this update will be provided to the submitter of the original IPR disclosure and to the Patent Holder's Contact.
diff --git a/ietf/utils/__init__.py b/ietf/utils/__init__.py
index 60efa910b..02365bfcc 100644
--- a/ietf/utils/__init__.py
+++ b/ietf/utils/__init__.py
@@ -6,10 +6,6 @@ from cache_foreign_key import FKAsOneToOne
from soup2text import TextSoup, soup2text
from draft_search import normalize_draftname
-# DJANGO_096: needs to be removed
-from templated_form import makeTemplatedForm
-makeFormattingForm = makeTemplatedForm
-
# See http://docs.python.org/tut/node8.html regarding the use of __all__ and
# also regarding the practice of using "from xxx import *" in interactive
# sessions vs. in source files.
diff --git a/ietf/utils/templated_form.py b/ietf/utils/templated_form.py
deleted file mode 100644
index 54e9c9073..000000000
--- a/ietf/utils/templated_form.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright The IETF Trust 2007, All Rights Reserved
-
-from django.utils.html import escape
-
-def makeTemplatedForm(template=None):
- """Create a form class which formats its fields using the provided template
-
- The template is provided with a dictionary containing the following key-value
- pairs:
-
- "label": field label, if any,
- "errors": list of errors, if any,
- "text": widget rendering for an unbound form / field value for a bound form,
- "help_text": field help text, if any
- """
- from django.template import loader
- import django.newforms as forms
-
- class TemplatedForm(forms.BaseForm):
- _template = template
- def __getitem__(self, name):
- "Returns a rendered field with the given name."
- #syslog.syslog("FormattingForm.__getitem__(%s)" % (name, ))
- try:
- field = self.fields[name]
- except KeyError:
- raise KeyError('Key %r not found in Form' % name)
- if not isinstance(field, forms.fields.Field):
- return field
- bf = forms.forms.BoundField(self, field, name)
- errors = [escape(error) for error in bf.errors]
- rendering = loader.render_to_string(self._template, { "errors": errors, "label": bf.label, "text": unicode(bf), "help_text": field.help_text, "field":field })
- return rendering
- return TemplatedForm
IPR Disclosure Page