Initial changes to add an erb101 area of the site

three_d_viewer/templates/three_d_viewer/base.html

@@ -18,12 +18,15 @@
 <div id="container">
 	<div id="header">
         <div id="logo">
-		<img src={% static "three_d_viewer/images/logo_main.png" %} class="logoImage">
+		<a href="{% url 'three_d_viewer:home' %}"><img src={% static "three_d_viewer/images/logo_main.png" %} class="logoImage"></a>
         </div><!-- CLOSE LOGO !-->
     	<div id="menuContainer">
             <div id='cssmenu'>
             <ul>
+               {% block home %}
                <li class='active mainitem'><a href="{% url 'three_d_viewer:home' %}"><span>Home</span></a></li>
+               <li class='active mainitem'><a href="{% url 'three_d_viewer:erb101_home' %}"><span>ERB101</span></a></li>
+               {% endblock %}
                <li class='has-sub mainitem'><a href='#'><span>Minerals</span></a>
                   <ul>
                      <li class='has-sub'><a><span>Theory</span></a>
@@ -33,12 +36,12 @@
                            <li class='last'><a href="{% url 'three_d_viewer:theory_bowen' %}"><span>Bowen's reaction series</span></a></li>
                         </ul>
                      </li>
-                     <li><a href="{% url 'three_d_viewer:minerals_practice' %}"><span>Practice</span></a></li>
+                     {% block mineral_practice %}<li><a href="{% url 'three_d_viewer:minerals_practice' %}"><span>Practice</span></a></li>{% endblock %}
                      <!--<li class='last'><a href="{% url 'three_d_viewer:minerals_selftest' %}"><span>Self Test</span></a></li>!-->
                   </ul>
                </li>
-               <li class="mainitem"><a href="{%  url 'three_d_viewer:rocks_practice' %}"><span>Rocks</span></a></li>
-               <li class='last mainitem'><a href="{%  url 'three_d_viewer:fossil_practice' %}"><span>Fossils</span></a></li>
+               {% block rock_practice %}<li class="mainitem"><a href="{%  url 'three_d_viewer:rocks_practice' %}"><span>Rocks</span></a></li>{% endblock %}
+               {% block fossil_menu %}<li class='last mainitem'><a href="{%  url 'three_d_viewer:fossil_practice' %}"><span>Fossils</span></a></li>{% endblock %}
             </ul>
             </div><!-- CLOSE CSSMENU !-->
     </div><!-- CLOSE MENUCONTAINER !-->

three_d_viewer/templates/three_d_viewer/erb101/base.html

@@ -0,0 +1,17 @@
+{% extends "three_d_viewer/base.html" %}
+
+{% block home %}
+<li class='active mainitem'><a href="{% url 'three_d_viewer:erb101_home' %}"><span>ERB101 Home</span></a></li>
+{% endblock %}
+
+{% block mineral_practice %}
+<li><a href="{% url 'three_d_viewer:erb101_minerals_practice' %}"><span>Practice</span></a></li>
+{% endblock %}
+
+
+{% block rock_practice %}
+<li class="mainitem"><a href="{%  url 'three_d_viewer:erb101_rocks_practice' %}"><span>Rocks</span></a></li>
+{% endblock %}
+
+{% block fossil_menu %}
+{% endblock %}

three_d_viewer/templates/three_d_viewer/erb101/home.html

@@ -0,0 +1,11 @@
+{% extends "three_d_viewer/erb101/base.html" %}
+
+{% block content %}
+<div id="pushDownTwo"></div>
+<div id="mainText">
+    <h3 class="headings">ERB101 home page</h3><br><br>
+    <p>
+    blah blah blah
+    </p>
+</div>
+{% endblock %}

three_d_viewer/templates/three_d_viewer/erb101/rock_practice.html

@@ -0,0 +1,3 @@
+{% extends "three_d_viewer/rock_practice.html" %}
+
+{% block base %}{% extends "three_d_viewer/erb101/base.html" %}{% endblock %}

three_d_viewer/templates/three_d_viewer/practice_internals.html

@@ -0,0 +1,21 @@
+{% block content %}
+<div id="sidebar">
+    <div id='mineralMenu'>
+        <ul>
+            <li class="has-sub mainitem"><a href="#">{%  block menu_header %}Select a sample{%  endblock %}</a>
+            <ul>
+                {% for sample in active_samples %}
+                    <li><a href={% url sample.url sample.id %}>{{ sample.name }}</a></li>
+                {% endfor %}
+            </ul>
+            </li>
+        </ul>
+    </div><!-- close MINERALMENU !-->
+    {% block sample_detail %}
+    {% endblock %}
+</div>
+
+{% block 3dcontent %}
+{%  endblock %}
+
+{% endblock %}

three_d_viewer/templates/three_d_viewer/sample_practice.html

@@ -1,4 +1,4 @@
-{% extends "three_d_viewer/base.html" %}
+{% extends base_template %}
 
 {% block content %}
 <div id="sidebar">