Commit 4a2ace3a by Sola Committed by Piotr Mitros

implementing mustache templates

parent 4d6cf7a8
...@@ -55,6 +55,7 @@ class CrowdsourceHinter(XBlock): ...@@ -55,6 +55,7 @@ class CrowdsourceHinter(XBlock):
""" """
html = self.resource_string("static/html/crowdsourcehinter.html") html = self.resource_string("static/html/crowdsourcehinter.html")
frag = Fragment(html.format(self=self)) frag = Fragment(html.format(self=self))
frag.add_javascript_url('//cdnjs.cloudflare.com/ajax/libs/mustache.js/0.8.1/mustache.min.js')
frag.add_css(self.resource_string("static/css/crowdsourcehinter.css")) frag.add_css(self.resource_string("static/css/crowdsourcehinter.css"))
frag.add_javascript(self.resource_string("static/js/src/crowdsourcehinter.js")) frag.add_javascript(self.resource_string("static/js/src/crowdsourcehinter.js"))
frag.initialize_js('CrowdsourceHinter') frag.initialize_js('CrowdsourceHinter')
......
<script type="x-tmpl-mustache" id="show_hint_feedback"> <script type="x-tmpl-mustache" id="show_hint_feedback">
<div class="hint_value" value={{hint}}> <div class="hint_value" value={{hintvalue}}>
<div role="button" class="rate_hint" data-rate="upvote" data-icon="arrow-u" aria-label="upvote"> <div role="button" class="rate_hint" data-rate="upvote" data-icon="arrow-u" aria-label="upvote">
<b></b> <b></b>
</div> </div>
...@@ -13,6 +13,13 @@ ...@@ -13,6 +13,13 @@
</div> </div>
</div> </div>
</script> </script>
<script type="text/template" id="testing">
<div>
{{testone}}
{{testtwo}}
</div>
</script>
<div class="crowdsourcehinter_block"> <!--most stuff just for testing purposes--> <div class="crowdsourcehinter_block"> <!--most stuff just for testing purposes-->
<p> <span class='HintsToUse'></span> <p> <span class='HintsToUse'></span>
...@@ -28,7 +35,21 @@ ...@@ -28,7 +35,21 @@
<div class="feedback"> <div class="feedback">
<script type="x-tmpl-mustache" id="show_hint_feedback">
<div class="hint_value" value={{hintvalue}}>
<div role="button" class="rate_hint" data-rate="upvote" data-icon="arrow-u" aria-label="upvote">
<b></b>
</div>
<div role="button" class="rate_hint" data-rate="flag" data-icon="flag" aria-label="flag">
<b>!</b>
</div>
<div class ="rating"> {{rating}} </div>
<div class="hint"> {{hint}} </div>
<div role="button" class="rate_hint" data-rate="downvote" aria-label="downvote">
<b></b>
</div>
</div>
</script>
</div> </div>
<p> <p>
......
...@@ -17,6 +17,7 @@ function CrowdsourceHinter(runtime, element){ ...@@ -17,6 +17,7 @@ function CrowdsourceHinter(runtime, element){
//read the data from the problem_graded event here //read the data from the problem_graded event here
function get_event_data(event_type, data, element){ function get_event_data(event_type, data, element){
console.log("is this still changing");
onStudentSubmission(data); onStudentSubmission(data);
} }
Logger.listen('problem_graded', null, get_event_data); Logger.listen('problem_graded', null, get_event_data);
...@@ -72,12 +73,18 @@ function CrowdsourceHinter(runtime, element){ ...@@ -72,12 +73,18 @@ function CrowdsourceHinter(runtime, element){
//This appended div includes upvote/downvote/flagging buttons, the hint, and the hint's rating //This appended div includes upvote/downvote/flagging buttons, the hint, and the hint's rating
$(".student_answer", element).each(function(){ $(".student_answer", element).each(function(){
if ($(this).find("span").text() == result.student_answer){ if ($(this).find("span").text() == result.student_answer){
var template = $('#show_hint_feedback').html(); /*var template = $('#show_hint_feedback').html();
Mustache.parse(template);
var data = { var data = {
"hint": result.hint, hintvalue: "result.hint",
"rating": result.rating hint: "result.hint",
rating: "result.rating"
}; };
$(this).append(Mustache.to_html(template, data)); $(this).append(Mustache.render(template, data)); */
var template = $('#testing').html();
var data= {testone: "testing", testtwo: "TESTING"};
var html = Mustache.to_html(template, data);
$(this).html(html);
/**$(this).append(unescape("<div class=\"hint_value\" value = \"" + result.hint + "\">" + /**$(this).append(unescape("<div class=\"hint_value\" value = \"" + result.hint + "\">" +
"<div role=\"button\"class=\"rate_hint\"data-rate=\"upvote\" data-icon=\"arrow-u\" aria-label=\"upvote\"><b>↑</b></div>" + "<div role=\"button\"class=\"rate_hint\"data-rate=\"upvote\" data-icon=\"arrow-u\" aria-label=\"upvote\"><b>↑</b></div>" +
"<div role=\"button\" class=\"rate_hint\" data-rate=\"flag\" data-icon=\"flag\" aria-label=\"flag\"><b>!</b></div>"+ "<div role=\"button\" class=\"rate_hint\" data-rate=\"flag\" data-icon=\"flag\" aria-label=\"flag\"><b>!</b></div>"+
......
...@@ -3,23 +3,13 @@ crowdsourcehinter/__init__.py ...@@ -3,23 +3,13 @@ crowdsourcehinter/__init__.py
crowdsourcehinter/crowdsourcehinter.py crowdsourcehinter/crowdsourcehinter.py
crowdsourcehinter/static/README.txt crowdsourcehinter/static/README.txt
crowdsourcehinter/static/css/crowdsourcehinter.css crowdsourcehinter/static/css/crowdsourcehinter.css
crowdsourcehinter/static/css/crowdsourcehinter.css~
crowdsourcehinter/static/css/crowdxblock.css~
crowdsourcehinter/static/html/crowdsourcehinter.html crowdsourcehinter/static/html/crowdsourcehinter.html
crowdsourcehinter/static/html/crowdsourcehinter.html~
crowdsourcehinter/static/html/crowdsourcehinterstudio.html crowdsourcehinter/static/html/crowdsourcehinterstudio.html
crowdsourcehinter/static/html/crowdsourcehinterstudio.html~
crowdsourcehinter/static/html/crowdxblock.html~
crowdsourcehinter/static/js/src/crowdsourcehinter.js crowdsourcehinter/static/js/src/crowdsourcehinter.js
crowdsourcehinter/static/js/src/crowdsourcehinter.js~ crowdsourcehinter/static/js/src/crowdsourcehinter.js~
crowdsourcehinter/static/js/src/crowdxblock.js~
crowdsourcehinter_xblock.egg-info/PKG-INFO crowdsourcehinter_xblock.egg-info/PKG-INFO
crowdsourcehinter_xblock.egg-info/PKG-INFO~
crowdsourcehinter_xblock.egg-info/SOURCES.txt crowdsourcehinter_xblock.egg-info/SOURCES.txt
crowdsourcehinter_xblock.egg-info/SOURCES.txt~
crowdsourcehinter_xblock.egg-info/dependency_links.txt crowdsourcehinter_xblock.egg-info/dependency_links.txt
crowdsourcehinter_xblock.egg-info/entry_points.txt crowdsourcehinter_xblock.egg-info/entry_points.txt
crowdsourcehinter_xblock.egg-info/entry_points.txt~
crowdsourcehinter_xblock.egg-info/requires.txt crowdsourcehinter_xblock.egg-info/requires.txt
crowdsourcehinter_xblock.egg-info/top_level.txt crowdsourcehinter_xblock.egg-info/top_level.txt
crowdsourcehinter_xblock.egg-info/top_level.txt~ \ No newline at end of file
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment