From a6c5f1b805b74c9c44fa68b0e1ee4c73d5d2bfaa Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sun, 17 Jun 2007 23:19:21 +0000 Subject: [PATCH] Fixes to IPR templates, view and model, and acceptable diffs. - Legacy-Id: 485 --- ietf/ipr/models.py | 15 ++- ietf/ipr/views.py | 8 +- ietf/templates/ipr/details.html | 114 +++++++++++++----- test/diff/_ipr_new-generic_ | 75 ++++++++++++ test/diff/_ipr_new-specific_ | 73 +++++++++++ test/diff/_ipr_new-third-party_ | 9 +- ...search__rfc_search=1034&option=rfc_search} | 0 7 files changed, 253 insertions(+), 41 deletions(-) create mode 100644 test/diff/_ipr_new-generic_ create mode 100644 test/diff/_ipr_new-specific_ rename test/diff/{_ipr_search__rfc_search-1034&option=rfc_search => _ipr_search__rfc_search=1034&option=rfc_search} (100%) diff --git a/ietf/ipr/models.py b/ietf/ipr/models.py index b34f62862..2c4541e90 100644 --- a/ietf/ipr/models.py +++ b/ietf/ipr/models.py @@ -7,12 +7,15 @@ from ietf.idtracker.models import Rfc # Models LICENSE_CHOICES = ( - (1, 'No License Required for Implementers.'), - (2, 'Royalty-Free, Reasonable and Non-Discriminatory License to All Implementers.'), - (3, 'Reasonable and Non-Discriminatory License to All Implementers with Possible Royalty/Fee.'), - (4, 'Licensing Declaration to be Provided Later.'), - (5, 'Unwilling to Commit to the Provisions of a), b), or c) Above..'), - (6, 'See Text Below for Licensing Declaration.'), + (1, 'a) No License Required for Implementers.'), + (2, 'b) Royalty-Free, Reasonable and Non-Discriminatory License to All Implementers.'), + (3, 'c) Reasonable and Non-Discriminatory License to All Implementers with Possible Royalty/Fee.'), + (4, 'd) Licensing Declaration to be Provided Later (implies a willingness' + ' to commit to the provisions of a), b), or c) above to all implementers;' + ' otherwise, the next option "Unwilling to Commit to the Provisions of' + ' a), b), or c) Above". - must be selected).'), + (5, 'e) Unwilling to Commit to the Provisions of a), b), or c) Above.'), + (6, 'f) See Text Below for Licensing Declaration.'), ) STDONLY_CHOICES = ( (0, ""), diff --git a/ietf/ipr/views.py b/ietf/ipr/views.py index a0c709123..542674082 100644 --- a/ietf/ipr/views.py +++ b/ietf/ipr/views.py @@ -63,7 +63,13 @@ def show(request, ipr_id=None): ipr.other_notes = linebreaks(escape(ipr.other_notes)) if ipr.licensing_option: - ipr.licensing_option = dict(LICENSE_CHOICES)[ipr.licensing_option] + text = dict(LICENSE_CHOICES)[ipr.licensing_option] + # Very hacky way to get rid of the last part of option 'd': + cut = text.find(" (") + if cut > 0: + text = text[cut:] + "." + # get rid of the "a) ", "b) ", etc. + ipr.licensing_option = text[3:] if ipr.is_pending: ipr.is_pending = dict(SELECT_CHOICES)[ipr.is_pending] if ipr.applies_to_all: diff --git a/ietf/templates/ipr/details.html b/ietf/templates/ipr/details.html index 2534d8eb2..58b2954ea 100644 --- a/ietf/templates/ipr/details.html +++ b/ietf/templates/ipr/details.html @@ -1,3 +1,11 @@ + {% if section_list.generic %} + {% endif %} + {% if section_list.specific %} + {% endif %} + {% if section_list.third_party %} + {% endif %} + + {% extends "base.html" %} {% block title %}IPR Details{% endblock %} {% block body_attributes %} @@ -111,52 +119,46 @@ {% 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 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. - {% endif %} - {% if section_list.specific %} + {% 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. - {% endif %} - {% if section_list.third_party %} + 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 %} + {% endif %}

