Merge pull request #43 from edx/will/fix-template-path

Will/fix template path

apps/openassessment/xblock/static/html/oa_base.html → apps/openassessment/templates/oa_base.html

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

apps/openassessment/xblock/openassessmentblock.py

@@ -270,7 +270,7 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse
             "grade_state": grade_state,
         }
 
-        template = get_template("static/html/oa_base.html")
+        template = get_template("oa_base.html")
         context = Context(context_dict)
         frag = Fragment(template.render(context))
         frag.add_css(load("static/css/openassessment.css"))
@@ -372,7 +372,6 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse
             (Response): A Response Object with the generated HTML fragment. This
                 is intended for AJAX calls to load dynamically into a larger
                 document.
-
         """
         if not context_dict:
             context_dict = {}

apps/openassessment/xblock/peer_assessment_mixin.py

@@ -71,7 +71,7 @@ class PeerAssessmentMixin(object):
         if assessment:
             peer_sub = self.get_peer_submission(self.get_student_item_dict(), assessment)
             context_dict = {"peer_submission": peer_sub}
-        return self.render_assessment('static/html/oa_peer_assessment.html', context_dict)
+        return self.render_assessment('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('static/html/oa_self_assessment.html')
+        return self.render_assessment('oa_self_assessment.html')
 

apps/openassessment/xblock/submission_mixin.py

@@ -120,6 +120,6 @@ class SubmissionMixin(object):
         Generates the submission HTML for the first section of an Open
         Assessment XBlock. See OpenAssessmentBlock.render_assessment() for
         more information on rendering XBlock sections.
-
         """
         return self.render_assessment('static/html/oa_response.html')
+        return self.render_assessment('oa_response.html')

settings/base.py

@@ -140,6 +140,7 @@ INSTALLED_APPS = (
     # edx-tim apps
     'submissions',
     'openassessment.peer',
+    'openassessment',
 )
 
 # A sample logging configuration. The only tangible logging