From 6e75584d06f7954cf21abf4f9ef7edf9f6d497ee Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Fri, 30 Nov 2012 14:14:29 -0500 Subject: [PATCH] Convert templates to mako --- common/lib/capa/capa/responsetypes.py | 5 ++--- lms/templates/open_ended_error.html | 2 +- lms/templates/open_ended_feedback.html | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py index ec3f4763d5..56be2ae584 100644 --- a/common/lib/capa/capa/responsetypes.py +++ b/common/lib/capa/capa/responsetypes.py @@ -24,7 +24,6 @@ import os import subprocess import xml.sax.saxutils as saxutils from shapely.geometry import Point, MultiPoint -from django.template.loader import render_to_string # specific library imports from calc import evaluator, UndefinedVariable @@ -2079,9 +2078,9 @@ class OpenEndedResponse(LoncapaResponse): feedback=self._convert_longform_feedback_to_html(response_items) if not response_items['success']: - return render_to_string("open_ended_error.html", {'errors' : feedback}) + return self.system.render_template("open_ended_error.html", {'errors' : feedback}) - feedback_template=render_to_string("open_ended_feedback.html",{ + feedback_template=self.system.render_template("open_ended_feedback.html",{ 'grader_type' : response_items['grader_type'], 'score' : response_items['score'], 'feedback' : feedback, diff --git a/lms/templates/open_ended_error.html b/lms/templates/open_ended_error.html index fb3698ccd3..58a90f86ef 100644 --- a/lms/templates/open_ended_error.html +++ b/lms/templates/open_ended_error.html @@ -6,7 +6,7 @@
- {{errors}} + ${errors}
\ No newline at end of file diff --git a/lms/templates/open_ended_feedback.html b/lms/templates/open_ended_feedback.html index 2dc8f555f6..cb90006456 100644 --- a/lms/templates/open_ended_feedback.html +++ b/lms/templates/open_ended_feedback.html @@ -2,15 +2,15 @@
Feedback
-

Score: {{score}}

- {% if grader_type == "ML" %} +

Score: ${score}

+ % if grader_type == "ML":

Check below for full feedback:

- {% endif %} + % endif
- {% autoescape off %} {{feedback}} {% endautoescape %} + ${ feedback | n}
\ No newline at end of file