From 636688d1d43ee7984ca7f92e97e31ab0c34d3e92 Mon Sep 17 00:00:00 2001 From: Pasi Eronen Date: Thu, 20 Aug 2009 19:55:12 +0000 Subject: [PATCH] Use different template for IPR editing form; removed editing-specific parts from view-only template - Legacy-Id: 1653 --- ietf/ipr/new.py | 2 +- ietf/templates/ipr/details.html | 143 ------- ietf/templates/ipr/details_edit.html | 560 +++++++++++++++++++++++++++ 3 files changed, 561 insertions(+), 144 deletions(-) create mode 100644 ietf/templates/ipr/details_edit.html diff --git a/ietf/ipr/new.py b/ietf/ipr/new.py index 30a4a725b..9733a28a1 100644 --- a/ietf/ipr/new.py +++ b/ietf/ipr/new.py @@ -310,7 +310,7 @@ def new(request, type, update=None, submitter=None): form.unbound_form = True # ietf.utils.log(dir(form.ietf_contact_is_submitter)) - return render("ipr/details.html", {"ipr": form, "section_list":section_list, "debug": debug}, context_instance=RequestContext(request)) + return render("ipr/details_edit.html", {"ipr": form, "section_list":section_list, "debug": debug}, context_instance=RequestContext(request)) def update(request, ipr_id=None): """Update a specific IPR disclosure""" diff --git a/ietf/templates/ipr/details.html b/ietf/templates/ipr/details.html index b7986c470..ccf8f3b75 100644 --- a/ietf/templates/ipr/details.html +++ b/ietf/templates/ipr/details.html @@ -1,12 +1,5 @@ {% extends "base.html" %} {# Copyright The IETF Trust 2007, All Rights Reserved #} - {% if section_list.generic %} - {% endif %} - {% if section_list.specific %} - {% endif %} - {% if section_list.third_party %} - {% endif %} - {% block title %}IPR Details - {{ ipr.title }}{% endblock %} {% block body_attributes %} @@ -105,85 +98,6 @@ Submitted Date: {{ ipr.submitted_date|date:"F j, Y" }} {% endif %} - {% if section_list.form_intro %} -

The Patent Disclosure and Licensing Declaration Template for {{ section_list.disclosure_type }}

-

- {% if section_list.generic %} - This document is an IETF IPR Patent Disclosure and Licensing Declaration - Template and is submitted to inform the IETF of a) patent - or patent application information that is not related to a specific - IETF document or contribution, and b) an IPR Holder's intention with - respect to the licensing of its necessary patent claims. No actual - license is implied by submission of this template. - {% endif %} - {% if section_list.specific %} - This document is an IETF IPR Disclosure and Licensing Declaration - Template and is submitted to inform the IETF of a) patent or patent - application information regarding the IETF document or contribution - listed in Section IV, and b) an IPR Holder's intention with respect to - the licensing of its necessary patent claims. No actual license is - implied by submission of this template. Please complete and submit a - separate template for each IETF document or contribution to which the - disclosed patent information relates. - {% endif %} - {% if section_list.third_party %} - This form is used to let the IETF know about patent information - regarding an IETF document or contribution when the person letting the - IETF know about the patent has no relationship with the patent owners. - Click here if you want to disclose information about patents or patent - applications where you do have a relationship to the patent owners or - patent applicants. - {% endif %} -

- - {% if section_list.also_specific %} -

- - Note: According to Section 6.4.3 of - RFC 3979, - "Intellectual Property Rights in IETF Technology," you - are still required to file specific disclosures on IPR unless your - generic disclosure satisfies certain conditions. Please see the - RFC for details. -

- {% endif %} - - -

- - If you wish to submit your IPR disclosure by e-mail, then please send - it to ietf-ipr@ietf.org. - Submissions made by e-mail that do not comply with the formal - requirements of Section 6, "IPR Disclosures," of RFC 3979, - - "Intellectual Property Rights in IETF Technology", - will be posted, but will be marked as "non-compliant". - -

-
-
- {% endif %} - - - {% if ipr.errors %} -

- There were errors in the submitted form -- see below. Please correct these and resubmit. - {% if ipr.non_field_errors %} -

- {% endif %} -

- {% endif %} - - {% if section_list.form_legend %} -

- Fields marked with * are required. -

- {% endif %} {% if section_list.holder %} @@ -258,7 +172,6 @@ @@ -290,23 +203,8 @@ {% if ipr.patents or ipr.notes %} @@ -324,11 +222,7 @@ @@ -381,39 +275,12 @@ @@ -552,14 +419,4 @@ {% endif %} - {% if section_list.form_submit %} -
- -
-
- IPR Disclosure Page
- View IPR Disclosures

