Add text for header icons
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,21 +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="masterDetails">
- <states>
- <state key="ProjectJDKs.UI">
- <settings>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- </states>
- </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,26 +5,32 @@
</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="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="1378773145747" 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" />
@@ -39,7 +45,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 +81,7 @@
<option name="LOG_MESSAGE" value="" />
</breakpoint>
</breakpoint_any>
+ <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
<breakpoint_rules />
<ui_properties />
</component>
@@ -85,28 +91,28 @@
</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">
+ <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="35" column="74" selection-start="1081" selection-end="1081" vertical-scroll-proportion="-20.875">
+ <state line="6" column="110" selection-start="190" selection-end="190" vertical-scroll-proportion="-3.9230769">
<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">
+ <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="11" column="0" selection-start="247" selection-end="1668" vertical-scroll-proportion="-6.875">
+ <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="resource_read.html" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/resource_read.html">
+ <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="14" column="89" selection-start="580" selection-end="580" vertical-scroll-proportion="0.30837005">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0">
<folding />
</state>
</provider>
@@ -115,7 +121,52 @@
<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="47" column="50" selection-start="2578" selection-end="2596" vertical-scroll-proportion="0.0">
+ <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="12" column="96" selection-start="451" selection-end="451" vertical-scroll-proportion="-7.8461537">
<folding />
</state>
</provider>
@@ -129,6 +180,7 @@
</FindUsagesManager>
</component>
<component name="Git.Settings">
+ <option name="SYNC_SETTING" value="DONT" />
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="GitLogSettings">
@@ -139,28 +191,30 @@
<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$/ckanext/datagovau/templates/package/read.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>
<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 +242,7 @@
<sortByType />
</navigator>
<panes>
- <pane id="Scope" />
+ <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -231,7 +285,7 @@
<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="myItemId" value="ckanext" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -248,6 +302,10 @@
<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>
<PATH>
<PATH_ELEMENT>
@@ -266,6 +324,10 @@
<option name="myItemId" value="datagovau" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="public" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -285,7 +347,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="public" />
+ <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>
@@ -307,6 +373,10 @@
<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>
@@ -326,6 +396,10 @@
</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>
@@ -339,19 +413,26 @@
</PATH>
</subPane>
</pane>
- <pane id="PackagesPane" />
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
+ <property name="project.structure.last.edited" value="Project" />
<property name="GoToFile.includeJavaFiles" value="false" />
+ <property name="project.structure.proportion" value="0.0" />
+ <property name="options.splitter.main.proportions" value="0.3" />
+ <property name="MemberChooser.sorted" value="false" />
+ <property name="options.lastSelected" value="vcs.Git" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+ <property name="project.structure.side.proportion" value="0.0" />
+ <property name="DefaultHtmlFileTemplate" value="Html5" />
+ <property name="MemberChooser.copyJavadoc" value="false" />
<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="MemberChooser.showClasses" value="true" />
- <property name="DefaultHtmlFileTemplate" value="Html5" />
<property name="GoToClass.includeLibraries" value="false" />
- <property name="MemberChooser.copyJavadoc" value="false" />
+ <property name="options.searchVisible" value="true" />
+ <property name="options.splitter.details.proportions" value="0.2" />
</component>
<component name="PyConsoleOptionsProvider">
<option name="myPythonConsoleState">
@@ -367,14 +448,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 +461,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">
@@ -486,6 +567,23 @@
</configuration>
</component>
<component name="ShelveChangesManager" show_recycled="false" />
+ <component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="false" SSL_PROTOCOLS="all">
+ <option name="USER" value="" />
+ <option name="PASSWORD" value="" />
+ <option name="mySSHConnectionTimeout" value="30000" />
+ <option name="mySSHReadTimeout" value="30000" />
+ <option name="LAST_MERGED_REVISION" />
+ <option name="MERGE_DRY_RUN" value="false" />
+ <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
+ <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
+ <option name="IGNORE_SPACES_IN_MERGE" value="false" />
+ <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
+ <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
+ <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
+ <option name="FORCE_UPDATE" value="false" />
+ <option name="IGNORE_EXTERNALS" value="false" />
+ <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
+ </component>
<component name="TodoView" selected-index="0">
<todo-panel id="selected-file">
<are-packages-shown value="false" />
@@ -507,24 +605,24 @@
</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="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="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="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="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="false" weight="0.33" 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="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" />
@@ -572,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="Update HTML package output to interim metadata standard" />
+ <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" />
@@ -587,105 +685,196 @@
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<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 />
</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$/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="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <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">
- <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">
- <folding />
- </state>
- </provider>
- </entry>
+ <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>
+ </entry>
+ </component>
+ <component name="masterDetails">
+ <states>
+ <state key="ArtifactsStructureConfigurable.UI">
+ <settings>
+ <artifact-editor />
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="FacetStructureConfigurable.UI">
+ <settings>
+ <last-edited>No facets are configured</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="GlobalLibrariesConfigurable.UI">
+ <settings>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="JdkListConfigurable.UI">
+ <settings>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="ModuleStructureConfigurable.UI">
+ <settings>
+ <last-edited>ckanext-datagovau</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ <option value="0.5" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="ProjectJDKs.UI">
+ <settings>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="ProjectLibrariesConfigurable.UI">
+ <settings>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ </states>
</component>
</project>
--- 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);
+ if (req.http.host) {
+ hash_data(req.http.host);
+ } else {
+ hash_data(server.ip);
+ }
if (req.http.Cookie) {
- set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *__utm.=[^;]+;? *", "\1"); # removes all cookies named __utm? (utma, utmb...) - tracking thing
-
- if (req.http.Cookie == "") {
- remove req.http.Cookie;
- }
- }
-}
+ hash_data(req.http.Cookie);
+}
+}
sub vcl_deliver {
if (!resp.http.Vary) {
set resp.http.Vary = "Accept-Encoding";
} else if (resp.http.Vary !~ "(?i)Accept-Encoding") {
set resp.http.Vary = resp.http.Vary + ",Accept-Encoding";
}
- if (obj.hits > 0) {
- set resp.http.X-Cache = "HIT";
- } else {
- set resp.http.X-Cache = "MISS";
- }
+ remove resp.http.X-Varnish;
+ remove resp.http.Via;
+ remove resp.http.Age;
+ remove resp.http.X-Powered-By;
+if (req.url ~ "^/geoserver/") {
+ set resp.http.Access-Control-Allow-Origin = "*";
+ set resp.http.Access-Control-Allow-Methods = "GET, POST, PUT, DELETE";
+ set resp.http.Access-Control-Allow-Headers = "Origin, X-Requested-With, Content-Type, Accept";
+}
}
-
+sub vcl_error {
+ remove obj.http.Server;
+ if (obj.status == 751) {
+ set obj.http.Location = obj.response;
+ set obj.status = 301;
+ return (deliver);
+ }
+ if (obj.status == 753) {
+ set obj.http.Location = obj.response;
+ set obj.status = 301;
+ return (deliver);
+ }
+}
#
# Below is a commented-out copy of the default VCL logic. If you
# redefine any of these subroutines, the built-in logic will be
--- /dev/null
+++ b/admin/development.ini
@@ -1,1 +1,365 @@
-
+#
+# ckan - Pylons configuration
+#
+# The %(here)s variable will be replaced with the parent directory of this file
+#
+[DEFAULT]
+
+# Change debug to true when doing CKAN development, it enables Pylons'
+# interactive debugging tool, makes Fanstatic serve unminified JS and CSS
+# files, and enables CKAN templates' debugging features.
+#
+# WARNING: *THIS SETTING MUST BE SET TO FALSE ON A PRODUCTION ENVIRONMENT*
+# Debug mode will enable the interactive debugging tool, allowing ANYONE to
+# execute malicious code after an exception is raised.
+debug = False
+
+email_to = ddg@alert.links.com.au
+error_email_from = data.gov@finance.gov.au
+
+# The SMTP server to connect to when sending emails to users, with optional
+# port (default: 25). For example: lavabit.com, or smtp.gmail.com:587. To
+# connect to a local sendmail process enter 'localhost'.
+#smtp.server = localhost
+smtp.server = smtp.gmail.com:587
+
+# Whether or not to use STARTTLS when connecting to the SMTP server.
+#smtp.starttls = False
+smtp.starttls = True
+
+# The username and password to use to authenticate with the SMTP server.
+# Optional, if these are left commented-out then CKAN will try to send email
+# to the SMTP server without logging in first.
+#smtp.user = your_username@gmail.com
+#smtp.password = your_password
+smtp.user = datagovau@gmail.com
+smtp.password = ***
+googleanalytics.id = ***
+# The email address that emails sent by CKAN to users should appear to come
+# from. Optional (default: None, note that the SMTP server may insert its own
+# from address).
+smtp.mail_from = data.gov@finance.gov.au
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 5000
+
+[app:main]
+use = egg:ckan
+ckan.tracking_enabled = true
+full_stack = true
+cache_dir = %(here)s/data
+beaker.session.key = ckan
+beaker.session.secret = ***
+app_instance_uuid = ***
+# Auth
+
+ckan.auth.anon_create_dataset = false
+ckan.auth.create_unowned_dataset = false
+ckan.auth.create_dataset_if_not_in_organization = false
+ckan.auth.user_create_organizations = false
+ckan.auth.user_delete_organizations = true
+ckan.auth.user_create_groups = false
+ckan.auth.user_delete_groups = true
+ckan.auth.create_user_via_api = true
+
+# List the names of CKAN extensions to activate.
+# Note: This line is required to be here for packaging, even if it is empty.
+# Note: Add ``pdf_preview`` to enable the resource preview for PDFs
+# Add the ``resource_proxy`` plugin to enable resorce proxying and get around the same origin policy
+# Add ``datastore`` to enable the CKAN DataStore extension
+ckan.plugins = qa disqus stats json_preview recline_preview datastore datastorer googleanalytics resource_proxy wms_preview kml_preview geojson_preview datagovau
+
+disqus.name = datagovau
+
+# If you'd like to fine-tune the individual locations of the cache data dirs
+# for the Cache data, or the Session saves, un-comment the desired settings
+# here:
+#beaker.cache.data_dir = %(here)s/data/cache
+#beaker.session.data_dir = %(here)s/data/sessions
+
+# Specify the database for SQLAlchemy to use:
+# * Postgres is currently required for a production CKAN deployment
+# * Sqlite (memory or file) can be used as a quick alternative for testing
+#sqlalchemy.url = postgresql://ckanuser:pass@localhost/ckantest
+sqlalchemy.url = ***
+#sqlalchemy.url = sqlite:///
+#sqlalchemy.url = sqlite:///%(here)s/somedb.db
+
+# Un-comment and specify the URLs for the DataStore database.
+# * Postgres is required
+#ckan.datastore.write_url = postgresql://ckanuser:pass@localhost/datastore
+#ckan.datastore.read_url = postgresql://readonlyuser:pass@localhost/datastore
+ckan.datastore.write_url = ***
+ckan.datastore.read_url = ***
+
+# repoze.who config
+who.config_file = %(here)s/who.ini
+who.log_level = warning
+who.log_file = %(cache_dir)s/who_log.ini
+
+# Location of RDF versions of datasets
+#rdf_packages = http://semantic.ckan.net/record/
+
+# Location of licenses group (defaults to cached local version of ckan group)
+#licenses_group_url = http://licenses.opendefinition.org/licenses/groups/ckan.json
+licenses_group_url = file://%(here)s/licenses.json
+
+# Dataset form to use
+package_form = standard
+
+# Hide certain extras fields from dataset read form:
+# package_hide_extras = for_search_index_only
+
+# API configuration
+#apikey_header_name = X-CKAN-API-Key
+
+## extra places to look for templates and public files (comma separated lists)
+## any templates/files found will override correspondingly named ones in
+## ckan/templates/ and ckan/public
+## (e.g. to override main layout template layout.html or add extra css files)
+# extra_template_paths = %(here)s/my-templates
+# extra_public_paths = %(here)s/my-public
+
+# Dataset form integration
+#package_edit_return_url = http://another.frontend/dataset/<NAME>
+#package_new_return_url = http://another.frontend/dataset/<NAME>
+
+
+# Turn on messaging with carrot, default to false
+#ckan.async_notifier = true
+# Messaging module used by carrot:
+# * pyamqplib - AMQP (e.g. for RabbitMQ)
+# * queue - native Python Queue (debugging and tests only)
+#carrot_messaging_library = pyamqplib
+
+## Perform search just using database (rather than use e.g. solr).
+## In this setup search is crude and limited .e.g no full-text search, no faceting ...
+## However, very useful for getting up and running quickly with CKAN
+# ckan.simple_search = 1
+
+## Title of site (using in several places including templates and <title> tag
+ckan.site_title = data.gov.au
+
+## Logo image to use on the home page
+ckan.site_logo = /base/images/ckan-logo.png
+
+## Site tagline / description (used on front page)
+ckan.site_description = Australian Government Open Data Catalogue
+
+## Used in creating some absolute urls (such as rss feeds, css files) and
+## dump filenames
+ckan.site_url = http://data.gov.au
+
+## Favicon (default is the CKAN software favicon)
+ckan.favicon = /images/icons/ckan.ico
+
+## The gravatar default to use. This can be any of the pre-defined strings
+## as defined on http://en.gravatar.com/site/implement/images/ (e.g. "identicon"
+## or "mm"). Or it can be a url, e.g. "http://example.com/images/avatar.jpg"
+ckan.gravatar_default = identicon
+
+## Solr support
+solr_url = http://solr.data.gov.au:8983/solr
+
+## Automatic indexing. Make all changes immediately available via the search
+## after editing or creating a dataset. Default is true. If for some reason
+## you need the indexing to occur asynchronously, set this option to 0.
+# ckan.search.automatic_indexing = 1
+
+## An 'id' for the site (using, for example, when creating entries in a common search index)
+## If not specified derived from the site_url
+ckan.site_id = data.gov.au
+
+## API url to use (e.g. in AJAX callbacks)
+## Enable if the API is at a different domain
+# ckan.api_url = http://www.ckan.net
+
+## html content to be inserted just before </head> tag (e.g. extra stylesheet)
+## NB: can use html e.g. <strong>blah</strong>
+## NB: can have multiline strings just indent following lines
+# ckan.template_head_end = <link rel="stylesheet" href="http://mysite.org/css/custom.css" type="text/css">
+
+## html content to be inserted just before </body> tag (e.g. google analytics code)
+## NB: can use html e.g. <strong>blah</strong>
+## NB: can have multiline strings just indent following lines
+# ckan.template_footer_end =
+
+# These three settings (ckan.log_dir, ckan.dump_dir and ckan.backup_dir) are
+# all used in cron jobs, not in CKAN itself. CKAN logging is configured
+# in the logging configuration below
+# Directory for logs (produced by cron scripts associated with ckan)
+ckan.log_dir = %(here)s/log
+# Directory for JSON/CSV dumps (must match setting in apache config)
+ckan.dump_dir = %(here)s/dump
+# Directory for SQL database backups
+ckan.backup_dir = %(here)s/backup
+
+# Default authorizations for new domain objects
+#ckan.default_roles.Package = {"visitor": ["reader"], "logged_in": ["reader"]}
+#ckan.default_roles.Group = {"visitor": ["reader"], "logged_in": ["reader"]}
+#ckan.default_roles.System = {"visitor": ["reader"], "logged_in": ["editor"]}
+#ckan.default_roles.AuthorizationGroup = {"visitor": ["reader"], "logged_in": ["reader"]}
+
+## Ckan public and private recaptcha keys [localhost]
+#ckan.recaptcha.publickey = 6LcL-94SAAAAAKCHKLIgCYNJczalehF4a3GHlPyR
+#ckan.recaptcha.privatekey = 6LcL-94SAAAAADCsq995yBsNl7lHEgJ3Ukqf4Ykq
+
+# Locale/languages
+ckan.locale_default = en_GB
+ckan.locales_offered = en_GB
+# Languages are grouped by percentage of strings in CKAN 1.8 translated
+# (those with 100% first, then those with >=80%, then >=50%, then <50%) and
+# within these groups roughly sorted by number of worldwide native speakers
+# according to Wikipedia.
+ckan.locale_order = en_GB pt_BR ja it cs_CZ ca es fr el sv sr sr@latin no sk fi ru de pl nl bg ko_KR hu sa sl lv
+ckan.locales_filtered_out = en
+
+## Atom Feeds
+#
+# Settings for customising the metadata provided in
+# atom feeds.
+#
+# These settings are used to generate the <id> tags for both feeds
+# and entries. The unique <id>s are created following the method
+# outlined in http://www.taguri.org/ ie - they generate tagURIs, as specified
+# in http://tools.ietf.org/html/rfc4151#section-2.1 :
+#
+# <id>tag:thedatahub.org,2012:/feeds/group/933f3857-79fd-4beb-a835-c0349e31ce76</id>
+#
+# Each component has the corresponding settings:
+#
+# "thedatahub.org" is ckan.feeds.authority_name
+# "2012" is ckan.feeds.date
+#
+
+# Leave blank to use the ckan.site_url config value, otherwise set to a
+# domain or email address that you own. e.g. thedatahub.org or
+# admin@thedatahub.org
+ckan.feeds.authority_name =
+
+# Pick a date of the form "yyyy[-mm[-dd]]" during which the above domain was
+# owned by you.
+ckan.feeds.date = 2012
+
+# If not set, then the value in `ckan.site_id` is used.
+ckan.feeds.author_name =
+
+# If not set, then the value in `ckan.site_url` is used.
+ckan.feeds.author_link =
+
+## File Store
+#
+# CKAN allows users to upload files directly to file storage either on the local
+# file system or to online ‘cloud’ storage like Amazon S3 or Google Storage.
+#
+# If you are using local file storage, remember to set ckan.site_url.
+#
+# To enable cloud storage (Google or S3), first run: pip install boto
+#
+# @see http://docs.ckan.org/en/latest/filestore.html
+
+# 'Bucket' to use for file storage
+ckan.storage.bucket = ckandga
+
+# To enable local file storage:
+ofs.impl = pairtree
+ofs.storage_dir = /srv/ckan/dga
+
+# To enable Google cloud storage:
+#ofs.impl = google
+#ofs.gs_access_key_id =
+#ofs.gs_secret_access_key =
+
+# To enable S3 cloud storage:
+#ofs.impl = s3
+#ofs.aws_access_key_id = ....
+#ofs.aws_secret_access_key = ....
+
+
+## Previews
+#
+# Set the file types that should be previewed inline (e.g. images) or directly in an iframe.
+
+ckan.preview.direct = png jpg gif
+ckan.preview.loadable = html htm rdf+xml owl+xml xml n3 n-triples turtle plain atom csv tsv rss txt json
+
+
+# Activity Streams
+#
+# Default maximum number of activities to show in an activity stream.
+# ckan.activity_list_limit = 31
+
+
+# Activity Streams Email Notifications
+#
+# Uncomment this line to enable activity streams email notifications.
+# You also need to setup a cron job to send the emails, see the documentation.
+#ckan.activity_streams_email_notifications = True
+
+# Email notifications for events older than this time delta will not be sent.
+# Accepted formats: '2 days', '14 days', '4:35:00' (hours, minutes, seconds),
+# '7 days, 3:23:34', etc.
+# ckan.email_notifications_since = 2 days
+
+ckan.cache_expires = 2592000
+#ckan.page_cache_enabled = True
+ckan.static_max_age = 2592000
+ckan.cache_enabled = True
+# DEBUGGING
+
+# ckan.debug_supress_header This option can be set to suppress the debug
+# information showing the controller and action recieving the request being
+# shown in the header. Note: This info only shows if debug is set to true.
+ckan.debug_supress_header = false
+
+## ===================================
+## Extensions
+
+## Config option to enable the (1 day) cache for stats
+## Default (if not defined) is True as stats computations are intensive
+# ckanext.stats.cache_enabled = True
+
+# Logging configuration
+[loggers]
+keys = root, ckan, ckanext
+
+[handlers]
+keys = console, file
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARNING
+handlers = console, file
+
+[logger_ckan]
+level = ERROR
+handlers = console, file
+qualname = ckan
+propagate = 0
+
+[logger_ckanext]
+level = WARNING
+handlers = console, file
+qualname = ckanext
+propagate = 0
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[handler_file]
+class = logging.handlers.RotatingFileHandler
+formatter = generic
+level = NOTSET
+#args = ("ckan.log", "a", 20000000, 9)
+args = ("/var/log/ckan/dga/ckan.log", "a", 20000000, 9)
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s
+
--- /dev/null
+++ b/admin/reset.sh
@@ -1,1 +1,17 @@
+paster --plugin=ckan db clean --config=development.ini
+echo "drop extension postgis cascade;" | psql -d ckantest
+paster --plugin=ckan db clean --config=development.ini
+#to initiate for first time instead of load from dump
+#paster --plugin=ckan db init --config=development.in
+#paster --plugin=ckan user add maxious password=snmc email=maxious@gmail.com
+#paster --plugin=ckan sysadmin add maxious
+#paster --plugin=ckan db dump dump.db
+
+#paster --plugin=ckan db load --config=development.ini dump.db
+paster --plugin=ckan db load --config=development.ini dump.harvest.db
+echo "create extension postgis;" | psql -d ckantest
+#sleep 2
+paster --plugin=ckan search-index rebuild --config=development.ini
+#rm -r /tmp/pairtree_*
+
--- /dev/null
+++ b/admin/start.sh
@@ -1,1 +1,6 @@
+export NEW_RELIC_CONFIG_FILE="newrelic.ini"
+export VIRTUAL_ENV="/var/lib/ckan/dga/pyenv"
+export PATH="/var/lib/ckan/dga/pyenv:/var/lib/ckan/dga/pyenv/bin:$PATH"
+cd /var/lib/ckan/dga/pyenv/src/ckan
+newrelic-admin run-program paster serve development.ini
--- a/ckanext/datagovau/plugin.py
+++ b/ckanext/datagovau/plugin.py
@@ -5,28 +5,24 @@
import ckan.lib.dictization.model_dictize as model_dictize
import ckan.plugins.toolkit as tk
import ckan.model as model
+from pylons import config
-#parse the activity feed for last active non-system user
-def get_last_active_user(id):
- system_user = "de0ba262-83fe-45e2-adda-41bb9f0c86d8"
- user_list = [x for x in lib.helpers.get_action('package_activity_list',{'id':id}) if x['user_id'] != system_user]
- user = user_list[0]['user_id']
- if user is None:
- return lib.helpers.get_action('user_show',{'id':system_user})
- else:
- return lib.helpers.get_action('user_show',{'id':user})
+from sqlalchemy import orm
+import ckan.model
# get user created datasets and those they have edited
def get_user_datasets(user_dict):
created_datasets_list = user_dict['datasets']
- active_datasets_id_list = [x['data']['package'] for x in
+ active_datasets_list = [x['data']['package'] for x in
lib.helpers.get_action('user_activity_list',{'id':user_dict['id']}) if x['data'].get('package')]
- active_datasets_list = active_datasets_id_list #if you need more detail, fetch each dataset here
- print active_datasets_list
- return created_datasets_list + active_datasets_list
+ raw_list = created_datasets_list + active_datasets_list
+ filtered_dict = {}
+ for dataset in raw_list:
+ if dataset['id'] not in filtered_dict.keys():
+ filtered_dict[dataset['id']] = dataset
+ return filtered_dict.values()
-
-class ExampleIDatasetFormPlugin(plugins.SingletonPlugin,
+class DataGovAuPlugin(plugins.SingletonPlugin,
tk.DefaultDatasetForm):
'''An example IDatasetForm CKAN plugin.
@@ -34,20 +30,7 @@
'''
plugins.implements(plugins.IConfigurer, inherit=False)
- plugins.implements(plugins.IDatasetForm, inherit=False)
plugins.implements(plugins.ITemplateHelpers, inherit=False)
-
- # These record how many times methods that this plugin's methods are
- # called, for testing purposes.
- num_times_new_template_called = 0
- num_times_read_template_called = 0
- num_times_edit_template_called = 0
- num_times_search_template_called = 0
- num_times_history_template_called = 0
- num_times_package_form_called = 0
- num_times_check_data_dict_called = 0
- num_times_setup_template_variables_called = 0
-
def update_config(self, config):
# Add this plugin's templates dir to CKAN's extra_template_paths, so
@@ -61,112 +44,6 @@
# config['licenses_group_url'] = 'http://%(ckan.site_url)/licenses.json'
def get_helpers(self):
- return {'get_last_active_user': get_last_active_user, 'get_user_datasets': get_user_datasets}
-
- def is_fallback(self):
- # Return True to register this plugin as the default handler for
- # package types not handled by any other IDatasetForm plugin.
- return True
-
- def package_types(self):
- # This plugin doesn't handle any special package types, it just
- # registers itself as the default (above).
- return []
+ return {'get_user_datasets': get_user_datasets}
- def create_package_schema(self):
- schema = super(ExampleIDatasetFormPlugin, self).create_package_schema()
- schema = self._modify_package_schema(schema)
- return schema
-
- def update_package_schema(self):
- schema = super(ExampleIDatasetFormPlugin, self).update_package_schema()
- schema = self._modify_package_schema(schema)
- return schema
-
- def show_package_schema(self):
- schema = super(ExampleIDatasetFormPlugin, self).show_package_schema()
-
- # Don't show vocab tags mixed in with normal 'free' tags
- # (e.g. on dataset pages, or on the search page)
- schema['tags']['__extras'].append(tk.get_converter('free_tags_only'))
-
- # Add our custom_text field to the dataset schema.
- # ignore_missing == optional
- # ignore_empty == mandatory but not for viewing
- # !!! always convert_from_extras first
- schema.update({
- 'agency_program': [tk.get_converter('convert_from_extras'),
- tk.get_validator('ignore_missing')],
- 'contact_point': [tk.get_converter('convert_from_extras'),
- tk.get_validator('ignore_empty')],
- 'spatial_coverage': [tk.get_converter('convert_from_extras'),
- tk.get_validator('ignore_empty')],
- 'granularity': [tk.get_converter('convert_from_extras'),
- tk.get_validator('ignore_empty')],
- 'jurisdiction': [tk.get_converter('convert_from_extras'),
- tk.get_validator('ignore_empty')],
- 'temporal_coverage': [tk.get_converter('convert_from_extras'),
- tk.get_validator('ignore_empty')],
- 'data_state': [tk.get_converter('convert_from_extras'),
- tk.get_validator('ignore_empty')],
- 'update_freq': [tk.get_converter('convert_from_extras'),
- tk.get_validator('ignore_empty')]
- })
- return schema
-
- def _modify_package_schema(self, schema):
- # Add our custom_test metadata field to the schema, this one will use
- # convert_to_extras instead of convert_to_tags.
- # ignore_missing == optional
- # not_empty == mandatory, enforced here while modifying
-
- schema.update({
- 'agency_program': [tk.get_validator('ignore_missing'),
- tk.get_converter('convert_to_extras')],
- 'contact_point': [tk.get_converter('convert_to_extras'),
- tk.get_validator('not_empty')],
- 'spatial_coverage': [tk.get_converter('convert_to_extras'),
- tk.get_validator('not_empty')],
- 'granularity': [tk.get_converter('convert_to_extras'),
- tk.get_validator('not_empty')],
- 'jurisdiction': [tk.get_converter('convert_to_extras'),
- tk.get_validator('not_empty')],
- 'temporal_coverage': [tk.get_converter('convert_to_extras'),
- tk.get_validator('not_empty')],
- 'data_state': [tk.get_converter('convert_to_extras'),
- tk.get_validator('not_empty')],
- 'update_freq': [tk.get_converter('convert_to_extras'),
- tk.get_validator('not_empty')]
- })
- return schema
-
- # These methods just record how many times they're called, for testing
- # purposes.
- # TODO: It might be better to test that custom templates returned by
- # these methods are actually used, not just that the methods get
- # called.
-
- def setup_template_variables(self, context, data_dict):
- return super(ExampleIDatasetFormPlugin, self).setup_template_variables(
- context, data_dict)
-
- def new_template(self):
- return super(ExampleIDatasetFormPlugin, self).new_template()
-
- def read_template(self):
- return super(ExampleIDatasetFormPlugin, self).read_template()
-
- def edit_template(self):
- return super(ExampleIDatasetFormPlugin, self).edit_template()
-
- def search_template(self):
- return super(ExampleIDatasetFormPlugin, self).search_template()
-
- def history_template(self):
- return super(ExampleIDatasetFormPlugin, self).history_template()
-
- def package_form(self):
- return super(ExampleIDatasetFormPlugin, self).package_form()
-
-
--- /dev/null
+++ b/ckanext/datagovau/templates/base.html
@@ -1,1 +1,7 @@
+{% ckan_extends %}
+ {% block meta %}
+ {{ super() }}
+<meta name="google-site-verification" content="B8scmW2_LMm4IW_ogXK9lojznO57GBpYlWrFjfGz3X8" />
+ {% endblock %}
+
--- /dev/null
+++ b/ckanext/datagovau/templates/dataviewer/base.html
@@ -1,1 +1,11 @@
+{% ckan_extends %}
+{% block scripts %}
+ {{ super() }}
+ <script>
+ preload_resource.url = preload_resource.url.replace("https:","").replace("http:","");
+ preload_resource.original_url = preload_resource.original_url.replace("https:","").replace("http:","");
+ </script>
+{% endblock %}
+
+
--- /dev/null
+++ b/ckanext/datagovau/templates/dataviewer/snippets/data_preview.html
@@ -1,1 +1,32 @@
+<div class="module-content ckanext-datapreview">
+ {% if embed %}
+ {# images can be embedded directly #}
+ <img src="{{ resource_url }}"></img>
+ {% else %}
+ <div class="data-viewer-error js-hide">
+ <p class="text-error">
+ <i class="icon-info-sign"></i>
+ {{ _('This resource can not be previewed at the moment.') }}
+ <a href="#" data-toggle="collapse" data-target="#data-view-error">
+ {{ _('Click here for more information.') }}
+ </a>
+ </p>
+ <p id="data-view-error" class="collapse"></p>
+ <p>
+ <a href="{{ raw_resource_url }}" class="btn btn-large resource-url-analytics" target="_blank">
+ <i class="icon-large icon-download"></i>
+ {{ _('Download resource') }}
+ </a>
+ </p>
+ </div>
+ <iframe src="{{ resource_url }}" frameborder="0" width="100%" data-module="data-viewer">
+ <p>{{ _('Your browser does not support iframes.') }}</p>
+ </iframe>
+ {% endif %}
+</div>
+<div class="embedhint" style="padding-left: 15px;">
+<h4>Embed this visualisation in your own website...</h4>
+Copy the HTML in the box below and you can display this visualisation on your own website.<br/>
+<textarea style="width:97%"><iframe src="{{ resource_url }}" frameborder="0" width="100%" height="600px"></iframe></textarea>
+</div>
--- /dev/null
+++ b/ckanext/datagovau/templates/header.html
@@ -1,1 +1,55 @@
+{% ckan_extends %}
+{% block header_account_logged %}
+{% if c.userobj.sysadmin %}
+<li>
+ <a href="{{ h.url_for(controller='admin', action='index') }}" title="{{ _('Sysadmin settings') }}">
+ <i class="icon-legal"> Sysadmin settings</i>
+ </a>
+</li>
+{% endif %}
+<li>
+ <a href="{{ h.url_for(controller='user', action='read', id=c.userobj.name) }}" class="image" title="{{ _('View profile') }}">
+ {{ h.gravatar((c.userobj.email_hash if c and c.userobj else ''), size=22) }}
+ <span class="username">{{ c.userobj.display_name }}</span>
+ </a>
+</li>
+{% set new_activities = h.new_activities() %}
+<li class="notifications {% if new_activities > 0 %}notifications-important{% endif %}">
+ {% set notifications_tooltip = ngettext('Dashboard (%(num)d new item)', 'Dashboard (%(num)d new items)', new_activities) %}
+ <a href="{{ h.url_for(controller='user', action='dashboard') }}" title="{{ notifications_tooltip }}">
+ <i class="icon-dashboard"> notifications_tooltip</i>
+ <span>{{ new_activities }}</span>
+ </a>
+</li>
+{% block header_account_settings_link %}
+<li>
+ <a href="{{ h.url_for(controller='user', action='edit', id=c.userobj.name) }}" title="{{ _('Edit settings') }}">
+ <i class="icon-cog"> Edit settings</i>
+ </a>
+</li>
+{% endblock %}
+{% block header_account_log_out_link %}
+<li>
+ <a href="{{ h.url_for('/user/_logout') }}" title="{{ _('Log out') }}">
+ <i class="icon-signout"> Log out</i>
+ </a>
+</li>
+{% endblock %}
+
+{% block header_site_navigation %}
+ <nav class="section navigation">
+ <ul class="nav nav-pills">
+ {% block header_site_navigation_tabs %}
+ {{ h.build_nav_main(
+ ('search', _('Datasets')),
+ ('organizations_index', _('Organizations')),
+ ('about', _('About'))
+ ) }}
+ <li><a href="//data.gov.au/stats">Site Statistics</a></li>
+ <li><a href="https://datagovau.ideascale.com/">Feedback/Request Data</a></li>
+ {% endblock %}
+ </ul>
+ </nav>
+{% endblock %}
+
--- /dev/null
+++ b/ckanext/datagovau/templates/home/index.html
@@ -1,1 +1,47 @@
+{% ckan_extends %}
+{% block home_secondary_content %}
+<script type="text/javascript" src="//www.google.com/jsapi">
+</script>
+<script type="text/javascript">
+google.load("feeds", "1") //Load Google Ajax Feed API (version 1)
+</script>
+ <div id="feeddiv"></div>
+
+<script type="text/javascript">
+
+var feedcontainer=document.getElementById("feeddiv")
+var feedurl="http://www.finance.gov.au/taxonomy/term/1274/feed"
+var feedlimit=3
+var rssoutput="<div class='module module-shallow module-narrow module-dark info box' style='color:black'><h2>Latest data.gov.au News</h2><i class='ckan-icon ckan-icon-feed'></i><a href='http://www.finance.gov.au/taxonomy/term/1274/feed/'> Subscribe to the blog </a></div>"
+
+
+function rssfeedsetup(){
+var feedpointer=new google.feeds.Feed(feedurl) //Google Feed API method
+feedpointer.setNumEntries(feedlimit) //Google Feed API method
+feedpointer.load(displayfeed) //Google Feed API method
+}
+
+function displayfeed(result){
+if (!result.error){
+var thefeeds=result.feed.entries
+for (var i=0; i<thefeeds.length; i++) {
+rssoutput+="<div class='module module-shallow module-narrow module-dark info box'><h3><a href='" + thefeeds[i].link + "'>" + thefeeds[i].title + "</a></h3>"
+rssoutput+= " <font color='black'>Posted on " + new Date(thefeeds[i].publishedDate).toDateString() + "</font></div>"
+}
+rssoutput+=""
+feedcontainer.innerHTML=rssoutput
+}
+else
+alert("Error fetching feeds!")
+}
+
+window.onload=function(){
+rssfeedsetup()
+}
+
+</script>
+
+{{ super() }}
+ {% endblock %}
+
--- /dev/null
+++ b/ckanext/datagovau/templates/home/snippets/stats.html
@@ -1,1 +1,78 @@
+{% set stats = h.get_site_statistics() %}
+
+<div class="box stats">
+ <div class="inner">
+ <h3>{{ _('{0} statistics').format(g.site_title) }}</h3>
+ <ul>
+ <li>
+ <a href="{{ h.url_for(controller='package', action='search') }}">
+ <b>{{ h.SI_number_span(stats.dataset_count) }}</b>
+ {{ _('dataset') if stats.dataset_count == 1 else _('datasets') }}
+ </a>
+ </li>
+ <li>
+ <a href="{{ h.url_for(controller='organization', action='index') }}">
+ <b>{{ h.SI_number_span(stats.organization_count) }}</b>
+ {{ _('organisation') if stats.organization_count == 1 else _('organisations') }}
+ </a>
+ </li>
+ <li>
+ <a href="{{ h.url_for(controller='group', action='index') }}">
+ <b>{{ h.SI_number_span(stats.group_count) }}</b>
+ {{ _('group') if stats.group_count == 1 else _('groups') }}
+ </a>
+ </li>
+ <!--<li>
+ <a href="{{ h.url_for(controller='related', action='dashboard') }}">
+ <b>{{ h.SI_number_span(stats.related_count) }}</b>
+ {{ _('related item') if stats.related_count == 1 else _('related items') }}
+ </a>
+ </li>-->
+ </ul>
+ </div>
+</div>
+
+ <div id="feeddiv">
+</div>
+
+<script type="text/javascript" src="//www.google.com/jsapi">
+</script>
+<script type="text/javascript">
+google.load("feeds", "1") //Load Google Ajax Feed API (version 1)
+</script>
+
+<script type="text/javascript">
+
+var feedcontainer=document.getElementById("feeddiv")
+var feedurl="http://www.finance.gov.au/taxonomy/term/1274/feed"
+var feedlimit=4
+var rssoutput="<div class='module module-shallow module-narrow module-dark info box' style='color:black'><h2>Latest data.gov.au News</h2><i class='ckan-icon ckan-icon-feed'></i><a href='http://www.finance.gov.au/taxonomy/term/1274/feed/'> Subscribe to the blog </a></div>"
+
+
+function rssfeedsetup(){
+var feedpointer=new google.feeds.Feed(feedurl) //Google Feed API method
+feedpointer.setNumEntries(feedlimit) //Google Feed API method
+feedpointer.load(displayfeed) //Google Feed API method
+}
+
+function displayfeed(result){
+if (!result.error){
+var thefeeds=result.feed.entries
+for (var i=0; i<thefeeds.length; i++) {
+rssoutput+="<div class='module module-shallow module-narrow module-dark info box'><h3><a href='" + thefeeds[i].link + "'>" + thefeeds[i].title + "</a></h3>"
+rssoutput+= " <font color='black'>Posted on " + new Date(thefeeds[i].publishedDate).toDateString() + "</font></div>"
+}
+rssoutput+=""
+feedcontainer.innerHTML=rssoutput
+}
+else
+alert("Error fetching feeds!")
+}
+
+window.onload=function(){
+rssfeedsetup()
+}
+
+</script>
+
--- a/ckanext/datagovau/templates/package/read.html
+++ b/ckanext/datagovau/templates/package/read.html
@@ -1,167 +1,18 @@
{% ckan_extends %}
+{% block primary_content_inner %}
+{{ super() }}
+<div class="module-content">
+ {{ h.disqus_comments() }}
+</div>
+{% endblock %}
-{% block package_additional_info %}
-<section class="additional-info" xmlns:dcat="http://www.w3.org/ns/dcat#"
- xmlns:dcam="http://purl.org/dc/dcam/"
- xmlns:aglsterms="http://www.agls.gov.au/agls/terms/"
- xmlns:agentterms="http://www.agls.gov.au/agls/agentterms/"
- xmlns:availterms="http://www.agls.gov.au/agls/availterms/"
- xmlns:adminterms="http://www.agls.gov.au/agls/adminterms/"
- xmlns:dct="http://purl.org/dc/terms/">
- <h3>{{ _('Additional Info') }}</h3>
- <table class="table table-striped table-bordered table-condensed">
- <thead>
- <tr>
- <th scope="col">{{ _('Field') }}</th>
- <th scope="col">{{ _('Value') }}</th>
- </tr>
- </thead>
- <tbody>
+{% block secondary_content %}
+ {{ super() }}
-
- {# Add our custom field to the dataset read page. #}
- {% if pkg.get('metadata_created') %}
- <tr>
- <th scope="row" class="dataset-label">Date Published</th>
- <td class="dataset-details" property="dct:issued">{{ pkg.metadata_created.split("T")[0] }}</td>
- </tr>
- {% endif %}
- {% if pkg.get('metadata_updated') %}
- <tr>
- <th scope="row" class="dataset-label">Date Updated</th>
- <td class="dataset-details" property="dct:updated">{{ pkg.metadata_updated.split("T")[0] }}</td>
- </tr>
- {% endif %}
- {% if pkg.get('agency_program') %}
- <tr>
- <th scope="row" class="dataset-label">Agency Program</th>
- <td class="dataset-details"> {{ pkg.agency_program }}</td>
- </tr>
- {% endif %}
- {% if pkg.get('Agency Program') %}
- <tr>
- <th scope="row" class="dataset-label">Agency Program</th>
- <td class="dataset-details"> {{ pkg.get('Agency Program') }}</td>
- </tr>
- {% endif %}
- {% if h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI') %}
- <tr>
- <th scope="row" class="dataset-label">{{ _('Source') }}</th>
- <td class="dataset-details" property="dct:source">{{ h.link_to(h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI'),
- h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI'), rel='dct:source', target='_blank') }}
- </td>
- </tr>
- {% endif %}
-
- {% if pkg.get('contact_point') %}
- <tr>
- <th scope="row" class="dataset-label">Contact Point</th>
- <td class="dataset-details" property="dcat:contactPoint"> {{ h.mail_to(email_address=pkg.contact_point,
- name=pkg.contact_point) }}</td>
- </tr>
- {% endif %}
- {% if pkg.get('spatial_coverage') %}
-
- <tr>
- <th scope="row" class="dataset-label">Geospatial Coverage</th>
- <td class="dataset-details" property="dct:spatial"> {{ pkg.spatial_coverage }}</td>
- </tr>
- {% endif %}
- {% if h.get_pkg_dict_extra(pkg,'Geospatial Coverage') %}
-
- <tr>
- <th scope="row" class="dataset-label">Geospatial Coverage</th>
- <td class="dataset-details" property="dct:spatial"> {{ h.get_pkg_dict_extra(pkg,'Geospatial Coverage') }}</td>
- </tr>
- {% endif %}
- {% if pkg.get('granularity') %}
-
- <tr>
- <th scope="row" class="dataset-label">Data Granularity</th>
- <td class="dataset-details"> {{ pkg.granularity }}</td>
- </tr>
- {% endif %}
- {% if h.get_pkg_dict_extra(pkg,'Granularity') %}
-
- <tr>
- <th scope="row" class="dataset-label">Data Granularity</th>
- <td class="dataset-details"> {{ h.get_pkg_dict_extra(pkg,'Granularity') }}</td>
- </tr>
- {% endif %}
- {% if pkg.get('jurisdiction') %}
-
- <tr>
- <th scope="row" class="dataset-label">Government Jurisdiction</th>
- <td class="dataset-details" property="aglsterms:AglsJuri"> {{ pkg.jurisdiction }}</td>
- </tr>
- {% endif %}
- {% if h.get_pkg_dict_extra(pkg,'AGLSTERMS.Jurisdiction') %}
-
- <tr>
- <th scope="row" class="dataset-label">Government Jurisdiction</th>
- <td class="dataset-details" property="aglsterms:AglsJuri"> {{ h.get_pkg_dict_extra(pkg,'AGLSTERMS.Jurisdiction') }}</td>
- </tr>
- {% endif %}
- {% if pkg.get('temporal_coverage') %}
-
- <tr>
- <th scope="row" class="dataset-label">Temporal Coverage</th>
- <td class="dataset-details" property="dct:temporal"> {{ pkg.temporal_coverage }}</td>
- </tr>
- {% endif %}
- {% if h.get_pkg_dict_extra(pkg,'Temporal Coverage') %}
-
- <tr>
- <th scope="row" class="dataset-label">Temporal Coverage</th>
- <td class="dataset-details" property="dct:temporal"> {{ h.get_pkg_dict_extra(pkg,'Temporal Coverage') }}</td>
- </tr>
- {% endif %}
- {% if pkg.get('data_state') %}
-
- <tr>
- <th scope="row" class="dataset-label">Data State</th>
- <td class="dataset-details"> {{ pkg.data_state }}</td>
- </tr>
- {% endif %}
- {% if pkg.get('update_freq') %}
-
- <tr>
- <th scope="row" class="dataset-label">Update Frequency</th>
- <td class="dataset-details"> {{ pkg.update_freq }}</td>
- </tr>
- {% endif %}
- {% if h.get_pkg_dict_extra(pkg,'Update Frequency') %}
- <tr>
- <th scope="row" class="dataset-label">Update Frequency</th>
- <td class="dataset-details"> {{ h.get_pkg_dict_extra(pkg,'Update Frequency') }}</td>
- </tr>
- {% endif %}
-
-{% set email =h.get_last_active_user(c.pkg_dict['id']).get('email','') %}
- <tr>
- <th scope="row" class="dataset-label">{{ _('Maintainer') }}</th>
- <td class="dataset-details" property="dc:contributor">{{
- h.mail_to(email_address=(email or ' '), name=h.get_last_active_user(c.pkg_dict['id']).get("display_name",'')) }}
- </td>
- </tr>
- <tr>
- <th scope="row" class="dataset-label">Publisher/Agency</th>
- <td class="dataset-details" property="dc:publisher">{{ c.pkg_dict['organization']['title']}}
- </td>
- </tr>
- <tr>
- <th scope="row" class="dataset-label">Type</th>
- <td class="dataset-details" property="dc:type">Dataset</td>
- </tr>
- <tr>
- <th scope="row" class="dataset-label">Language</th>
- <td class="dataset-details" property="dc:language">English</td>
- </tr>
-
- </tbody>
- </table>
-</section>
-
+ {% set dataset_extent = h.get_pkg_dict_extra(c.pkg_dict, 'spatial', '') %}
+ {% if dataset_extent %}
+ {% snippet "spatial/snippets/dataset_map_sidebar.html", extent=dataset_extent %}
+ {% endif %}
{% endblock %}
--- a/ckanext/datagovau/templates/package/read.n3
+++ /dev/null
@@ -1,45 +1,1 @@
-@prefix : <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix dct: <http://purl.org/dc/terms/> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-<${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}>
-a dcat:Dataset;
- dct:description "${c.pkg_dict['notes']}";
- dct:identifier "${c.pkg_dict['name']}";
- dct:relation [
- rdf:value "";
- :label "change_note" ],
- [
- rdf:value "";
- :label "definition_note" ],
- [
- rdf:value "";
- :label "editorial_note" ],
- [
- rdf:value "";
- :label "example_note" ],
- [
- rdf:value "";
- :label "history_note" ],
- [
- rdf:value "";
- :label "scope_note" ],
- [
- rdf:value "";
- :label "skos_note" ],
- [
- rdf:value "";
- :label "temporal_granularity" ],
- [
- rdf:value "";
- :label "type_of_dataset" ],
- [
- rdf:value "";
- :label "update_frequency" ];
- dct:title "${c.pkg_dict['title']}";
- :label "${c.pkg_dict['name']}";
- = <urn:uuid:${c.pkg_dict['id']}>;
- foaf:homepage <http://127.0.0.1:5000/dataset/testt> .
--- a/ckanext/datagovau/templates/package/read.rdf
+++ /dev/null
@@ -1,157 +1,1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rdf:RDF
- xmlns:py="http://genshi.edgewall.org/"
- xmlns:foaf="http://xmlns.com/foaf/0.1/"
- xmlns:owl="http://www.w3.org/2002/07/owl#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:dcat="http://www.w3.org/ns/dcat#"
- xmlns:dcam="http://purl.org/dc/dcam/"
- xmlns:aglsterms="http://www.agls.gov.au/agls/terms/"
- xmlns:agentterms="http://www.agls.gov.au/agls/agentterms/"
- xmlns:availterms="http://www.agls.gov.au/agls/availterms/"
- xmlns:adminterms="http://www.agls.gov.au/agls/adminterms/"
- xmlns:dct="http://purl.org/dc/terms/"
- >
- <dcat:Dataset rdf:about="${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}">
- <dct:identifier>${c.pkg_dict['name']}</dct:identifier>
- <dct:title>${c.pkg_dict['title']}</dct:title>
- <dct:landingPage
- rdf:resource="${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True) }"/>
- <owl:sameAs rdf:resource="urn:uuid:${c.pkg_dict['id']}"/>
- <dct:type>Dataset</dct:type>
- <dct:description>${c.pkg_dict['notes']}</dct:description>
- <dct:issued>${c.pkg_dict['metadata_created']}</dct:issued>
- <dct:modified>${c.pkg_dict['metadata_modified']}</dct:modified>
- <dct:language>en</dct:language>
-<py:choose>
- <py:when test="c.pkg_dict.get('license_url',None)">
- <dct:license>${c.pkg_dict['license_url']}</dct:license>
- <dct:rights rdf:resource="${c.pkg_dict['license_url']}"/>
- </py:when>
- <py:otherwise>
- <dct:license>${c.pkg_dict['license_id']}</dct:license>
- <dct:rights rdf:resource="${c.pkg_dict['license_id']}"/>
- </py:otherwise>
-</py:choose>
- <py:for each="tag_dict in c.pkg_dict.get('tags',[])">
- <dcat:keyword>${ tag_dict["name"] }</dcat:keyword>
- </py:for>
- <py:for each="group_dict in c.pkg_dict.get('groups',[])">
- <dcat:theme>${ group_dict["title"] }</dcat:theme>
- </py:for>
-
- <foaf:homepage
- rdf:resource="${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}"/>
- <rdfs:label>${c.pkg_dict['name']}</rdfs:label>
-
-
- <py:for each="rsc_dict in c.pkg_dict['resources']">
- <dcat:distribution>
- <dcat:Distribution>
- <dct:title>${rsc_dict.get('name')}</dct:title>
- <owl:sameAs rdf:resource="urn:uuid:${rsc_dict.get('id')}"/>
- <dct:description>${rsc_dict.get('description')}</dct:description>
- <dcat:accessURL rdf:resource="${ rsc_dict.get('url') }"/>
- <dct:created>${rsc_dict.get('created')}</dct:created>
- <dct:modified>${rsc_dict.get('revision_timestamp')}</dct:modified>
- <dcat:byteSize py:if="rsc_dict.get('size')">${rsc_dict.get('size')}</dcat:byteSize>
- <dcat:mediaType py:if="rsc_dict.get('mimetype')">${rsc_dict.get('mimetype')}</dcat:mediaType>
- <dct:extent py:if="rsc_dict.get('size')">${rsc_dict.get('size')} bytes</dct:extent>
- <dct:format py:if="rsc_dict.get('format')">
- <dct:IMT>
- <rdf:value>${rsc_dict.get('format')}</rdf:value>
- <rdfs:label>${rsc_dict.get('format')}</rdfs:label>
- </dct:IMT>
- </dct:format>
- <dct:title py:if="rsc_dict.get('name')">${rsc_dict.get('name')}</dct:title>
- </dcat:Distribution>
- </dcat:distribution>
- </py:for>
- <dct:publisher py:if="c.pkg_dict.get('organization', None)">
- <rdf:Description>
- <foaf:name>${ c.pkg_dict['organization']['title'] }</foaf:name>
- </rdf:Description>
- </dct:publisher>
- <dct:creator py:if="c.pkg_dict.get('organization', None)">
- <rdf:Description>
- <foaf:name>${ c.pkg_dict['organization']['title'] }</foaf:name>
- </rdf:Description>
- </dct:creator>
- <dct:contributor>
- <rdf:Description>
- <foaf:name>${h.get_last_active_user(c.pkg_dict['id'])["display_name"]}</foaf:name>
- <foaf:mbox py:if="h.get_last_active_user(c.pkg_dict['id']).get('email', None)"
- rdf:resource="mailto:${h.get_last_active_user(c.pkg_dict['id'])['email']}"/>
- </rdf:Description>
- </dct:contributor>
-
-
- <foaf:homepage py:if="h.get_pkg_dict_extra(c.pkg_dict,'DCTERMS.Source.URI')">${h.get_pkg_dict_extra(c.pkg_dict,'DCTERMS.Source.URI') }
- </foaf:homepage>
-
- <dcat:contactPoint py:if="c.pkg_dict.get('contact_point')">${c.pkg_dict.contact_point }</dcat:contactPoint>
- <dct:spatial py:if="c.pkg_dict.get('spatial_coverage')">${ c.pkg_dict.spatial_coverage }</dct:spatial>
- <dct:spatial py:if="h.get_pkg_dict_extra(c.pkg_dict,'Geospatial Coverage')">${ h.get_pkg_dict_extra(c.pkg_dict,'Geospatial Coverage') }</dct:spatial>
- <aglsterms:AglsJuri py:if="c.pkg_dict.get('jurisdiction')">${ c.pkg_dict.jurisdiction }</aglsterms:AglsJuri>
- <aglsterms:AglsJuri py:if="h.get_pkg_dict_extra(c.pkg_dict,'AGLSTERMS.Jurisdiction')">${ h.get_pkg_dict_extra(c.pkg_dict,'AGLSTERMS.Jurisdiction') }</aglsterms:AglsJuri>
- <dct:temporal py:if="c.pkg_dict.get('temporal_coverage')">${ c.pkg_dict.get('temporal_coverage') }</dct:temporal>
- <dct:temporal py:if="h.get_pkg_dict_extra(c.pkg_dict,'Temporal Coverage')">${ h.get_pkg_dict_extra(c.pkg_dict,'Temporal Coverage') }</dct:temporal>
- <dct:relation py:if="c.pkg_dict.get('data_state')">
- <rdf:Description>
- <rdfs:label>Data State</rdfs:label>
- <rdf:value>${ c.pkg_dict.get('data_state') }</rdf:value>
- </rdf:Description>
- </dct:relation>
-
- <dct:relation py:if="c.pkg_dict.get('update_freq')">
- <rdf:Description>
- <rdfs:label>Update Frequency</rdfs:label>
- <rdf:value>${ c.pkg_dict.get('update_freq') }</rdf:value>
- </rdf:Description>
- </dct:relation>
- <dct:relation py:if="h.get_pkg_dict_extra(c.pkg_dict,'Update Frequency')">
- <rdf:Description>
- <rdfs:label>Update Frequency</rdfs:label>
- <rdf:value>${ h.get_pkg_dict_extra(c.pkg_dict,'Update Frequency') }</rdf:value>
- </rdf:Description>
- </dct:relation>
-
- <dct:relation py:if="h.get_pkg_dict_extra(c.pkg_dict,'Agency Program')">
- <rdf:Description>
- <rdfs:label>Agency Program</rdfs:label>
- <rdf:value>${ h.get_pkg_dict_extra(c.pkg_dict,'Agency Program') }</rdf:value>
- </rdf:Description>
- </dct:relation>
- <dct:relation py:if="c.pkg_dict.get('agency_program')">
- <rdf:Description>
- <rdfs:label>Agency Program</rdfs:label>
- <rdf:value>${ c.pkg_dict.get('agency_program') }</rdf:value>
- </rdf:Description>
- </dct:relation>
-
- <dct:relation py:if="h.get_pkg_dict_extra(c.pkg_dict,'Granularity')">
- <rdf:Description>
- <rdfs:label>Data Granularity</rdfs:label>
- <rdf:value>${ h.get_pkg_dict_extra(c.pkg_dict,'Granularity') }</rdf:value>
- </rdf:Description>
- </dct:relation>
- <dct:relation py:if="c.pkg_dict.get('granularity')">
- <rdf:Description>
- <rdfs:label>Data Granularity</rdfs:label>
- <rdf:value>${ c.pkg_dict.get('granularity') }</rdf:value>
- </rdf:Description>
- </dct:relation>
-
- <py:for each="extra_dict in c.pkg_dict.get('extras',[])">
- <dct:relation>
- <rdf:Description>
- <rdfs:label>${extra_dict.get('key','')}</rdfs:label>
- <rdf:value>${extra_dict.get('value','')}</rdf:value>
- </rdf:Description>
- </dct:relation>
- </py:for>
- </dcat:Dataset>
-</rdf:RDF>
-
--- a/ckanext/datagovau/templates/package/read_base.html
+++ /dev/null
@@ -1,47 +1,1 @@
-{% ckan_extends %}
-{% block links -%}
-{{ super() }}
-<link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
-<link rel="schema.AGLSTERMS" href="http://www.agls.gov.au/agls/terms/" />
-
-{% endblock -%}
-
-{% block head_extras -%}
-{{ super() }}
-<meta name="DCTERMS.Language" scheme="RFC3066" content="en" />
-<meta name="DCTERMS.Type" scheme="AGLSTERMS.Document" content="dataset" />
-<meta name="DCTERMS.Creator" scheme="AGLSTERMS.AglsAgent" content="{{ pkg['organization']['title'] }}" />
-<meta name="DCTERMS.Modified" scheme="DCTERMS.ISO8601" content="{{pkg['metadata_modified']}}" />
-<meta name="DCTERMS.Published" scheme="DCTERMS.ISO8601" content="{{pkg['metadata_created']}}" />
-{% if h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI') %}<meta name="DCTERMS.Source.URI" content="{{h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI')}}" />{% endif %}
-<meta name="DCTERMS.License" content="{{pkg['license_url']}}" />
-<meta name="DCTERMS.Coverage.Temporal" content="{{pkg.temporal_coverage or h.get_pkg_dict_extra(pkg,'Temporal Coverage')}}" />
-<meta name="DCTERMS.Coverage.Spatial" content="{{pkg.spatial_coverage or h.get_pkg_dict_extra(pkg,'Geospatial Coverage')}}" />
-<meta name="AGLSTERMS.Jurisdiction" scheme="AGLSTERMS.AglsJuri" content="{{pkg.jurisdiction or h.get_pkg_dict_extra(pkg,'AGLSTERMS.Jurisdiction')}}" />
-<meta name="DCAT.Theme" scheme="VO" content="{% for x in pkg.groups %}{{x['title']}},{% endfor %}" />
-<meta name="DCTERMS.Identifier" content="{{h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}}" />
-<meta name="DCTERMS.Title" content="{{pkg['title']}}" />
-<meta name="DCTERMS.Description" scheme="" content="{{pkg['notes']}}" />
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-{% endblock -%}
-
-{% block package_info %}
-<div class="module context-info">
- <div class="module-content">
- <h1 class="heading" property="dct:title">{{ pkg.title or pkg.name }}</h1>
- <div class="nums">
- <dl>
- <dt>{{ _('Followers') }}</dt>
- <dd>{{ h.SI_number_span(h.get_action('dataset_follower_count', {'id': pkg.id})) }}</dd>
- </dl>
- </div>
- <div class="follow_button">
- {{ h.follow_button('dataset', pkg.name) }}
- </div>
- </div>
-</div>
-{% endblock %}
-
-
--- a/ckanext/datagovau/templates/package/resource_read.html
+++ /dev/null
@@ -1,36 +1,1 @@
-{% ckan_extends %}
-{% block links -%}
-{{ super() }}
-<link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
-<link rel="schema.AGLSTERMS" href="http://www.agls.gov.au/agls/terms/" />
-
-{% endblock -%}
-
-{% block head_extras -%}
-{{ super() }}
-<meta name="DCTERMS.Language" scheme="RFC3066" content="en" />
-<meta name="DCTERMS.Type" scheme="AGLSTERMS.Document" content="dataset" />
-<meta name="DCTERMS.Creator" scheme="AGLSTERMS.AglsAgent" content="{{ pkg['organization']['title'] }}" />
-<meta name="DCTERMS.Modified" scheme="DCTERMS.ISO8601" content="{{res['revision_timestamp']}}" />
-<meta name="DCTERMS.Published" scheme="DCTERMS.ISO8601" content="{{res['created']}}" />
-{% if h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI') %}<meta name="DCTERMS.Source.URI" content="{{h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI')}}" />{% endif %}
-<meta name="DCTERMS.License" content="{{pkg['license_url']}}" />
-<meta name="DCTERMS.Coverage.Temporal" content="{{pkg.temporal_coverage or h.get_pkg_dict_extra(pkg,'Temporal Coverage')}}" />
-<meta name="DCTERMS.Coverage.Spatial" content="{{pkg.spatial_coverage or h.get_pkg_dict_extra(pkg,'Geospatial Coverage')}}" />
-<meta name="AGLSTERMS.Jurisdiction" scheme="AGLSTERMS.AglsJuri" content="{{pkg.jurisdiction or h.get_pkg_dict_extra(pkg,'AGLSTERMS.Jurisdiction')}}" />
-<meta name="DCAT.Theme" scheme="VO" content="{% for x in pkg.groups %}{{x['title']}},{% endfor %}" />
-<meta name="DCAT.byteSize" content="{{res.get('size')}}" />
-<meta name="DCAT.mediaType" content="{{res.get('mimetype')}}" />
-<meta name="DCTERMS.Identifier" content="{{res.get('url')}}" />
-<meta name="DCTERMS.Title" content="{{res['name']}}" />
-<meta name="DCTERMS.Description" scheme="" content="{{res['description']}}" />
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-<meta name="DCTERMS.Format" content="{{res.format}}" />
-<meta name="DCTERMS.File.Size" content="{{res.size}}" />
-
-{% endblock -%}
-
-
-
--- /dev/null
+++ b/ckanext/datagovau/templates/package/search.html
@@ -1,1 +1,7 @@
+{% ckan_extends %}
+{% block secondary_content %}
+{{ super() }}
+ {% snippet "spatial/snippets/spatial_query.html", default_extent="[[-11, 114], [-42, 154]]" %}
+{% endblock %}
+
--- a/ckanext/datagovau/templates/package/snippets/package_basic_fields.html
+++ b/ckanext/datagovau/templates/package/snippets/package_basic_fields.html
@@ -1,41 +1,4 @@
{% ckan_extends %}
-
-{% block package_basic_fields_org %}
-
-{{ super() }}
-
-{{ form.input('agency_program', label=_('Agency Program'), id='field-agency_program',
-placeholder=_('Name of the Agency Program that generated the data if relevant'),
-value=data.agency_program, error=errors.agency_program, classes=['control-medium']) }}
-
-{{ form.input('contact_point', label=_('Contact Point'), id='field-contact_point',
-placeholder=_('Email address for questions about content of dataset'),
-value=data.contact_point, error=errors.contact_point, classes=['control-medium']) }}
-
-{{ form.input('spatial_coverage', label=_('Geospatial Coverage'), id='field-spatial_coverage',
-placeholder=_('The geographical area covered by the data. Eg: Whole of Australia, New South Wales, Canberra'),
-value=data.spatial_coverage, error=errors.spatial_coverage, classes=['control-medium']) }}
-
-{{ form.input('granularity', label=_('Data Granularity'), id='field-granularity',
-placeholder=_('Granularity in time, place etc. Eg: incidents reports on daily basis by location.'),
-value=data.granularity, error=errors.granularity, classes=['control-medium']) }}
-
-{{ form.input('jurisdiction', label=_('Government Jurisdiction'), id='field-jurisdiction',
-placeholder=_('New South Wales, Glenorchy City Council, Federal'),
-value=data.jurisdiction, error=errors.jurisdiction, classes=['control-medium']) }}
-
-{{ form.input('temporal_coverage', label=_('Temporal Coverage'), id='field-temporal_coverage',
-placeholder=_('The timespan the dataset relates to: Current, 2008, 2008-2012, Jan 2012'),
-value=data.temporal_coverage, error=errors.temporal_coverage, classes=['control-medium']) }}
-
-{{ form.select('data_state', label=_('Data State'), options= [{'value': 'active', 'text': 'Active'}, {'value': 'inactive', 'text': 'Inactive'}],
-selected='Active', error=errors.data_state) }}
-
-{{ form.input('update_freq', label=_('Update Frequency'), id='field-update_freq',
-placeholder=_('How often the dataset is updated. Eg: Daily, Weekly, Never'),
-value=data.update_freq, error=errors.update_freq, classes=['control-medium']) }}
-
-{% endblock %}
{% block package_basic_fields_license %}
@@ -60,3 +23,4 @@
</div>
</div>
{% endblock %}
+
--- a/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html
+++ b/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html
@@ -8,19 +8,6 @@
{% endblock %}
{# https://github.com/okfn/ckan/blob/master/ckan/templates/macros/form.html documents the macros for fields #}
-
-{% block package_metadata_fields %}
-
-
-{{ super() }}
-
-{% endblock %}
-
-{% block package_metadata_author %}
-{% endblock %}
-
-{% block package_metadata_fields_maintainer %}
-{% endblock %}
{% block dataset_fields %}
{% if data.groups %}
@@ -40,3 +27,4 @@
{% set group_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/group/autocomplete?q=?', 'data-module-key': 'id', 'data-module-label': 'title'} %}
{{ form.input(group_name, label=_('Add Group/Theme'), id="field-group", value=data[group_name], classes=['control-medium'], attrs=group_attrs) }}
{% endblock %}
+
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@
entry_points=\
"""
[ckan.plugins]
- datagovau=ckanext.datagovau.plugin:ExampleIDatasetFormPlugin
+ datagovau=ckanext.datagovau.plugin:DataGovAuPlugin
""",
)