From f9c6c5c7d31452128b36526482101f25bc7d07a3 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 21 May 2007 16:49:26 +0000 Subject: [PATCH] * Added IPR form fields for listing rfcs and drafts * Some style tweaks - Legacy-Id: 142 --- ietf/ipr/view_new.py | 5 +++++ ietf/templates/ipr/details.html | 23 +++++++++++++++-------- ietf/templates/ipr/style.html | 18 +++++++++--------- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/ietf/ipr/view_new.py b/ietf/ipr/view_new.py index ca747177b..07e1b1fca 100644 --- a/ietf/ipr/view_new.py +++ b/ietf/ipr/view_new.py @@ -16,6 +16,9 @@ def ipr_detail_form_callback(field, **kwargs): return forms.IntegerField(widget=forms.RadioSelect(choices=models.LICENSE_CHOICES), required=True) if field.name in ["selecttype", "selectowned"]: return forms.IntegerField(widget=forms.RadioSelect(choices=((1, "YES"), (2, "NO"))), required=False) + if field.name in ["rfc_number", "id_document_tag"]: + log(field.name) + return forms.CharFieldField(required=False) return field.formfield(**kwargs) def ipr_contact_form_callback(field, **kwargs): @@ -97,6 +100,8 @@ def new(request, type): for contact in ["holder_contact", "ietf_contact", "submitter"]: if contact in section_list: 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) BaseIprForm.__init__(self, *args, **kw) # Special validation code diff --git a/ietf/templates/ipr/details.html b/ietf/templates/ipr/details.html index 0e035438e..479b3bafc 100644 --- a/ietf/templates/ipr/details.html +++ b/ietf/templates/ipr/details.html @@ -244,13 +244,20 @@ IETF Document or Other Contribution to Which this IPR Disclosure Relates: - {% for rfc in ipr.rfcs.all %} - RFC {{ rfc.rfc_number.rfc_number }}:"{{ rfc.rfc_number.rfc_name }}" - {% endfor %} - - {% for draft in ipr.drafts.all %} - Internet-Draft:"{{ draft.document.id_document_name }}"
({{ draft.document.filename }}-{{ draft.document.revision }}) - {% endfor %} + {% if ipr.rfclist %} + RFC Numbers:{{ ipr.rfclist }} + {% else %} + {% for rfc in ipr.rfcs.all %} + RFC {{ rfc.rfc_number.rfc_number }}:"{{ rfc.rfc_number.rfc_name }}" + {% endfor %} + {% endif %} + {% if ipr.draftlist %} + I-D Filenames (draft-...):{{ ipr.draftlist }} + {% else %} + {% for draft in ipr.drafts.all %} + Internet-Draft:"{{ draft.document.id_document_name }}"
({{ draft.document.filename }}-{{ draft.document.revision }}) + {% endfor %} + {% endif %} {% if ipr.other_designations %} Designations for Other Contributions:{{ ipr.other_designations }} {% endif %} @@ -335,7 +342,7 @@ - + {{ ipr.licensing_option }}
{{ ipr.get_lic_opt_a_sub_display }} {{ ipr.get_lic_opt_b_sub_display }} diff --git a/ietf/templates/ipr/style.html b/ietf/templates/ipr/style.html index 0dcd316aa..3b5b949e2 100644 --- a/ietf/templates/ipr/style.html +++ b/ietf/templates/ipr/style.html @@ -7,23 +7,23 @@ .even tr:first-child th { background: #aaa; color: #336; font-family: Arial, sans-serif; font-size: small; text-align: left; font-weight: bold; } .odd tr:first-child th { background: #cca; color: #336; font-family: Arial, sans-serif; font-size: small; text-align: left; font-weight: bold; } table.ipr { - padding:2px; - border-width:1px; + padding:0.2ex; + border-width:0.1ex; border-style:solid; border-color:#305076; } - .ipr th { border: 0px; margin: 0px; padding: 4px; } - .ipr td { border: 0px; margin: 0px; padding: 4px; } - td.fixwidth { width: 14ex; } - .ipr ul { list-style-type: none; } + .ipr th { border: 0px; margin: 0px; padding: 0.4ex; } + .ipr td { border: 0px; margin: 0px; padding: 0.4ex; } + td.fixwidth { width: 18ex; } + .ipr ul { list-style-type: none; margin-left: 13ex;} h4.ipr { text-align: center; } - input { width: 72ex; font-family: sans-serif; font-size: 11pt; font-weight: normal; } + input { width: 68ex; font-family: sans-serif; font-size: 11pt; font-weight: normal; } input[type="radio"] { width: auto; } input[type="checkbox"] { width: auto; } input[type="submit"] { width: auto; } - textarea { width: 72ex; height: 5em; font-family: sans-serif; font-size: 11pt; font-weight: normal; } + textarea { width: 68ex; height: 5em; font-family: sans-serif; font-size: 11pt; font-weight: normal; } .required { color: red; float: right; padding-top: 0.7ex; font-size: 130%; } - .errorlist { background: red; padding: 0 0 0 2px; border: 0px; margin: 0px; } + .errorlist { background: red; padding: 0 0 0 0.2ex; border: 0px; margin: 0px; } .formlegend { } .formlegend .required { float: none; vertical-align: -0.5ex; padding: 0; } /* baseline | sub | super | top | text-top | middle | bottom | text-bottom | | */