From d7b47093a7f0eecfd24cfe43c4204267280f15eb Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 21 May 2007 19:07:13 +0000 Subject: [PATCH] * Added alternating colours for the entry rows in the form tables * Fixed yes/no radio button layout * Fixed submitter contact information copying for generic form - Legacy-Id: 143 --- ietf/ipr/urls.py | 2 +- ietf/ipr/view_new.py | 27 +++-- ietf/ipr/view_sections.py | 2 +- ietf/templates/ipr/details.html | 207 +++++++++++++++++++------------- ietf/templates/ipr/js.html | 86 ++++++++----- ietf/templates/ipr/style.html | 16 ++- 6 files changed, 208 insertions(+), 132 deletions(-) diff --git a/ietf/ipr/urls.py b/ietf/ipr/urls.py index 0fd40582b..af43b6591 100644 --- a/ietf/ipr/urls.py +++ b/ietf/ipr/urls.py @@ -7,7 +7,7 @@ urlpatterns = patterns('', (r'^ipr-(?P\d+)/$', views.show), (r'^update/$', views.updatelist), (r'^update/(?P\d+)/$', views.update), - (r'^new-(?P(specific|generic|third_party))/$', views.new), + (r'^new-(?P(specific|generic|third-party))/$', views.new), ) queryset = models.IprDetail.objects.all() diff --git a/ietf/ipr/view_new.py b/ietf/ipr/view_new.py index 07e1b1fca..de94cb96f 100644 --- a/ietf/ipr/view_new.py +++ b/ietf/ipr/view_new.py @@ -89,6 +89,7 @@ def new(request, type): rfclist = forms.CharField(required=False) draftlist = forms.CharField(required=False) stdonly_license = forms.BooleanField(required=False) + hold_contact_is_submitter = forms.BooleanField(required=False) ietf_contact_is_submitter = forms.BooleanField(required=False) if "holder_contact" in section_list: holder_contact = ContactForm(prefix="hold") @@ -102,7 +103,12 @@ def new(request, type): self.base_fields[contact] = ContactForm(prefix=contact[:4], *args, **kw) self.base_fields["rfclist"] = forms.CharField(required=False) self.base_fields["draftlist"] = forms.CharField(required=False) - self.base_fields["ietf_contact_is_submitter"] = forms.BooleanField(required=False) + if "holder_contact" in section_list: + self.base_fields["hold_contact_is_submitter"] = forms.BooleanField(required=False) + if "ietf_contact" in section_list: + self.base_fields["ietf_contact_is_submitter"] = forms.BooleanField(required=False) + self.base_fields["stdonly_license"] = forms.BooleanField(required=False) + BaseIprForm.__init__(self, *args, **kw) # Special validation code def clean(self): @@ -110,19 +116,18 @@ def new(request, type): # Submitter form filled in or 'same-as-ietf-contact' marked # Only one of rfc, draft, and other info fields filled in # RFC exists or draft exists and has right rev. or ... - - if self.ietf_contact_is_submitter: - self.submitter = self.ietf_contact pass + if request.method == 'POST': data = request.POST.copy() - if "ietf_contact_is_submitter" in data: - for subfield in ["name", "title", "department", "address1", "address2", "telephone", "fax", "email"]: - try: - data["subm_%s"%subfield] = data["ietf_%s"%subfield] - except Exception, e: - #log("Caught exception: %s"%e) - pass + for src in ["hold", "ietf"]: + if "%s_contact_is_submitter" % src in data: + for subfield in ["name", "title", "department", "address1", "address2", "telephone", "fax", "email"]: + try: + data[ "subm_%s" % subfield ] = data[ "%s_%s" % (src,subfield) ] + except Exception, e: + #log("Caught exception: %s"%e) + pass form = IprForm(data) if form.ietf_contact_is_submitter: form.ietf_contact_is_submitter_checked = "checked" diff --git a/ietf/ipr/view_sections.py b/ietf/ipr/view_sections.py index 22a3f2eb3..e5d2168d5 100644 --- a/ietf/ipr/view_sections.py +++ b/ietf/ipr/view_sections.py @@ -17,7 +17,7 @@ section_table = { "disclosure_type": "Generic", "form_legend": False, "per_rfc_disclosure": False, "also_specific": True, }, - "third_party": {"index": False, "title": True, "third_party": True, + "third-party": {"index": False, "title": True, "third_party": True, "legacy_intro": False, "new_intro": True, "form_intro": False, "holder": True, "holder_contact": False, "ietf_contact": True, "ietf_doc": True, "patent_info": True, "licensing": False, diff --git a/ietf/templates/ipr/details.html b/ietf/templates/ipr/details.html index 479b3bafc..f3d843f1b 100644 --- a/ietf/templates/ipr/details.html +++ b/ietf/templates/ipr/details.html @@ -1,6 +1,9 @@ {% extends "base.html" %} {% block title %}IPR Details{% endblock %} -{% block body_attributes %}onload="toggle_submitter_info()"{% 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" %} @@ -168,16 +171,16 @@ {% if section_list.holder %} -
+
- + - + {% block section1_data %} {% endblock %} @@ -188,46 +191,46 @@ {% if section_list.holder_contact %} -
+
{% cycle I,II,III,IV,V,VI,VII,VIII as section %}. {% ifequal section_list.disclosure_type "Third Party" %}Possible{% endifequal %} Patent Holder/Applicant ("Patent Holder")
Legal Name: {{ ipr.p_h_legal_name }}
- - - - - - - - - + + + + + + + +
+
{% 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 }}
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 }}
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
No information submitted
@@ -235,9 +238,9 @@ {% if section_list.ietf_doc %} -
+
- + {% if ipr.rfclist %} - + {% else %} {% for rfc in ipr.rfcs.all %} - + {% endfor %} {% endif %} {% if ipr.draftlist %} - + {% else %} {% for draft in ipr.drafts.all %} - + {% endfor %} {% endif %} {% if ipr.other_designations %} - + {% endif %}
{% if section_list.form_legend %}*{% endif %} {% cycle section %}. @@ -245,30 +248,30 @@
RFC Numbers:{{ ipr.rfclist }}
RFC Numbers:{{ ipr.rfclist }}
RFC {{ rfc.rfc_number.rfc_number }}:"{{ rfc.rfc_number.rfc_name }}"
RFC {{ rfc.rfc_number.rfc_number }}:"{{ rfc.rfc_number.rfc_name }}"
I-D Filenames (draft-...):{{ ipr.draftlist }}
I-D Filenames (draft-...):{{ ipr.draftlist }}
Internet-Draft:"{{ draft.document.id_document_name }}"
({{ draft.document.filename }}-{{ draft.document.revision }})
Internet-Draft:"{{ draft.document.id_document_name }}"
({{ draft.document.filename }}-{{ draft.document.revision }})
Designations for Other Contributions:{{ ipr.other_designations }}
Designations for Other Contributions:{{ ipr.other_designations }}
{% endif %} {% if section_list.patent_info %} -
+
- + {% if ipr.p_applications or ipr.p_notes %} + - - - - - - + + + + + + + + {% if section_list.generic %} - - + + {% else %} - + {% if ipr.discloser_identify %} - + {% else %} - + {% endif %} {% endif %} + {% else %} - + {% endif %} +
{% cycle section %}. Disclosure of Patent Information (i.e., patents or patent @@ -276,29 +279,39 @@
A. For granted patents or published pending patent applications, please provide the following information:
Patent, Serial, Publication, Registration, +
Patent, Serial, Publication, Registration, or Application/File number(s): {{ ipr.p_applications }}
Date(s) granted or applied for: {{ ipr.date_applied }}
Country: {{ ipr.country }}
Additional Notes: {{ ipr.p_notes }}
- B. Does this disclosure relate to an unpublished pending patent - application?: - {{ ipr.selecttype }} -
Date(s) granted or applied for: {{ ipr.date_applied }}
Country: {{ ipr.country }}
Additional Notes: {{ ipr.p_notes }}
+ + B. Does this disclosure relate to an unpublished pending patent + application?: + +
Select one: {{ ipr.selecttype }}
+
C. Does this disclosure apply to all IPR owned by - the submitter?: {{ ipr.selectowned }}
+ C. Does this disclosure apply to all IPR owned by + the submitter?: + +
Select one: {{ ipr.selectowned }}
+
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 @@ -309,14 +322,16 @@
{{ ipr.discloser_identify }}
{{ ipr.discloser_identify }}
No information submitted
No information submitted
This disclosure relates to an unpublished pending patent application.
This disclosure relates to an unpublished pending patent application.
{% endif %} @@ -324,14 +339,15 @@ {% if section_list.licensing %} -
+
- + + - - + {% if ipr.stdonly_license %} + + - {% if ipr.comments %} - - {% else %} - {% endif %} + + + + + {% if ipr.comments %} + + {% else %} + + {% endif %} + {% if ipr.lic_checkbox %} - + {% endif %} - +
{% cycle section %}. Licensing Declaration
The Patent Holder states that its position with respect to licensing any patent claims contained in the patent(s) or patent @@ -343,24 +359,35 @@
- {{ ipr.licensing_option }}
+ {{ ipr.licensing_option }} {{ ipr.get_lic_opt_a_sub_display }} {{ ipr.get_lic_opt_b_sub_display }} {{ ipr.get_lic_opt_c_sub_display }}
- Licensing information, comments, notes, or URL for further information: +
+ {{ ipr.stdonly_license }} + Above licensing declaration is limited solely to standards-track IETF documents.
{{ ipr.comments }}
No information submitted
+ 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 @@ -370,7 +397,7 @@
Note: The individual submitting this template represents and warrants that he or she is authorized by the Patent Holder to agree to the @@ -383,34 +410,46 @@ {% 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 - IETF Participant in Section III above) + 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 }}
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
No information submitted
@@ -418,18 +457,18 @@ {% if section_list.notes %} -
+
- + {% if ipr.other_notes %} - + {% else %} - + {% endif %}
{% cycle section %}. Other Notes:
{{ ipr.other_notes }}
{{ ipr.other_notes }}
No information submitted
No information submitted
diff --git a/ietf/templates/ipr/js.html b/ietf/templates/ipr/js.html index c9109210d..60bbd4141 100644 --- a/ietf/templates/ipr/js.html +++ b/ietf/templates/ipr/js.html @@ -1,34 +1,60 @@ - + return true; +} + diff --git a/ietf/templates/ipr/style.html b/ietf/templates/ipr/style.html index 3b5b949e2..50c905a52 100644 --- a/ietf/templates/ipr/style.html +++ b/ietf/templates/ipr/style.html @@ -1,21 +1,27 @@