Merge pull request #17 from mckinseyacademy/mcka-copy-changes

Mcka copy changes

poll/public/html/poll.html

@@ -30,12 +30,11 @@
           {% endfor %}
         </ul>
       </div>
-      <input class="input-main" type="button" name="poll-submit"
-             value="{% if choice %}Resubmit{% else %}Submit{% endif %}" disabled/>
+      <input class="input-main" type="button" name="poll-submit" value="Submit" disabled/>
     </form>
     <div class="poll-voting-thanks
         {% if not choice or can_vote %}poll-hidden{% endif %}">
-      <span>Thank you for your submission!</span>
+      <span>Thank you.</span>
     </div>
     <div class="poll-submissions-count poll-hidden">
       You have used <span class="poll-current-count">{{ submissions_count }}</span>

poll/public/html/survey.html

@@ -37,9 +37,9 @@
                 </tr>
             {% endfor %}
             </table>
-            <input class="input-main" type="button" name="poll-submit" value="{% if choices and can_vote %}Resubmit{% else %}Submit{% endif %}" disabled />
+            <input class="input-main" type="button" name="poll-submit" value="Submit" disabled />
         </form>
-        <div class="poll-voting-thanks{% if not choices or can_vote %} poll-hidden{% endif %}"><span>Thank you for your submission!</span></div>
+        <div class="poll-voting-thanks{% if not choices or can_vote %} poll-hidden{% endif %}"><span>Thank you.</span></div>
         <div class="poll-submissions-count poll-hidden">
             You have used <span class="poll-current-count">{{ submissions_count }}</span>
             out of <span class="poll-max-submissions">{{ max_submissions }}</span> submissions.

poll/public/js/poll.js

@@ -158,9 +158,7 @@ function PollUtil (runtime, element, pollType) {
             thanks.removeClass('poll-hidden');
             thanks.fadeOut(0).fadeIn('slow', 'swing');
             $('.poll-feedback-container', element).removeClass('poll-hidden');
-            if (can_vote) {
-                $('input[name="poll-submit"]', element).val(gettext('Resubmit'));
-            } else {
+            if (!can_vote) {
                 $('input', element).attr('disabled', true)
             }
             return;

setup.py

@@ -44,7 +44,7 @@ def package_data(pkg, roots):
 
 setup(
     name='xblock-poll',
-    version='1.2.1',
+    version='1.2.2',
     description='An XBlock for polling users.',
     packages=[
         'poll',

tests/integration/test_private_results.py

@@ -87,12 +87,9 @@ class TestPrivateResults(PollBaseTest):
         submit.click()
         self.wait_until_clickable(self.browser.find_element_by_css_selector('.poll-voting-thanks'))
 
-        self.assertIn('Resubmit', submit.get_attribute('outerHTML'), 'Resubmit')
-
-        # This should persist on page reload.
-        self.go_to_page(page_name)
-        submit = self.get_submit()
-        self.assertIn('Resubmit', submit.get_attribute('outerHTML'), 'Resubmit')
+        self.assertIn('Submit', submit.get_attribute('outerHTML'))
+        # ^ Note that in previous versions, this text would change to "Resubmit",
+        # but we removed that functionality in v1.2.2
 
     @unpack
     @data(*scenarios)