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

Fixes to IPR templates, view and model, and acceptable diffs.

Browse source 
- Legacy-Id: 485
This commit is contained in:
Henrik Levkowetz 2007-06-17 23:19:21 +00:00
parent 56aae66b03
commit a6c5f1b805
7 changed files with 253 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ietf/ipr/models.py
View file

@ -7,12 +7,15 @@ from ietf.idtracker.models import Rfc
# Models # Models
LICENSE_CHOICES = ( LICENSE_CHOICES = (
(1, 'No License Required for Implementers.'), (1, 'a) No License Required for Implementers.'),
(2, 'Royalty-Free, Reasonable and Non-Discriminatory License to All Implementers.'), (2, 'b) Royalty-Free, Reasonable and Non-Discriminatory License to All Implementers.'),
(3, 'Reasonable and Non-Discriminatory License to All Implementers with Possible Royalty/Fee.'), (3, 'c) Reasonable and Non-Discriminatory License to All Implementers with Possible Royalty/Fee.'),
(4, 'Licensing Declaration to be Provided Later.'), (4, 'd) Licensing Declaration to be Provided Later (implies a willingness'
(5, 'Unwilling to Commit to the Provisions of a), b), or c) Above..'), ' to commit to the provisions of a), b), or c) above to all implementers;'
(6, 'See Text Below for Licensing Declaration.'), ' 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 = ( STDONLY_CHOICES = (
(0, ""), (0, ""),

8
ietf/ipr/views.py
View file

@ -63,7 +63,13 @@ def show(request, ipr_id=None):
ipr.other_notes = linebreaks(escape(ipr.other_notes)) ipr.other_notes = linebreaks(escape(ipr.other_notes))
if ipr.licensing_option: 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: if ipr.is_pending:
ipr.is_pending = dict(SELECT_CHOICES)[ipr.is_pending] ipr.is_pending = dict(SELECT_CHOICES)[ipr.is_pending]
if ipr.applies_to_all: if ipr.applies_to_all:

114
ietf/templates/ipr/details.html
View file

@ -1,3 +1,11 @@
{% if section_list.generic %}
{% endif %}
{% if section_list.specific %}
{% endif %}
{% if section_list.third_party %}
{% endif %}
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}IPR Details{% endblock %} {% block title %}IPR Details{% endblock %}
{% block body_attributes %} {% block body_attributes %}
@ -111,52 +119,46 @@
{% if section_list.form_intro %} {% if section_list.form_intro %}
<h4 class="ipr">The Patent Disclosure and Licensing Declaration Template for {{ section_list.disclosure_type }}</h4> <h4 class="ipr">The Patent Disclosure and Licensing Declaration Template for {{ section_list.disclosure_type }}</h4>
<p class="ipr"> <p class="ipr">
{% if section_list.generic %}
{% if section_list.generic %} This document is an IETF IPR Patent Disclosure and Licensing Declaration
This document is an IETF IPR Disclosure and Licensing Declaration Template and is submitted to inform the IETF of a) patent
Template and is submitted to inform the IETF of a) patent or patent or patent application information that is not related to a specific
application information regarding the IETF document or contribution IETF document or contribution, and b) an IPR Holder's intention with
listed in Section IV, and b) an IPR Holder's intention with respect to respect to the licensing of its necessary patent claims. No actual
the licensing of its necessary patent claims. No actual license is license is implied by submission of this template.
implied by submission of this template. {% endif %}
{% endif %} {% if section_list.specific %}
{% if section_list.specific %}
This document is an IETF IPR Disclosure and Licensing Declaration This document is an IETF IPR Disclosure and Licensing Declaration
Template and is submitted to inform the IETF of a) patent or patent Template and is submitted to inform the IETF of a) patent or patent
application information regarding the IETF document or contribution application information regarding the IETF document or contribution
listed in Section IV, and b) an IPR Holder's intention with respect to 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 the licensing of its necessary patent claims. No actual license is
implied by submission of this template. implied by submission of this template. Please complete and submit a
{% endif %} separate template for each IETF document or contribution to which the
{% if section_list.third_party %} disclosed patent information relates.
{% endif %}
{% if section_list.third_party %}
This form is used to let the IETF know about patent information This form is used to let the IETF know about patent information
regarding an IETF document or contribution when the person letting the regarding an IETF document or contribution when the person letting the
IETF know about the patent has no relationship with the patent owners. IETF know about the patent has no relationship with the patent owners.
Click here if you want to disclose information about patents or patent Click here if you want to disclose information about patents or patent
applications where you do have a relationship to the patent owners or applications where you do have a relationship to the patent owners or
patent applicants. patent applicants.
{% endif %} {% endif %}
</p> </p>
{% if section_list.also_specific %} {% if section_list.also_specific %}
<p class="ipr"> <p class="ipr">
Note: According to Section 6.4.3 of<a Note: According to Section 6.4.3 of
href="http://www.ietf.org/rfc/rfc3979.txt?number=3979"> RFC <a href="http://www.ietf.org/rfc/rfc3979.txt?number=3979">RFC 3979</a>,
3979</a>, "Intellectual Property Rights in IETF Technology," you "Intellectual Property Rights in IETF Technology," you
are still required to file specific disclosures on IPR unless your are still required to file specific disclosures on IPR unless your
generic disclosure satisfies certain conditions. Please see the generic disclosure satisfies certain conditions. Please see the
RFC for details. RFC for details.
</p> </p>
{% endif %} {% endif %}
{% if section_list.per_rfc_disclosure %}
<p class="ipr">
Please complete and submit a
separate template for each IETF document or contribution to which the
disclosed patent information relates.
</p>
{% endif %}
<p class="ipr"> <p class="ipr">
@ -165,8 +167,9 @@
Submissions made by e-mail that do not comply with the formal Submissions made by e-mail that do not comply with the formal
requirements of Section 6, "IPR Disclosures," of <a requirements of Section 6, "IPR Disclosures," of <a
href="http://www.ietf.org/rfc/rfc3979.txt?number=3979">RFC 3979</a>, href="http://www.ietf.org/rfc/rfc3979.txt?number=3979">RFC 3979</a>,
"Intellectual Property Rights in IETF Technology," will be posted, but <!-- The following line isn't present on all three .cgi versions. Bah. -->
will be marked as "non-compliant". "Intellectual Property Rights in IETF Technology",
will be posted, but will be marked as "non-compliant".
</p> </p>
<hr /> <hr />
@ -292,6 +295,14 @@
<th colspan="2" > <th colspan="2" >
{% cycle section %}. {% cycle section %}.
{% if section_list.form_legend %} {% 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 %} {% if section_list.third_party %}
Disclosure of Patent Information, if known (i.e., patents or Disclosure of Patent Information, if known (i.e., patents or
patent applications required to be disclosed by Section 6 of RFC3979) patent applications required to be disclosed by Section 6 of RFC3979)
@ -318,8 +329,11 @@
<tr class="{% cycle row_parity %}"> <tr class="{% cycle row_parity %}">
<td colspan="2"> <td colspan="2">
<i> <i>
B. Does this disclosure relate to an unpublished pending patent {% if section_list.form_legend %}
application?: B. Does your disclosure relate to an unpublished pending patent application?:
{% else %}
B. Does this disclosure relate to an unpublished pending patent application?:
{% endif %}
</i> </i>
<b>{{ ipr.is_pending }}</b> <b>{{ ipr.is_pending }}</b>
</td> </td>
@ -373,12 +387,41 @@
</tr> </tr>
<tbody class="{% cycle row_parity %}"> <tbody class="{% cycle row_parity %}">
<tr> <tr>
<td colspan="2"><i> The Patent Holder states that its position with respect <td colspan="2"><i>
{% 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):</i>
{% 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):</i>
{% 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):</i>
{% endif %}
{% else %}
The Patent Holder states that its position with respect
to licensing any patent claims contained in the patent(s) or patent to licensing any patent claims contained in the patent(s) or patent
application(s) disclosed above that would necessarily be infringed by application(s) disclosed above that would necessarily be infringed by
implementation of the technology required by the relevant IETF specification implementation of the technology required by the relevant IETF specification
("Necessary Patent Claims"), for the purpose of implementing such ("Necessary Patent Claims"), for the purpose of implementing such
specification, is as follows(select one licensing declaration option only):</i> specification, is as follows(select one licensing declaration option only):</i>
{% endif %}
</td> </td>
</tr> </tr>
<tr> <tr>
@ -410,12 +453,25 @@
{% if ipr.lic_checkbox %} {% if ipr.lic_checkbox %}
<tr class="{% cycle row_parity %}"> <tr class="{% cycle row_parity %}">
<td colspan="2"> <td colspan="2">
<p>
{% ifnotequal ipr.lic_checkbox 1 %}{{ ipr.lic_checkbox }}{% endifnotequal %} {% ifnotequal ipr.lic_checkbox 1 %}{{ ipr.lic_checkbox }}{% endifnotequal %}
The individual submitting this template represents and warrants that all The individual submitting this template represents and warrants that all
terms and conditions that must be satisfied for implementers of any terms and conditions that must be satisfied for implementers of any
covered IETF specification to obtain a license have been disclosed in this covered IETF specification to obtain a license have been disclosed in this
IPR disclosure statement. IPR disclosure statement.
</p>
{% if section_list.generic %}
<p>
Note: According to
<a href="http://www.ietf.org/rfc/rfc3979.txt?number=3979">RFC 3979</a>,
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.
</p>
{% endif %}
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
<tr class="{% cycle row_parity %}"> <tr class="{% cycle row_parity %}">

75
test/diff/_ipr_new-generic_ Normal file
View file

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

73
test/diff/_ipr_new-specific_ Normal file
View file

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

9
test/diff/_ipr_new-third-party_
View file

@ -20,19 +20,18 @@
+Disclosure Relates: +Disclosure Relates:
+RFC Numbers: +RFC Numbers:
+I-D Filenames (draft-...): +I-D Filenames (draft-...):
@@ -36,7 +37,8 @@ @@ -36,4 +37,4 @@
-number(s): -number(s):
-Date(s) granted or applied for: -Date(s) granted or applied for:
-Country: -Country:
-Additional Note(s): -Additional Note(s):
-B. Does your disclosure relate to an unpublished pending patent
-application?
-Select one: Yes No
+number(s): * +number(s): *
+Date(s) granted or applied for: * +Date(s) granted or applied for: *
+Country: * +Country: *
+Additional Notes: +Additional Notes:
+B. Does this disclosure relate to an unpublished pending patent @@ -41,2 +42,3 @@
-application?
-Select one: Yes No
+application?: +application?:
+YES +YES
+NO +NO

0
test/diff/_ipr_search__rfc_search-1034&option=rfc_search → test/diff/_ipr_search__rfc_search=1034&option=rfc_search
View file