shane/rockviewer
1
0
Fork 0
Code Issues 1 Pull Requests Releases 2 Wiki Activity

Style Changes

Browse Source
This commit is contained in:
Shane Frischkorn
2014-03-07 10:07:20 +10:00
parent d6b8f71d58
commit 3b8a2bac4a
14 changed files with 222 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

336
.idea/workspace.xml generated
View File

@@ -2,8 +2,17 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="56ba8ed1-8d88-44b6-a1d9-9818bc65c9ae" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/acknowledgements.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/acknowledgements.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/rockviewer.wsgi" afterPath="$PROJECT_DIR$/rockviewer.wsgi" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/bowen.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/bowen.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/glossary.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/glossary.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/home.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/home.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_theory.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_theory.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/structure.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/structure.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/static/three_d_viewer/css/styles.css" afterPath="$PROJECT_DIR$/three_d_viewer/static/three_d_viewer/css/styles.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/urls.py" afterPath="$PROJECT_DIR$/three_d_viewer/urls.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="rockviewer.iws" />
<ignored path=".idea/workspace.xml" />
@@ -31,7 +40,7 @@
<file leaf-file-name="rockviewer.wsgi" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/rockviewer.wsgi">
<provider selected="true" editor-type-id="text-editor">
<state line="4" column="70" selection-start="212" selection-end="212" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="204">
<state line="4" column="70" selection-start="212" selection-end="212" vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="204">
<folding />
</state>
</provider>
@@ -46,14 +55,32 @@
</provider>
</entry>
</file>
<file leaf-file-name="bowen.html" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/bowen.html">
<provider selected="true" editor-type-id="text-editor">
<state line="26" column="0" selection-start="2222" selection-end="2222" vertical-scroll-proportion="-17.0" vertical-offset="0" max-vertical-offset="544">
<folding>
<element signature="n#style#0;n#img#0;n#p#0;n#div#1;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="acknowledgements.html" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/acknowledgements.html">
<provider selected="true" editor-type-id="text-editor">
<state line="13" column="14" selection-start="582" selection-end="582" vertical-scroll-proportion="0.25" vertical-offset="0" max-vertical-offset="884">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="structure.html" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/structure.html">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="731">
<state line="35" column="14" selection-start="3090" selection-end="3090" vertical-scroll-proportion="-22.884615" vertical-offset="0" max-vertical-offset="731">
<folding>
<marker date="1393813347627" expanded="true" signature="136:3047" placeholder="..." />
<marker date="1393813347627" expanded="true" signature="273:2993" placeholder="..." />
<marker date="1393813347627" expanded="true" signature="2785:2989" placeholder="..." />
<element signature="n#style#0;n#img#0;n#figure#0;n#div#1;n#!!top" expanded="true" />
</folding>
</state>
</provider>
@@ -68,10 +95,19 @@
</provider>
</entry>
</file>
<file leaf-file-name="base.html" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html">
<file leaf-file-name="home.html" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/home.html">
<provider selected="true" editor-type-id="text-editor">
<state line="37" column="23" selection-start="1803" selection-end="1803" vertical-scroll-proportion="0.6447964" vertical-offset="59" max-vertical-offset="1122">
<state line="51" column="9" selection-start="3009" selection-end="3009" vertical-scroll-proportion="-33.346153" vertical-offset="0" max-vertical-offset="986">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="glossary.html" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/glossary.html">
<provider selected="true" editor-type-id="text-editor">
<state line="3" column="24" selection-start="86" selection-end="86" vertical-scroll-proportion="-1.9615384" vertical-offset="0" max-vertical-offset="357">
<folding />
</state>
</provider>
@@ -86,37 +122,10 @@
</provider>
</entry>
</file>
<file leaf-file-name="detail.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://C:/Envs/rockviewer/Lib/site-packages/django/views/generic/detail.py">
<provider selected="true" editor-type-id="text-editor">
<state line="109" column="0" selection-start="3875" selection-end="3875" vertical-scroll-proportion="0.0" vertical-offset="1478" max-vertical-offset="2941">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="base.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://C:/Envs/rockviewer/Lib/site-packages/django/template/base.py">
<provider selected="true" editor-type-id="text-editor">
<state line="781" column="0" selection-start="28536" selection-end="28536" vertical-scroll-proportion="0.0" vertical-offset="10080" max-vertical-offset="22423">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="__init__.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://C:/Envs/rockviewer/Lib/site-packages/django/conf/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state line="150" column="0" selection-start="5942" selection-end="5942" vertical-scroll-proportion="0.0" vertical-offset="2094" max-vertical-offset="3281">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="fossil_practice.html" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/fossil_practice.html">
<provider selected="true" editor-type-id="text-editor">
<state line="2" column="39" selection-start="92" selection-end="92" vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="136">
<state line="781" column="0" selection-start="28536" selection-end="28536" vertical-scroll-proportion="0.0" vertical-offset="13277" max-vertical-offset="22797">
<folding />
</state>
</provider>
@@ -129,7 +138,7 @@
<file leaf-file-name="urls.py" pinned="false" current="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/three_d_viewer/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state line="20" column="71" selection-start="1703" selection-end="1703" vertical-scroll-proportion="0.3104189" vertical-offset="0" max-vertical-offset="931">
<state line="9" column="0" selection-start="331" selection-end="331" vertical-scroll-proportion="0.10955961" vertical-offset="0" max-vertical-offset="931">
<folding />
</state>
</provider>
@@ -166,7 +175,6 @@
<list>
<option value="C:/Python27/Lib/site-packages/dajaxice/urls.py" />
<option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/detail.html" />
<option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/home.html" />
<option value="$PROJECT_DIR$/three_d_viewer/templates/sample_practice.html" />
<option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_practice.html" />
<option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/rock_practice.html" />
@@ -176,11 +184,17 @@
<option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/mineral_detail.html" />
<option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/fossil_detail.html" />
<option value="$PROJECT_DIR$/three_d_viewer/models.py" />
<option value="$PROJECT_DIR$/three_d_viewer/urls.py" />
<option value="$PROJECT_DIR$/three_d_viewer/views.py" />
<option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html" />
<option value="$PROJECT_DIR$/rockviewer.wsgi" />
<option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html" />
<option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/home.html" />
<option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/glossary.html" />
<option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_theory.html" />
<option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/structure.html" />
<option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/bowen.html" />
<option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/acknowledgements.html" />
<option value="$PROJECT_DIR$/three_d_viewer/urls.py" />
</list>
</option>
</component>
@@ -216,6 +230,7 @@
<sortByType />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -362,7 +377,6 @@
</PATH>
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -478,27 +492,7 @@
<option name="PARAMETERS" value="" />
<method />
</configuration>
<configuration default="true" type="Python.DjangoServer" factoryName="Django server">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<module name="rockviewer" />
<option name="launchJavascriptDebuger" value="false" />
<option name="port" value="8000" />
<option name="host" value="" />
<option name="additionalOptions" value="" />
<option name="browserUrl" value="" />
<option name="runTestServer" value="false" />
<option name="runNoReload" value="false" />
<option name="useCustomRunCommand" value="false" />
<option name="customRunCommand" value="" />
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug" singleton="true">
<method />
</configuration>
<configuration default="true" type="tests" factoryName="Unittests">
@@ -524,7 +518,27 @@
<option name="USE_PARAM" value="false" />
<method />
</configuration>
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug" singleton="true">
<configuration default="true" type="Python.DjangoServer" factoryName="Django server">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<module name="rockviewer" />
<option name="launchJavascriptDebuger" value="false" />
<option name="port" value="8000" />
<option name="host" value="" />
<option name="additionalOptions" value="" />
<option name="browserUrl" value="" />
<option name="runTestServer" value="false" />
<option name="runNoReload" value="false" />
<option name="useCustomRunCommand" value="false" />
<option name="customRunCommand" value="" />
<method />
</configuration>
<configuration default="true" type="tests" factoryName="Doctests">
@@ -642,14 +656,15 @@
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="2576" height="1576" extended-state="6" />
<editor active="true" />
<editor active="false" />
<layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32944608" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32963988" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2609375" sideWeight="0.6705539" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2609375" sideWeight="0.6705539" order="0" side_tool="false" content_ui="combo" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39889196" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -658,11 +673,10 @@
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
</layout>
</component>
<component name="Vcs.Log.UiProperties">
@@ -695,34 +709,6 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/sample_practice.html">
<provider selected="true" editor-type-id="text-editor">
<state line="6" column="107" selection-start="174" selection-end="228" vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="476">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_selftest.html">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="323">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/sample_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state line="74" column="0" selection-start="1859" selection-end="1859" vertical-scroll-proportion="0.0" vertical-offset="1258" max-vertical-offset="6987">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/rock_practice.html">
<provider selected="true" editor-type-id="text-editor">
<state line="2" column="51" selection-start="104" selection-end="104" vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="136">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html">
<provider selected="true" editor-type-id="text-editor">
<state line="40" column="80" selection-start="2035" selection-end="2035" vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1122">
@@ -732,16 +718,12 @@
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/mineral_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state line="32" column="40" selection-start="1034" selection-end="1034" vertical-scroll-proportion="0.0" vertical-offset="544" max-vertical-offset="1445">
<folding />
</state>
<state line="32" column="40" selection-start="1034" selection-end="1034" vertical-scroll-proportion="0.0" vertical-offset="544" max-vertical-offset="1445" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/rock_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state line="3" column="16" selection-start="84" selection-end="84" vertical-scroll-proportion="0.0" vertical-offset="51" max-vertical-offset="697">
<folding />
</state>
<state line="3" column="16" selection-start="84" selection-end="84" vertical-scroll-proportion="0.0" vertical-offset="51" max-vertical-offset="697" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/views.py">
@@ -755,19 +737,7 @@
<provider selected="true" editor-type-id="text-editor">
<state line="76" column="33" selection-start="2287" selection-end="2287" vertical-scroll-proportion="0.0" vertical-offset="1292" max-vertical-offset="2499">
<folding>
<element signature="e#62#90#0" expanded="true" />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
<element signature="e#62#90#0" expanded="false" />
</folding>
</state>
</provider>
@@ -831,9 +801,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/mineral_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state line="418" column="56" selection-start="11469" selection-end="11469" vertical-scroll-proportion="0.0" vertical-offset="7106" max-vertical-offset="7956">
<folding />
</state>
<state line="418" column="56" selection-start="11469" selection-end="11469" vertical-scroll-proportion="0.0" vertical-offset="7106" max-vertical-offset="7956" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/views.py">
@@ -847,19 +815,7 @@
<provider selected="true" editor-type-id="text-editor">
<state line="67" column="0" selection-start="1993" selection-end="1993" vertical-scroll-proportion="0.0" vertical-offset="1139" max-vertical-offset="2193">
<folding>
<element signature="e#62#90#0" expanded="true" />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
<element signature="e#62#90#0" expanded="false" />
</folding>
</state>
</provider>
@@ -922,13 +878,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/home.html">
<provider selected="true" editor-type-id="text-editor">
<state line="6" column="58" selection-start="231" selection-end="231" vertical-scroll-proportion="0.13043478" vertical-offset="0" max-vertical-offset="782">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/sample_practice.html">
<provider selected="true" editor-type-id="text-editor">
<state line="6" column="107" selection-start="174" selection-end="228" vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="476">
@@ -945,9 +894,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/mineral_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state line="32" column="40" selection-start="1034" selection-end="1034" vertical-scroll-proportion="0.0" vertical-offset="544" max-vertical-offset="1445">
<folding />
</state>
<state line="32" column="40" selection-start="1034" selection-end="1034" vertical-scroll-proportion="0.0" vertical-offset="544" max-vertical-offset="1445" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/fossil_detail.html">
@@ -966,23 +913,12 @@
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/rock_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state line="3" column="16" selection-start="84" selection-end="84" vertical-scroll-proportion="0.0" vertical-offset="51" max-vertical-offset="697">
<folding />
</state>
<state line="3" column="16" selection-start="84" selection-end="84" vertical-scroll-proportion="0.0" vertical-offset="51" max-vertical-offset="697" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/rock_practice.html">
<provider selected="true" editor-type-id="text-editor">
<state line="2" column="51" selection-start="104" selection-end="104" vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="136">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state line="20" column="71" selection-start="1703" selection-end="1703" vertical-scroll-proportion="0.3104189" vertical-offset="0" max-vertical-offset="931">
<folding />
</state>
<state line="2" column="51" selection-start="104" selection-end="104" vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="136" />
</provider>
</entry>
<entry file="file://C:/Envs/rockviewer/Lib/site-packages/django/conf/__init__.py">
@@ -996,19 +932,7 @@
<provider selected="true" editor-type-id="text-editor">
<state line="103" column="0" selection-start="3358" selection-end="3358" vertical-scroll-proportion="0.0" vertical-offset="764" max-vertical-offset="2771">
<folding>
<element signature="e#62#90#0" expanded="true" />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="..." />
<marker date="1393813357736" expanded="true" signature="-1:-1" placeholder="&quot;&quot;&quot;...&quot;&quot;&quot;" />
<element signature="e#62#90#0" expanded="false" />
</folding>
</state>
</provider>
@@ -1041,24 +965,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/structure.html">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="910">
<folding>
<marker date="1393813347627" expanded="true" signature="136:3047" placeholder="..." />
<marker date="1393813347627" expanded="true" signature="273:2993" placeholder="..." />
<marker date="1393813347627" expanded="true" signature="2785:2989" placeholder="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html">
<provider selected="true" editor-type-id="text-editor">
<state line="52" column="0" selection-start="3853" selection-end="3853" vertical-scroll-proportion="-27.961538" vertical-offset="157" max-vertical-offset="1054">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/rockviewer.wsgi">
<provider selected="true" editor-type-id="text-editor">
<state line="4" column="70" selection-start="212" selection-end="212" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="204">
@@ -1073,9 +979,69 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_theory.html">
<provider selected="true" editor-type-id="text-editor">
<state line="34" column="42" selection-start="3044" selection-end="3044" vertical-scroll-proportion="0.65384614" vertical-offset="0" max-vertical-offset="1037">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/glossary.html">
<provider selected="true" editor-type-id="text-editor">
<state line="3" column="24" selection-start="86" selection-end="86" vertical-scroll-proportion="-1.9615384" vertical-offset="0" max-vertical-offset="357">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/home.html">
<provider selected="true" editor-type-id="text-editor">
<state line="51" column="9" selection-start="3009" selection-end="3009" vertical-scroll-proportion="-33.346153" vertical-offset="0" max-vertical-offset="986">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html">
<provider selected="true" editor-type-id="text-editor">
<state line="37" column="23" selection-start="1803" selection-end="1803" vertical-scroll-proportion="0.6447964" vertical-offset="59" max-vertical-offset="1122">
<state line="30" column="73" selection-start="1183" selection-end="1183" vertical-scroll-proportion="-11.461538" vertical-offset="212" max-vertical-offset="1122">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/structure.html">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="14" selection-start="3090" selection-end="3090" vertical-scroll-proportion="-22.884615" vertical-offset="0" max-vertical-offset="731">
<folding>
<element signature="n#style#0;n#img#0;n#figure#0;n#div#1;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/pressure_temp.html">
<provider selected="true" editor-type-id="text-editor">
<state line="52" column="0" selection-start="3853" selection-end="3853" vertical-scroll-proportion="-27.961538" vertical-offset="157" max-vertical-offset="1054">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/theory/bowen.html">
<provider selected="true" editor-type-id="text-editor">
<state line="26" column="0" selection-start="2222" selection-end="2222" vertical-scroll-proportion="-17.0" vertical-offset="0" max-vertical-offset="544">
<folding>
<element signature="n#style#0;n#img#0;n#p#0;n#div#1;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state line="9" column="0" selection-start="331" selection-end="331" vertical-scroll-proportion="0.10955961" vertical-offset="0" max-vertical-offset="931">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/acknowledgements.html">
<provider selected="true" editor-type-id="text-editor">
<state line="13" column="14" selection-start="582" selection-end="582" vertical-scroll-proportion="0.25" vertical-offset="0" max-vertical-offset="884">
<folding />
</state>
</provider>

