Iniital work for new UI

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

View File

@@ -0,0 +1,881 @@
@charset "UTF-8";
/* RESETS & CUSTOM FONT DECLARATIONS */
* {
margin: 0;
padding: 0;
}
@font-face {
font-family: 'quicksandbold';
src: url('fonts/qcksnd-bold-webfont.eot');
src: url('fonts/qcksnd-bold-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/qcksnd-bold-webfont.woff') format('woff'),
url('fonts/qcksnd-bold-webfont.ttf') format('truetype'),
url('fonts/qcksnd-bold-webfont.svg#quicksandbold') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'quicksandbold_italic';
src: url('fonts/qcksnd-bolditalic-webfont.eot');
src: url('fonts/qcksnd-bolditalic-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/qcksnd-bolditalic-webfont.woff') format('woff'),
url('fonts/qcksnd-bolditalic-webfont.ttf') format('truetype'),
url('fonts/qcksnd-bolditalic-webfont.svg#quicksandbold_italic') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'quicksanddash';
src: url('fonts/qcksnd-dash-webfont.eot');
src: url('fonts/qcksnd-dash-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/qcksnd-dash-webfont.woff') format('woff'),
url('fonts/qcksnd-dash-webfont.ttf') format('truetype'),
url('fonts/qcksnd-dash-webfont.svg#quicksanddash') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'quicksanditalic';
src: url('fonts/qcksnd-italic-webfont.eot');
src: url('fonts/qcksnd-italic-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/qcksnd-italic-webfont.woff') format('woff'),
url('fonts/qcksnd-italic-webfont.ttf') format('truetype'),
url('fonts/qcksnd-italic-webfont.svg#quicksanditalic') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'quicksandlight';
src: url('fonts/qcksnd-light-webfont.eot');
src: url('fonts/qcksnd-light-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/qcksnd-light-webfont.woff') format('woff'),
url('fonts/qcksnd-light-webfont.ttf') format('truetype'),
url('fonts/qcksnd-light-webfont.svg#quicksandlight') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'quicksandlight_italic';
src: url('fonts/qcksnd-lightitalic-webfont.eot');
src: url('fonts/qcksnd-lightitalic-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/qcksnd-lightitalic-webfont.woff') format('woff'),
url('fonts/qcksnd-lightitalic-webfont.ttf') format('truetype'),
url('fonts/qcksnd-lightitalic-webfont.svg#quicksandlight_italic') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'quicksandregular';
src: url('fonts/qcksnd-regular-webfont.eot');
src: url('fonts/qcksnd-regular-webfont.eot?#iefix') format('embedded-opentype'),
url('fonts/qcksnd-regular-webfont.woff') format('woff'),
url('fonts/qcksnd-regular-webfont.ttf') format('truetype'),
url('fonts/qcksnd-regular-webfont.svg#quicksandregular') format('svg');
font-weight: normal;
font-style: normal;
}
/* GENERAL STRUCTURE */
html, body {
height: 100%;
}
body {
background-image:url('images/background_tile_lightest.jpg');
background-repeat: repeat;
background-attachment: scroll;
}
#wrapper {
min-height: 100%;
height: auto !important;
height: 100%;
margin: 0 auto -55px; /* the bottom margin is the negative value of the footer's height */
}
#footer, #push {
height: 55px; /* .push must be the same height as .footer */
clear: both;
}
#footer {
width: 100%;
margin-left: auto;
background-color: #CCCCCC;
z-index: 900;
}
#footer ul {
list-style-type: none;
text-align: center;
padding: 15px 20px;
}
#footer li {
display: inline;
text-align: center;
font-family: 'quicksandbold', Helvetica, sans-serif;
font-size: 14px;
font-weight: bold;
color: #7a8189;
text-transform: uppercase;
}
#footer a {
text-decoration: none;
display: inline;
text-align: center;
font-family: 'quicksandbold', Helvetica, sans-serif;
font-size: 14px;
font-weight: bold;
color: #7a8189;
text-transform: uppercase;
}
#footer a:hover {
text-decoration: none;
display: inline;
text-align: center;
font-family: 'quicksandbold', Helvetica, sans-serif;
font-size: 14px;
font-weight: bold;
color: #FFFFFF;
text-transform: uppercase;
-webkit-transition: color 0.25s ease-out;
-moz-transition: color 0.25s ease-out;
-ms-transition: color 0.25s ease-out;
-o-transition: color 0.25s ease-out;
transition: color 0.25s ease-out;
}
#container {
width: 100%;
height:91.2vh;
background-image:url('images/background_tile_lightest.jpg');
background-repeat: repeat;
background-attachment: scroll;
}
#header {
width: 100%;
height: auto;
}
#logo {
width: 20%;
height: 44px;
background-color: #FFFFFF;
text-align: center;
float: left;
}
#logo p {
padding-top: 5%;
}
#menuContainer {
width: 80%;
height: auto;
float: right;
}
#mainText {
width: 70%;
padding-left:7px;
margin-left: auto;
margin-right: auto;
background: rgb(255, 255, 255);
/* RGBa with 0.6 opacity */
background: rgba(255, 255, 255, 0.5);
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)";
}
#sidebar {
width: 20%;
height: auto;
float: left;
}
#virtualObject {
width: 80%;
height: auto;
float: right;
}
#mineralOne,
#mineralTwo,
#mineralThree,
#mineralFour,
#mineralFive {
float: left;
width: 100%;
padding-left: 5px;
padding-top: 5px;
}
#pushDown {
width: 100%;
padding-bottom: 40vh;
}
#pushDownTwo {
width: 100%;
padding-bottom: 60px;
}
#pushDownThree {
width: 100%;
padding-bottom: 10px;
}
/* TEXT STYLES */
#mainText p {
font-size: 12pt;
font-family: 'quicksandregular', Helvetica, sans-serif;
line-height: 16pt;
text-align: left;
color: #000;
}
#mineralContainer p {
font-size: 12pt;
font-family: 'quicksandregular', Helvetica, sans-serif;
line-height: 16pt;
text-align: left;
color: #000;
}
h1.subHeadings {
font-size: 22pt;
font-family: 'quicksandbold', Helvetica, sans-serif;
text-transform: uppercase;
letter-spacing: 3px;
line-height: 26pt;
text-align: left;
padding-bottom: 5px;
color: #000;
}
h2.theoryHeadings {
font-size: 14pt;
font-family: 'quicksandbold', Helvetica, sans-serif;
line-height: 18pt;
text-align: left;
color: #000;
padding-top: 5px;
padding-bottom: 5px;
}
img.example {
width: 100%;
height: auto;
}
/* MENU SPECIFIC STYLES */
#cssmenu {
position: relative;
height: 44px;
background: #CCCCCC;
width: auto;
}
#cssmenu ul {
list-style: none;
padding: 0;
margin: 0;
line-height: 1;
}
#cssmenu > ul {
position: relative;
display: block;
background: #CCCCCC;
height: 32px;
width: 100%;
z-index: 500;
}
#cssmenu > ul > li {
display: block;
position: relative;
float: left;
margin: 0;
padding: 0;
}
#cssmenu > ul > li.mainitem { /*CUSTOM CLASS TEST*/
width: 25%;
}
#cssmenu > ul > #menu-button {
display: none;
}
#cssmenu ul li a {
display: block;
font-family: 'quicksandbold', Helvetica, sans-serif;
text-decoration: none;
}
#cssmenu > ul > li > a {
font-size: 14px;
font-weight: bold;
padding: 15px 20px;
color: #7a8189;
text-transform: uppercase;
-webkit-transition: color 0.25s ease-out;
-moz-transition: color 0.25s ease-out;
-ms-transition: color 0.25s ease-out;
-o-transition: color 0.25s ease-out;
transition: color 0.25s ease-out;
}
#cssmenu > ul > li.has-sub > a {
padding-right: 32px;
}
#cssmenu > ul > li:hover > a {
color: #ffffff;
}
#cssmenu li.has-sub::after {
display: block;
content: '';
position: absolute;
width: 0;
height: 0;
}
#cssmenu > ul > li.has-sub::after {
right: 10px;
top: 20px;
border: 5px solid transparent;
border-top-color: #7a8189;
}
#cssmenu > ul > li:hover::after {
border-top-color: #ffffff;
}
#indicatorContainer {
position: absolute;
height: 12px;
width: 100%;
bottom: 0px;
overflow: hidden;
z-index: -1;
}
#pIndicator {
position: absolute;
height: 0;
width: 100%;
border: 12px solid transparent;
border-top-color: #2b2f3a;
z-index: -2;
-webkit-transition: left .25s ease;
-moz-transition: left .25s ease;
-ms-transition: left .25s ease;
-o-transition: left .25s ease;
transition: left .25s ease;
}
#cIndicator {
position: absolute;
height: 0;
width: 100%;
border: 12px solid transparent;
border-top-color: #2b2f3a;
top: -12px;
right: 100%;
z-index: -2;
}
#cssmenu ul ul {
position: absolute;
left: -9999px;
top: 70px;
opacity: 0;
-webkit-transition: opacity .3s ease, top .25s ease;
-moz-transition: opacity .3s ease, top .25s ease;
-ms-transition: opacity .3s ease, top .25s ease;
-o-transition: opacity .3s ease, top .25s ease;
transition: opacity .3s ease, top .25s ease;
z-index: 1000;
}
#cssmenu ul ul ul {
top: 37px;
padding-left: 5px;
}
#cssmenu ul ul li {
position: relative;
}
#cssmenu > ul > li:hover > ul {
left: auto;
top: 44px;
opacity: 1;
}
#cssmenu ul ul li:hover > ul {
left: 170px;
top: 0;
opacity: 1;
}
#cssmenu ul ul li a {
width: 130px;
border-bottom: 1px solid #eee;
padding: 10px 20px;
font-size: 12px;
color: #9ea2a5;
background: #fff;
-webkit-transition: all .35s ease;
-moz-transition: all .35s ease;
-ms-transition: all .35s ease;
-o-transition: all .35s ease;
transition: all .35s ease;
}
#cssmenu ul ul li:hover > a {
background: #f6f6f6;
color: #8c9195;
}
#cssmenu ul ul li:last-child > a,
#cssmenu ul ul li.last > a {
border-bottom: 0;
}
.submenuArrow {
border: 6px solid transparent;
width: 0;
height: 0;
border-bottom-color: #fff;
position: absolute;
top: -12px;
}
#cssmenu ul ul li.has-sub::after {
border: 4px solid transparent;
border-left-color: #9ea2a5;
right: 10px;
top: 12px;
-moz-transition: all .2s ease;
-ms-transition: all .2s ease;
-o-transition: all .2s ease;
transition: all .2s ease;
-webkit-transition: -webkit-transform 0.2s ease, right 0.2s ease;
}
#cssmenu ul ul li.has-sub:hover::after {
border-left-color: #fff;
right: -5px;
-webkit-transform: rotateY(180deg);
-ms-transform: rotateY(180deg);
-moz-transform: rotateY(180deg);
-o-transform: rotateY(180deg);
transform: rotateY(180deg);
}
@media all and (max-width: 800px), only screen and (-webkit-min-device-pixel-ratio: 2) and (max-width: 1024px), only screen and (min--moz-device-pixel-ratio: 2) and (max-width: 1024px), only screen and (-o-min-device-pixel-ratio: 2/1) and (max-width: 1024px), only screen and (min-device-pixel-ratio: 2) and (max-width: 1024px), only screen and (min-resolution: 192dpi) and (max-width: 1024px), only screen and (min-resolution: 2dppx) and (max-width: 1024px) {
#cssmenu {
width: auto;
}
#cssmenu ul {
width: auto;
}
#cssmenu .submenuArrow,
#cssmenu #indicatorContainer {
display: none;
}
#cssmenu > ul {
height: auto;
display: block;
}
#cssmenu > ul > li {
float: none;
}
#cssmenu li,
#cssmenu > ul > li {
display: none;
}
#cssmenu ul ul,
#cssmenu ul ul ul,
#cssmenu ul > li:hover > ul,
#cssmenu ul ul > li:hover > ul {
position: relative;
left: auto;
top: auto;
opacity: 1;
padding-left: 0;
}
#cssmenu ul .has-sub::after {
display: none;
}
#cssmenu ul li a {
padding: 12px 20px;
}
#cssmenu ul ul li a {
border: 0;
background: none;
width: auto;
padding: 8px 35px;
}
#cssmenu ul ul li:hover > a {
background: none;
color: #8c9195;
}
#cssmenu ul ul ul a {
padding: 8px 50px;
}
#cssmenu ul ul ul ul a {
padding: 8px 65px;
}
#cssmenu ul ul ul ul ul a {
padding: 8px 80px;
}
#cssmenu ul ul ul ul ul ul a {
padding: 8px 95px;
}
#cssmenu > ul > #menu-button {
display: block;
cursor: pointer;
}
#cssmenu #menu-button > a {
padding: 14px 20px;
}
#cssmenu ul.open li,
#cssmenu > ul.open > li {
display: block;
}
#cssmenu > ul.open > li#menu-button > a {
color: #fff;
border-bottom: 1px solid rgba(150, 150, 150, 0.1);
}
#cssmenu #menu-button::after {
display: block;
content: '';
position: absolute;
height: 3px;
width: 22px;
border-top: 2px solid #7a8189;
border-bottom: 2px solid #7a8189;
right: 20px;
top: 15px;
}
#cssmenu #menu-button::before {
display: block;
content: '';
position: absolute;
height: 3px;
width: 22px;
border-top: 2px solid #7a8189;
right: 20px;
top: 25px;
}
#cssmenu ul.open #menu-button::after,
#cssmenu ul.open #menu-button::before {
border-color: #fff;
}
}
#mineralMenu {
position: relative;
height: 44px;
background: #CCCCCC;
width: auto;
}
#mineralMenu ul {
list-style: none;
padding: 0;
margin: 0;
line-height: 1;
}
#mineralMenu > ul {
position: relative;
display: block;
background: #CCCCCC;
height: 32px;
width: 100%;
z-index: 500;
}
#mineralMenu > ul > li {
display: block;
position: relative;
float: left;
margin: 0;
padding: 0;
}
/*CUSTOM CLASS TEST*/
#mineralMenu > ul > li.mainitem {
width: 100%;
}
#mineralMenu > ul > #menu-button {
display: none;
}
#mineralMenu ul li a {
display: block;
font-family: 'quicksandbold', Helvetica, sans-serif;
text-decoration: none;
}
#mineralMenu > ul > li > a {
font-size: 14px;
font-weight: bold;
padding: 15px 20px;
color: #7a8189;
text-transform: uppercase;
-webkit-transition: color 0.25s ease-out;
-moz-transition: color 0.25s ease-out;
-ms-transition: color 0.25s ease-out;
-o-transition: color 0.25s ease-out;
transition: color 0.25s ease-out;
}
#mineralMenu > ul > li.has-sub > a {
padding-right: 32px;
}
#mineralMenu > ul > li:hover > a {
color: #ffffff;
}
#mineralMenu li.has-sub::after {
display: block;
content: '';
position: absolute;
width: 0;
height: 0;
}
#mineralMenu > ul > li.has-sub::after {
right: 10px;
top: 20px;
border: 5px solid transparent;
border-top-color: #7a8189;
}
#mineralMenu > ul > li:hover::after {
border-top-color: #ffffff;
}
#indicatorContainer {
position: absolute;
height: 12px;
width: 100%;
bottom: 0px;
overflow: hidden;
z-index: -1;
}
#pIndicator {
position: absolute;
height: 0;
width: 100%;
border: 12px solid transparent;
border-top-color: #2b2f3a;
z-index: -2;
-webkit-transition: left .25s ease;
-moz-transition: left .25s ease;
-ms-transition: left .25s ease;
-o-transition: left .25s ease;
transition: left .25s ease;
}
#cIndicator {
position: absolute;
height: 0;
width: 100%;
border: 12px solid transparent;
border-top-color: #2b2f3a;
top: -12px;
right: 100%;
z-index: -2;
}
#mineralMenu ul ul {
position: absolute;
left: -9999px;
top: 70px;
opacity: 0;
-webkit-transition: opacity .3s ease, top .25s ease;
-moz-transition: opacity .3s ease, top .25s ease;
-ms-transition: opacity .3s ease, top .25s ease;
-o-transition: opacity .3s ease, top .25s ease;
transition: opacity .3s ease, top .25s ease;
z-index: 1000;
}
#mineralMenu ul ul ul {
top: 37px;
padding-left: 5px;
}
#mineralMenu ul ul li {
position: relative;
}
#mineralMenu > ul > li:hover > ul {
left: auto;
top: 44px;
opacity: 1;
}
#mineralMenu ul ul li:hover > ul {
left: 170px;
top: 0;
opacity: 1;
}
#mineralMenu ul ul li a {
width: 130px;
border-bottom: 1px solid #eee;
padding: 10px 20px;
font-size: 10px;
color: #9ea2a5;
background: #fff;
-webkit-transition: all .35s ease;
-moz-transition: all .35s ease;
-ms-transition: all .35s ease;
-o-transition: all .35s ease;
transition: all .35s ease;
}
#mineralMenu ul ul li:hover > a {
background: #f6f6f6;
color: #8c9195;
}
#mineralMenu ul ul li:last-child > a,
#mineralMenu ul ul li.last > a {
border-bottom: 0;
}
.submenuArrow {
border: 6px solid transparent;
width: 0;
height: 0;
border-bottom-color: #fff;
position: absolute;
top: -12px;
}
#mineralMenu ul ul li.has-sub::after {
border: 4px solid transparent;
border-left-color: #9ea2a5;
right: 10px;
top: 12px;
-moz-transition: all .2s ease;
-ms-transition: all .2s ease;
-o-transition: all .2s ease;
transition: all .2s ease;
-webkit-transition: -webkit-transform 0.2s ease, right 0.2s ease;
}
#mineralMenu ul ul li.has-sub:hover::after {
border-left-color: #fff;
right: -5px;
-webkit-transform: rotateY(180deg);
-ms-transform: rotateY(180deg);
-moz-transform: rotateY(180deg);
-o-transform: rotateY(180deg);
transform: rotateY(180deg);
}
@media all and (max-width: 800px), only screen and (-webkit-min-device-pixel-ratio: 2) and (max-width: 1024px), only screen and (min--moz-device-pixel-ratio: 2) and (max-width: 1024px), only screen and (-o-min-device-pixel-ratio: 2/1) and (max-width: 1024px), only screen and (min-device-pixel-ratio: 2) and (max-width: 1024px), only screen and (min-resolution: 192dpi) and (max-width: 1024px), only screen and (min-resolution: 2dppx) and (max-width: 1024px) {
#mineralMenu {
width: auto;
}
#mineralMenu ul {
width: auto;
}
#mineralMenu .submenuArrow,
#mineralMenu #indicatorContainer {
display: none;
}
#mineralMenu > ul {
height: auto;
display: block;
}
#mineralMenu > ul > li {
float: none;
}
#mineralMenu li,
#mineralMenu > ul > li {
display: none;
}
#mineralMenu ul ul,
#mineralMenu ul ul ul,
#mineralMenu ul > li:hover > ul,
#mineralMenu ul ul > li:hover > ul {
position: relative;
left: auto;
top: auto;
opacity: 1;
padding-left: 0;
}
#mineralMenu ul .has-sub::after {
display: none;
}
#mineralMenu ul li a {
padding: 12px 20px;
}
#mineralMenu ul ul li a {
border: 0;
background: none;
width: auto;
padding: 8px 35px;
}
#mineralMenu ul ul li:hover > a {
background: none;
color: #8c9195;
}
#mineralMenu ul ul ul a {
padding: 8px 50px;
}
#mineralMenu ul ul ul ul a {
padding: 8px 65px;
}
#mineralMenu ul ul ul ul ul a {
padding: 8px 80px;
}
#mineralMenu ul ul ul ul ul ul a {
padding: 8px 95px;
}
#mineralMenu > ul > #menu-button {
display: block;
cursor: pointer;
}
#mineralMenu #menu-button > a {
padding: 14px 20px;
}
#mineralMenu ul.open li,
#mineralMenu > ul.open > li {
display: block;
}
#mineralMenu > ul.open > li#menu-button > a {
color: #fff;
border-bottom: 1px solid rgba(150, 150, 150, 0.1);
}
#mineralMenu #menu-button::after {
display: block;
content: '';
position: absolute;
height: 3px;
width: 22px;
border-top: 2px solid #7a8189;
border-bottom: 2px solid #7a8189;
right: 20px;
top: 15px;
}
#mineralMenu #menu-button::before {
display: block;
content: '';
position: absolute;
height: 3px;
width: 22px;
border-top: 2px solid #7a8189;
/*right: 20px;
top: 25px;*/
}
#mineralMenu ul.open #menu-button::after,
#mineralMenu ul.open #menu-button::before {
border-color: #fff;
}
}

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,58 @@
$( document ).ready(function() {
$('#cssmenu').prepend('<div id="indicatorContainer"><div id="pIndicator"><div id="cIndicator"></div></div></div>');
var activeElement = $('#cssmenu>ul>li:first');
$('#cssmenu>ul>li').each(function() {
if ($(this).hasClass('active')) {
activeElement = $(this);
}
});
var posLeft = activeElement.position().left;
var elementWidth = activeElement.width();
posLeft = posLeft + elementWidth/2 -6;
if (activeElement.hasClass('has-sub')) {
posLeft -= 6;
}
$('#cssmenu #pIndicator').css('left', posLeft);
var element, leftPos, indicator = $('#cssmenu pIndicator');
$("#cssmenu>ul>li").hover(function() {
element = $(this);
var w = element.width();
if ($(this).hasClass('has-sub'))
{
leftPos = element.position().left + w/2 - 12;
}
else {
leftPos = element.position().left + w/2 - 6;
}
$('#cssmenu #pIndicator').css('left', leftPos);
}
, function() {
$('#cssmenu #pIndicator').css('left', posLeft);
});
$('#cssmenu>ul>.has-sub>ul').append('<div class="submenuArrow"></div>');
$('#cssmenu>ul').children('.has-sub').each(function() {
var posLeftArrow = $(this).width();
posLeftArrow /= 2;
posLeftArrow -= 12;
$(this).find('.submenuArrow').css('left', posLeftArrow);
});
$('#cssmenu>ul').prepend('<li id="menu-button"><a>Menu</a></li>');
$( "#menu-button" ).click(function(){
if ($(this).parent().hasClass('open')) {
$(this).parent().removeClass('open');
}
else {
$(this).parent().addClass('open');
}
});
});

