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

Updated the database to add the new models to the webpage

Browse Source
This commit is contained in:
Shane Frischkorn
2013-11-12 11:19:20 +10:00
parent 6f7291c2f2
commit 46bdb9832d
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@
<title>{% block title %}3D Sample Viewer{% endblock %}</title>
{% block includes %}
<link href="{% static "three_d_viewer/css/bootstrap.min.css" %}" rel="stylesheet" media="screen" />
<link href="{% static "three_d_viewer/css/bootstrap.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 %}
@@ -30,7 +30,7 @@
{% endblock %}
</div>
<div class="col-md-8">
<div id="contentdiv" class="col-md-8" style="border:1px solid black" height="100%">
{% block content %}
<p>Put some intro text sort of stuff here</p>
{% endblock %}

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

@@ -372,6 +372,6 @@ function handleMouseMove(event){
{% endblock %}
{% block content %}
<canvas id="canvas" style="border: 1px dotted #bfbfbf;" width="640" height="480"></canvas>
<canvas id="canvas" style="border: 1px dotted #bfbfbf;"></canvas>
<div><br><span id="progress" style="color: red"></span></div>
{% endblock %}