* 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

Author: levkowetz

ietf/ipr/urls.py

@@ -7,7 +7,7 @@
      (r'^ipr-(?P<ipr_id>\d+)/$', views.show),
      (r'^update/$', views.updatelist),
      (r'^update/(?P<ipr_id>\d+)/$', views.update),
-     (r'^new-(?P<type>(specific|generic|third_party))/$', views.new),
+     (r'^new-(?P<type>(specific|generic|third-party))/$', views.new),
 )
 
 queryset = models.IprDetail.objects.all()

ietf/ipr/view_new.py

@@ -89,6 +89,7 @@ class IprForm(BaseIprForm):
         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,27 +103,31 @@ def __init__(self, *args, **kw):
                     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):
             # Required:
             # 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"

ietf/ipr/view_sections.py

@@ -17,7 +17,7 @@
                                 "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,