- templates simplified using a base question and blocks for each type of answer.

Miguel Barão
1 parent c68f0ced
Showing 6 changed files with 72 additions and 104 deletions Show diff stats
serve.py
templates/learn.html
templates/question-checkbox.html
templates/question-radio.html
templates/question-text.html
templates/question-textarea.html
@@ -130,19 +130,9 @@ class LearnHandler(BaseHandler):
 # ----------------------------------------------------------------------------
 # respond to AJAX to get a JSON question
 class QuestionHandler(BaseHandler):
-    # @tornado.web.authenticated
-    # def get(self):
-    #     question = self.application.learn.next_question()
-    #     print('---> question.get')
-    #     print(question)
-    #     if question['type'] == 'checkbox':
-    #         self.render('question-checkbox.html',
-    #             question=question,
-    #             md=md,
-    #             )
-
-    #     else:
-    #         self.write('Error!!!')
+    @tornado.web.authenticated
+    def get(self):
+        self.redirect('/')
     @tornado.web.authenticated
     def post(self):
@@ -189,12 +179,6 @@ class QuestionHandler(BaseHandler):
             'correct': correct,
             })
-        # if question['type'] == 'checkbox':
-        #     self.render('question-checkbox.html',
-        #         question=question, # the dictionary with the question??
-        #         md=md,  # passes function that renders markdown to html
-        #         )
-
 # ----------------------------------------------------------------------------
 def main():
@@ -100,7 +100,41 @@ $.fn.extend({
     }
 });
