From 46bdb9832d0c054223fae0c20d59d3c302a97781 Mon Sep 17 00:00:00 2001
From: Shane Frischkorn <shanef@gmail.com>
Date: Tue, 12 Nov 2013 11:19:20 +1000
Subject: [PATCH] Updated the database to add the new models to the webpage

---
 db.sqlite3                                    | Bin 159744 -> 159744 bytes
 .../static/three_d_viewer/css/bootstrap.css   |   3 +++
 .../templates/three_d_viewer/base.html        |   4 ++--
 .../templates/three_d_viewer/detail.html      |   2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/db.sqlite3 b/db.sqlite3
index 0103b0846883da9088cb53a9536b530846051e00..5d95e66e0a40c6fa2ae9188c94235d8a90090e45 100644
GIT binary patch
delta 2241
zcmah~TWl0n7@nEEbq4mFR*GCo>CzS!g-*|0cV-HPrBI8oTUuyqi-zoF+FiQ0?xih_
z$%65PCofId2YA335{wUql(-KBNmP<5BuLN@B8CDnJSg$PLn8+C%<NX0F3LW9n=|MC
zzyJHsod266v-FW!`n@`G=KVG8wi%-3?)tOgQ=e8*;4%RR!R6^1bROi76Gz=gmr_pr
z=cQLTolcq-Qo)h%5PvWe3GkBK%pv@1-r2r4(6LL6_j0?q=FINC-6=6R(W4Ld=sodx
zUtcGee6??+v%5R6KQ-cc9Sy}|dpIQ--no@WoY2B?EgbJcoQ7mgl2{cX5y^pYJX)Km
z*hkXT;Kfkwf()K#5w9wuG<EHwP({H91bhJJu>L!cp)D&&gD62w&s}x8mO1DS0y3c1
zxpwKsB|Ni*?x-r(xTqUd8_2!BqrKk4>O^>0AC|`_qsb927>uVviaMmGQn~Edcwk7G
zVjhVHfX(-I?zy4<{R86z{oRtEAB+#iUyJzreUrX;Uu5u5<dA<yB;K`S`0zk{7xEp7
z#C?;!hyC%M5#QA4leg*<y}9|ed3oWnh=L+dZ+SFht95{L1Z)CNU=hY)C%6gDfpfUy
zlVE+b#YaA`3sATT$P4Qxf@6u85)nkjGch_EjOpQED4HEpasr<~;%LlSEJD&(ZP6^9
z1&50qSYscs6Si+`$8AG4xAmU&l=V&PCd*%zE0zx|ozvabSEziaMiX9=tZ5}T&9_i`
zvz(ye_au5$UgRi-Q+uMR6fWr67f6IN*<?be+9QF)Fn*E>r1eCWRn#&Q?OepfYrM+x
zlBfv$Vy3)F)uNPAS5>5PnuJ(hP$eYcRHZu?NM|QmPbs|a8R3G+3LaHNhGtJ!EIJlV
z=twTbH&n*wH6HWxGRJvvg6zv>LdmgcR`*J!lyw!yf;35CWknGb6=xuCC>u>AV>o5;
zd3eSDq2O3a6$K>cF$eF9hSJGU3@csCv0W%}G(AIxD6yg-BV?SZus0SMj$)2Lrh;QD
zZ*su4itdpn<nbsfNESR4EpJbb>j`(p)uRV+Q^|yDpPr8D8I~()s5ot;Y68znih|D%
zYmnLlF?<_!9+fpOu7?y2YgQDGDj07^+@21E@{wpVl?-RZ){;m!x#;rXB!pO`DzYe0
zjM$z`49AjjJsrS>Ed4CbqDi=d#8nsB5-uf40(Kb-U-FZu*EN$FPo~40UD3?JotbQ4
zXvl@{w6V(MQhGX<(bMe9EoJ74CS(oaCRC*IN|~A4T-fF&mlscNAR`~wI-r|?ci<QB
zBlr%~VFz@>Dm>^9LE9_y8W(zmqH?k<gS8ef`K)af85RNx9k<EPEgHC9aLnSdhAvnK
zmqQ3?XaSGG9QYml41NN)v8`OkwfaGi%|eotW}<4MVxq@H*+j`i(L}*S-bBtsWMZq;
zLX)fkErs>JlDAiC;4}dqf(P&toQ5C56YyO)4oATEg%^J#x4FQ5a0mPVu7a<@m*4^@
zg0tWga2no&Kf)XE8Z<spFM<6AGh=FFOl^#*jWM+`rZ&dZ#+cd|QyXn+V@z#~sf}qh
zcr2`mEyX{dkW0vFJ3MB5OD@6h;Aij*JcbMAU_-s#Mzqo7f81|t@eHKisK&Xs2>1t_
zgLmP5_zS#+b7!F4ptstKcU!5(>NQJ&Ou#(c19H%Y`z*qZ-~^n7Ux5Qa#^KAsHqf-p
z;cTL5qBU*$Wrhu9;}zDq@&$);9Z3_bMoWH%W9%hsE9Cr?s|`FR?Dgboh^cT?U8poz
z29>ouWQ|UTa}(ZcS}^#=zP<3RpK4rYe`+c4JW*vt79RVlm96%te$@!d6hS<P<uNoU
zY{p!c*M&V@RN70|<Axem*OcX8w=-PTELV2ewbc%%8y9K#*FeqP`Bm}nE{b&h1A&J(
Aw*UYD

delta 716
zcmZ9HO=uHA6vt=McEcvkyfj8HZFQ1Z>qi>5o1|@Gk=A1Aq2GEj2(sO5o7GJsn+=6t
z>_HEnRDv#|2c?&K5(&5m(SlMhf>sbDNNJ6SUaX3jSi$P_LoCAZVBY)j|CnCpr<eKb
z^?2q+Lr=|B)KcF6D0%N8harI=QLGb&p^%u9y+TV^prRNLN8(W-6ct245DIVS!VIh+
zs4#F9ij_Am>fs!n2pq)g+FN_jDLOj&a&g4{nlF6$!I_H$(}H&`Qat|iWsQd;B?JMo
z4i==LkCaG>$-E$DiQuQcn4V6h+r!B=Eh3B3d3AhjY&@yOr1rK6rM1I|IxP$EfV(Ql
zT`}zxpJ66VoUJuzb~WSO*4+a*^}xeHFM^No9A@A$D9{Vd%)kq#a|!diTEp9YBC$|M
zILi9en!QW-Syd34O#3oZtP|#m+4L1Jd4gmO!8{b<KHPz8FbNmThHtpb0iR$I-osmX
z#o*h-T3g3XOln{j!7Ah5!DE<Zms?=Xg6*uEUCIc)Lj}sP0-xDs0j%;-o8P_1PVxvY
zK|fHEC%?!CVv$iY$_O8clNA&{f_dcYQ*?!@IhxC+6)KUNC~%0a1KqNrX0n=UC?VNM
zSO5EpW`58{kHHh<Z)9Noh%pt}L`L$GZcK?xIJTkS^SkV>4Tr$6CQYbWS(9>GTIRx_
z&7Y_qP-UHM)r{hEY>~blF8{e6uC}{kJdc{?Y-U1ZQFX~s&P}Ga^Y!f5ie~?iP47P0
z$nbrqQ>+?$5;c^ZL6b^O*42xKn$3jh2~A4TvA-jfmbA@$r=(0WXJj+h?;#tee*kIM
B-C_U$

diff --git a/three_d_viewer/static/three_d_viewer/css/bootstrap.css b/three_d_viewer/static/three_d_viewer/css/bootstrap.css
index bbda4ee..52d2d86 100644
--- a/three_d_viewer/static/three_d_viewer/css/bootstrap.css
+++ b/three_d_viewer/static/three_d_viewer/css/bootstrap.css
@@ -29,6 +29,8 @@ audio,
 canvas,
 video {
   display: inline-block;
+  /*width: 100%;
+  height: 100%;*/
 }
 
 audio:not([controls]) {
@@ -849,6 +851,7 @@ pre code {
   min-height: 1px;
   padding-right: 15px;
   padding-left: 15px;
+  height: 80%;
 }
 
 .col-xs-1,
diff --git a/three_d_viewer/templates/three_d_viewer/base.html b/three_d_viewer/templates/three_d_viewer/base.html
index 27b9d15..1364972 100644
--- a/three_d_viewer/templates/three_d_viewer/base.html
+++ b/three_d_viewer/templates/three_d_viewer/base.html
@@ -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 %}
diff --git a/three_d_viewer/templates/three_d_viewer/detail.html b/three_d_viewer/templates/three_d_viewer/detail.html
index 6ecd062..bdf2ce9 100644
--- a/three_d_viewer/templates/three_d_viewer/detail.html
+++ b/three_d_viewer/templates/three_d_viewer/detail.html
@@ -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 %}