diff --git a/ietf/nomcom/forms.py b/ietf/nomcom/forms.py index 730f392ca..d3cd78141 100644 --- a/ietf/nomcom/forms.py +++ b/ietf/nomcom/forms.py @@ -17,6 +17,7 @@ from ietf.nomcom.utils import (NOMINATION_RECEIPT_TEMPLATE, FEEDBACK_RECEIPT_TEM get_user_email, validate_private_key, validate_public_key, get_or_create_nominee, create_feedback_email) from ietf.person.models import Email +from ietf.person.fields import AutocompletedEmailField from ietf.utils.fields import MultiEmailField from ietf.utils.mail import send_mail @@ -655,6 +656,8 @@ class PositionForm(BaseNomcomForm, forms.ModelForm): fieldsets = [('Position', ('name', 'description', 'is_open', 'incumbent'))] + incumbent = AutocompletedEmailField(required=False) + class Meta: model = Position fields = ('name', 'description', 'is_open', 'incumbent') diff --git a/ietf/templates/nomcom/edit_position.html b/ietf/templates/nomcom/edit_position.html index be1ed7ce5..3add94e61 100644 --- a/ietf/templates/nomcom/edit_position.html +++ b/ietf/templates/nomcom/edit_position.html @@ -1,5 +1,14 @@ {% extends "nomcom/nomcom_private_base.html" %} +{% block pagehead %} + +{% endblock %} + +{% block content_end %} + + +{% endblock %} + {% block nomcom_content %}

{% if position %}Edit{% else %}Add{% endif %} position

diff --git a/ietf/templates/nomcom/list_positions.html b/ietf/templates/nomcom/list_positions.html index 398a57fe7..d6a193415 100644 --- a/ietf/templates/nomcom/list_positions.html +++ b/ietf/templates/nomcom/list_positions.html @@ -11,7 +11,7 @@
Description:
{{ position.description }}
Incumbent:
-
{{ position.incumbent }}
+
{% if position.incumbent %}{{ position.incumbent.person }} <{{ position.incumbent.address }}>{% else %}None{% endif %}
Is open:
{{ position.is_open }}
Templates:
diff --git a/static/css/base2.css b/static/css/base2.css index 1bd01acd8..534152e5a 100644 --- a/static/css/base2.css +++ b/static/css/base2.css @@ -308,6 +308,10 @@ div.info-message-error { border: 1px solid red; background-color: #ffeebb; paddi margin-left: 150px; } +.baseform .fieldWidget ul.token-input-list { + clear: none; +} + #feedbackformset .fieldWidget { margin-left: 0px; }