related auth func
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,7 @@
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true">
<output url="file://$PROJECT_DIR$/out" />
</component>
+ <component name="RegexUtilComponent" text="1900-01-01 2007/08/13 1900.01.01 1900 01 01 1900-01.01 1900 13 01 1900 02 31" flags="0" regex="(19|20)\d\d([- /.])(0[1-9]|1[012])\2(0[1-9]|[12][0-9]|3[01])" mode="0" />
</project>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,24 +5,32 @@
</component>
<component name="ChangeListManager">
<list default="true" id="89ace156-8d75-43de-ba53-6e829c197435" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/resource_item.html" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_basic_fields.html" afterPath="$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_basic_fields.html" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html" afterPath="$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_metadata_fields.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$/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/resource_read.html" afterPath="$PROJECT_DIR$/ckanext/datagovau/templates/package/resource_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="1379979602449" 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" />
- <file path="/package_metadata_fields.html" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378729194397" ignored="false" />
- <file path="/read_base.html" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378774943838" ignored="false" />
- <file path="/read.rdf" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378775057466" ignored="false" />
+ <file path="/Dummy.txt" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1379987697128" ignored="false" />
+ <file path="/plugin.py" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1379980346924" ignored="false" />
+ <file path="/setup.py" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1379980236185" ignored="false" />
+ <file path="/package_basic_fields.html" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1379984845682" ignored="false" />
+ <file path="/package_metadata_fields.html" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1379984915516" ignored="false" />
+ <file path="/read_base.html" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1379985182291" ignored="false" />
+ <file path="/read.rdf" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1379985068490" ignored="false" />
<file path="/README.rst" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378703724236" ignored="false" />
- <file path="/a.dummy" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378689054922" ignored="false" />
- <file path="/read.html" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378721657045" ignored="false" />
+ <file path="/a.dummy" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1379987251443" ignored="false" />
+ <file path="/read.html" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1379984781447" ignored="false" />
<file path="/create.py" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378705719051" ignored="false" />
<file path="/additional_info.html" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378717234941" ignored="false" />
- <file path="/resource_read.html" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378775248415" ignored="false" />
+ <file path="/resource_read.html" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1379985226010" ignored="false" />
+ <file path="/resources_list.html" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1379986542457" ignored="false" />
+ <file path="/resource_item.html" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1379987596016" ignored="false" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -83,19 +91,10 @@
</component>
<component name="FileEditorManager">
<leaf>
- <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="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
<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="0.0">
+ <state line="6" column="110" selection-start="190" selection-end="190" vertical-scroll-proportion="-3.9230769">
<folding />
</state>
</provider>
@@ -104,16 +103,70 @@
<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="31" column="51" selection-start="1921" selection-end="1921" vertical-scroll-proportion="-19.038462">
+ <state line="10" column="0" selection-start="233" selection-end="246" vertical-scroll-proportion="-6.5384617">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="read.html" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="read.html" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/user/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>
+ </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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="57" column="119" selection-start="2936" selection-end="2936" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="dashboard_datasets.html" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/user/dashboard_datasets.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="21" selection-start="0" selection-end="18" vertical-scroll-proportion="-0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="plugin.py" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/ckanext/datagovau/plugin.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="14" column="154" selection-start="577" selection-end="577" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="resource_item.html" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/resource_item.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="22" column="129" selection-start="1133" selection-end="1133" vertical-scroll-proportion="0.5771605">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="package_basic_fields.html" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_basic_fields.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="51" column="125" selection-start="2745" selection-end="2745" vertical-scroll-proportion="-13.807693">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="read.html" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/read.html">
<provider selected="true" editor-type-id="text-editor">
- <state line="22" column="154" selection-start="872" selection-end="872" vertical-scroll-proportion="0.68">
+ <state line="12" column="96" selection-start="451" selection-end="451" vertical-scroll-proportion="-7.8461537">
<folding />
</state>
</provider>
@@ -138,21 +191,22 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/ckanext/datagovau/theme/templates/layout.html" />
<option value="$PROJECT_DIR$/ckanext/datagovau/forms.py" />
- <option value="$PROJECT_DIR$/setup.py" />
<option value="$PROJECT_DIR$/README.rst" />
<option value="$PROJECT_DIR$/ckanext/datagovau/theme/public/licenses.json" />
<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$/setup.py" />
+ <option value="$PROJECT_DIR$/ckanext/datagovau/plugin.py" />
<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/snippets/resources_list.html" />
+ <option value="$PROJECT_DIR$/ckanext/datagovau/templates/package/read_base.html" />
<option value="$PROJECT_DIR$/ckanext/datagovau/templates/package/read.html" />
+ <option value="$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/resource_item.html" />
</list>
</option>
</component>
@@ -296,6 +350,10 @@
<option name="myItemId" value="templates" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="user" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -320,6 +378,36 @@
</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="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_ELEMENT>
+ <option name="myItemId" value="snippets" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -524,17 +612,17 @@
<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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22048998" sideWeight="0.5" order="1" 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="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.16183448" sideWeight="0.6703786" 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="false" 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="true" weight="0.32962137" sideWeight="0.5" order="7" 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.32962137" 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.22091782" sideWeight="0.5" order="1" 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" />
@@ -582,7 +670,7 @@
<option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="Move Disqus comments to package not resource page" />
+ <option name="LAST_COMMIT_MESSAGE" value="Allow anonymous access to datastore API search" />
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -598,6 +686,7 @@
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
<MESSAGE value="Update HTML package output to interim metadata standard" />
<MESSAGE value="Move Disqus comments to package not resource page" />
+ <MESSAGE value="Allow anonymous access to datastore API search" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@@ -624,47 +713,79 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/setup.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="23" column="48" selection-start="677" selection-end="677" vertical-scroll-proportion="0.6788194">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/ckanext/datagovau/plugin.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="14" column="154" selection-start="577" selection-end="577" 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="57" column="119" selection-start="2936" selection-end="2936" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </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="18" column="70" selection-start="675" selection-end="675" vertical-scroll-proportion="-11.769231">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/user/dashboard_datasets.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="21" selection-start="0" selection-end="18" vertical-scroll-proportion="-0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/user/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/resource_read.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="10" column="0" selection-start="233" selection-end="246" vertical-scroll-proportion="-6.5384617">
+ <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="6" column="110" selection-start="190" selection-end="190" vertical-scroll-proportion="-3.9230769">
+ <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="12" column="96" selection-start="451" selection-end="451" vertical-scroll-proportion="-7.8461537">
+ <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="22" column="154" selection-start="872" selection-end="872" vertical-scroll-proportion="0.68">
+ <state line="51" column="125" selection-start="2745" selection-end="2745" vertical-scroll-proportion="-13.807693">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/resource_item.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="22" column="129" selection-start="1133" selection-end="1133" vertical-scroll-proportion="0.5771605">
<folding />
</state>
</provider>
--- a/README.rst
+++ b/README.rst
@@ -2,13 +2,12 @@
It comprises:
-* A CKAN Extension "plugin" at ``ckanext/datagovau/plugin.py`` which, when
- loaded, overrides various settings in the core ``ini``-file to provide:
- * A path to local customisations of the core templates
- * A custom Package edit form that defaults to cc-by licence
- * A custom n3/rdf output format
+* A custom Package edit form that defaults to cc-by licence
+* Replaces links with http/https protocol independent versions
+* Provides HTML to users to embed data previews on their own website
+* A cut down licenses.json file
-* A cut down licenses.json file
+This extension is complemented by ckanext-agls for AGLS metadata, ckanext-googleanalytics for Google Analytics tracking of API usage and ckanext-dga-stats for the customised site statistics page.
Installation
============
--- a/admin/data.gov.au
+++ b/admin/data.gov.au
@@ -19,6 +19,11 @@
ExpiresDefault "access plus 1 week"
</FilesMatch>
</IfModule>
+AddType application/octet-stream .woff
+<FilesMatch "\.(eot|otf|woff|ttf)$">
+ SetEnvIf Origin "^http(s)?://(.+\.)?(data.gov.au)$" origin_is=$0
+ Header set Access-Control-Allow-Origin %{origin_is}e env=origin_is
+</FilesMatch>
<Directory />
Options FollowSymLinks
--- a/admin/default.vcl
+++ b/admin/default.vcl
@@ -8,45 +8,147 @@
.host = "127.0.0.1";
.port = "8080";
}
+backend geoserver {
+ .host = "172.31.18.207";
+ .port = "8983";
+}
sub vcl_fetch {
set beresp.grace = 1h;
-
- if (beresp.http.content-type ~ "(text|application)") {
+ unset beresp.http.Server;
+ # These status codes should always pass through and never cache.
+ if ( beresp.status >= 500 ) {
+ set beresp.ttl = 0s;
+ }
+ if (beresp.http.content-type ~ "(text|javascript|json|xml|html)") {
set beresp.do_gzip = true;
}
+ # CKAN cache headers are used by Varnish cache, but should not be propagated to
+ # the Internet. Tell browsers and proxies not to cache. This means Varnish always
+ # gets the responsibility to server the right content at all times.
+ if (beresp.http.Cache-Control ~ "max-age") {
+ unset beresp.http.set-cookie;
+ set beresp.http.Cache-Control = "no-cache";
+ }
+
+ # Encourage assets to be cached by proxies and browsers
+ # JS and CSS may be gzipped depending on headers
+ # see https://developers.google.com/speed/docs/best-practices/caching
+ if (req.url ~ "\.(css|js)") {
+ set beresp.http.Vary = "Accept-Encoding";
+ }
+
+ # Encourage assets to be cached by proxies and browsers for 1 day
+ if (req.url ~ "\.(png|gif|jpg|swf|css|js)") {
+ unset beresp.http.set-cookie;
+ set beresp.http.Cache-Control = "public, max-age=86400";
+ set beresp.ttl = 1d;
+ }
+
+ # Encourage CKAN vendor assets (which are versioned) to be cached by
+ # by proxies and browsers for 1 year
+ if (req.url ~ "^/scripts/vendor/") {
+ unset beresp.http.set-cookie;
+ set beresp.http.Cache-Control = "public, max-age=31536000";
+ set beresp.ttl = 12m;
+ }
+}
+sub vcl_recv {
+ if (req.http.user-agent ~ "Ezooms" || req.http.user-agent ~ "Ahrefs") {
+ error 403;
+ }
+if (req.url ~ "^/geoserver/") {
+ set req.backend = geoserver;
+ } else {
+ set req.backend = default;
+ #redirect secure traffic to https
+ if ( (req.http.Cookie ~ "auth_tkt" || req.http.Cookie ~ "ckan" || req.url ~ "user/(reset|login)") && req.http.X-Forwarded-Proto !~ "(?i)https") {
+ set req.http.x-Redir-Url = "https://data.gov.au" + req.url;
+ error 753 req.http.x-Redir-Url;
+ }
+ # remove locale links
+ if (req.url ~ "/((?!js)..|.._..|sr_Latn)/") {
+ set req.http.x-Redir-Url = regsub(req.url, "/((?!js)..|.._..|sr_Latn)/", "/");
+ error 751 req.http.x-Redir-Url;
+ }
+ # rewrite broken resources
+ if (req.url ~ "leaflet") {
+ set req.url = regsub(req.url, "fanstatic/ckanext-spatial/:version:2013-09-13T02:32:17.87/:bundle:js/vendor/leaflet/images", "js/vendor/leaflet/images");
+ }
+ # remove old hostnames
+ if (req.http.host ~ "data.australia.gov.au") {
+ set req.http.x-Redir-Url = "http://data.gov.au" + req.url;
+ error 751 req.http.x-Redir-Url;
+ }
+
+ if (req.url ~ "^/_tracking") {
+ // exclude web spiders from statistics
+ if (req.http.user-agent ~ "Googlebot" || req.http.user-agent ~ "baidu" || req.http.user-agent ~ "bing") {
+ error 200;
+ } else {
+ return (pass);
+ }
+ }
if (req.url ~ "\.(png|gif|jpg|jpeg|swf|css|js|woff|eot)$") {
- unset beresp.http.set-cookie;
+ //Varnish to deliver content from cache even if the request othervise indicates that the request should be passed
+ return(lookup);
}
}
-sub vcl_recv {
- if (req.url ~ "^/_tracking") {
- return (pass);
- }
- if (req.url ~ "\.(png|gif|jpg|jpeg|swf|css|js|woff|eot)$") {
- return(lookup);
- }
+ // Remove has_js and Google Analytics cookies. Evan added sharethis cookies
+ set req.http.Cookie = regsuball(req.http.Cookie, "(^|;\s*)(__[a-z]+|has_js|cookie-agreed-en|_csoot|_csuid|_chartbeat2)=[^;]*", "");
+
+ // Remove a ";" prefix, if present.
+ set req.http.Cookie = regsub(req.http.Cookie, "^;\s*", "");
+ // Remove empty cookies.
+ if (req.http.Cookie ~ "^\s*$") {
+ unset req.http.Cookie;
+ }
+
+ remove req.http.X-Forwarded-For;
+ set req.http.X-Forwarded-For = req.http.X-Real-IP;
+}
+sub vcl_hash {
+ # http://serverfault.com/questions/112531/ignoring-get-parameters-in-varnish-vcl
+ set req.url = regsub(req.url, "(?:(.com|.au))/((?!js)..|.._..|sr_Latn)/", "/");
+ hash_data(req.url);