Changed 'requirement' to 'desired expertise' in user-visible places in the nomcom app.

- Legacy-Id: 6259

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:

ietf/nomcom/urls.py

@@ -32,6 +32,7 @@ urlpatterns = patterns('ietf.nomcom.views',
 
     url(r'^(?P<year>\d{4})/$', 'year_index', name='nomcom_year_index'),
     url(r'^(?P<year>\d{4})/requirements/$', 'requirements', name='nomcom_requirements'),
+    url(r'^(?P<year>\d{4})/expertise/$', 'requirements', name='nomcom_requirements'),
     url(r'^(?P<year>\d{4})/questionnaires/$', 'questionnaires', name='nomcom_questionnaires'),
     url(r'^(?P<year>\d{4})/feedback/$', 'public_feedback', name='nomcom_public_feedback'),
     url(r'^(?P<year>\d{4})/nominate/$', 'public_nominate', name='nomcom_public_nominate'),

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

ietf/templates/nomcom/nomcom_private_base.html

@@ -27,7 +27,7 @@
       {% if selected == "edit_nomcom" %}<span class="selected">Edit Settings</span>{% else %}<a href="{% url nomcom_edit_nomcom year %}">Edit Settings</a>{% endif %} |
       {% if selected == "edit_templates" %}<span class="selected">Edit Pages</span>{% else %}<a href="{% url nomcom_list_templates year %}">Edit Pages</a>{% endif %} |
       {% if selected == "edit_positions" %}<span class="selected">Edit Positions</span>{% else %}<a href="{% url nomcom_list_positions year %}">Edit Positions</a>{% endif %} |
-      {% if selected == "merge" %}<span class="selected">Merge Email Addresses</span>{% else %}<a href="{% url nomcom_private_merge year %}">Merge Email Addresses</a>{% endif %} 
+      {% if selected == "merge" %}<span class="selected">Merge Email Addresses</span>{% else %}<a href="{% url nomcom_private_merge year %}">Merge Email Addresses</a>{% endif %} |
       {% if selected == "edit_members" %}<span class="selected">Edit Nomcom Members</span>{% else %}<a href="{% url nomcom_edit_members year %}">Edit Nomcom Members</a>{% endif %}
     </div>
     {% endif %}

ietf/templates/nomcom/nomcom_public_base.html

@@ -12,7 +12,7 @@
       {% if selected == "nominate" %}<span class="selected">Nominate</span>{% else %}<a href="{% url nomcom_public_nominate year %}">Nominate</a>{% endif %} |
       {% if selected == "feedback" %}<span class="selected">Provide Comments</span>{% else %}<a href="{% url nomcom_public_feedback year %}">Provide Comments</a>{% endif %} |
     {% endif %}
-    {% if selected == "requirements" %}<span class="selected">Requirements</span>{% else %}<a href="{% url nomcom_requirements year %}">Requirements</a>{% endif %} |
+    {% if selected == "requirements" %}<span class="selected">Desired Expertise</span>{% else %}<a href="{% url nomcom_requirements year %}">Desired Expertise</a>{% endif %} |
     {% if selected == "questionnaires" %}<span class="selected">Questionnaires</span>{% else %}<a href="{% url nomcom_questionnaires year %}">Questionnaires</a>{% endif %} |
   </div>
 

ietf/templates/nomcom/requirements.html

@@ -7,17 +7,17 @@
   <script type="text/javascript" src="/js/base.js"></script>
 {% endblock pagehead %}
 
-{% block subtitle %} - Requirements {% endblock %}
+{% block subtitle %} - Desired Expertise {% endblock %}
 
 {% block nomcom_content %}
-  <h2>Requirements</h2>
+  <h2>Desired Expertises</h2>
   <div id="mytabs" class="yui-navset">
   <ul class="yui-nav">
     {% for position in positions %}
       <li><a href="#{{ position.name }}"><em>{{ position.name }}</em></a></li>
     {% endfor %}
   </ul>
-  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
   <div class="yui-content">
     {% for position in positions %}
       <div id="{{ position.name }}">