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

Organising files

Browse Source
This commit is contained in:
Shane Frischkorn
2013-09-14 22:52:59 +10:00
parent 7d83685d2c
commit db9780699b
11 changed files with 10046 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
three_d_viewer/templates/three_d_viewer/base.html
View File

@@ -5,12 +5,14 @@
<head>
<title>{% block title %}3D Sample Viewer{% endblock %}</title>
<link href="{% static "three_d_viewer/css/bootstrap.min.css" %}" rel="stylesheet" media="screen">
<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>
{% block includes %}
<link href="{% static "three_d_viewer/css/bootstrap.min.css" %}" rel="stylesheet" media="screen" />
<script type="text/javascript" src="{% static "three_d_viewer/js/jquery-2.0.3.js" %}"></script>
<script type="text/javascript" src="{% static "three_d_viewer/js/bootstrap.min.js" %}"></script>
{% endblock %}
</head>
<body onload={% block loadscript %}"load();"{% endblock %}>
<body onload={% block loadscript %}""{% endblock %}>
<div class="container">
<div class="page-header">
{% block pageheader %}

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

@@ -1,17 +1,13 @@
{% load url from future %}
{% extends "three_d_viewer/base.html" %}
{% load static %}
{% load dajaxice_templatetags %}
<html>
<head>
<title>3D Sample Viewer</title>
<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>
{% block includes %}
{{ 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/ctm.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">
@@ -129,9 +125,9 @@ function webGLStart(){
mat4.identity(rotationMatrix);
canvas.onmousedown = handleMouseDown;
document.onmouseup = handleMouseUp;
document.onmousemove = handleMouseMove;
document.onmousewheel = handleMouseWheel;
canvas.onmouseup = handleMouseUp;
canvas.onmousemove = handleMouseMove;
canvas.onmousewheel = handleMouseWheel;
window.addEventListener("DOMMouseScroll", handleMouseWheel, false);
@@ -366,40 +362,34 @@ function my_callback(data){
}
alert(message);
}
</script
</script>
{% endblock %}
</head>
{% block loadscript %}"load();"{% endblock %}
<body onload="load();">
<div class="container">
<div class="page-header">
<h1>{{ sample.name }}</h1>
<p class="lead">{{ sample.description }}</p>
</div>
{% block pageheader %}
<h1>{{ sample.name }}</h1>
<p class="lead">{{ sample.description }}</p>
{% endblock %}
<div class="row">
<div class="col-md-4">
<div class="row">
{% 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="col-md-8">
<canvas id="canvas"></canvas>
<div><br><span id="progress" style="color: red"></span></div>
</div>
</div>
</div
</body>
{% block sidebar %}
<div class="row">
{% 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>
{% endblock %}
</html>
{% block content %}
<canvas id="canvas" style="border: 1px dotted #bfbfbf;" width="640" height="480"></canvas>
<div><br><span id="progress" style="color: red"></span></div>
{% endblock %}