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

Some bootstrapping

Browse Source
This commit is contained in:
Shane Frischkorn
2013-09-10 10:11:48 +10:00
parent 6057e403f6
commit 7f099bfca4
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,4 @@
{% load url from future %}
{% load static %}
{% load dajaxice_templatetags %}
@@ -5,11 +6,12 @@
<head>
<title>3D Sample Viewer</title>
<link href="{% static "three_d_viewer/css/bootstrap.css" %}" rel="stylesheet">
<link href="{% static "three_d_viewer/css/bootstrap.min.css" %}" rel="stylesheet" media="screen">
<script type="text/javascript" src="{% static "three_d_viewer/lzma.js" %}"></script>
<script type="text/javascript" src="{% static "three_d_viewer/ctm.js" %}"></script>
<script type="text/javascript" src="{% static "three_d_viewer/glMatrix-0.9.5.min.js" %}"></script>
<script type="text/javascript" src="{% static "three_d_viewer/jquery-2.0.3.js" %}"></script>
<script type="text/javascript" srv="{% static "three_d_viewer/js/bootstrap.min.js" %}"></script>
{% dajaxice_js_import %}
<script id="shader-vs" type="x-shader/x-vertex">
@@ -370,16 +372,14 @@ function my_callback(data){
</head>
<body onload="load();">
<div class="container">
<div class="page-header">
<h1>{{ sample.name }}</h1>
<p class="lead">{{ sample.description }}</p>
</div>
<center>
<canvas id="canvas" style="border: 1px dotted #bfbfbf;" width=933 height="700"></canvas>
<div><span id="progress" style="color: red"></span></br>
</div>
</center>
<div class="row">
<div class="col-md-4">
{% if sample.questions %}
{{ sample.questions.all.0 }}<br>
{% for answer in sample.questions.all.0.answers.all %}
@@ -387,7 +387,13 @@ function my_callback(data){
{% 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 %}
<body>
</div>
<div class="col-md-8">
<canvas id="canvas" <!--style="border: 1px dotted #bfbfbf;" width=933 height="700"--></canvas>
<div><br><span id="progress" style="color: red"></span></div>
</div>
</div>
</div
</body>
</html>