Work on unified metadata output
Work on unified metadata output

file:b/.idea/.name (new)
--- /dev/null
+++ b/.idea/.name
@@ -1,1 +1,1 @@
-
+ckanext-datagovau

--- /dev/null
+++ b/.idea/compiler.xml
@@ -1,1 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="!?*.java" />
+      <entry name="!?*.form" />
+      <entry name="!?*.class" />
+      <entry name="!?*.groovy" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.flex" />
+      <entry name="!?*.kt" />
+      <entry name="!?*.clj" />
+    </wildcardResourcePatterns>
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>
 
+

--- /dev/null
+++ b/.idea/encodings.xml
@@ -1,1 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
 
+

file:b/.idea/misc.xml (new)
--- /dev/null
+++ b/.idea/misc.xml
@@ -1,1 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <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>
+</project>
 
+

file:b/.idea/modules.xml (new)
--- /dev/null
+++ b/.idea/modules.xml
@@ -1,1 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/ckanext-datagovau.iml" filepath="$PROJECT_DIR$/ckanext-datagovau.iml" />
+    </modules>
+  </component>
+</project>
 
+

--- /dev/null
+++ b/.idea/scopes/scope_settings.xml
@@ -1,1 +1,5 @@
-
+<component name="DependencyValidationManager">
+  <state>
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </state>
+</component>

file:b/.idea/vcs.xml (new)
--- /dev/null
+++ b/.idea/vcs.xml
@@ -1,1 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
 
+

