Merge pull request #193 from edx/talbs/template-turbowaiter

Turbo Waiting Template

apps/openassessment/templates/openassessmentblock/peer/oa_peer_complete.html

 {%  extends "openassessmentblock/peer/oa_peer_assessment.html" %}
 
 {% block list_item %}
-<li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment is--empty is--complete is--collapsed">
+<li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment ui-toggle-visibility is--empty is--complete is--collapsed">
 {% endblock %}
 
 {% block title %}

apps/openassessment/templates/openassessmentblock/peer/oa_peer_turbo_mode.html

 {%  extends "openassessmentblock/peer/oa_peer_assessment.html" %}
 
 {% block list_item %}
-<li id="openassessment__peer-assessment"class="openassessment__steps__step step--peer-assessment ui-toggle-visibility is--complete is--collapsed">
+<li id="openassessment__peer-assessment"class="openassessment__steps__step step--peer-assessment ui-toggle-visibility is--complete">
 {% endblock %}
 
 {% block title %}
@@ -117,4 +117,3 @@
     </div>
 </div>
 {% endblock %}
-

apps/openassessment/templates/openassessmentblock/peer/oa_peer_turbo_mode_waiting.html

+{%  extends "openassessmentblock/peer/oa_peer_assessment.html" %}
+
+{% block list_item %}
+<li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment ui-toggle-visibility is--complete">
+{% endblock %}
+
+{% block title %}
+<span class="step__status">
+  <span class="step__status__label">This step's status:</span>
+  <span class="step__status__value">
+    <span class="copy">
+      Complete
+      (<span class="step__status__value--completed">{{ graded }}</span>)
+    </span>
+    <i class="ico icon-ok"></i>
+  </span>
+</span>
+{% endblock %}
+
+{% block body %}
+<div class="ui-toggle-visibility__content">
+    <div class="wrapper--step__content">
+
+        <div class="step__message message message--complete">
+            <h3 class="message__title">Congratulations!</h3>
+            <div class="message__content">
+              <p>You have successfully completed all of the peer assessment that you have been asked to do for this step. If you would like to continue providing feedback to your peers you may do so here, but it will not influence your final grade.</p>
+
+              <p><strong>Currently there are no responses for you to assess. This should change momentarily. Check back shortly to provide feedback on more of your peers' responses.</strong></p>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}

apps/openassessment/templates/openassessmentblock/peer/oa_peer_waiting.html

@@ -25,7 +25,7 @@
             <h3 class="message__title">Waiting for more peer responses</h3>
 
             <div class="message__content">
-              <p>There are currently no responses for you to assess. This should change momentarily. Check back shortly to continue completing this problem. One this and all other steps are completed, you will receive a grade.</p>
+              <p>There are currently no responses for you to assess. This should change momentarily. Check back shortly to continue completing this problem. Once this and all other steps are completed, you will receive a grade.</p>
             </div>
         </div>
     </div>

apps/openassessment/xblock/peer_assessment_mixin.py

@@ -168,7 +168,7 @@ class PeerAssessmentMixin(object):
                 path = 'openassessmentblock/peer/oa_peer_turbo_mode.html'
                 context_dict["peer_submission"] = peer_sub
             else:
-                path = 'openassessmentblock/peer/oa_peer_waiting.html'
+                path = 'openassessmentblock/peer/oa_peer_turbo_mode_waiting.html'
         elif workflow.get("status") == "done" or finished:
             path = "openassessmentblock/peer/oa_peer_complete.html"
 

apps/openassessment/xblock/static/sass/oa/views/_oa-base.scss

@@ -30,6 +30,14 @@
       @extend %copy-3;
       color: $copy-secondary-color;
 
+      p {
+        margin-bottom: ($baseline-v/2);
+
+        &:last-child {
+          @extend %wipe-last-child;
+        }
+      }
+
       a {
         @extend %link-copy;
       }