-
- {% endif %} - {% endblock %} diff --git a/ietf/templates/ipr/details_edit.html b/ietf/templates/ipr/details_edit.html new file mode 100644 index 000000000..7b6a03004 --- /dev/null +++ b/ietf/templates/ipr/details_edit.html @@ -0,0 +1,560 @@ +{% extends "base.html" %} +{# Copyright The IETF Trust 2007, All Rights Reserved #} + +{% block title %}IPR Details - {{ ipr.title }}{% endblock %} +{% block body_attributes %} + {% if section_list.holder_contact %}onload="toggle_submitter_info('holder')"{% endif %} + {% if section_list.ietf_contact %}onload="toggle_submitter_info('ietf')"{% endif %} +{% endblock %} +{% block content %} + +{% include "ipr/style.html" %} +{% include "ipr/js.html" %} + +
+ {% if section_list.title %} +
- {% if section_list.form_legend %}*{% endif %} {% cycle section %}. IETF Document or Other Contribution to Which this IPR Disclosure Relates:
{% 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) - {% endif %} - {% if section_list.specific %} - Disclosure of Patent Information (i.e., patents or patent - applications required to be disclosed by Section 6 of RFC3979) - {% endif %} - {% if section_list.third_party %} - 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 %}
Additional Notes: {{ ipr.notes }}
- {% 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 }}
- {% 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 - application(s) disclosed above that would necessarily be infringed by - implementation of a technology required by a relevant IETF specification - ("Necessary Patent Claims"), for the purpose of implementing such - specification, is as follows(select one licensing declaration option only): - {% endif %} - {% if section_list.specific %} - 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 %} - {% if section_list.third_party %} - 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 %} - {% 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.title }}

+
+
+ {% endif %} + {% ifnotequal ipr.status 1 %} + + This IPR disclosure was {{ ipr.get_status_display }}
+ + {% endifnotequal %} + {% if section_list.legacy_intro %} + + This IPR disclosure was submitted by e-mail.
+ {% if not ipr.comply %} + + This IPR disclosure does not comply with the formal requirements of Section 6, + "IPR Disclosures," of RFC 3979, "Intellectual Property Rights in IETF Technology." +
+ {% endif %} + Sections {% block legacy_sections %}I, II, and IV{% endblock %} of "The Patent Disclosure and Licensing Declaration Template + for {{ section_list.disclosure_type }}" have been completed for this IPR disclosure. + Additional information may be available in the original submission.
+
+ The text of the original IPR disclosure is available further down, and also here:
+ {{ipr.legacy_url_0}}. +
+ + {% endif %} + {% if section_list.new_intro %} + Only those sections of the "Patent Disclosure and Licensing Declaration + Template for {{ section_list.disclosure_type }}" where the submitter provided + information are displayed.
+ {% endif %} + {% if section_list.new_intro or section_list.legacy_intro %} + {% if ipr.legacy_title_1 %} + {{ ipr.legacy_title_1 }}
+ {% endif %} + + {% if ipr.legacy_title_2 %} + {{ ipr.legacy_title_2 }}
+ {% endif %} + + {% for item in ipr.updates.all %} + +
+ This IPR disclosure updates IPR disclosure ID #{{ item.updated.ipr_id }}, + {% ifequal item.updated.status 0 %} + "{{ item.updated.title }}". + {% else %} + {% ifequal item.updated.status 1 %} + "{{ item.updated.title }}". + {% else %} + "{{ item.updated.title }}", which was removed at the request of the submitter. + {% endifequal %} + {% endifequal %} +
+ + {% endfor %} + + {% for item in ipr.updated_by.all %} + {% ifequal item.processed 1 %} + +
+ This IPR disclosure has been updated by IPR disclosure ID #{{ item.ipr.ipr_id }}, + {% ifequal item.status_to_be 1 %} + "{{ item.ipr.title }}". + {% else %} + "{{ item.ipr.title }}", which was removed at the request of the submitter. + {% endifequal %} +
+ + {% endifequal %} + {% endfor %} + +
+ Click here to update this IPR disclosure
+ +
+ Submitted Date: {{ ipr.submitted_date|date:"F j, Y" }} + {% endif %} + + {% if section_list.form_intro %} +

The Patent Disclosure and Licensing Declaration Template for {{ section_list.disclosure_type }}

+