+// function getCookie(name) {
+//     var r = document.cookie.match("\\b" + name + "=([^;]*)\\b");
+//     return r ? r[1] : undefined;
+// }
+
+// jQuery.postJSON = function(url, args, callback) {
+//     args._xsrf = getCookie("_xsrf");
+//     alert(args);
+//     $.ajax({url: url, data: $.param(args), dataType: "text", type: "POST",
+//         success: function(response) {
+//         callback(eval("(" + response + ")"));
+//     }});
+// }
+
 function getQuestion() {
+    // var data = $("#question_form").serialize();
+    // $.postJSON('/question', data, function(response){
+    //         $("#question_div").html(response["html"]);
+    //         MathJax.Hub.Queue(["Typeset",MathJax.Hub,"question"]);
+
+    //         if (response["correct"]) {
+    //             $('#question_div').animateCSS('pulse');
+    //         }
+    //         else {
+    //             $('#question_div').animateCSS('shake');
+    //         }
+
+    //         $("input:text").bind("keypress", function (e) {
+    //             if (e.keyCode == 13) {
+    //                 e.preventDefault();
+    //                 getQuestion();
+    //             }
+    //         });
+    //     });
+
     $.ajax({
         type: "POST",
         url: "/question",
+{% extends "question.html" %}
 {% autoescape %}
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <!-- <h3 id="title"> -->
-            {{ question['title'] }}
-        <!-- </h3> -->
+{% block answer %}
+<fieldset data-role="controlgroup">
+    <div class="list-group">
+    {% for n,opt in enumerate(question['options']) %}
+            <a class="list-group-item">
+                <input type="checkbox" id="{{ n }}" name="answer" value="{{ n }}">
+                {{ opt }}
+            </a>
+    {% end %}
     </div>
-    <div class="panel-body">
-
-        <div id="text">
-        {{ md(question['text']) }}
-        </div>
-
-        <fieldset data-role="controlgroup">
-            <div class="list-group">
-            {% for n,opt in enumerate(question['options']) %}
-                    <a class="list-group-item">
-                        <input type="checkbox" id="{{ n }}" name="answer" value="{{ n }}">
-                        {{ opt }}
-                    </a>
-            {% end %}
-            </div>
-        </fieldset>
-    </div>
-</div>
+</fieldset>
+{% end %}
 \ No newline at end of file
+{% extends "question.html" %}
 {% autoescape %}
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <!-- <h3 id="title"> -->
-            {{ question['title'] }}
-        <!-- </h3> -->
+{% block answer %}
+<fieldset data-role="controlgroup">
+    <div class="list-group">
+    {% for n,opt in enumerate(question['options']) %}
+            <a class="list-group-item">
+                <input type="radio" id="{{ n }}" name="answer" value="{{ n }}">
+                {{ md(opt) }}
+            </a>
+    {% end %}
     </div>
-
-    <div class="panel-body">
-
-        <div id="text">
-        {{ md(question['text']) }}
-        </div>
-
-        <fieldset data-role="controlgroup">
-            <div class="list-group">
-            {% for n,opt in enumerate(question['options']) %}
-                    <a class="list-group-item">
-                        <input type="radio" id="{{ n }}" name="answer" value="{{ n }}">
-                        {{ md(opt) }}
-                    </a>
-            {% end %}
-            </div>
-        </fieldset>
-
-    </div>
-</div>
 \ No newline at end of file
+</fieldset>
+{% end %}
 \ No newline at end of file
-{% autoescape %}
+{% extends "question.html" %}
-
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <!-- <h3 id="title"> -->
-            {{ question['title'] }}
-        <!-- </h3> -->
-    </div>
-
-    <div class="panel-body">
-
-        <div id="text">
-        {{ md(question['text']) }}
-        </div>
-
-        <fieldset data-role="controlgroup">
-            <input type="text" class="form-control" id="answer" name="answer" value="">
-        </fieldset>
-    </div>
-</div>
+{% block answer %}
+<fieldset data-role="controlgroup">
+    <input type="text" class="form-control" id="answer" name="answer" value="">
+</fieldset>
+{% end %}
 \ No newline at end of file
+{% extends "question.html" %}
 {% autoescape %}
-
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <!-- <h3 id="title"> -->
-            {{ question['title'] }}
-        <!-- </h3> -->
-    </div>
-
-    <div class="panel-body">
-        <div id="text">
-            {{ md(question['text']) }}
-        </div>
-
-        <textarea class="form-control" rows="{{ question['lines'] }}" name="answer"></textarea><br />
-        <input type="hidden" name="question_ref" value="{{ question['ref'] }}">
-    </div>
-</div>
+{% block answer %}
+<textarea class="form-control" rows="{{ question['lines'] }}" name="answer"></textarea><br />
+<input type="hidden" name="question_ref" value="{{ question['ref'] }}">
+{% end %}
 \ No newline at end of file
	@@ -130,19 +130,9 @@ class LearnHandler(BaseHandler):		@@ -130,19 +130,9 @@ class LearnHandler(BaseHandler):
130	# ----------------------------------------------------------------------------	130	# ----------------------------------------------------------------------------
131	# respond to AJAX to get a JSON question	131	# respond to AJAX to get a JSON question
132	class QuestionHandler(BaseHandler):	132	class QuestionHandler(BaseHandler):
133	- # @tornado.web.authenticated
134	- # def get(self):
135	- # question = self.application.learn.next_question()
136	- # print('---> question.get')
137	- # print(question)
138	- # if question['type'] == 'checkbox':
139	- # self.render('question-checkbox.html',
140	- # question=question,
141	- # md=md,
142	- # )
143	-
144	- # else:
145	- # self.write('Error!!!')	133	+ @tornado.web.authenticated
		134	+ def get(self):
		135	+ self.redirect('/')
146		136
147	@tornado.web.authenticated	137	@tornado.web.authenticated
148	def post(self):	138	def post(self):
	@@ -189,12 +179,6 @@ class QuestionHandler(BaseHandler):		@@ -189,12 +179,6 @@ class QuestionHandler(BaseHandler):
189	'correct': correct,	179	'correct': correct,
190	})	180	})
191		181
192	- # if question['type'] == 'checkbox':
193	- # self.render('question-checkbox.html',
194	- # question=question, # the dictionary with the question??
195	- # md=md, # passes function that renders markdown to html
196	- # )
197	-
198		182
199	# ----------------------------------------------------------------------------	183	# ----------------------------------------------------------------------------
200	def main():	184	def main():
	@@ -100,7 +100,41 @@ $.fn.extend({		@@ -100,7 +100,41 @@ $.fn.extend({
100	}	100	}
101	});	101	});
102		102
		103	+// function getCookie(name) {
		104	+// var r = document.cookie.match("\\b" + name + "=([^;]*)\\b");
		105	+// return r ? r[1] : undefined;
		106	+// }
		107	+
		108	+// jQuery.postJSON = function(url, args, callback) {
		109	+// args._xsrf = getCookie("_xsrf");
		110	+// alert(args);
		111	+// $.ajax({url: url, data: $.param(args), dataType: "text", type: "POST",
		112	+// success: function(response) {
		113	+// callback(eval("(" + response + ")"));
		114	+// }});
		115	+// }
		116	+
