Work on new ui layout

This commit is contained in:
2014-02-20 15:21:50 +10:00
parent ef96af8d46
commit 8c05629d51
66 changed files with 11627 additions and 290 deletions

View File

@@ -1,43 +1,5 @@
<!doctype html>
<html>
<head>
<meta charset="UTF-8">
<title>3DVOL - Minerals/Self Test</title>
<link rel='stylesheet' type='text/css' href='styles.css' />
<script src='http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js'></script>
<script type='text/javascript' src='menu_jquery.js'></script>
</head>
<body>
<div id="wrapper">
<div id="container">
<div id="header">
<div id="logo">
<p>3D VOL</p>
</div>
<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>
</div>
<div id="content">
{% extends "three_d_viewer/base.html" %}
{% block content %}
<div id="pushDownTwo"></div>
<div id="mainText">
<h1 class="subHeadings">Self Test</h1>
@@ -48,19 +10,4 @@
<p>Line of placeholder text</p>
<div id="pushDownThree"></div>
</div>
</div>
</div>
<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>
</html>
{% endblock %}