--- /dev/null
+++ b/.idea/workspace.xml
@@ -1,1 +1,684 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="89ace156-8d75-43de-ba53-6e829c197435" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.rst" afterPath="$PROJECT_DIR$/README.rst" />
+    </list>
+    <ignored path="ckanext-datagovau.iws" />
+    <ignored path=".idea/workspace.xml" />
+    <file path="/Dummy.txt" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378710608503" ignored="false" />
+    <file path="/plugin.py" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378709809996" 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="1378705320245" ignored="false" />
+    <file path="/package_metadata_fields.html" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378701829955" ignored="false" />
+    <file path="/read_base.html" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378179756405" ignored="false" />
+    <file path="/read.rdf" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378709644530" 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="1378702039287" ignored="false" />
+    <file path="/create.py" changelist="89ace156-8d75-43de-ba53-6e829c197435" time="1378705719051" ignored="false" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
+  <component name="CreatePatchCommitExecutor">
+    <option name="PATCH_PATH" value="" />
+  </component>
+  <component name="DaemonCodeAnalyzer">
+    <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" />
+        <option name="NOTIFY_UNCAUGHT" value="true" />
+        <option name="ENABLED" value="false" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="REMOVE_AFTER_HIT" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="SUSPEND" value="true" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="true" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint>
+        <option name="NOTIFY_CAUGHT" value="true" />
+        <option name="NOTIFY_UNCAUGHT" value="true" />
+        <option name="ENABLED" value="false" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="REMOVE_AFTER_HIT" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="SUSPEND" value="true" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="true" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+    </breakpoint_any>
+    <breakpoint_rules />
+    <ui_properties />
+  </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
+  <component name="FavoritesManager">
+    <favorites_list name="ckanext-datagovau" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="package_metadata_fields.html" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="13" column="0" selection-start="439" selection-end="439" vertical-scroll-proportion="-8.125">
+              <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="15" column="45" selection-start="378" selection-end="378" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="package.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/../ckan/ckan/controllers/package.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="1124" column="45" selection-start="46939" selection-end="46947" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="read.rdf" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/read.rdf">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="34" column="31" selection-start="1911" selection-end="1911" vertical-scroll-proportion="0.55921054">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="get.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/../ckan/ckan/logic/action/get.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="978" column="29" selection-start="30370" selection-end="30823" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="helpers.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/../ckan/ckan/lib/helpers.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="617" column="20" selection-start="20720" selection-end="20720" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindManager">
+    <FindUsagesManager>
+      <setting name="OPEN_NEW_TAB" value="false" />
+    </FindUsagesManager>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="GitLogSettings">
+    <option name="myDateState">
+      <MyDateState />
+    </option>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="changedFiles">
+      <list>
+        <option value="$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$/ckanext/datagovau/templates/package/read_base.html" />
+        <option value="$PROJECT_DIR$/ckanext/datagovau/templates/package/read.html" />
+        <option value="$PROJECT_DIR$/README.rst" />
+        <option value="$PROJECT_DIR$/ckanext/datagovau/theme/public/licenses.json" />
+        <option value="$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html" />
+        <option value="$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_basic_fields.html" />
+        <option value="$PROJECT_DIR$/../ckan/ckan/logic/action/create.py" />
+        <option value="$PROJECT_DIR$/ckanext/datagovau/templates/package/read.rdf" />
+        <option value="$PROJECT_DIR$/ckanext/datagovau/plugin.py" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="x" value="1279" />
+    <option name="width" value="1922" />
+    <option name="height" value="1084" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectReloadState">
+    <option name="STATE" value="0" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+    </navigator>
+    <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value=".idea" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext_datagovau.egg-info" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="public" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="package" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext-datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ckanext" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="datagovau" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="package" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="snippets" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="GoToFile.includeJavaFiles" 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/logic/action/get.py" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="DefaultHtmlFileTemplate" value="Html5" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
+  </component>
+  <component name="RunManager">
+    <configuration default="true" type="PythonConfigurationType" factoryName="Python">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <module name="ckanext-datagovau" />
+      <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">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <module name="" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="FOLDER_NAME" value="" />
+      <option name="TEST_TYPE" value="TEST_SCRIPT" />
+      <option name="PATTERN" value="" />
+      <option name="USE_PATTERN" value="false" />
+      <option name="PUREUNITTEST" value="true" />
+      <option name="PARAMS" value="" />
+      <option name="USE_PARAM" value="false" />
+      <method />
+    </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <method />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="Doctests">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <module name="ckanext-datagovau" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="FOLDER_NAME" value="" />
+      <option name="TEST_TYPE" value="TEST_SCRIPT" />
+      <option name="PATTERN" value="" />
+      <option name="USE_PATTERN" value="false" />
+      <method />
+    </configuration>
+    <configuration default="true" type="JavascriptDebugSession" factoryName="Local" singleton="true">
+      <JSDebuggerConfigurationSettings>
+        <option name="engineId" value="embedded" />
+        <option name="fileUrl" />
+      </JSDebuggerConfigurationSettings>
+      <method />
+    </configuration>
+    <list size="0" />
+    <configuration name="&lt;template&gt;" type="JUnit" default="true" selected="false">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    </configuration>
+    <configuration name="&lt;template&gt;" type="TestNG" default="true" selected="false">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    </configuration>
+    <configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" />
+    </configuration>
+    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
+      <Host>localhost</Host>
+      <Port>5050</Port>
+    </configuration>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false" />
+  <component name="TodoView" selected-index="0">
+    <todo-panel id="selected-file">
+      <are-packages-shown value="false" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="default-changelist">
+      <are-packages-shown value="false" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="false" />
+    </todo-panel>
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="1279" y="0" width="1922" height="1084" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3290735" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3290735" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.16183448" sideWeight="0.7790822" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22091782" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+    </layout>
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
+    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
+    <option name="CHECK_NEW_TODO" value="true" />
+    <option name="myTodoPanelSettings">
+      <value>
+        <are-packages-shown value="false" />
+        <are-modules-shown value="false" />
+        <flatten-packages value="false" />
+        <is-autoscroll-to-source value="false" />
+      </value>
+    </option>
+    <option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
+    <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
+    <option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
+    <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
+    <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
+    <option name="DEFAULT_PATCH_EXTENSION" value="patch" />
+    <option name="SHORT_DIFF_HORIZONTALLY" value="true" />
+    <option name="SHORT_DIFF_EXTRA_LINES" value="2" />
+    <option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
+    <option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
+    <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
+    <option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
+    <option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
+    <option name="SHOW_DIRTY_RECURSIVELY" value="false" />
+    <option name="LIMIT_HISTORY" value="true" />
+    <option name="MAXIMUM_HISTORY_ROWS" value="1000" />
+    <option name="UPDATE_FILTER_SCOPE_NAME" />
+    <option name="USE_COMMIT_MESSAGE_MARGIN" value="false" />
+    <option name="COMMIT_MESSAGE_MARGIN_SIZE" value="72" />
+    <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" />
+    <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" />
+    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
+    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
+    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
+    <option name="ACTIVE_VCS_NAME" />
+    <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
+    <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
+    <option name="UPDATE_FILTER_BY_SCOPE" value="false" />
+    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
+    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/ckanext/datagovau/templates/package/snippets/package_basic_fields.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="11" column="24" selection-start="436" selection-end="436" vertical-scroll-proportion="-2.2297297">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../ckan/ckan/templates/snippets/activity_item.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/package/read_base.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="24" column="50" selection-start="993" selection-end="998" vertical-scroll-proportion="0.42352942" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../ckan/ckan/model/activity.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/model/user.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/templates/activity_streams/activity_stream_items.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="8" column="0" selection-start="560" selection-end="745" vertical-scroll-proportion="-5.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../ckan/ckan/model/package.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="481" column="51" selection-start="20096" selection-end="20104" vertical-scroll-proportion="0.33258173" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../ckan/ckanext/example_idatasetform/plugin.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="35" column="35" selection-start="1320" selection-end="1320" vertical-scroll-proportion="-1.2697369" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../ckan/ckan/common.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="9" column="0" selection-start="331" selection-end="331" vertical-scroll-proportion="0.14802632" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../ckan/ckan/templates/package/activity.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="7" column="27" selection-start="318" selection-end="343" vertical-scroll-proportion="0.11824324" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../ckan/ckan/lib/helpers.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="617" column="20" selection-start="20720" selection-end="20720" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../ckan/ckan/logic/action/get.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="978" column="29" selection-start="30370" selection-end="30823" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../ckan/ckan/controllers/package.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="1124" column="45" selection-start="46939" selection-end="46947" 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="13" column="0" selection-start="439" selection-end="439" vertical-scroll-proportion="-8.125">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ckanext/datagovau/plugin.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="15" column="45" selection-start="378" selection-end="378" 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="34" column="31" selection-start="1911" selection-end="1911" vertical-scroll-proportion="0.55921054">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
 