View File

@@ -0,0 +1,68 @@
{% load static %}
{% load dajaxice_templatetags %}
<html>
<head>
<title>{% block title %}3D Sample Viewer{% endblock %}</title>
{% 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/Old/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>

View File

@@ -416,10 +416,10 @@ function resizeCanvas() {
{% block sidebar %}
<div class="row">
{% include "three_d_viewer/sampletree.html" %}
{% include "three_d_viewer/Old/sampletree.html" %}
</div>
<div class="row">
{% include "three_d_viewer/question.html" %}
{% include "three_d_viewer/Old/question.html" %}
</div>
{% endblock %}

View File

@@ -0,0 +1 @@
{% extends "three_d_viewer/base.html" %}

View File

@@ -12,7 +12,7 @@
<ul>
<ul class="nav nav-list tree">
{% for category in parent_categories %}
{% include "three_d_viewer/treenode.html" %}
{% include "three_d_viewer/Old/treenode.html" %}
{% endfor %}
</ul>
</ul>

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>

View File

@@ -1 +1,62 @@
{% extends "three_d_viewer/base.html" %}
<!doctype html>
<html>
<head>
<meta charset="UTF-8">
<title>3DVOL - 3D Virtual Object Library</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><!-- 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>
</html>

View File

@@ -0,0 +1,114 @@
<!doctype html>
<html>
<head>
<meta charset="UTF-8">
<title>3DVOL - Minerals/Practice</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>
<script>
$(document).ready(function(){
$('a').click(function () {
var divname= this.name;
$("#"+divname).show("slow").siblings().hide("slow");
});
});
</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='#'><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">
<div id="sidebar">
<div id='mineralMenu'>
<ul>
<li class="has-sub mainitem"><a href="#">Select a mineral</a>
<ul>
<li><a href='#mineralOne' name="mineralOne"><span>Mineral 1</span></a></li>
<li><a href='#mineralTwo' name="mineralTwo"><span>Mineral 2</span></a></li>
<li><a href='#mineralThree' name="mineralThree"><span>Mineral 3</span></a></li>
<li><a href='#mineralFour' name="mineralFour"><span>Mineral 4</span></a></li>
<li class="last"><a href='#mineralFive' name="mineralFive"><span>Mineral 5</span></a></li>
</ul>
</li>
</ul>
</div><!-- close MINERALMENU !-->
<div id="mineralContainer">
<div id="mineralOne" style="display:none">
<h1 class="subHeadings">Mineral name here</h1>
<h2 class="theoryHeadings">Physical properties</h2>
<p>Info about the mineral here</p>
<p>Info about the mineral here</p>
<p>Info about the mineral here</p>
<h2 class="theoryHeadings">Diagnostic features</h2>
<p>Info about the mineral here</p>
<p>Info about the mineral here</p>
<p>Info about the mineral here</p>
<h2 class="theoryHeadings">Geological significance</h2>
<p>Info about the mineral here</p>
<p>Info about the mineral here</p>
<p>Info about the mineral here</p>
</div>
<div id="mineralTwo" style="display:none">
<p>Info about mineral 2</p>
</div>
<div id="mineralThree" style="display:none">
<p>Info about mineral 3</p>
</div>
<div id="mineralFour" style="display:none">
<p>Info about mineral 4</p>
</div>
<div id="mineralFive" style="display:none">
<p>Info about mineral 5</p>
</div>
</div>
</div>
<div id="virtualObject">
<img src="images/rock_example.jpeg" class="example" />
</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>

View File

@@ -0,0 +1,66 @@
<!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">
<div id="pushDownTwo"></div>
<div id="mainText">
<h1 class="subHeadings">Self Test</h1>
<p>Line of placeholder text for explaining the self-test section.</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 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>

View File

@@ -0,0 +1,77 @@
<!doctype html>
<html>
<head>
<meta charset="UTF-8">
<title>3DVOL - Minerals/Theory</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" style="height:auto !important;">
<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='#'><span>Theory</span></a>
<ul>
<li><a href='#structureofearth'><span>Structure of Earth</span></a></li>
<li><a href='#pressureandtemp'><span>Pressure and temperature</span></a></li>
<li class='last'><a href='#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">
<div id="pushDownTwo"></div>
<div id="mainText">
<h1 class="subHeadings">Theory</h1>
<p>Text about the theory section</p>
<h2 class="theoryHeadings" id="structureofearth">Structure of Earth</h2>
<p>Line of placeholder text</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>
<p>Line of placeholder text</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><p>Line of placeholder text</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><p>Line of placeholder text</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><p>Line of placeholder text</p><p>Line of placeholder text</p><p>Line of placeholder text</p>
<h2 class="theoryHeadings" id="pressureandtemp">Pressure and temperature</h2>
<p>Line of placeholder text</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><p>Line of placeholder text</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><p>Line of placeholder text</p><p>Line of placeholder text</p><p>Line of placeholder text</p>
<h2 class="theoryHeadings" id="bowensreactionseries">Bowen's reaction series</h2>
<p>Line of placeholder text</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><p>Line of placeholder text</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><p>Line of placeholder text</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><p>Line of placeholder text</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><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>