103	function getQuestion() {	117	function getQuestion() {
		118	+ // var data = $("#question_form").serialize();
		119	+ // $.postJSON('/question', data, function(response){
		120	+ // $("#question_div").html(response["html"]);
		121	+ // MathJax.Hub.Queue(["Typeset",MathJax.Hub,"question"]);
		122	+
		123	+ // if (response["correct"]) {
		124	+ // $('#question_div').animateCSS('pulse');
		125	+ // }
		126	+ // else {
		127	+ // $('#question_div').animateCSS('shake');
		128	+ // }
		129	+
		130	+ // $("input:text").bind("keypress", function (e) {
		131	+ // if (e.keyCode == 13) {
		132	+ // e.preventDefault();
		133	+ // getQuestion();
		134	+ // }
		135	+ // });
		136	+ // });
		137	+
104	$.ajax({	138	$.ajax({
105	type: "POST",	139	type: "POST",
106	url: "/question",	140	url: "/question",
		1	+{% extends "question.html" %}
1	{% autoescape %}	2	{% autoescape %}
2		3
3	-<div class="panel panel-default">
4	- <div class="panel-heading">
5	- <!-- <h3 id="title"> -->
6	- {{ question['title'] }}
7	- <!-- </h3> -->	4	+{% block answer %}
		5	+<fieldset data-role="controlgroup">
		6	+ <div class="list-group">
		7	+ {% for n,opt in enumerate(question['options']) %}
		8	+ <a class="list-group-item">
		9	+ <input type="checkbox" id="{{ n }}" name="answer" value="{{ n }}">
		10	+ {{ opt }}
		11	+ </a>
		12	+ {% end %}
8	</div>	13	</div>
9	- <div class="panel-body">
10	-
11	- <div id="text">
12	- {{ md(question['text']) }}
13	- </div>
14	-
15	- <fieldset data-role="controlgroup">
16	- <div class="list-group">
17	- {% for n,opt in enumerate(question['options']) %}
18	- <a class="list-group-item">
19	- <input type="checkbox" id="{{ n }}" name="answer" value="{{ n }}">
20	- {{ opt }}
21	- </a>
22	- {% end %}
23	- </div>
24	- </fieldset>
25	- </div>
26	-</div>	14	+</fieldset>
		15	+{% end %}
27	\ No newline at end of file	16	\ No newline at end of file
1	-{% autoescape %}	1	+{% extends "question.html" %}
2		2
3	-
4	-<div class="panel panel-default">
5	- <div class="panel-heading">
6	- <!-- <h3 id="title"> -->
7	- {{ question['title'] }}
8	- <!-- </h3> -->
9	- </div>
10	-
11	- <div class="panel-body">
12	-
13	- <div id="text">
14	- {{ md(question['text']) }}
15	- </div>
16	-
17	- <fieldset data-role="controlgroup">
18	- <input type="text" class="form-control" id="answer" name="answer" value="">
19	- </fieldset>
20	- </div>
21	-</div>	3	+{% block answer %}
		4	+<fieldset data-role="controlgroup">
		5	+ <input type="text" class="form-control" id="answer" name="answer" value="">
		6	+</fieldset>
		7	+{% end %}
22	\ No newline at end of file	8	\ No newline at end of file