+

file:a/README.rst -> file:b/README.rst
--- a/README.rst
+++ b/README.rst
@@ -4,9 +4,11 @@
 
 * 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 and available licenses database
-  * A custom Package edit form
+  * 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 cut down licenses.json file
 
 Installation
 ============
@@ -17,5 +19,9 @@
 
 Then activate it by setting ``ckan.plugins = datagovau`` in your main ``ini``-file.
 
+To add the cut down licenses.json set ``licenses_group_url = http://%(ckan.site_url)/licenses.json``
+or copy ``ckanext/datagovau/theme/public/licenses.json`` to the same folder as your CKAN config ini file
+and set ``licenses_group_url = file://%(here)s/licenses.json``
 
 
+

--- /dev/null
+++ b/ckanext/datagovau/__init__.py

--- /dev/null
+++ b/ckanext/datagovau/plugin.py
@@ -1,1 +1,164 @@
+import logging
 
+import ckan.plugins as plugins
+import ckan.plugins.toolkit as tk
+
+
+# get_action will be deprecated soon, this is the replacement
+def get_user(user):
+    user_name = unicode(user)
+    if user_name:
+        user_obj = model.User.get(id)
+        context['user_obj'] = user_obj
+        if user_obj is None:
+            raise NotFound
+    else:
+        raise NotFound
+
+    return model_dictize.user_dictize(user_obj,context)
+
+
+class ExampleIDatasetFormPlugin(plugins.SingletonPlugin,
+                                tk.DefaultDatasetForm):
+    '''An example IDatasetForm CKAN plugin.
+
+    Uses a tag vocabulary to add a custom metadata field to datasets.
+
+    '''
+    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
+        # that CKAN will use this plugin's custom templates.
+        # here = os.path.dirname(__file__)
+        # rootdir = os.path.dirname(os.path.dirname(here))
+
+        tk.add_template_directory(config, 'templates')
+        tk.add_public_directory(config, 'theme/public')
+        tk.add_resource('theme/public', 'ckanext-datagovau')
+        # config['licenses_group_url'] = 'http://%(ckan.site_url)/licenses.json'
+
+    def get_helpers(self):
+        return {'getuser': get_user}
+
+    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 []
+
+
+    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/package/read.html
@@ -1,1 +1,44 @@
+{% ckan_extends %}
 