{% if section_list.also_specific %}

- Note: According to Section 6.4.3 of RFC - 3979, "Intellectual Property Rights in IETF Technology," you + 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 section_list.per_rfc_disclosure %} -

- Please complete and submit a - separate template for each IETF document or contribution to which the - disclosed patent information relates. -

- {% endif %}

@@ -165,8 +167,9 @@ 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". + + "Intellectual Property Rights in IETF Technology", + will be posted, but will be marked as "non-compliant".

@@ -292,6 +295,14 @@ {% 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) @@ -318,8 +329,11 @@ - B. Does this disclosure relate to an unpublished pending patent - application?: + {% 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 }} @@ -373,12 +387,41 @@ - The Patent Holder states that its position with respect + + {% 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 %} + @@ -410,12 +453,25 @@ {% if ipr.lic_checkbox %} +

{% 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 %} + + {% endif %} diff --git a/test/diff/_ipr_new-generic_ b/test/diff/_ipr_new-generic_ new file mode 100644 index 000000000..264bc9c1b --- /dev/null +++ b/test/diff/_ipr_new-generic_ @@ -0,0 +1,75 @@ +--- https://datatracker.ietf.org/public/ipr_generic.cgi ++++ /ipr/new-generic/ +@@ -9,1 +9,1 @@ +-Note: According to Section 6.4.3 ofRFC3979, "Intellectual Property ++Note: According to Section 6.4.3 of RFC3979, "Intellectual Property +@@ -16,1 +16,3 @@ +-RFC3979 will be posted, but will be marked as "non-compliant". ++RFC3979, "Intellectual Property Rights in IETF Technology", will be ++posted, but will be marked as "non-compliant". ++Fields marked with * are required. +@@ -18,2 +20,2 @@ +-Legal Name: +-II. Patent Holder's Contact for License Application (Required field* ) ++Legal Name: * ++II. Patent Holder's Contact for License Application +@@ -31,5 +33,6 @@ +-please provide the following information: Patent, Serial, Publication, +-Registration, or Application/File number(s): +-Date(s) granted or applied for: +-Country: +-Additional Note(s): ++please provide the following information: ++Patent, Serial, Publication, Registration, or Application/File ++number(s): * ++Date(s) granted or applied for: * ++Country: * ++Additional Notes: +@@ -37,4 +40,6 @@ +-application? +-Select one: Yes No +-C. Does this disclosure apply to all IPR owned by the submitter? +-Select one: Yes No ++application?: ++YES ++NO ++C. Does this disclosure apply to all IPR owned by the submitter?: ++YES ++NO +@@ -48,2 +53,2 @@ +-a) No License Required for Implementers. This licensing declaration is +-limited solely to standards-track IETF documents. ++* ++a) No License Required for Implementers. +@@ -51,2 +56,1 @@ +-Implementers. This licensing declaration is limited solely to +-standards-track IETF documents. ++Implementers. +@@ -54,2 +58,1 @@ +-Possible Royalty/Fee. This licensing declaration is limited solely to +-standards-track IETF documents. ++Possible Royalty/Fee. +@@ -61,3 +64,5 @@ +-f ) See Text Box Below for Licensing Declaration. +-Licensing information, comments, notes, or URL for further information +-: ++f) See Text Below for Licensing Declaration. ++Above licensing declaration is limited solely to standards-track IETF ++documents. ++Licensing information, comments, notes, or URL for further ++information: +@@ -68,1 +73,1 @@ +-NOTE: According to RFC3979, Section 6.4.3, unless you check the box ++Note: According to RFC3979, Section 6.4.3, unless you check the box +@@ -71,1 +76,1 @@ +-NOTE: The individual submitting this template represents and warrants ++Note: The individual submitting this template represents and warrants +@@ -75,3 +80,2 @@ +-the Patent Holder's Contact for License Application in Section II +-above) (Required field* ) +-Same as Section II above ++the Contact Information above) ++Same as in Section II above: +@@ -86,1 +90,1 @@ +-VI. Other Note(s): ++VI. Other Notes: \ No newline at end of file diff --git a/test/diff/_ipr_new-specific_ b/test/diff/_ipr_new-specific_ new file mode 100644 index 000000000..12059efe1 --- /dev/null +++ b/test/diff/_ipr_new-specific_ @@ -0,0 +1,73 @@ +--- https://datatracker.ietf.org/public/ipr.cgi ++++ /ipr/new-specific/ +@@ -16,0 +16,1 @@ ++Fields marked with * are required. +@@ -17,2 +18,2 @@ +-Legal Name: +-II. Patent Holder's Contact for License Application (Required field* ) ++Legal Name: * ++II. Patent Holder's Contact for License Application +@@ -28,1 +29,1 @@ +-Belief Triggered this Disclosure (Optional) (Required field* ) ++Belief Triggered this Disclosure: +@@ -37,4 +38,4 @@ +-IV. IETF Document or Other Contribution to Which this IPR Disclosure +-Relates ( Please fill in one of the boxes below ) +-RFC Number (Numeric value only): +-I-D Filename (draft-...): ++* IV. IETF Document or Other Contribution to Which this IPR Disclosure ++Relates: ++RFC Numbers: ++I-D Filenames (draft-...): +@@ -47,4 +48,4 @@ +-number(s): +-Date(s) granted or applied for: +-Country: +-Additional Note(s): ++number(s): * ++Date(s) granted or applied for: * ++Country: * ++Additional Notes: +@@ -52,2 +53,3 @@ +-application? +-Select one: Yes No ++application?: ++YES ++NO +@@ -59,1 +61,1 @@ +-covered. ++covered: +@@ -68,2 +70,2 @@ +-a) No License Required for Implementers. This licensing declaration is +-limited solely to standards-track IETF documents. ++* ++a) No License Required for Implementers. +@@ -71,2 +73,1 @@ +-Implementers. This licensing declaration is limited solely to +-standards-track IETF documents. ++Implementers. +@@ -74,2 +75,1 @@ +-Possible Royalty/Fee. This licensing declaration is limited solely to +-standards-track IETF documents. ++Possible Royalty/Fee. +@@ -81,3 +81,5 @@ +-f ) See Text Box Below for Licensing Declaration. +-Licensing information, comments, notes, or URL for further information +-: ++f) See Text Below for Licensing Declaration. ++Above licensing declaration is limited solely to standards-track IETF ++documents. ++Licensing information, comments, notes, or URL for further ++information: +@@ -88,1 +90,1 @@ +-NOTE: The individual submitting this template represents and warrants ++Note: The individual submitting this template represents and warrants +@@ -92,2 +94,3 @@ +-IETF Participant in Section III above) (Required field* ) +-Same as Section III above ++the Contact Information above) ++Same as in Section II above: ++Same as in Section III above: +@@ -102,1 +105,1 @@ +-VIII. Other Note(s): ++VIII. Other Notes: \ No newline at end of file diff --git a/test/diff/_ipr_new-third-party_ b/test/diff/_ipr_new-third-party_ index 3bfaf7b41..8be796bba 100644 --- a/test/diff/_ipr_new-third-party_ +++ b/test/diff/_ipr_new-third-party_ @@ -20,19 +20,18 @@ +Disclosure Relates: +RFC Numbers: +I-D Filenames (draft-...): -@@ -36,7 +37,8 @@ +@@ -36,4 +37,4 @@ -number(s): -Date(s) granted or applied for: -Country: -Additional Note(s): --B. Does your disclosure relate to an unpublished pending patent --application? --Select one: Yes No +number(s): * +Date(s) granted or applied for: * +Country: * +Additional Notes: -+B. Does this disclosure relate to an unpublished pending patent +@@ -41,2 +42,3 @@ +-application? +-Select one: Yes No +application?: +YES +NO diff --git a/test/diff/_ipr_search__rfc_search-1034&option=rfc_search b/test/diff/_ipr_search__rfc_search=1034&option=rfc_search similarity index 100% rename from test/diff/_ipr_search__rfc_search-1034&option=rfc_search rename to test/diff/_ipr_search__rfc_search=1034&option=rfc_search