Iniital work for new UI

This commit is contained in:
Shane Frischkorn 2014-02-19 16:10:57 +10:00
parent d72dbdd9b2
commit ef96af8d46
168 changed files with 27011 additions and 67 deletions

View file

@ -2,67 +2,62 @@
{% load dajaxice_templatetags %}
<html>
<head>
<title>{% block title %}3D Sample Viewer{% endblock %}</title>
<head>
<meta charset="UTF-8">
<title>3DVOL - 3D Virtual Object Library</title>
<link href="{% static "three_d_viewer/css/styles.css" %}" rel="stylesheet" media="screen" />
<script type="text/javascript" src="{% static "three_d_viewer/js/jquery.min.js" %}"></script>
<script type='text/javascript' src="{% static "three_d_viewer/js/menu_jquery.js.js" %}"></script>
</head>
{% block includes %}
<link href="{% static "three_d_viewer/css/bootstrap.css" %}" rel="stylesheet" media="screen" />
<link href="{% static "three_d_viewer/css/custom.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 %}
</head>
<body onload={% block loadscript %}""{% endblock %}>
<div class="my-fluid-container">
<div class="page-header">
{% block pageheader %}
<h1>Three-D Virtual Object Library</h1>
<p class="lead">3DVOL</p>
{% endblock %}
</div>
<div class="row my-fluid-container">
<div class="col-sm-3">
{% block sidebar %}
<div class="row">
{% include "three_d_viewer/sampletree.html" %}
</div>
{% endblock %}
</div>
<div id="contentdiv" class="col-sm-9" height="100%">
<div class="row">
{% block content %}
<p><h3>Welcome to 3DVOL Minerals.</h3><br><br>
This website contains a three-dimensional virtual object library of the most important rock-forming minerals making up planet Earth. You will find information on:<br>
<ul>
<li>Which are the most common minerals on Earth?</li>
<li>What are their most important physical and chemical properties?</li>
<li>Where in the Earth and under which physical conditions do they form?</li>
<li>How can they be identified in hand specimen?</li>
</ul>
A mineral is typically defined as an inorganic solid with a particular chemical composition and a characteristic, periodic atomic structure.
This characteristic atomic make-up is often reflected in the macroscopic crystalline structure of a mineral.
The 3D models presented on this website will help you to visualise, study, and memorise these beautiful and often
complex crystal structures as well as other diagnostic features of minerals.
<br>
We hope that you enjoy using 3DVOL.
<br><br>
Your 3DVOL team
<br><br>
Acknowledgements
<br>
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.
</p>
{% endblock %}
</div>
<div class="row">
{% block details %}
{% endblock details %}
</div>
</div>
</div>
</div>
</body>
</html>
<body>
<div id="wrapper">
<div id="container">
<div id="header">
<div id="logo">
<p>3D VOL</p>
</div><!-- CLOSE LOGO !-->
<div id="menuContainer">
<div id='cssmenu'>
<ul>
<li class='active mainitem'><a href='home.html'><span>Home</span></a></li>
<li class='has-sub mainitem'><a href='#'><span>Minerals</span></a>
<ul>
<li class='has-sub'><a href='minerals_theory.html'><span>Theory</span></a>
<ul>
<li><a href='minerals_theory.html#structureofearth'><span>Structure of Earth</span></a></li>
<li><a href='minerals_theory.html#pressureandtemp'><span>Pressure and temperature</span></a></li>
<li class='last'><a href='minerals_theory.html#bowensreactionseries'><span>Bowen's reaction series</span></a></li>
</ul>
</li>
<li><a href='minerals_practice.html'><span>Practice</span></a></li>
<li class='last'><a href='minerals_selftest.html'><span>Self Test</span></a></li>
</ul>
</li>
<li class="mainitem"><a href='#'><span>Rocks</span></a></li>
<li class='last mainitem'><a href='#'><span>Fossils</span></a></li>
</ul>
</div><!-- CLOSE CSSMENU !-->
</div><!-- CLOSE MENUCONTAINER !-->
</div><!-- HEADER !-->
<div id="content">
<div id="pushDown"></div>
<div id="mainText">
<p>Line of placeholder text for introduction to 3DVOL</p>
<p>Line of placeholder text</p>
<p>Line of placeholder text</p>
<p>Line of placeholder text</p>
<p>Line of placeholder text</p>
</div><!-- CLOSE MAINTEXT !-->
</div><!-- CLOSE CONTENT !-->
</div><!-- CLOSE CONTAINER !-->
<div id="push"></div><!-- CLOSE PUSH !-->
</div><!-- CLOSE WRAPPER !-->
<div id="footer">
<ul>
<li><a href="#">Glossary</a></li>
<li>&nbsp; - &nbsp;</li>
<li><a href="#">Acknowledgements</a></li>
</ul>
</div><!-- CLOSE FOOTER !-->
</body>