shane/rockviewer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

BIN
db.sqlite3
View file

Binary file not shown.

3
three_d_viewer/static/three_d_viewer/css/bootstrap.css vendored
View file

@ -29,6 +29,8 @@ audio,
canvas, canvas,
video { video {
display: inline-block; display: inline-block;
/*width: 100%;
height: 100%;*/
} }
audio:not([controls]) { audio:not([controls]) {
@ -849,6 +851,7 @@ pre code {
min-height: 1px; min-height: 1px;
padding-right: 15px; padding-right: 15px;
padding-left: 15px; padding-left: 15px;
height: 80%;
} }
.col-xs-1, .col-xs-1,

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

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

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

@ -372,6 +372,6 @@ function handleMouseMove(event){
{% 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;"></canvas>
<div><br><span id="progress" style="color: red"></span></div> <div><br><span id="progress" style="color: red"></span></div>
{% endblock %} {% endblock %}