shane/rockviewer
1
0
Fork 0
Code Issues 1 Pull Requests Releases 2 Wiki Activity

Moved multiple choice questions to their own template

Browse Source
This commit is contained in:
Shane Frischkorn
2013-09-15 20:17:45 +10:00
parent e5233f24cb
commit 64f90d5075
2 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
three_d_viewer/templates/three_d_viewer/detail.html
View File

@@ -1,14 +1,12 @@
{% extends "three_d_viewer/base.html" %} {% extends "three_d_viewer/base.html" %}
{% load static %} {% load static %}
{% load dajaxice_templatetags %}
{% block includes %} {% block includes %}
{{ block.super }} {{ block.super }}
<script type="text/javascript" src="{% static "three_d_viewer/js/lzma.js" %}"></script> <script type="text/javascript" src="{% static "three_d_viewer/js/lzma.js" %}"></script>
<script type="text/javascript" src="{% static "three_d_viewer/js/ctm.js" %}"></script> <script type="text/javascript" src="{% static "three_d_viewer/js/ctm.js" %}"></script>
<script type="text/javascript" src="{% static "three_d_viewer/js/glMatrix-0.9.5.min.js" %}"></script> <script type="text/javascript" src="{% static "three_d_viewer/js/glMatrix-0.9.5.min.js" %}"></script>
{% dajaxice_js_import %}
<script id="shader-vs" type="x-shader/x-vertex"> <script id="shader-vs" type="x-shader/x-vertex">
attribute vec3 aVertexPosition; attribute vec3 aVertexPosition;
@@ -354,42 +352,26 @@ function handleMouseMove(event){
lastMouseY = newY; lastMouseY = newY;
} }
} }
function my_callback(data){
var message = "Incorrect";
if (data.result){
message = 'Correct';
}
alert(message);
}
</script> </script>
{% endblock %} {% endblock %}
{% block loadscript %}"load();"{% endblock %} {% block loadscript %}"load();"{% endblock %}
{% block pageheader %} {% block pageheader %}
<h1>{{ sample.name }}</h1> <h1>{{ sample.name }}</h1>
<p class="lead">{{ sample.description }}</p> <p class="lead">{{ sample.description }}</p>
{% endblock %} {% endblock %}
{% block sidebar %} {% block sidebar %}
<div class="row"> <div class="row">
{% include "three_d_viewer/sampletree.html" %} {% include "three_d_viewer/sampletree.html" %}
</div>
<div class="row">
<div class="well">
{% if sample.questions %}
{{ sample.questions.all.0 }}<br>
{% for answer in sample.questions.all.0.answers.all %}
<input type="radio" name="answer" value={{answer.id}}>{{ answer}}</input><br>
{% endfor %}
<input type="button" onclick="Dajaxice.three_d_viewer.check_answer(my_callback, {'answerid':$('input:radio[name=answer]:checked').val(), 'questionid':{{ sample.questions.all.0.id }}})" value="Get message from server!" />
{% endif %}
</div> </div>
</div> <div class="row">
{% include "three_d_viewer/question.html" %}
</div>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<canvas id="canvas" style="border: 1px dotted #bfbfbf;" width="640" height="480"></canvas> <canvas id="canvas" style="border: 1px dotted #bfbfbf;" width="640" height="480"></canvas>
<div><br><span id="progress" style="color: red"></span></div> <div><br><span id="progress" style="color: red"></span></div>
{% endblock %} {% endblock %}

23
three_d_viewer/templates/three_d_viewer/question.html Normal file
View File

@@ -0,0 +1,23 @@
{% load dajaxice_templatetags %}
{% dajaxice_js_import %}
<script type="text/javascript">
function my_callback(data)
{
var message = "Incorrect";
if (data.result){
message = 'Correct';
}
alert(message);
}
</script>
{% if sample.questions.all %}
<div class="well">
{{ sample.questions.all.0 }}<br>
{% for answer in sample.questions.all.0.answers.all %}
<input type="radio" name="answer" value={{answer.id}}>{{ answer}}</input><br>
{% endfor %}
<input type="button" onclick="Dajaxice.three_d_viewer.check_answer(my_callback, {'answerid':$('input:radio[name=answer]:checked').val(), 'questionid':{{ sample.questions.all.0.id }}})" value="Get message from server!" />
</div>
{% endif %}