Merge branch 'master' into sanchez/TIM-171-Submission-UI

Conflicts:
	apps/openassessment/xblock/peer_assessment_mixin.py
	apps/openassessment/xblock/submission_mixin.py

apps/openassessment/templates/oa_base.html → apps/openassessment/templates/openassessmentblock/oa_base.html

@@ -75,6 +75,6 @@
         </ol>
 
         <!-- STATUS: problem grade -->
-        {% include "oa_grade.html" %}
+        {% include "openassessmentblock/oa_grade.html" %}
     </div>
 </div>

apps/openassessment/xblock/openassessmentblock.py

@@ -272,7 +272,7 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse
             "grade_state": grade_state,
         }
 
-        template = get_template("oa_base.html")
+        template = get_template("openassessmentblock/oa_base.html")
         context = Context(context_dict)
         frag = Fragment(template.render(context))
         frag.add_css(load("static/css/openassessment.css"))

apps/openassessment/xblock/peer_assessment_mixin.py

@@ -75,7 +75,7 @@ class PeerAssessmentMixin(object):
                 "rubric_instructions": self.rubric_instructions,
                 "rubric_criteria": self.rubric_criteria
             }
-        return self.render_assessment('oa_peer_assessment.html', context_dict)
+        return self.render_assessment('openassessmentblock/oa_peer_assessment.html', context_dict)
 
     def get_peer_submission(self, student_item_dict, assessment):
         peer_submission = False

apps/openassessment/xblock/self_assessment_mixin.py

@@ -16,5 +16,5 @@ class SelfAssessmentMixin(object):
 
     @XBlock.handler
     def render_self_assessment(self, data, suffix=''):
-        return self.render_assessment('oa_self_assessment.html')
+        return self.render_assessment('openassessmentblock/oa_self_assessment.html')
 

apps/openassessment/xblock/submission_mixin.py

-import datetime
 from xblock.core import XBlock
 from submissions import api
-from openassessment.peer import api as peer_api
 
 
 class SubmissionMixin(object):
@@ -150,7 +148,7 @@ class SubmissionMixin(object):
             "step_status": step_status,
         }
 
-        path = "oa_response.html"
+        path = "openassessmentblock/oa_response.html"
         if student_score:
             assessments = peer_api.get_assessments(student_submission["uuid"])
             median_scores = peer_api.get_assessment_median_scores(
@@ -163,10 +161,10 @@ class SubmissionMixin(object):
             for criterion in context["rubric_criteria"]:
                 criterion["median_score"] = median_scores[criterion["name"]]
 
-            path = 'oa_response_graded.html'
+            path = 'openassessmentblock/oa_response_graded.html'
         elif student_submission:
             path = 'oa_response_submitted.html'
         elif due < datetime.datetime.now() and not student_submission:
-            path = 'oa_response_closed.html'
+            path = 'openassessmentblock/oa_response_closed.html'
 
         return self.render_assessment(path, context_dict=context)