Finishing updates

three_d_viewer/templates/three_d_viewer/acknowledgements.html

@@ -5,7 +5,7 @@
     <div id="mainText">
         <h3 class="headings">Acknowledgements</h3><br><br>
 	<p>
-	3DVOL has been been developed by Shane Frischkorn, Andy Bates, Christoph Schrank, Mark Barry, Linda Nothdurft, and Luke Nothdurft.
+	3DVOL has been been developed by Shane Frischkorn, Andy Bates, Christoph Shrank, Mark Barry, Linda Nothdurft, and Luke Nothdurft.
 	</p>
 	<br /><br />
         <p>3DVOL is funded by the QUT Teaching and Learning Unit and the School of Earth, Environmental, and Biological Sciences. QUT High Performance Computing provides technical support.

three_d_viewer/templates/three_d_viewer/theory/bowen.html

@@ -7,12 +7,12 @@
         <h1 class="subHeadings">Theory</h1>
         <h2 class="theoryHeadings" id="bowensreactionseries">Bowen's Reaction Series</h2>
         <p>
-	Bowen's Reaction Series arranges the <a href="{% url silicates_theory %}"><span>silicate minerals</span></a> in the order that they crystallize from magma. The minerals at the 
+	Bowen's Reaction Series arranges the <a href="{% url 'three_d_viewer:theory_silicates' %}"><span>silicate minerals</span></a> in the order that they crystallize from magma. The minerals at the 
     top of the series crystallize from the melt at higher temperature than those lower down. It contains a continuous series, (right hand limb), a 
     discontinuous series (left hand limb), and the residual phases, which are listed in their relative sequence of crystallization. The discontinuous 
     series describes the sequence of minerals that crystallize as the temperature of the magma decreases. The discontinuity of each of the 
     crystallization sequences reflects the different melting/crystallization temperatures of the minerals, and the change in composition of the 
-    residual magma, as the early crystallizing phases are being fractionated from the melt. The continuous series always crystallizes <a href={% url url_extender|add:plag.url plag.id %}>plagioclase</a>, 
+    residual magma, as the early crystallizing phases are being fractionated from the melt. The continuous series always crystallizes <a href={% url 'three_d_viewer:'|add:plag.url plag.id %}>plagioclase</a>, 
     but the composition of the plagioclase changes from more calcic (i.e. anorthite) at higher temperatures to more sodic (i.e. albite) as the 
     temperature decreases. The compositional change during mineral growth can be recorded in compositional zoning of plagioclase 
     crystals. The minerals at the bottom of Bowen’s reaction series crystallize last and are more stable, 
@@ -23,7 +23,7 @@
     crystallize <a href={% url url_extender|add:quartz.url quartz.id %}>quartz</a>. Which minerals actually form, depend on many factors, such as the chemical composition of the melt, temperature, 
     pressure, and amount of fractional crystallization. For example, basalts form from the crystallization of 
     <a href={% url url_extender|add:olivine.url olivine.id %}>olivine</a>, 
-    <a href={% url url_extender|add:diopside.url diopside.id %}>pyroxene</a> and 
+    <a href={% url url_extenderadd:diopside.url diopside.id %}>pyroxene</a> and 
     calcic plagioclase, meaning that crystallization stopped without the series progressing. If more fractional crystallization 
     were to occur, more intermediate and felsic minerals can crystallize. 
             <br/>

three_d_viewer/templates/three_d_viewer/theory/classification.html

@@ -8,7 +8,7 @@
         <h2 class="theoryHeadings" id="classification">Classification of Minerals</h2>
         <p>
         The classification of minerals is based on their chemistry. The following mineral classes are based on the character of their common anions:</p>
-        <li><p><a href="{% url silicates_theory %}"><span>Silicates</span></a> (SiO<sub>4</sub><sup>4-</sup>)</p></li>
+        <li><p><a href="{% url 'three_d_viewer:theory_silicates' %}"><span>Silicates</span></a> (SiO<sub>4</sub><sup>4-</sup>)</p></li>
         <li><p>Oxides (O<sup>2-</sup>)</p></li>
         <li><p>Sulfides (S<sup>2-</sup>)</p></li>
         <li><p>Sulfates (SO<sub>4</sub><sup>2-</sup>)</p></li>
@@ -19,7 +19,7 @@
         <li><p>Native elements, e.g. Au.</p></li>
         <p><br />
         <img src="{% static "three_d_viewer/images/element abundance.png" %}" align="right" width="412" height="324">
-        The relative abundance of elements in the Earth’s crust (see <a href="{% url structure_theory %}"><span>Structure of Earth</span></a>) determines which minerals form. 
+        The relative abundance of elements in the Earth’s crust (see <a href="{% url 'three_d_viewer:theory_structure' %}"><span>Structure of Earth</span></a>) determines which minerals form. 
         Oxygen is the most abundant anion in the Earth’s crust. 
         Thus, the crust can be seen as a tight package of oxygen anions (O<sup>2-</sup>), which are bonded by larger cations, 
         such as Si<sup>4+</sup>, Mg<sup>2+</sup>, or Al<sup>3+</sup>.

three_d_viewer/templates/three_d_viewer/theory/structure.html

@@ -13,7 +13,7 @@
 	</figure>
     <br />
     <p>The Earth's structure is differentiated in three distinct layers: the core, mantle, and crust. The layers are distinguished 
-    by a change in the velocity of seismic waves at their boundaries. 
+    by a change in the velocity of seismic waves at their boundaries (? Seismic profile). 
     The crust is the upper most part of the earth, with 
     depths ranging from an average of 7 km in the oceans, to an average of 38 km in continental crust. The crust thickens underneath mountain 
     ranges, and can reach depths of 90 km underneath the Himalayas. The composition of the crust also differs between oceanic and continental 

three_d_viewer/views.py

@@ -291,9 +291,6 @@ class TheoryTemplateView(generic.TemplateView):
         context['plag'] = Mineral.objects.filter(name='Plagioclase')[0]
         context['diopside'] = Mineral.objects.filter(name='Diopside')[0]
         context['actinolite'] = Mineral.objects.filter(name='Actinolite')[0]
-        
-        context['silicates_theory'] = 'three_d_viewer:theory_silicates'
-        context['structure_theory'] = 'three_d_viewer:theory_structure'
         return context
  
 class ERB101TheoryTemplateView(generic.TemplateView):
@@ -307,8 +304,5 @@ class ERB101TheoryTemplateView(generic.TemplateView):
         context['plag'] = Mineral.objects.filter(name='Plagioclase')[0]
         context['diopside'] = Mineral.objects.filter(name='Diopside')[0]
         context['actinolite'] = Mineral.objects.filter(name='Actinolite')[0]
-        
-        context['silicates_theory'] = 'three_d_viewer:erb101_theory_silicates'
-        context['structure_theory'] = 'three_d_viewer:erb101_theory_structure'
         return context