From 34d8e295e940a4704abcaf598c60ee5b49fd9284 Mon Sep 17 00:00:00 2001
From: Shane Frischkorn <shanef@gmail.com>
Date: Sun, 20 Oct 2013 09:41:15 +1000
Subject: [PATCH] Fixed nesting in the tree menu

---
 db.sqlite3                                    | Bin 159744 -> 159744 bytes
 .../templates/three_d_viewer/sampletree.html  |   8 +-------
 .../templates/three_d_viewer/treenode.html    |  14 ++++++++++++++
 3 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 three_d_viewer/templates/three_d_viewer/treenode.html

diff --git a/db.sqlite3 b/db.sqlite3
index fab2c1b769480bdd005885bb586838b47bf6fa22..733e1f29369d37322d0a4fd60911f94315fd5573 100644
GIT binary patch
delta 733
zcmaiwF=!KE6vw}J-^F^DHZO&eAk}(Okw{7SzPsFA5=9IZi%6;B;@C*8NoW&exR|CO
zhPH@ZsuJV`CsA~AkYIu?1wki=4uTGXbt-~VDX2q3^<tM&g)aZ$z4!m|{{PyFR9lg5
z_rt=S{ll>EY<zslA6Ga}M0r9tBdQ)#&BpRll=(egm7whF>lx?{c~$vC<Gk`lt}k!w
zQ6}va&*#%w!;V!;C3~Who+>dzyTtNQBV+KH`p=E%5!o|3TTbqJdanJlkB6DM?FEB#
z#u}maN4nSJ+ax&X+k7s=y6@;=Itsf1<<3!^wH0RsVeF8et7fiD6bp7NS}soJC#S3C
z1TUDm?2OIqn0ZxdwGc-AH0TwaE(L}}?<ud~CVeYkKN*xrQUV-=A(e40%vqSn6;(@U
zW`diMcsw3842fT`(z(1<uv4X~Fq};lGFDnCrb_N4ay+m_=>LbHCG>d2&~#JPWNoCB
zD&%ZyhZ`cT*&&#H<oBRO@H4)`hd7TGo^JFq9gm&Z`e{dXx@s_89-vA1@A_}EvNQh)
zYBY$8PS=W?80)y`GB2VmQVD_`2{`xGU@8>E3c=Udzz29AZ(#*D@CUBp7hJ*@_!OVu
zU0lF9yw(bRhqKu2p#V~_qjJER`wcg`zPavq*mUWS(P^R(KG4%Iku#Zsb-CON9x^Dw
zw)$w(FMuDhO+;KJxQ@SY6~DUX_qb1_Akhw*3L+&yJ0cQ7#3mCe2SI2}j|n%GKZ*Cq
AeE<Le

delta 400
zcmYL@JxCj29LC@Oy%*z|^qv#U<VQ~;DB9?Imo!ud7Y8XNXpweS@hXYmn)o%vB$PU7
z6gk03EbSyHM{{&BQ0Q7ZbSeeoC`c`WbTH7Klgl&xp5OCiD@wMaY&TM_*fc=Pr=z1~
zEv^gEXZH4)@owX3uMp1na!jalu!EsaZFtlY><D~wUg~E79}OoqUhVc&TX*haPG|Ke
zuaOaE2!9IFjaocum)m%Pc12aU2SG!v(-~_awzOt0B-5F=`OKI~rPFicnWQn9nqOa@
zO8H$El+bu6khA?db$KJh0XNr0x%aA!0>cHq;0Og+PQ7@IrhZcx(TE`;QSoqD#G*oo
zTDx#gSsuc^?XP&IdhrJK{xwavg^*|X3I~Tcz!vUsi)&n>jL$g6N9<t}dH2a5dV%7J
zX6OIWTmNs5|ACSx`2f2FDblPqD(v~>tTmTe(#Xfc3LCK|k~7w9dTep6q)DWKF(%`R
lp^6*)#g$k7g$5rd;*!i6@%xZDXG%#(E02l0t3%Q|{Xa0@byWZW

diff --git a/three_d_viewer/templates/three_d_viewer/sampletree.html b/three_d_viewer/templates/three_d_viewer/sampletree.html
index 8b18aa0..73c2feb 100644
--- a/three_d_viewer/templates/three_d_viewer/sampletree.html
+++ b/three_d_viewer/templates/three_d_viewer/sampletree.html
@@ -12,13 +12,7 @@
         <ul>
             <ul class="nav nav-list tree">
                 {% for category in parent_categories %}
-                    <li><label class="tree-toggle nav-header">{{ category.name }}</label>
-                        <ul class="nav nav-list tree">
-                            {% for sample in category.samples.all %}
-                                <li><a href="{% url 'three_d_viewer:detail' sample.id %}">{{ sample.name }}</a></li>
-                            {% endfor %}
-                        </ul>
-                    </li>
+                    {% include "three_d_viewer/treenode.html" %}
                 {% endfor %}
             </ul>
         </ul>
diff --git a/three_d_viewer/templates/three_d_viewer/treenode.html b/three_d_viewer/templates/three_d_viewer/treenode.html
new file mode 100644
index 0000000..2399ada
--- /dev/null
+++ b/three_d_viewer/templates/three_d_viewer/treenode.html
@@ -0,0 +1,14 @@
+<li><label class="tree-toggle nav-header">{{ category.name }}</label>
+    <ul class="nav nav-list tree">
+    {% for child in category.children.all %}
+        {% with category=child template_name="three_d_viewer/treenode.html" %}
+            <ul style="list-style: none;">
+                {% include template_name %}
+            </ul>
+        {%endwith%}
+    {% endfor %}
+    {% for sample in category.samples.all %}
+            <li><a href="{% url 'three_d_viewer:detail' sample.id %}">{{ sample.name }}</a></li>
+    {% endfor %}
+    </ul>
+</li>
\ No newline at end of file