BIN
db.sqlite3
View File

Binary file not shown.

57
three_d_viewer/static/three_d_viewer/css/styles.css
View File

@@ -133,10 +133,15 @@ body {
}
#footer {
left: 0;
right: 0;
bottom: 0;
display: block;
position: fixed;
width: 100%;
margin-left: auto;
/*margin-left: auto;*/
background-color: #CCCCCC;
z-index: 900;
z-index: 1000;
}
#footer ul {
@@ -199,11 +204,16 @@ body {
#logo {
width: 20%;
height: 44px;
background-color: #FFFFFF;
text-align: center;
background-color: #CCCCCC;
text-align: left;
float: left;
}
.logoImage {
width: auto;
height: 44px;
}
#logo p {
padding-top: 5%;
}
@@ -270,8 +280,18 @@ body {
}
/* TEXT STYLES */
ul.introList {
list-style-type: none;
}
td.term {
padding-right: 100px;
}
#mainText p {
font-size: 12pt;
font-family: 'quicksandregular', Helvetica, sans-serif;
@@ -280,6 +300,14 @@ body {
color: #000;
}
#theoryText 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;
@@ -311,6 +339,17 @@ h2.theoryHeadings {
}
h3.headings {
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;
@@ -628,7 +667,7 @@ img.example {
margin: 0;
padding: 0;
}
/*CUSTOM CLASS TEST*/
/*CUSTOM CLASS TEST*/
#mineralMenu > ul > li.mainitem {
width: 100%;
}
@@ -644,7 +683,7 @@ img.example {
font-size: 14px;
font-weight: bold;
padding: 15px 20px;
color: #7a8189;
color: #7a8189 ;
text-transform: uppercase;
-webkit-transition: color 0.25s ease-out;
-moz-transition: color 0.25s ease-out;
@@ -706,6 +745,7 @@ img.example {
z-index: -2;
}
#mineralMenu ul ul {
width: 84.5%; /* TESTING HERE!!!!!!!!!!!!!! */
position: absolute;
left: -9999px;
top: 70px;
@@ -720,9 +760,11 @@ img.example {
#mineralMenu ul ul ul {
top: 37px;
padding-left: 5px;
width: 100%;
}
#mineralMenu ul ul li {
position: relative;
width: 100%;
}
#mineralMenu > ul > li:hover > ul {
left: auto;
@@ -735,7 +777,7 @@ img.example {
opacity: 1;
}
#mineralMenu ul ul li a {
width: 130px;
width: 100%;
border-bottom: 1px solid #eee;
padding: 10px 20px;
font-size: 10px;
@@ -783,6 +825,7 @@ img.example {
-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;

BIN
three_d_viewer/static/three_d_viewer/images/Thumbs.db Normal file
View File

Binary file not shown.

BIN
three_d_viewer/static/three_d_viewer/images/bowen.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 96 KiB

BIN
three_d_viewer/static/three_d_viewer/images/logo_main.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

2
three_d_viewer/templates/three_d_viewer/acknowledgements.html
View File

@@ -3,7 +3,7 @@
{% block content %}
<div id="pushDown"></div>
<div id="mainText">
<h3>Acknowledgements</h3><br><br>
<h3 class="headings">Acknowledgements</h3><br><br>
<p>
3DVOL has been been developed by Shane Frischkorn, Andy Bates, Christoph Shrank, Mark Barry, Linda Nothdurft, and Luke Nothdurft.
</p>

2
three_d_viewer/templates/three_d_viewer/base.html
View File

@@ -18,7 +18,7 @@
<div id="container">
<div id="header">
<div id="logo">
<img src={% static "three_d_viewer/images/logo2.png" %}>
<img src={% static "three_d_viewer/images/logo_main.png" %} class="logoImage">
</div><!-- CLOSE LOGO !-->
<div id="menuContainer">
<div id='cssmenu'>

6
three_d_viewer/templates/three_d_viewer/glossary.html
View File

@@ -1,13 +1,13 @@
{% extends "three_d_viewer/base.html" %}
{% block content %}
<div id="pushDown"></div>
<div id="pushDownTwo"></div>
<div id="mainText">
<p><h3>Glossary</h3><br><br>
<p><h3 class="headings">Glossary</h3><br><br>
<table>
{% for entry in entries %}
<tr>
<td><p>{{ entry.name }}</p></td>
<td class="term"><p>{{ entry.name }}</p></td>
<td><p>{{ entry.definition }}</p></td>
</tr>
{% endfor %}

8
three_d_viewer/templates/three_d_viewer/home.html
View File

@@ -1,18 +1,20 @@
{% extends "three_d_viewer/base.html" %}
{% block content %}
<div id="pushDown"></div>
<div id="pushDownTwo"></div>
<div id="mainText">
<h3>Welcome to 3DVOL – Minerals.</h3><br><br>
<h3 class="headings">Welcome to 3DVOL – Minerals.</h3><br><br>
<p>
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>
</p>
<ul>
<br/>
<ul class="introList">
<li><p>Which are the most common minerals on Earth?</p></li>
<li><p>What are their most important physical and chemical properties?</p></li>
<li><p>Where in the Earth and under which physical conditions do they form?</p></li>
<li><p>How can they be identified in hand specimen?</p></li>
</ul>
<br/>
<p>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

6
three_d_viewer/templates/three_d_viewer/minerals_theory.html
View File

@@ -27,10 +27,10 @@
The lithosphere contains the crust, and the upper part of the mantle down to ~100km under oceanic crust, and 200-300km under continental crust (Twiss & Moores, 2007).
The lithosphere-asthenosphere boundary is defined by the 1300K isotherm, which is the temperature where olivine starts to behave viscously.
The rocks in the mesosphere are under more pressure than those in the asthenosphere, so no longer behave viscously.
<figure>
<img src="{% static "three_d_viewer/images/bowen.png" %}">
<figure class="theoryImages">
<img src="{% static "three_d_viewer/images/bowen.png" %}>
<figcaption>Image sourced from <a href="http://pubs.usgs.gov/gip/dynamic/graphics/FigS1-1.gif">USGS</a>.</figcaption>
<figure>
</figure>
</p>
<h2 class="theoryHeadings" id="pressureandtemp">Pressure and temperature</h2>
<p>

3
three_d_viewer/templates/three_d_viewer/theory/bowen.html
View File

@@ -18,7 +18,8 @@
The actual reactions depend on many factors, such as the chemical composition of the melt, temperature, pressure, and amount of fractional crystallisation.
For example, basalts form from the crystallisation of olivine, pyroxene and calcic plagioclase meaning that crystallisation stopped without the series progressing.
If more fractional crystallisation were to occur, more intermediate and felsic minerals can crystallise.
<img src="{% static "three_d_viewer/images/bowen.png" %}">
<br/>
<img src="{% static "three_d_viewer/images/bowen.jpg" %}" style="padding-top:20px; text-align: left;" width="600px" height="auto">
</p>
<div id="pushDownThree"></div>
</div>

12
three_d_viewer/templates/three_d_viewer/theory/structure.html
View File

@@ -3,7 +3,7 @@
{% block content %}
<div id="pushDownTwo"></div>
<div id="mainText">
<div id="mainText">
<h1 class="subHeadings">Theory</h1>
<h2 class="theoryHeadings" id="structureofearth">Structure of Earth</h2>
<p>
@@ -26,12 +26,12 @@
uniform throughout the mantle though, but changes in pressure and temperature determine which polymorphs will exist at different depths.
The lithosphere contains the crust, and the upper part of the mantle down to ~100km under oceanic crust, and 200-300km under continental crust (Twiss & Moores, 2007).
The lithosphere-asthenosphere boundary is defined by the 1300K isotherm, which is the temperature where olivine starts to behave viscously.
The rocks in the mesosphere are under more pressure than those in the asthenosphere, so no longer behave viscously.
The rocks in the mesosphere are under more pressure than those in the asthenosphere, so no longer behave viscously.</p>
<figure>
<img src="{% static "three_d_viewer/images/structure - usgs.gif" %}">
<figcaption>Image sourced from <a href="http://pubs.usgs.gov/gip/dynamic/graphics/FigS1-1.gif">USGS</a>.</figcaption>
<figure>
</p>
<img src="{% static "three_d_viewer/images/structure - usgs.gif" %}" style="padding-top:20px;">
<figcaption><p>Image sourced from <a href="http://pubs.usgs.gov/gip/dynamic/graphics/FigS1-1.gif">USGS</a>.</p></figcaption>
</figure>
</div>
<div id="pushDownThree"></div>
</div>
{% endblock %}

1
three_d_viewer/urls.py
View File

@@ -7,7 +7,6 @@ urlpatterns = patterns(
'',
url(r'^$', views.HomeView.as_view(), name='home'),
url(r'^$', generic.TemplateView.as_view(template_name="three_d_viewer/home.html"), name='home'),
url(r'^minerals_theory/$', generic.TemplateView.as_view(template_name="three_d_viewer/minerals_theory.html"), name='minerals_theory'),
url(r'^theory/structure/$', generic.TemplateView.as_view(template_name="three_d_viewer/theory/structure.html"), name='theory_structure'),
url(r'^theory/bowen/$', generic.TemplateView.as_view(template_name="three_d_viewer/theory/bowen.html"), name='theory_bowen'),
url(r'^theory/pressure_temp/$', generic.TemplateView.as_view(template_name="three_d_viewer/theory/pressure_temp.html"), name='theory_pt'),