Template and code changes for the third-party IPR disclosure page, and an acceptable diff file.

- Legacy-Id: 483

ietf/ipr/view_sections.py

@@ -7,7 +7,7 @@ section_table = {
                                 "holder": True, "holder_contact": True, "ietf_contact": True,
                                 "ietf_doc": True, "patent_info": True, "licensing": True,
                                 "submitter": True, "notes": True, "form_submit": False,
-                                "disclosure_type": "Specific", "form_legend": False, 
+                                "disclosure_type": "Specific IPR Disclosures", "form_legend": False, 
                                 "per_rfc_disclosure": True, "also_specific": False,
                             },
                 "generic": {   "index": False, "title": True,
@@ -16,7 +16,7 @@ section_table = {
                                 "holder": True, "holder_contact": True, "ietf_contact": False,
                                 "ietf_doc": False, "patent_info": True, "licensing": True,
                                 "submitter": True, "notes": True, "form_submit": False,
-                                "disclosure_type": "Generic", "form_legend": False, 
+                                "disclosure_type": "Generic IPR Disclosures", "form_legend": False, 
                                 "per_rfc_disclosure": False, "also_specific": True,
                             },
                 "third-party": {"index": False, "title": True,
@@ -25,7 +25,7 @@ section_table = {
                                 "holder": True, "holder_contact": False, "ietf_contact": True,
                                 "ietf_doc": True, "patent_info": True, "licensing": False,
                                 "submitter": False, "notes": False, "form_submit": False,
-                                "disclosure_type": "Third Party", "form_legend": False, 
+                                "disclosure_type": "Notification", "form_legend": False, 
                                 "per_rfc_disclosure": False, "also_specific": False,
                             },
                 "legacy":   {   "index": False, "title": True, "legacy": True,

ietf/templates/ipr/details.html

@@ -30,14 +30,14 @@
 	 </font><br>
 	 {% endif %}
 	 Sections {% block legacy_sections %}I, II, and IV{% endblock %} of "The Patent Disclosure and Licensing Declaration Template 
-	 for {{ section_list.disclosure_type }} IPR Disclosures" have been completed for this IPR disclosure.
+	 for {{ section_list.disclosure_type }}" have been completed for this IPR disclosure.
 	 Additional information may be available in the original submission.<br>
 	 See the <a href="{{ ipr.legacy_url_0 }}">content of the original IPR disclosure</a>.<br>
       </font>
       {% endif %}
       {% if section_list.new_intro %}
       <font size="3"> Only those sections of the "Patent Disclosure and Licensing Declaration
-	 Template for {{ section_list.disclosure_type }} IPR Disclosures" where the submitter provided
+	 Template for {{ section_list.disclosure_type }}" where the submitter provided
 	 information are displayed.</font><br>
       {% endif %}
       {% if section_list.new_intro or section_list.legacy_intro %}
@@ -109,7 +109,7 @@
       {% endif %}
 
       {% if section_list.form_intro %}
-	 <h4 class="ipr">The Patent Disclosure and Licensing Declaration Template for {{ section_list.disclosure_type }} IPR Disclosures</h4>
+	 <h4 class="ipr">The Patent Disclosure and Licensing Declaration Template for {{ section_list.disclosure_type }}</h4>
 	 <p class="ipr">
 
 	    {% if section_list.generic %}
@@ -119,7 +119,8 @@
 	    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.
-	    {% else %}
+	    {% 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
@@ -127,6 +128,14 @@
 	    the licensing of its necessary patent claims.  No actual license is
 	    implied by submission of this template.
 	    {% 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 %}
 	 </p>
 
 	 {% if section_list.also_specific %}
@@ -184,7 +193,7 @@
 	 <tr class="{% cycle dark,light as row_parity %}">
 	    <th colspan=2>
 	       {% cycle I,II,III,IV,V,VI,VII,VIII as section %}.
-	       {% ifequal section_list.disclosure_type "Third Party" %}Possible{% endifequal %}
+	       {% if section_list.third_party %}Possible{% endif %}
 	       Patent Holder/Applicant ("Patent Holder")
 	    </th>
 	 </tr>
@@ -282,8 +291,13 @@
 	    <tr class="{% cycle dark,light as row_parity %}">
 	       <th colspan="2" >
 	       {% cycle section %}.
+	       {% 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)
+	       {% else %}
 	       Disclosure of Patent Information (i.e., patents or patent
 	       applications required to be disclosed by Section 6 of RFC 3979)	    
+	       {% endif %}
 	       </th>
 	    </tr>
 	    {% if ipr.patents or ipr.notes %}

test/diff/_ipr_new-third-party_

@@ -0,0 +1,41 @@
+--- https://datatracker.ietf.org/public/ipr_notify.cgi 
++++ /ipr/new-third-party/ 
+@@ -10,1 +10,1 @@
+-it to ietf-ipr@ietf.org.Submissions made by e-mail that do not comply
++it to ietf-ipr@ietf.org. Submissions made by e-mail that do not comply
+@@ -14,0 +14,1 @@
++Fields marked with * are required.
+@@ -15,1 +16,1 @@
+-Legal Name:
++Legal Name: *
+@@ -17,1 +18,1 @@
+-Triggered this Disclosure (Required field* )
++Triggered this Disclosure:
+@@ -26,4 +27,4 @@
+-III. 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-...):
++* III. IETF Document or Other Contribution to Which this IPR
++Disclosure Relates:
++RFC Numbers:
++I-D Filenames (draft-...):
+@@ -36,7 +37,8 @@
+-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
++application?:
++YES
++NO
+@@ -48,1 +50,1 @@
+-covered.
++covered: