Changes to the mineral practice page
This commit is contained in:
163
.idea/dataSources.ids
generated
163
.idea/dataSources.ids
generated
@@ -1,6 +1,165 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<component name="dataSourceStorage">
|
||||
<data-source source="LOCAL" name="Django default" uuid="7e6a0f4c-659f-4195-8d38-0f33b1a39655">
|
||||
<database-info product="" version="" jdbc-version="" driver-name="" driver-version=""/>
|
||||
<data-source source="LOCAL" name="Django default" product="SQLite" version="3.7.6.3" jdbc-version="2.1" driver-name="SQLiteJDBC" driver-version="native" uuid="7e6a0f4c-659f-4195-8d38-0f33b1a39655">
|
||||
<case-sensitivity plain-identifiers="mixed" quoted-identifiers="mixed"/>
|
||||
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
|
||||
<jdbc-url>jdbc:sqlite:$PROJECT_DIR$/db.sqlite3</jdbc-url>
|
||||
<libraries>
|
||||
<library>
|
||||
<url>file://$USER_HOME$/.PyCharm30/config/jdbc-drivers/xerial-sqlite-license.txt</url>
|
||||
</library>
|
||||
<library>
|
||||
<url>file://$USER_HOME$/.PyCharm30/config/jdbc-drivers/sqlite-jdbc-3.7.6.3-20110609.081603-3.jar</url>
|
||||
</library>
|
||||
</libraries>
|
||||
<schema name="" catalog=""/>
|
||||
<table name="auth_group" schema="" catalog="" type="TABLE">
|
||||
<column name="id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="name" sqlType="VARCHAR(80)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<primary-key columns="id"/>
|
||||
<exported-key name="#FAKE_auth_user_groups_1" table="auth_user_groups" schema="" catalog="" columns="group_id"/>
|
||||
</table>
|
||||
<table name="auth_group_permissions" schema="" catalog="" type="TABLE">
|
||||
<column name="id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="group_id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="permission_id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<primary-key columns="id"/>
|
||||
<foreign-key name="#FAKE_auth_group_permissions_1" columns="permission_id" ref-table="auth_permission" ref-schema="" ref-catalog="" ref-columns="id" update-rule="3" delete-rule="3" deferrability="1"/>
|
||||
<index name="auth_group_permissions_83d7f98b" unique="true" columns="permission_id"/>
|
||||
<index name="auth_group_permissions_5f412f9a" unique="true" columns="group_id"/>
|
||||
</table>
|
||||
<table name="auth_permission" schema="" catalog="" type="TABLE">
|
||||
<column name="id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="name" sqlType="VARCHAR(50)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="content_type_id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="codename" sqlType="VARCHAR(100)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<primary-key columns="id"/>
|
||||
<exported-key name="#FAKE_auth_group_permissions_1" table="auth_group_permissions" schema="" catalog="" columns="permission_id"/>
|
||||
<exported-key name="#FAKE_auth_user_user_permissions_1" table="auth_user_user_permissions" schema="" catalog="" columns="permission_id"/>
|
||||
<index name="auth_permission_37ef4eb4" unique="true" columns="content_type_id"/>
|
||||
</table>
|
||||
<table name="auth_user" schema="" catalog="" type="TABLE">
|
||||
<column name="id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="password" sqlType="VARCHAR(128)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="last_login" sqlType="DATETIME" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="is_superuser" sqlType="BOOL" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="username" sqlType="VARCHAR(30)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="first_name" sqlType="VARCHAR(30)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="last_name" sqlType="VARCHAR(30)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="email" sqlType="VARCHAR(75)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="is_staff" sqlType="BOOL" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="is_active" sqlType="BOOL" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="date_joined" sqlType="DATETIME" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<primary-key columns="id"/>
|
||||
<exported-key name="#FAKE_django_admin_log_2" table="django_admin_log" schema="" catalog="" columns="user_id"/>
|
||||
</table>
|
||||
<table name="auth_user_groups" schema="" catalog="" type="TABLE">
|
||||
<column name="id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="user_id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="group_id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<primary-key columns="id"/>
|
||||
<foreign-key name="#FAKE_auth_user_groups_1" columns="group_id" ref-table="auth_group" ref-schema="" ref-catalog="" ref-columns="id" update-rule="3" delete-rule="3" deferrability="1"/>
|
||||
<index name="auth_user_groups_5f412f9a" unique="true" columns="group_id"/>
|
||||
<index name="auth_user_groups_6340c63c" unique="true" columns="user_id"/>
|
||||
</table>
|
||||
<table name="auth_user_user_permissions" schema="" catalog="" type="TABLE">
|
||||
<column name="id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="user_id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="permission_id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<primary-key columns="id"/>
|
||||
<foreign-key name="#FAKE_auth_user_user_permissions_1" columns="permission_id" ref-table="auth_permission" ref-schema="" ref-catalog="" ref-columns="id" update-rule="3" delete-rule="3" deferrability="1"/>
|
||||
<index name="auth_user_user_permissions_83d7f98b" unique="true" columns="permission_id"/>
|
||||
<index name="auth_user_user_permissions_6340c63c" unique="true" columns="user_id"/>
|
||||
</table>
|
||||
<table name="django_admin_log" schema="" catalog="" type="TABLE">
|
||||
<column name="id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="action_time" sqlType="DATETIME" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="user_id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="content_type_id" sqlType="INTEGER" length="2000000000" precision="10" nullable="true" jdbcType="4"/>
|
||||
<column name="object_id" sqlType="TEXT" length="2000000000" precision="10" nullable="true" jdbcType="12"/>
|
||||
<column name="object_repr" sqlType="VARCHAR(200)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="action_flag" sqlType="SMALLINT UNSIGNED" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="change_message" sqlType="TEXT" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<primary-key columns="id"/>
|
||||
<foreign-key name="#FAKE_django_admin_log_1" columns="content_type_id" ref-table="django_content_type" ref-schema="" ref-catalog="" ref-columns="id" update-rule="3" delete-rule="3" deferrability="1"/>
|
||||
<foreign-key name="#FAKE_django_admin_log_2" columns="user_id" ref-table="auth_user" ref-schema="" ref-catalog="" ref-columns="id" update-rule="3" delete-rule="3" deferrability="1"/>
|
||||
<index name="django_admin_log_37ef4eb4" unique="true" columns="content_type_id"/>
|
||||
<index name="django_admin_log_6340c63c" unique="true" columns="user_id"/>
|
||||
</table>
|
||||
<table name="django_content_type" schema="" catalog="" type="TABLE">
|
||||
<column name="id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="name" sqlType="VARCHAR(100)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="app_label" sqlType="VARCHAR(100)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="model" sqlType="VARCHAR(100)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<primary-key columns="id"/>
|
||||
<exported-key name="#FAKE_django_admin_log_1" table="django_admin_log" schema="" catalog="" columns="content_type_id"/>
|
||||
</table>
|
||||
<table name="django_session" schema="" catalog="" type="TABLE">
|
||||
<column name="session_key" sqlType="VARCHAR(40)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="session_data" sqlType="TEXT" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="expire_date" sqlType="DATETIME" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<primary-key columns="session_key"/>
|
||||
<index name="django_session_b7b81f0c" unique="true" columns="expire_date"/>
|
||||
</table>
|
||||
<table name="django_site" schema="" catalog="" type="TABLE">
|
||||
<column name="id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="domain" sqlType="VARCHAR(100)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="name" sqlType="VARCHAR(50)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<primary-key columns="id"/>
|
||||
</table>
|
||||
<table name="south_migrationhistory" schema="" catalog="" type="TABLE">
|
||||
<column name="id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="app_name" sqlType="VARCHAR(255)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="migration" sqlType="VARCHAR(255)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="applied" sqlType="DATETIME" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<primary-key columns="id"/>
|
||||
</table>
|
||||
<table name="three_d_viewer_answer" schema="" catalog="" type="TABLE">
|
||||
<column name="id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="text" sqlType="VARCHAR(2000)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="correct" sqlType="BOOL" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="question_id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<primary-key columns="id"/>
|
||||
<index name="three_d_viewer_answer_25110688" unique="true" columns="question_id"/>
|
||||
</table>
|
||||
<table name="three_d_viewer_category" schema="" catalog="" type="TABLE">
|
||||
<column name="id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="name" sqlType="VARCHAR(100)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="active" sqlType="BOOL" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="parent_id" sqlType="INTEGER" length="2000000000" precision="10" nullable="true" jdbcType="4"/>
|
||||
<primary-key columns="id"/>
|
||||
<index name="three_d_viewer_category_410d0aac" unique="true" columns="parent_id"/>
|
||||
</table>
|
||||
<table name="three_d_viewer_mineral" schema="" catalog="" type="TABLE">
|
||||
<column name="streak" sqlType="VARCHAR(100)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="habit" sqlType="VARCHAR(1000)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="lustre" sqlType="VARCHAR(100)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="colour" sqlType="VARCHAR(100)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="sample_ptr_id" sqlType="INTEGER" length="2000000000" precision="10" nullable="true" jdbcType="4"/>
|
||||
<column name="cleavage_fracture" sqlType="VARCHAR(100)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="identifying_features" sqlType="VARCHAR(1000)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="specific_gravity" sqlType="DECIMAL" length="2000000000" precision="10" nullable="true" jdbcType="6"/>
|
||||
<column name="occurance" sqlType="VARCHAR(1000)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="crystallography" sqlType="VARCHAR(100)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="hardness" sqlType="DECIMAL" length="2000000000" precision="10" nullable="true" jdbcType="6"/>
|
||||
<column name="chemical_formula" sqlType="VARCHAR(100)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<primary-key columns="sample_ptr_id"/>
|
||||
</table>
|
||||
<table name="three_d_viewer_question" schema="" catalog="" type="TABLE">
|
||||
<column name="id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="text" sqlType="VARCHAR(2000)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="sample_id" sqlType="INTEGER" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<primary-key columns="id"/>
|
||||
<index name="three_d_viewer_question_95642b83" unique="true" columns="sample_id"/>
|
||||
</table>
|
||||
<table name="three_d_viewer_sample" schema="" catalog="" type="TABLE">
|
||||
<column name="description" sqlType="VARCHAR(2000)" length="2000000000" precision="10" nullable="true" jdbcType="12"/>
|
||||
<column name="model_filename" sqlType="VARCHAR(1000)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<column name="parent_id" sqlType="INTEGER" length="2000000000" precision="10" nullable="true" jdbcType="4"/>
|
||||
<column name="active" sqlType="BOOL" length="2000000000" precision="10" nullable="false" jdbcType="4"/>
|
||||
<column name="id" sqlType="INTEGER" length="2000000000" precision="10" nullable="true" jdbcType="4"/>
|
||||
<column name="name" sqlType="VARCHAR(100)" length="2000000000" precision="10" nullable="false" jdbcType="12"/>
|
||||
<primary-key columns="id"/>
|
||||
</table>
|
||||
</data-source>
|
||||
</component>
|
||||
14
.idea/dataSources.xml
generated
14
.idea/dataSources.xml
generated
@@ -1,11 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="DataSourceManagerImpl" format="xml" hash="186051761">
|
||||
<component name="DataSourceManagerImpl" format="xml" hash="1501324042">
|
||||
<data-source source="LOCAL" name="Django default" uuid="7e6a0f4c-659f-4195-8d38-0f33b1a39655">
|
||||
<driver-ref>sqlite.xerial</driver-ref>
|
||||
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
|
||||
<jdbc-url>jdbc:sqlite:H:\GitHub\rockviewer\db.sqlite3</jdbc-url>
|
||||
<libraries />
|
||||
<jdbc-url>jdbc:sqlite:$PROJECT_DIR$/db.sqlite3</jdbc-url>
|
||||
<libraries>
|
||||
<library>
|
||||
<url>file://$USER_HOME$/.PyCharm30/config/jdbc-drivers/xerial-sqlite-license.txt</url>
|
||||
</library>
|
||||
<library>
|
||||
<url>file://$USER_HOME$/.PyCharm30/config/jdbc-drivers/sqlite-jdbc-3.7.6.3-20110609.081603-3.jar</url>
|
||||
</library>
|
||||
</libraries>
|
||||
</data-source>
|
||||
</component>
|
||||
</project>
|
||||
|
||||
2
.idea/misc.xml
generated
2
.idea/misc.xml
generated
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7.5 virtualenv at C:\Envs\rockviewer" project-jdk-type="Python SDK" />
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7.4 virtualenv at ~/.virtualenvs/rockviewer" project-jdk-type="Python SDK" />
|
||||
</project>
|
||||
|
||||
|
||||
9
.idea/rockviewer.iml
generated
9
.idea/rockviewer.iml
generated
@@ -11,11 +11,18 @@
|
||||
</component>
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="jdk" jdkName="Python 2.7.5 virtualenv at C:\Envs\rockviewer" jdkType="Python SDK" />
|
||||
<orderEntry type="jdk" jdkName="Python 2.7.4 virtualenv at ~/.virtualenvs/rockviewer" jdkType="Python SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
<component name="PyDocumentationSettings">
|
||||
<option name="myDocStringFormat" value="Plain" />
|
||||
</component>
|
||||
<component name="TemplatesService">
|
||||
<option name="TEMPLATE_CONFIGURATION" value="Django" />
|
||||
</component>
|
||||
<component name="TestRunnerService">
|
||||
<option name="projectConfiguration" value="Unittests" />
|
||||
<option name="PROJECT_TEST_RUNNER" value="Unittests" />
|
||||
</component>
|
||||
</module>
|
||||
|
||||
|
||||
392
.idea/workspace.xml
generated
392
.idea/workspace.xml
generated
@@ -2,21 +2,18 @@
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="56ba8ed1-8d88-44b6-a1d9-9818bc65c9ae" name="Default" comment="">
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/three_d_viewer/static/three_d_viewer/js/jquery.min.js" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/three_d_viewer/static/three_d_viewer/js/menu_jquery.js" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_practice.html" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_selftest.html" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_theory.html" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/three_d_viewer/static/three_d_viewer/css/styles.css" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/mineral_detail.html" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources.ids" afterPath="$PROJECT_DIR$/.idea/dataSources.ids" />
|
||||
<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/base.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.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="MOVED" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/base.html" />
|
||||
<change type="MOVED" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/home.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/home.html" />
|
||||
<change type="MOVED" beforePath="H:\GitHub\rockviewer\three_d_viewer\templates\three_d_viewer\detail.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/detail.html" />
|
||||
<change type="MOVED" beforePath="H:\GitHub\rockviewer\three_d_viewer\templates\three_d_viewer\mineral_detail.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/mineral_detail.html" />
|
||||
<change type="MOVED" beforePath="H:\GitHub\rockviewer\three_d_viewer\templates\three_d_viewer\question.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/question.html" />
|
||||
<change type="MOVED" beforePath="H:\GitHub\rockviewer\three_d_viewer\templates\three_d_viewer\sampletree.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/sampletree.html" />
|
||||
<change type="MOVED" beforePath="H:\GitHub\rockviewer\three_d_viewer\templates\three_d_viewer\treenode.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/treenode.html" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources.xml" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_practice.html" afterPath="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_practice.html" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/models.py" afterPath="$PROJECT_DIR$/three_d_viewer/models.py" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/rockviewer.iml" afterPath="$PROJECT_DIR$/.idea/rockviewer.iml" />
|
||||
<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$/three_d_viewer/views.py" afterPath="$PROJECT_DIR$/three_d_viewer/views.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" />
|
||||
@@ -39,37 +36,19 @@
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf>
|
||||
<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/Old/home.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="119">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="base.html" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/base.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="10" column="8" selection-start="384" selection-end="479" vertical-scroll-proportion="-6.5384617" vertical-offset="0" max-vertical-offset="1241">
|
||||
<state line="33" column="16" selection-start="1288" selection-end="1288" vertical-scroll-proportion="0.0" vertical-offset="440" max-vertical-offset="1095">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="detail.html" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/detail.html">
|
||||
<file leaf-file-name="mineral_detail.html" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/mineral_detail.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="7395">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<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="0" column="0" selection-start="0" selection-end="2490" vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="1156">
|
||||
<state line="62" column="23" selection-start="1779" selection-end="1779" vertical-scroll-proportion="0.0" vertical-offset="930" max-vertical-offset="1320">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@@ -78,16 +57,76 @@
|
||||
<file leaf-file-name="minerals_practice.html" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_practice.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="9.807693" vertical-offset="255" max-vertical-offset="2040">
|
||||
<state line="19" column="18" selection-start="546" selection-end="546" vertical-scroll-proportion="0.0" vertical-offset="285" max-vertical-offset="420">
|
||||
<folding>
|
||||
<marker date="1393026264539" expanded="true" signature="79:525" placeholder="..." />
|
||||
<marker date="1393026264539" expanded="true" signature="106:441" placeholder="..." />
|
||||
<marker date="1393026264539" expanded="true" signature="119:430" placeholder="..." />
|
||||
<marker date="1393026264539" expanded="true" signature="161:416" placeholder="..." />
|
||||
<marker date="1393026264539" expanded="true" signature="210:398" placeholder="..." />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="detail.html" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/detail.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="389" column="50" selection-start="10513" selection-end="10523" vertical-scroll-proportion="0.0" vertical-offset="5640" max-vertical-offset="6525">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="base.html" pinned="false" current="true" current-in-tab="true">
|
||||
<file leaf-file-name="minerals_practice.html" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/docs/prototype/3dvol/revised/minerals_practice.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="96" column="63" selection-start="4901" selection-end="4916" vertical-scroll-proportion="0.0" vertical-offset="1001" max-vertical-offset="1800">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="base.html" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="11" column="0" selection-start="431" selection-end="431" vertical-scroll-proportion="0.13433908" vertical-offset="0" max-vertical-offset="1392">
|
||||
<state line="10" column="19" selection-start="272" selection-end="272" vertical-scroll-proportion="0.0" vertical-offset="150" max-vertical-offset="990">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="mineral_detail.html" pinned="false" current="true" current-in-tab="true">
|
||||
<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="11478" selection-end="11478" vertical-scroll-proportion="0.3713389" vertical-offset="5915" max-vertical-offset="7020">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="views.py" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/views.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="65" column="19" selection-start="2102" selection-end="2102" vertical-scroll-proportion="0.0" vertical-offset="975" max-vertical-offset="1380">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="models.py" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/models.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="67" column="9" selection-start="2009" selection-end="2009" vertical-scroll-proportion="0.0" vertical-offset="1005" max-vertical-offset="1950">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="urls.py" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/urls.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="12" column="4" selection-start="769" selection-end="769" vertical-scroll-proportion="0.0" vertical-offset="180" max-vertical-offset="375">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@@ -103,21 +142,30 @@
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="GitLogSettings">
|
||||
<option name="myDateState">
|
||||
<MyDateState />
|
||||
</option>
|
||||
</component>
|
||||
<component name="IdeDocumentHistory">
|
||||
<option name="changedFiles">
|
||||
<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/three_d_viewer/minerals_practice.html" />
|
||||
<option value="$PROJECT_DIR$/three_d_viewer/urls.py" />
|
||||
<option value="$PROJECT_DIR$/three_d_viewer/models.py" />
|
||||
<option value="$PROJECT_DIR$/three_d_viewer/views.py" />
|
||||
<option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html" />
|
||||
<option value="$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/mineral_detail.html" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectFrameBounds">
|
||||
<option name="x" value="-8" />
|
||||
<option name="y" value="-8" />
|
||||
<option name="width" value="2576" />
|
||||
<option name="height" value="1576" />
|
||||
<option name="y" value="36" />
|
||||
<option name="width" value="1920" />
|
||||
<option name="height" value="1175" />
|
||||
</component>
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
||||
<OptionsSetting value="true" id="Add" />
|
||||
@@ -286,14 +334,6 @@
|
||||
<option name="myItemId" value="three_d_viewer" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="static" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="three_d_viewer" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="css" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
@@ -361,46 +401,21 @@
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
<PATH>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="rockviewer" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="rockviewer" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="docs" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="prototype" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="3dvol" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="images" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scope" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="recentsLimit" value="5" />
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="options.lastSelected" value="com.jetbrains.python.configuration.PythonSdkConfigurable" />
|
||||
<property name="options.splitter.main.proportions" value="0.3" />
|
||||
<property name="options.splitter.details.proportions" value="0.2" />
|
||||
<property name="options.searchVisible" value="true" />
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="recentsLimit" value="5" />
|
||||
<property name="options.lastSelected" value="editor.preferences.appearance" />
|
||||
<property name="FullScreen" value="false" />
|
||||
<property name="DefaultHtmlFileTemplate" value="Html5" />
|
||||
<property name="options.splitter.details.proportions" value="0.2" />
|
||||
<property name="options.searchVisible" value="true" />
|
||||
<property name="dynamic.classpath" value="false" />
|
||||
</component>
|
||||
<component name="PyConsoleOptionsProvider">
|
||||
<option name="myPythonConsoleState">
|
||||
@@ -591,6 +606,12 @@
|
||||
<option name="USE_PATTERN" value="false" />
|
||||
<method />
|
||||
</configuration>
|
||||
<configuration default="true" type="com.intellij.persistence.run.ConsoleRunConfigurationType" factoryName="Query Language Console">
|
||||
<option name="VM_PARAMETERS" value="" />
|
||||
<option name="USER_CFG_CLASS" />
|
||||
<option name="CONTEXT_PROVIDER" />
|
||||
<method />
|
||||
</configuration>
|
||||
<configuration default="false" name="rockviewer" type="Python.DjangoServer" factoryName="Django server">
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
<option name="PARENT_ENVS" value="true" />
|
||||
@@ -613,7 +634,9 @@
|
||||
<option name="runNoReload" value="false" />
|
||||
<option name="useCustomRunCommand" value="false" />
|
||||
<option name="customRunCommand" value="" />
|
||||
<RunnerSettings RunnerId="PyDebugRunner" />
|
||||
<RunnerSettings RunnerId="PythonRunner" />
|
||||
<ConfigurationWrapper RunnerId="PyDebugRunner" />
|
||||
<ConfigurationWrapper RunnerId="PythonRunner" />
|
||||
<method />
|
||||
</configuration>
|
||||
@@ -645,27 +668,33 @@
|
||||
<created>1392778868816</created>
|
||||
<updated>1392778868816</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="Changes to the mineral practice page">
|
||||
<created>1392989898846</created>
|
||||
<updated>1392989898846</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="2" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="-8" y="-8" width="2576" height="1576" extended-state="6" />
|
||||
<frame x="0" y="36" width="1920" height="1175" extended-state="0" />
|
||||
<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.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="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.25" sideWeight="0.5" 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.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26124197" 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.39941692" 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" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32963988" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32889733" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Version Control" 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="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" />
|
||||
@@ -683,140 +712,117 @@
|
||||
<option name="myTodoPanelSettings">
|
||||
<TodoPanelSettings />
|
||||
</option>
|
||||
<MESSAGE value="Changes to the mineral practice page" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Changes to the mineral practice page" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager />
|
||||
<breakpoint-manager>
|
||||
<option name="time" value="8" />
|
||||
</breakpoint-manager>
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://C:/Python27/Lib/site-packages/dajaxice/urls.py">
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/sampletree.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="0" column="21" selection-start="21" selection-end="21" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="221">
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="980" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$USER_HOME$/.virtualenvs/rockviewer/local/lib/python2.7/site-packages/django/views/generic/base.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="114" column="4" selection-start="4071" selection-end="4071" vertical-scroll-proportion="0.3321617" vertical-offset="1371" max-vertical-offset="3225" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/treenode.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="10" column="76" selection-start="438" selection-end="498" vertical-scroll-proportion="-6.25" vertical-offset="0" max-vertical-offset="285" />
|
||||
</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="-3.75" vertical-offset="0" max-vertical-offset="495" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/urls.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="12" column="4" selection-start="769" selection-end="769" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/question.html">
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/models.py">
|
||||
<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="476">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/docs/prototype/3dvol/revised/index.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="13" column="21" selection-start="387" selection-end="387" vertical-scroll-proportion="0.0" vertical-offset="240" max-vertical-offset="1156">
|
||||
<state line="67" column="9" selection-start="2009" selection-end="2009" vertical-scroll-proportion="0.0" vertical-offset="540" max-vertical-offset="1935">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/home.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="119">
|
||||
<folding />
|
||||
</state>
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="643" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/detail.html">
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/css/custom.css">
|
||||
<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="7395">
|
||||
<folding />
|
||||
</state>
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="643" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/home.html">
|
||||
<entry file="file://$PROJECT_DIR$/docs/prototype/3dvol/revised/minerals_practice.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="1156">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/question.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="942">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/docs/prototype/3dvol/index.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="1547">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/docs/prototype/3dvol/styles.css">
|
||||
<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="4029" max-vertical-offset="5304">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/docs/prototype/3dvol/revised/index.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="13" column="21" selection-start="387" selection-end="387" vertical-scroll-proportion="0.0" vertical-offset="240" max-vertical-offset="1156">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://C:/Python27/Lib/site-packages/dajaxice/urls.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="0" column="21" selection-start="21" selection-end="21" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="942">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/detail.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="7395">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/home.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="942">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_practice.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="9.807693" vertical-offset="255" max-vertical-offset="2040">
|
||||
<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="0" column="0" selection-start="0" selection-end="2490" vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="1156">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/static/three_d_viewer/js/menu_jquery.js">
|
||||
<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="1418">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/base.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="10" column="8" selection-start="384" selection-end="479" vertical-scroll-proportion="-6.5384617" vertical-offset="0" max-vertical-offset="1241">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/static/three_d_viewer/css/styles.css">
|
||||
<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="15062">
|
||||
<state line="96" column="63" selection-start="4901" selection-end="4916" vertical-scroll-proportion="0.0" vertical-offset="1001" max-vertical-offset="1800">
|
||||
<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="11" column="0" selection-start="431" selection-end="431" vertical-scroll-proportion="0.13433908" vertical-offset="0" max-vertical-offset="1392">
|
||||
<state line="10" column="19" selection-start="272" selection-end="272" vertical-scroll-proportion="0.0" vertical-offset="150" max-vertical-offset="990">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/minerals_practice.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="19" column="18" selection-start="546" selection-end="546" vertical-scroll-proportion="0.0" vertical-offset="285" max-vertical-offset="420">
|
||||
<folding>
|
||||
<marker date="1393026264539" expanded="true" signature="79:525" placeholder="..." />
|
||||
<marker date="1393026264539" expanded="true" signature="106:441" placeholder="..." />
|
||||
<marker date="1393026264539" expanded="true" signature="119:430" placeholder="..." />
|
||||
<marker date="1393026264539" expanded="true" signature="161:416" placeholder="..." />
|
||||
<marker date="1393026264539" expanded="true" signature="210:398" placeholder="..." />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/base.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="33" column="16" selection-start="1288" selection-end="1288" vertical-scroll-proportion="0.0" vertical-offset="440" max-vertical-offset="1095">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/detail.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="389" column="50" selection-start="10513" selection-end="10523" vertical-scroll-proportion="0.0" vertical-offset="5640" max-vertical-offset="6525">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/Old/mineral_detail.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="62" column="23" selection-start="1779" selection-end="1779" vertical-scroll-proportion="0.0" vertical-offset="930" max-vertical-offset="1320">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/three_d_viewer/views.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="65" column="19" selection-start="2102" selection-end="2102" vertical-scroll-proportion="0.0" vertical-offset="662" max-vertical-offset="1305">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</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="11478" selection-end="11478" vertical-scroll-proportion="0.3713389" vertical-offset="5915" max-vertical-offset="7020">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
||||
Reference in New Issue
Block a user