+ {% if section_list.generic %} + This document is an IETF IPR Patent Disclosure and Licensing Declaration + Template and is submitted to inform the IETF of a) patent + or patent application information that is not related to a specific + IETF document or contribution, and b) an IPR Holder's intention with + respect to the licensing of its necessary patent claims. No actual + license is implied by submission of this template. + {% endif %} + {% if section_list.specific %} + This document is an IETF IPR Disclosure and Licensing Declaration + Template and is submitted to inform the IETF of a) patent or patent + application information regarding the IETF document or contribution + listed in Section IV, and b) an IPR Holder's intention with respect to + the licensing of its necessary patent claims. No actual license is + implied by submission of this template. Please complete and submit a + separate template for each IETF document or contribution to which the + disclosed patent information relates. + {% endif %} + {% if section_list.third_party %} + This form is used to let the IETF know about patent information + regarding an IETF document or contribution when the person letting the + IETF know about the patent has no relationship with the patent owners. + Click here if you want to disclose information about patents or patent + applications where you do have a relationship to the patent owners or + patent applicants. + {% endif %} +

+ + {% if section_list.also_specific %} +

+ + Note: According to Section 6.4.3 of + RFC 3979, + "Intellectual Property Rights in IETF Technology," you + are still required to file specific disclosures on IPR unless your + generic disclosure satisfies certain conditions. Please see the + RFC for details. +

+ {% endif %} + + +

+ + If you wish to submit your IPR disclosure by e-mail, then please send + it to ietf-ipr@ietf.org. + Submissions made by e-mail that do not comply with the formal + requirements of Section 6, "IPR Disclosures," of RFC 3979, + + "Intellectual Property Rights in IETF Technology", + will be posted, but will be marked as "non-compliant". + +

+
+
+ {% endif %} + + + {% if ipr.errors %} +

+ There were errors in the submitted form -- see below. Please correct these and resubmit. + {% if ipr.non_field_errors %} +

    + {% for error in ipr.non_field_errors %} +
  • {{ error }}
    • + {% endfor %} +
+ {% endif %} +

+ {% endif %} + + {% if section_list.form_legend %} +

+ Fields marked with * are required. +

