diff --git a/ietf/ipr/models.py b/ietf/ipr/models.py index a710ba087..92b041377 100644 --- a/ietf/ipr/models.py +++ b/ietf/ipr/models.py @@ -77,7 +77,7 @@ class IprLicensing(models.Model): class IprDetail(models.Model): ipr_id = models.AutoField(primary_key=True) - p_h_legal_name = models.CharField("Legal Name", blank=True, maxlength=255) + p_h_legal_name = models.CharField("Legal Name", maxlength=255) document_title = models.CharField(blank=True, maxlength=255) rfc_number = models.IntegerField(null=True, editable=False, blank=True) # always NULL id_document_tag = models.IntegerField(null=True, editable=False, blank=True) # always NULL diff --git a/ietf/templates/ipr/formfield.html b/ietf/templates/ipr/formfield.html index 53bf13f41..c22d772b9 100644 --- a/ietf/templates/ipr/formfield.html +++ b/ietf/templates/ipr/formfield.html @@ -5,4 +5,5 @@ {% endfor %} {% endif %} - {{ field }}{{ help_text }} + {% if field.required %}*{% endif %}{{ text }} + {{ help_text }} \ No newline at end of file diff --git a/ietf/templates/ipr/style.html b/ietf/templates/ipr/style.html index 08da06c75..b3a8cf292 100644 --- a/ietf/templates/ipr/style.html +++ b/ietf/templates/ipr/style.html @@ -22,6 +22,6 @@ 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; } - .required { color: red; } + .required { color: red; float: right; padding-top: 1ex; } .errorlist { background: red; padding: 0 0 0 2px; border: 0px; margin: 0px; } diff --git a/ietf/utils.py b/ietf/utils.py index fc0d5ab43..2ad4d0a1d 100644 --- a/ietf/utils.py +++ b/ietf/utils.py @@ -266,6 +266,6 @@ def makeFormattingForm(template=None): return field bf = forms.forms.BoundField(self, field, name) errors = [escape(error) for error in bf.errors] - rendering = loader.render_to_string(self._template, { "errors": errors, "label": bf.label, "field": unicode(bf), "help_text": field.help_text }) + rendering = loader.render_to_string(self._template, { "errors": errors, "label": bf.label, "text": unicode(bf), "help_text": field.help_text, "field":field }) return rendering return FormattingForm