change "Questionnaire Response" label

See ietf-tools#1003
 - Legacy-Id: 5687

Author: ejimenez

ietf/name/fixtures/names.xml

@@ -542,7 +542,7 @@
         <field type="IntegerField" name="order">0</field>
     </object>
     <object pk="questio" model="name.feedbacktype">
-        <field type="CharField" name="name">Questionnaire</field>
+        <field type="CharField" name="name">Questionnaire response</field>
         <field type="TextField" name="desc"></field>
         <field type="BooleanField" name="used">True</field>
         <field type="IntegerField" name="order">0</field>

ietf/name/migrations/0008_add_feedback_types.py

@@ -8,7 +8,7 @@ class Migration(DataMigration):
 
     def forwards(self, orm):
         types = {'nomina': 'Nomination',
-                 'questio': 'Questionnaire',
+                 'questio': 'Questionnaire response',
                  'comment': 'Comment'}
         for slug, name in types.iteritems():
             FeedbackType.objects.get_or_create(slug=slug, name=name, used=True)

ietf/nomcom/forms.py

@@ -655,9 +655,9 @@ class Media:
 
 class QuestionnaireForm(BaseNomcomForm, forms.ModelForm):
 
-    comments = forms.CharField(label='Questionnaire on this candidate',
+    comments = forms.CharField(label='Questionnaire response from this candidate',
                                widget=forms.Textarea())
-    fieldsets = [('Provide questionnaires', ('nominee',
+    fieldsets = [('Questionnaire response', ('nominee',
                                              'comments'))]
 
     def __init__(self, *args, **kwargs):
@@ -666,7 +666,7 @@ def __init__(self, *args, **kwargs):
 
         super(QuestionnaireForm, self).__init__(*args, **kwargs)
         self.fields['nominee'] = PositionNomineeField(nomcom=self.nomcom, required=True)
-        
+
 
     def save(self, commit=True):
         feedback = super(QuestionnaireForm, self).save(commit=False)

ietf/nomcom/urls.py

@@ -8,7 +8,7 @@
     url(r'^(?P<year>\d{4})/private/key/$', 'private_key', name='nomcom_private_key'),
     url(r'^(?P<year>\d{4})/private/nominate/$', 'private_nominate', name='nomcom_private_nominate'),
     url(r'^(?P<year>\d{4})/private/feedback/$', 'private_feedback', name='nomcom_private_feedback'),
-    url(r'^(?P<year>\d{4})/private/questionnaire/$', 'private_questionnaire', name='nomcom_private_questionnaire'),
+    url(r'^(?P<year>\d{4})/private/questionnaire-response/$', 'private_questionnaire', name='nomcom_private_questionnaire'),
     url(r'^(?P<year>\d{4})/private/view-feedback/$', 'view_feedback', name='nomcom_view_feedback'),
     url(r'^(?P<year>\d{4})/private/view-feedback/pending/$', 'view_feedback_pending', name='nomcom_view_feedback_pending'),
     url(r'^(?P<year>\d{4})/private/view-feedback/nominee/(?P<nominee_id>\d+)$', 'view_feedback_nominee', name='nomcom_view_feedback_nominee'),

ietf/nomcom/views.py

@@ -326,7 +326,7 @@ def private_questionnaire(request, year):
                                  nomcom=nomcom, user=request.user)
         if form.is_valid():
             form.save()
-            message = ('success', 'The questionnaire has been registered.')
+            message = ('success', 'The questionnaire response has been registered.')
     else:
         form = QuestionnaireForm(nomcom=nomcom, user=request.user)
 

ietf/templates/nomcom/nomcom_private_base.html

@@ -10,7 +10,7 @@ <h1>Nomcom {{ year }} Private Area</h1>
     {% if selected == "index" %}<span class="selected">List of nominees</span>{% else %}<a href="{% url nomcom_private_index year %}">List of nominees</a>{% endif %} |
     {% if selected == "nominate" %}<span class="selected">Nominate</span>{% else %}<a href="{% url nomcom_private_nominate year %}">Nominate</a>{% endif %} |
     {% if selected == "feedback" %}<span class="selected">Provide comments</span>{% else %}<a href="{% url nomcom_private_feedback year %}">Provide comments</a>{% endif %} |
-    {% if selected == "questionnaire" %}<span class="selected">Provide questionnaires</span>{% else %}<a href="{% url nomcom_private_questionnaire year %}">Provide questionnaires</a>{% endif %} |
+    {% if selected == "questionnaire" %}<span class="selected">Questionnaire response</span>{% else %}<a href="{% url nomcom_private_questionnaire year %}">Questionnaire response</a>{% endif %} |
     {% if selected == "view_feedback" %}<span class="selected">View comments</span>{% else %}<a href="{% url nomcom_view_feedback year %}">View comments</a>{% endif %} |
     {% if selected == "private_key" %}<span class="selected">Private key</span>{% else %}<a href="{% url nomcom_private_key year %}">Private key</a>{% endif %}
     {% if user|is_chair:year %} |

ietf/templates/nomcom/private_index.html

@@ -12,7 +12,7 @@ <h2>Nominations stats</h2>
   <th>Accepted</th>
   <th>Declined</th>
   <th>Pending</th>
-  <th>Questionnaire</th>
+  <th>Questionnaire response</th>
   <th>Total</th>
 </tr>
 {% for item in stats %}
@@ -101,7 +101,7 @@ <h3>Select Filters</h3>
       <th>Nominees</th>
       <th>Position</th>
       <th>State</th>
-      <th>Questionnaire</th>
+      <th>Questionnaire response</th>
     </tr>
     {% for np in nominee_positions.not_duplicated %}
         <tr class="{{ forloop.counter|divisibleby:2|yesno:"oddrow,evenrow" }}">

ietf/templates/nomcom/private_questionnaire.html

@@ -1,7 +1,7 @@
 {% extends "nomcom/nomcom_private_base.html" %}
 
 
-{% block subtitle %} - Provide Quesionnaire{% endblock %}
+{% block subtitle %} - Quesionnaire Response{% endblock %}
 
 {% block pagehead %}
 {{ form.media }}

ietf/templates/nomcom/view_feedback.html

@@ -15,7 +15,7 @@ <h2>List of Nominees</h2>
   <th>Nominee</th>
   <th>Nominations</th>
   <th>Comments</th>
-  <th>Questionnaires</th>
+  <th>Questionnaire response</th>
 </tr>
 {% for nominee in nominees %}
 <tr class="{{ forloop.counter|divisibleby:2|yesno:"oddrow,evenrow" }}">