diff --git a/ietf/nomcom/fields.py b/ietf/nomcom/fields.py index 8957605ff..eab7111da 100644 --- a/ietf/nomcom/fields.py +++ b/ietf/nomcom/fields.py @@ -8,7 +8,6 @@ from ietf.utils.log import log class EncryptedException(Exception): pass - class EncryptedTextField(models.TextField): def pre_save(self, instance, add): if add: diff --git a/ietf/nomcom/urls.py b/ietf/nomcom/urls.py index 63f642df6..8e3ccd308 100644 --- a/ietf/nomcom/urls.py +++ b/ietf/nomcom/urls.py @@ -32,6 +32,7 @@ urlpatterns = patterns('ietf.nomcom.views', url(r'^(?P\d{4})/$', 'year_index', name='nomcom_year_index'), url(r'^(?P\d{4})/requirements/$', 'requirements', name='nomcom_requirements'), + url(r'^(?P\d{4})/expertise/$', 'requirements', name='nomcom_requirements'), url(r'^(?P\d{4})/questionnaires/$', 'questionnaires', name='nomcom_questionnaires'), url(r'^(?P\d{4})/feedback/$', 'public_feedback', name='nomcom_public_feedback'), url(r'^(?P\d{4})/nominate/$', 'public_nominate', name='nomcom_public_nominate'), diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py index 87c03c47c..74abc650d 100644 --- a/ietf/nomcom/views.py +++ b/ietf/nomcom/views.py @@ -425,8 +425,8 @@ def process_nomination_status(request, year, nominee_position_id, state, date, h state = get_object_or_404(NomineePositionState, slug=state) message = ('warning', - "Check Yes to set the state of your nomination to %s to %s (this"+ - "is not a final commitment - you can notify us later if you need to change this)" % + ("Click on 'Save' to set the state of your nomination to %s to %s (this"+ + "is not a final commitment - you can notify us later if you need to change this)") % (nominee_position.position.name, state.name)) if request.method == 'POST': nominee_position.state = state diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html index 404ba0004..8573fa715 100644 --- a/ietf/templates/nomcom/nomcom_private_base.html +++ b/ietf/templates/nomcom/nomcom_private_base.html @@ -27,7 +27,7 @@ {% if selected == "edit_nomcom" %}Edit Settings{% else %}Edit Settings{% endif %} | {% if selected == "edit_templates" %}Edit Pages{% else %}Edit Pages{% endif %} | {% if selected == "edit_positions" %}Edit Positions{% else %}Edit Positions{% endif %} | - {% if selected == "merge" %}Merge Email Addresses{% else %}Merge Email Addresses{% endif %} + {% if selected == "merge" %}Merge Email Addresses{% else %}Merge Email Addresses{% endif %} | {% if selected == "edit_members" %}Edit Nomcom Members{% else %}Edit Nomcom Members{% endif %} {% endif %} diff --git a/ietf/templates/nomcom/nomcom_public_base.html b/ietf/templates/nomcom/nomcom_public_base.html index 24070b5a2..a6abcc567 100644 --- a/ietf/templates/nomcom/nomcom_public_base.html +++ b/ietf/templates/nomcom/nomcom_public_base.html @@ -12,7 +12,7 @@ {% if selected == "nominate" %}Nominate{% else %}Nominate{% endif %} | {% if selected == "feedback" %}Provide Comments{% else %}Provide Comments{% endif %} | {% endif %} - {% if selected == "requirements" %}Requirements{% else %}Requirements{% endif %} | + {% if selected == "requirements" %}Desired Expertise{% else %}Desired Expertise{% endif %} | {% if selected == "questionnaires" %}Questionnaires{% else %}Questionnaires{% endif %} | diff --git a/ietf/templates/nomcom/requirements.html b/ietf/templates/nomcom/requirements.html index 19010b702..00198db2d 100644 --- a/ietf/templates/nomcom/requirements.html +++ b/ietf/templates/nomcom/requirements.html @@ -7,17 +7,17 @@ {% endblock pagehead %} -{% block subtitle %} - Requirements {% endblock %} +{% block subtitle %} - Desired Expertise {% endblock %} {% block nomcom_content %} -

Requirements

+

Desired Expertises

- Pick the position requirements to view from the list immediately above + Click on a position above to view the summary of desired expertise for that position
{% for position in positions %}