+{% block package_additional_info %}
+{{ super() }}
+
+{# Add our custom field to the dataset read page. #}
+{% if pkg.get('agency_program') %}
+<section class="resources module-content">
+    <p><strong>Agency Program</strong>: {{ pkg.agency_program }}</p>
+</section>
+{% endif %}
+{% if pkg.get('contact_point') %}
+<section class="resources module-content">
+    <p><strong>Contact Point</strong>: {{ pkg.contact_point }}</p>
+</section>
+{% endif %}
+{% if pkg.get('spatial_coverage') %}
+<section class="resources module-content">
+    <p><strong>Geospatial Coverage</strong>: {{ pkg.spatial_coverage }}</p></section>
+{% endif %}
+{% if pkg.get('granularity') %}
+<section class="resources module-content">
+    <p><strong>Data Granularity</strong>: {{ pkg.granularity }}</p></section>
+{% endif %}
+{% if pkg.get('jurisdiction') %}
+<section class="resources module-content">
+    <p><strong>Government Jurisdiction</strong>: {{ pkg.jurisdiction }}</p></section>
+{% endif %}
+{% if pkg.get('temporal_coverage') %}
+<section class="resources module-content">
+    <p><strong>Temporal Coverage</strong>: {{ pkg.temporal_coverage }}</p></section>
+{% endif %}
+{% if pkg.get('data_state') %}
+<section class="resources module-content">
+    <p><strong>Data State</strong>: {{ pkg.data_state }}</p></section>
+{% endif %}
+{% if pkg.get('update_freq') %}
+<section class="resources module-content">
+    <p><strong>Update Frequency</strong>: {{ pkg.update_freq }}</p></section>
+
+{% endif %}
+
+{% endblock %}
+

--- /dev/null
+++ b/ckanext/datagovau/templates/package/read.n3
@@ -1,1 +1,45 @@
+@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> .

--- /dev/null
+++ b/ckanext/datagovau/templates/package/read.rdf
@@ -1,1 +1,92 @@
+<?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>
+        <dct:license>${c.pkg_dict['license_url']}</dct:license>
+        <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>${ tag_dict["title"] }</dcat:theme>
+        </py:for>
 
+            <lol>${h.get_action("user_show",{"id":c.author})["display_name"]}</lol>
+        <lol>${h.get_action("user_show",{"id":c.author})["email"]}</lol>
+
+        <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('revision_timestamp')}</dct:created>
+                    <dct:modified>${rsc_dict.get('revision_timestamp')}</dct:modified>
+                    <dcat:byteSize>${rsc_dict.get('size')}</dcat:byteSize>
+                    <dcat:mediaType>${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('author', None)">
+            <rdf:Description>
+                <foaf:name>${ c.pkg_dict['author'] }</foaf:name>
+                <foaf:mbox  py:if="c.pkg_dict.get('maintainer_email', None)" rdf:resource="mailto:${c.pkg_dict['author_email']}"/>
+            </rdf:Description>
+        </dct:creator>
+        <dct:contributor py:if="c.pkg_dict.get('maintainer', None)">
+            <rdf:Description>
+                <foaf:name>${ c.pkg_dict['maintainer'] }</foaf:name>
+                <foaf:mbox  py:if="c.pkg_dict.get('maintainer_email', None)" rdf:resource="mailto:${c.pkg_dict['maintainer_email']}"/>
+            </rdf:Description>
+        </dct:contributor>
+
+        <dct:rights py:if="c.pkg_dict.get('license_url', None)" rdf:resource="${c.pkg_dict['license_url']}"/>
+        <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>
+

--- /dev/null
+++ b/ckanext/datagovau/templates/package/snippets/package_basic_fields.html
@@ -1,1 +1,63 @@
+{% 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.input('data_state', label=_('Data State'), id='field-data_state',
+placeholder=_('Active or Inactive'),
+value=data.data_state, error=errors.data_state, classes=['control-medium']) }}
+
+{{ 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 %}
+<div class="control-group">
+    {% set error = errors.license_id %}
+    <label class="control-label" for="field-license">{{ _("License") }}</label>
+    <div class="controls">
+        <select id="field-license" name="license_id" data-module="autocomplete">
+            {% for license_desc, license_id in licenses|sort if license_desc  %}
+            {# Make cc-by the default value for data.gov.au #}
+            <option value="{{ license_id }}" {% if data.get('license_id', 'cc-by') == license_id %}selected="selected"{% endif %}>{{ license_desc }}</option>
+            {% endfor %}
+        </select>
+        {% if error %}<span class="error-block">{{ error }}</span>{% endif %}
+    <span class="info-block info-inline">
+      <i class="icon-info-sign"></i>
+      {% trans %}
+        License definitions and additional information can be found
+        at <a href="http://opendefinition.org/licenses/">opendefinition.org</a>
+      {% endtrans %}
+    </span>
+    </div>
+</div>
+{% endblock %}

--- /dev/null
+++ b/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html
@@ -1,1 +1,18 @@
+{% ckan_extends %}
 
+{# Remove 'free extras' from the package form. If you're using
+convert_to/from_extras() as we are with our 'custom_text' field below then
+you need to remove free extras from the form, or editing your custom field
+won't work. #}
+{% block custom_fields %}
+{% endblock %}
+
+{# https://github.com/okfn/ckan/blob/master/ckan/templates/macros/form.html documents the macros for fields #}
+
+{% block package_metadata_fields %}
+
+
+{{ super() }}
+
+{% endblock %}
+

--- /dev/null
+++ b/ckanext/datagovau/theme/public/licenses.json
@@ -1,1 +1,30 @@
+[
+    {
+        "domain_content": true,
+        "domain_data": false,
+        "domain_software": false,
+        "family": "",
+        "id": "other-open",
+        "is_generic": true,
+        "is_okd_compliant": true,
+        "is_osi_compliant": false,
+        "maintainer": "",
+        "status": "active",
+        "title": "Other (Open)",
+        "url": ""
+    },
+    {
+        "domain_content": true,
+        "domain_data": false,
+        "domain_software": false,
+        "family": "",
+        "id": "cc-by",
+        "is_okd_compliant": true,
+        "is_osi_compliant": false,
+        "maintainer": "",
+        "status": "active",
+        "title": "Creative Commons Attribution 3.0 Australia",
+        "url": "http://creativecommons.org/licenses/by/3.0/au/"
+    }
 
+]