+ {% endif %} + + + {% if section_list.holder %} +
+ + + + + + {% block section1_data %} + + {% endblock %} + +
+ {% cycle I,II,III,IV,V,VI,VII,VIII as section %}. + {% if section_list.third_party %}Possible{% endif %} + Patent Holder/Applicant ("Patent Holder") +
Legal Name: {{ ipr.legal_name }}
+
+ {% endif %} + + + {% if section_list.holder_contact %} +
+ + + + + + + + + + + +
+ {% cycle section %}. + Patent Holder's Contact for License Application +
Name: {{ ipr.holder_contact.name }}
Title: {{ ipr.holder_contact.title }}
Department: {{ ipr.holder_contact.department }}
Address1: {{ ipr.holder_contact.address1 }}
Address2: {{ ipr.holder_contact.address2 }}
Telephone: {{ ipr.holder_contact.telephone }}
Fax: {{ ipr.holder_contact.fax }}
Email: {{ ipr.holder_contact.email }}
+
+ {% endif %} + + + {% if section_list.ietf_contact %} +
+ + + + + {% if ipr.ietf_contact.name %} + + + + + + + + + {% else %} + + {% endif %} +
+ {% cycle section %}. + Contact Information for the IETF Participant Whose Personal Belief Triggered this Disclosure: +
Name: {{ ipr.ietf_contact.name }}
Title: {{ ipr.ietf_contact.title }}
Department: {{ ipr.ietf_contact.department }}
Address1: {{ ipr.ietf_contact.address1 }}
Address2: {{ ipr.ietf_contact.address2 }}
Telephone: {{ ipr.ietf_contact.telephone }}
Fax: {{ ipr.ietf_contact.fax }}
Email: {{ ipr.ietf_contact.email }}
No information submitted
+
+ {% endif %} + + + {% if section_list.ietf_doc %} +
+ + + + + {% if ipr.rfclist %} + + {% else %} + {% for doc in ipr.rfcs.all %} + + {% endfor %} + {% endif %} + {% if ipr.draftlist %} + + {% else %} + {% for doc in ipr.drafts.all %} + + {% endfor %} + {% endif %} + {% if ipr.other_designations %} + + {% endif %} +
+ {% if section_list.form_legend %}*{% endif %} + {% cycle section %}. + IETF Document or Other Contribution to Which this IPR Disclosure Relates: +
RFC Numbers:{{ ipr.rfclist }}
RFC {{ doc.document.rfc_number }}:"{{ doc.document.title }}"
I-D Filenames (draft-...):{{ ipr.draftlist }}
Internet-Draft:"{{ doc.document.title }}"
({{ doc.document.filename }}-{{ doc.document.revision }})
Designations for Other Contributions:{{ ipr.other_designations }}
+
+ {% endif %} + + {% if section_list.patent_info %} +
+ + + + + {% if ipr.patents or ipr.notes %} + + + + + + + + + + + + + + {% if section_list.generic %} + + + + {% else %} + + + + {% if ipr.document_sections %} + + {% else %} + + {% endif %} + {% endif %} + + {% else %} + + {% endif %} + +
+ {% 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) + {% endif %} + {% if section_list.specific %} + Disclosure of Patent Information (i.e., patents or patent + applications required to be disclosed by Section 6 of RFC3979) + {% endif %} + {% if section_list.third_party %} + 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 %} +
+ A. For granted patents or published pending patent applications, + please provide the following information:
Patent, Serial, Publication, Registration, + or Application/File number(s): {{ ipr.patents }}
Date(s) granted or applied for: {{ ipr.date_applied }}
Country: {{ ipr.country }}
Additional Notes: {{ ipr.notes }}
+ {% 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 }} +
+ C. Does this disclosure apply to all IPR owned by + the submitter?: + {{ ipr.applies_to_all }} +
+ C. If an Internet-Draft or RFC includes multiple parts and it is not + reasonably apparent which part of such Internet-Draft or RFC is alleged + to be covered by the patent information disclosed in Section + V(A) or V(B), it is helpful if the discloser identifies here the sections of + the Internet-Draft or RFC that are alleged to be so + covered: +
{{ ipr.document_sections }}
No information submitted
This disclosure relates to an unpublished pending patent application.
+
+ {% endif %} + + + {% if section_list.licensing %} + +
+ + + + + + + + + + + + + {% if ipr.stdonly_license %} + + + + {% endif %} + + + + + {% if ipr.comments %} + + {% else %} + + {% endif %} + + {% if ipr.lic_checkbox %} + + + + + + {% endif %} + + + +
+ {% cycle section %}. + Licensing Declaration +
+ {% 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 + application(s) disclosed above that would necessarily be infringed by + implementation of a technology required by a relevant IETF specification + ("Necessary Patent Claims"), for the purpose of implementing such + specification, is as follows(select one licensing declaration option only): + {% endif %} + {% if section_list.specific %} + 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 %} + {% if section_list.third_party %} + 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 %} + {% 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.licensing_option }} +
+ {{ ipr.stdonly_license }} + Above licensing declaration is limited solely to standards-track IETF documents. +
+ Licensing information, comments, notes, or URL for further information: +
{{ ipr.comments }}
No information submitted
+

+ {% 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 + covered IETF specification to obtain a license have been disclosed in this + IPR disclosure statement. +

+ {% if section_list.generic %} +

+ Note: According to + RFC 3979, + Section 6.4.3, unless you check the box + above, and choose either option a) or b), you must still file specific + IPR disclosures as appropriate. +

+ {% endif %} +
+ Note: The individual submitting this template represents and warrants + that he or she is authorized by the Patent Holder to agree to the + above-selected licensing declaration. +
+
+ {% endif %} + + + {% if section_list.submitter %} +
+ + + + + {% if ipr.submitter.name %} + {% if ipr.ietf_contact_is_submitter %} + + {% if section_list.holder_contact %} + + + + {% endif %} + {% if section_list.ietf_contact %} + + + + {% endif %} + + {% endif %} + + + + + + + + + {% else %} + + {% endif %} +
+ {% cycle section %}. + Contact Information of Submitter of this Form (if different from the + Contact Information above) +
+ Same as in Section II above: + +
+ Same as in Section III above: + +
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 }}
No information submitted
+
+ {% endif %} + + + {% if section_list.notes %} +
+ + + + + {% if ipr.other_notes %} + + {% else %} + + {% endif %} +
+ {% cycle section %}. + Other Notes: +
{{ ipr.other_notes }}
No information submitted
+
+ {% endif %} + + {% comment %} (doesn't work -- commented out for now) + {% if ipr.legacy_url_0 %} +
+

The text of the original IPR declaration:

+ +
+ {% endif %} + {% endcomment %} + + {% if section_list.form_submit %} +
+
+
+
+ IPR Disclosure Page
+ View IPR Disclosures

+
+ {% endif %} + +{% endblock %}