--- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,14 +5,12 @@ </component> <component name="ChangeListManager"> <list default="true" id="89ace156-8d75-43de-ba53-6e829c197435" name="Default" comment=""> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/ckanext/datagovau/templates/package/resource_read.html" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ckanext/datagovau/templates/package/read.rdf" afterPath="$PROJECT_DIR$/ckanext/datagovau/templates/package/read.rdf" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ckanext/datagovau/templates/package/read_base.html" afterPath="$PROJECT_DIR$/ckanext/datagovau/templates/package/read_base.html" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ckanext/datagovau/templates/package/read.html" afterPath="$PROJECT_DIR$/ckanext/datagovau/templates/package/read.html" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="ckanext-datagovau.iws" /> <ignored path=".idea/workspace.xml" /> - <file path="/Dummy.txt" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378773145747" ignored="false" /> + <file path="/Dummy.txt" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1379979540844" ignored="false" /> <file path="/plugin.py" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378731005672" ignored="false" /> <file path="/setup.py" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378168657134" ignored="false" /> <file path="/package_basic_fields.html" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378727992485" ignored="false" /> @@ -39,7 +37,6 @@ <disable_hints /> </component> <component name="DebuggerManager"> - <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" /> <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true"> <breakpoint> <option name="NOTIFY_CAUGHT" value="true" /> @@ -76,6 +73,7 @@ <option name="LOG_MESSAGE" value="" /> </breakpoint> </breakpoint_any> + <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" /> <breakpoint_rules /> <ui_properties /> </component> @@ -88,7 +86,7 @@ <file leaf-file-name="package_metadata_fields.html" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="74" selection-start="1081" selection-end="1081" vertical-scroll-proportion="-20.875"> + <state line="35" column="74" selection-start="1081" selection-end="1081" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> @@ -97,25 +95,25 @@ <file leaf-file-name="read_base.html" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/read_base.html"> <provider selected="true" editor-type-id="text-editor"> - <state line="11" column="0" selection-start="247" selection-end="1668" vertical-scroll-proportion="-6.875"> + <state line="11" column="0" selection-start="247" selection-end="1668" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="resource_read.html" pinned="false" current="true" current-in-tab="true"> + <file leaf-file-name="resource_read.html" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/resource_read.html"> <provider selected="true" editor-type-id="text-editor"> - <state line="14" column="89" selection-start="580" selection-end="580" vertical-scroll-proportion="0.30837005"> + <state line="31" column="51" selection-start="1921" selection-end="1921" vertical-scroll-proportion="-19.038462"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="read.rdf" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/read.rdf"> + <file leaf-file-name="read.html" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/read.html"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="50" selection-start="2578" selection-end="2596" vertical-scroll-proportion="0.0"> + <state line="7" column="14" selection-start="148" selection-end="148" vertical-scroll-proportion="0.18364197"> <folding /> </state> </provider> @@ -147,20 +145,21 @@ <option value="$PROJECT_DIR$/../ckan/ckan/logic/action/create.py" /> <option value="$PROJECT_DIR$/../ckan/ckan/templates/package/snippets/additional_info.html" /> <option value="$PROJECT_DIR$/../ckan/ckan/templates/package/read_base.html" /> - <option value="$PROJECT_DIR$/ckanext/datagovau/templates/package/read.html" /> <option value="$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_basic_fields.html" /> <option value="$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html" /> <option value="$PROJECT_DIR$/ckanext/datagovau/plugin.py" /> <option value="$PROJECT_DIR$/ckanext/datagovau/templates/package/read_base.html" /> <option value="$PROJECT_DIR$/ckanext/datagovau/templates/package/read.rdf" /> <option value="$PROJECT_DIR$/ckanext/datagovau/templates/package/resource_read.html" /> + <option value="$PROJECT_DIR$/ckanext/datagovau/templates/package/read.html" /> </list> </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="1280" /> - <option name="width" value="1920" /> - <option name="height" value="1080" /> + <option name="x" value="-4" /> + <option name="y" value="-4" /> + <option name="width" value="1928" /> + <option name="height" value="1044" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="false"> <OptionsSetting value="true" id="Add" /> @@ -188,7 +187,7 @@ <sortByType /> </navigator> <panes> - <pane id="Scope" /> + <pane id="PackagesPane" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -231,20 +230,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="ckanext_datagovau.egg-info" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="ckanext-datagovau" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ckanext-datagovau" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="ckanext" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -307,39 +292,39 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="templates" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="ckanext-datagovau" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="ckanext-datagovau" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="ckanext" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="datagovau" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="templates" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="package" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="ckanext-datagovau" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ckanext-datagovau" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ckanext" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="datagovau" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="package" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="snippets" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> </subPane> </pane> - <pane id="PackagesPane" /> + <pane id="Scope" /> </panes> </component> <component name="PropertiesComponent"> @@ -347,10 +332,10 @@ <property name="GoToClass.toSaveIncludeLibraries" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="MemberChooser.sorted" value="false" /> - <property name="last_opened_file_path" value="$PROJECT_DIR$/../ckan/ckan/templates/package/resource_read.html" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="MemberChooser.showClasses" value="true" /> + <property name="GoToClass.includeLibraries" value="false" /> <property name="DefaultHtmlFileTemplate" value="Html5" /> - <property name="GoToClass.includeLibraries" value="false" /> <property name="MemberChooser.copyJavadoc" value="false" /> </component> <component name="PyConsoleOptionsProvider"> @@ -367,14 +352,6 @@ </key> </component> <component name="RunManager"> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - <method /> - </configuration> <configuration default="true" type="PythonConfigurationType" factoryName="Python"> <option name="INTERPRETER_OPTIONS" value="" /> <option name="PARENT_ENVS" value="true" /> @@ -388,6 +365,14 @@ <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" /> <option name="SCRIPT_NAME" value="" /> <option name="PARAMETERS" value="" /> + <method /> + </configuration> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> <method /> </configuration> <configuration default="true" type="tests" factoryName="Unittests"> @@ -507,17 +492,17 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="1280" y="0" width="1920" height="1080" extended-state="6" /> - <editor active="true" /> + <frame x="-4" y="-4" width="1928" height="1044" extended-state="6" /> + <editor active="false" /> <layout> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3290735" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Palette" 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="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3290735" sideWeight="0.5" order="6" 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.16183448" sideWeight="0.7795527" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.16183448" sideWeight="0.77951" 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="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="true" weight="0.22044729" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22048998" 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.33" 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" /> @@ -592,96 +577,68 @@ <breakpoint-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/../ckan/ckan/templates/base.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" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/../ckan/ckan/templates/macros/form.html"> - <provider selected="true" editor-type-id="text-editor"> - <state line="94" column="0" selection-start="4027" selection-end="4027" vertical-scroll-proportion="-21.333334" /> + <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_metadata_fields.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"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/read_base.html"> + <provider selected="true" editor-type-id="text-editor"> + <state line="11" column="0" selection-start="247" selection-end="1668" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/resource_read.html"> + <provider selected="true" editor-type-id="text-editor"> + <state line="14" column="89" selection-start="580" selection-end="580" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_basic_fields.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" /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ckanext/datagovau/plugin.py"> + <provider selected="true" editor-type-id="text-editor"> + <state line="106" column="0" selection-start="4140" selection-end="4271" vertical-scroll-proportion="0.0" /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html"> + <provider selected="true" editor-type-id="text-editor"> + <state line="35" column="74" selection-start="1081" selection-end="1081" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/read_base.html"> + <provider selected="true" editor-type-id="text-editor"> + <state line="11" column="0" selection-start="247" selection-end="1668" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/read.rdf"> + <provider selected="true" editor-type-id="text-editor"> + <state line="47" column="50" selection-start="2578" selection-end="2596" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/resource_read.html"> + <provider selected="true" editor-type-id="text-editor"> + <state line="31" column="51" selection-start="1921" selection-end="1921" vertical-scroll-proportion="-19.038462"> + <folding /> + </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/read.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"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_basic_fields.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"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/../ckan/ckan/templates/package/snippets/package_metadata_fields.html"> - <provider selected="true" editor-type-id="text-editor"> - <state line="21" column="0" selection-start="1147" selection-end="1147" vertical-scroll-proportion="-0.625" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/../ckan/ckan/model/package.py"> - <provider selected="true" editor-type-id="text-editor"> - <state line="209" column="0" selection-start="7434" selection-end="7434" vertical-scroll-proportion="0.0" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/../ckan/ckan/logic/action/get.py"> - <provider selected="true" editor-type-id="text-editor"> - <state line="758" column="37" selection-start="24462" selection-end="24462" vertical-scroll-proportion="-6.6" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/../ckan/ckan/logic/schema.py"> - <provider selected="true" editor-type-id="text-editor"> - <state line="172" column="0" selection-start="7641" selection-end="7641" vertical-scroll-proportion="0.0" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/../ckan/ckan/lib/navl/validators.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" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/../ckan/ckan/logic/converters.py"> - <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="0" selection-start="391" selection-end="1056" vertical-scroll-proportion="0.0" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/ckanext/datagovau/plugin.py"> - <provider selected="true" editor-type-id="text-editor"> - <state line="106" column="0" selection-start="4140" selection-end="4271" vertical-scroll-proportion="0.0" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html"> - <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="74" selection-start="1081" selection-end="1081" vertical-scroll-proportion="-20.875"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/read_base.html"> - <provider selected="true" editor-type-id="text-editor"> - <state line="11" column="0" selection-start="247" selection-end="1668" vertical-scroll-proportion="-6.875"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/../ckan/ckan/templates/package/resource_read.html"> - <provider selected="true" editor-type-id="text-editor"> - <state line="24" column="105" selection-start="970" selection-end="970" vertical-scroll-proportion="0.48018292"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/read.rdf"> - <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="50" selection-start="2578" selection-end="2596" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/resource_read.html"> - <provider selected="true" editor-type-id="text-editor"> - <state line="14" column="89" selection-start="580" selection-end="580" vertical-scroll-proportion="0.30837005"> + <state line="7" column="14" selection-start="148" selection-end="148" vertical-scroll-proportion="0.18364197"> <folding /> </state> </provider>