[1720][forms, templates] Don't show tags with vocabularies
in standard 'tags' listing
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@
.#*
build/
dist/
-
+distribute-*
--- a/README.rst
+++ b/README.rst
@@ -12,6 +12,13 @@
* A custom Pylons controller for overriding some core CKAN behaviour
* A custom Package edit form
+
+* A custom Group edit form
+
+* A plugin that allows for custom forms to be used for datasets based on
+ their "type".
+
+* A custom User registration and edition form
* Some simple template customisations
@@ -32,17 +39,18 @@
* To understand the nuts and bolts of this file, which is a CKAN
*Extension*, read in conjunction with the "Extension
- documentation":http://packages.python.org/ckan/plugins.html
+ documentation": http://docs.ckan.org/en/latest/plugins.html
* One thing the extension does is set the values of
``extra_public_paths`` and ``extra_template_paths`` in the CKAN
config, which are "documented
- here":http://packages.python.org/ckan/configuration.html#extra-template-paths
+ here": http://docs.ckan.org/en/latest/configuration.html#extra-template-paths
* These are set to point at directories within
- `ckanext/example/theme/`` (in this package). Here, we override
- the home page, provide some extra style with an ``extra.css``, and
- customise the navigation and header of the main template in the file ``layout.html``.
+ ``ckanext/example/theme/`` (in this package). Here we:
+ * override the home page HTML ``ckanext/example/theme/templates/home/index.html``
+ * provide some extra style by serving ``extra.css`` (which is loaded using the ``ckan.template_head_end`` option
+ * customise the navigation and header of the main template in the file ``layout.html``.
The latter file is a great place to make global theme alterations.
It uses the _layout template_ pattern "described in the Genshi
@@ -50,7 +58,9 @@
This allows you to use Xpath selectors to override snippets of HTML
globally.
-* The custom package edit form at ``package_form.py`` follows the
- conventions in the "main CKAN
- documentation":http://packages.python.org/ckan/forms.html
+* The custom package edit form at ``package_form.py`` follows a deprecated
+ way to make a form (using FormAlchemy). This part of the Example Theme needs
+ updating. In the meantime, follow the instructions at:
+ http://readthedocs.org/docs/ckan/en/latest/forms.html
+
--- a/ckanext/example/controller.py
+++ b/ckanext/example/controller.py
@@ -4,6 +4,8 @@
from ckan.lib.base import model
from ckan.lib.base import render
from ckan.lib.base import _
+
+from ckan.lib.navl.validators import not_empty
from ckan.controllers.user import UserController
@@ -12,29 +14,40 @@
"""This controller is an example to show how you might extend or
override core CKAN behaviour from an extension package.
- It duplicates functionality in the core CKAN UserController's
- register function, but extends it to make an email address
- mandatory.
+ It overrides 2 method hooks which the base class uses to create the
+ validation schema for the creation and editing of a user; to require
+ that a fullname is given.
"""
- def custom_register(self):
- if request.method == 'POST':
- # custom validation that requires an email address
- error = False
- c.email = request.params.getone('email')
- c.login = request.params.getone('login')
- if not model.User.check_name_available(c.login):
- error = True
- h.flash_error(_("That username is not available."))
- if not c.email:
- error = True
- h.flash_error(_("You must supply an email address."))
- try:
- self._get_form_password()
- except ValueError, ve:
- h.flash_error(ve)
- error = True
- if error:
- return render('user/register.html')
- # now delegate to core CKAN register method
- return self.register()
+ new_user_form = 'user/register.html'
+
+ def _add_requires_full_name_to_schema(self, schema):
+ """
+ Helper function that modifies the fullname validation on an existing schema
+ """
+ schema['fullname'] = [not_empty, unicode]
+
+ def _new_form_to_db_schema(self):
+ """
+ Defines a custom schema that requires a full name to be supplied
+
+ This method is a hook that the base class calls for the validation
+ schema to use when creating a new user.
+ """
+ schema = super(CustomUserController, self)._new_form_to_db_schema()
+ self._add_requires_full_name_to_schema(schema)
+ return schema
+
+ def _edit_form_to_db_schema(self):
+ """
+ Defines a custom schema that requires a full name cannot be removed
+ when editing the user.
+
+ This method is a hook that the base class calls for the validation
+ schema to use when editing an exiting user.
+ """
+ schema = super(CustomUserController, self)._edit_form_to_db_schema()
+ self._add_requires_full_name_to_schema(schema)
+ return schema
+
+
--- /dev/null
+++ b/ckanext/example/forms.py
@@ -1,1 +1,224 @@
-
+import os, logging
+from ckan.authz import Authorizer
+from ckan.logic.converters import convert_to_extras,\
+ convert_from_extras, convert_to_tags, convert_from_tags, free_tags_only
+from ckan.logic.schema import package_form_schema, group_form_schema
+from ckan.lib.base import c, model
+from ckan.plugins import IDatasetForm, IGroupForm, IConfigurer, IConfigurable
+from ckan.plugins import implements, SingletonPlugin
+from ckan.lib.navl.validators import ignore_missing, not_empty, keep_extras
+
+log = logging.getLogger(__name__)
+
+class ExampleGroupForm(SingletonPlugin):
+ """This plugin demonstrates how a class packaged as a CKAN
+ extension might extend CKAN behaviour by providing custom forms
+ based on the type of a Group.
+
+ In this case, we implement two extension interfaces to provide custom
+ forms for specific types of group.
+
+ - ``IConfigurer`` allows us to override configuration normally
+ found in the ``ini``-file. Here we use it to specify where the
+ form templates can be found.
+
+ - ``IGroupForm`` allows us to provide a custom form for a dataset
+ based on the 'type' that may be set for a group. Where the
+ 'type' matches one of the values in group_types then this
+ class will be used.
+ """
+ implements(IGroupForm, inherit=True)
+ implements(IConfigurer, inherit=True)
+
+ def update_config(self, config):
+ """
+ This IConfigurer implementation causes CKAN to look in the
+ ```templates``` directory when looking for the group_form()
+ """
+ here = os.path.dirname(__file__)
+ rootdir = os.path.dirname(os.path.dirname(here))
+ template_dir = os.path.join(rootdir, 'ckanext',
+ 'example', 'theme', 'templates')
+ config['extra_template_paths'] = ','.join([template_dir,
+ config.get('extra_template_paths', '')])
+
+ def group_form(self):
+ """
+ Returns a string representing the location of the template to be
+ rendered. e.g. "forms/group_form.html".
+ """
+ return 'forms/group_form.html'
+
+ def group_types(self):
+ """
+ Returns an iterable of group type strings.
+
+ If a request involving a group of one of those types is made, then
+ this plugin instance will be delegated to.
+
+ There must only be one plugin registered to each group type. Any
+ attempts to register more than one plugin instance to a given group
+ type will raise an exception at startup.
+ """
+ return ["testgroup"]
+
+ def is_fallback(self):
+ """
+ Returns true iff this provides the fallback behaviour, when no other
+ plugin instance matches a group's type.
+
+ As this is not the fallback controller we should return False. If
+ we were wanting to act as the fallback, we'd return True
+ """
+ return False
+
+ def form_to_db_schema(self):
+ """
+ Returns the schema for mapping group data from a form to a format
+ suitable for the database.
+ """
+ return group_form_schema()
+
+ def db_to_form_schema(self):
+ """
+ Returns the schema for mapping group data from the database into a
+ format suitable for the form (optional)
+ """
+ return {}
+
+ def check_data_dict(self, data_dict):
+ """
+ Check if the return data is correct.
+
+ raise a DataError if not.
+ """
+
+ def setup_template_variables(self, context, data_dict):
+ """
+ Add variables to c just prior to the template being rendered.
+ """
+
+
+class ExampleDatasetForm(SingletonPlugin):
+ """This plugin demonstrates how a theme packaged as a CKAN
+ extension might extend CKAN behaviour.
+
+ In this case, we implement three extension interfaces:
+
+ - ``IConfigurer`` allows us to override configuration normally
+ found in the ``ini``-file. Here we use it to specify where the
+ form templates can be found.
+ - ``IDatasetForm`` allows us to provide a custom form for a dataset
+ based on the type_name that may be set for a package. Where the
+ type_name matches one of the values in package_types then this
+ class will be used.
+ """
+ implements(IDatasetForm, inherit=True)
+ implements(IConfigurer, inherit=True)
+ implements(IConfigurable)
+
+ def update_config(self, config):
+ """
+ This IConfigurer implementation causes CKAN to look in the
+ ```templates``` directory when looking for the package_form()
+ """
+ here = os.path.dirname(__file__)
+ rootdir = os.path.dirname(os.path.dirname(here))
+ template_dir = os.path.join(rootdir, 'ckanext',
+ 'example', 'theme', 'templates')
+ config['extra_template_paths'] = ','.join([template_dir,
+ config.get('extra_template_paths', '')])
+
+ def configure(self, config):
+ """
+ Adds our new vocabulary to the database if it doesn't
+ already exist.
+ """
+ self.vocab_name = u'example_vocab'
+ v = model.Vocabulary.get(self.vocab_name)
+ if not v:
+ log.info("Adding vocab %s" % self.vocab_name)
+ vocab = model.Vocabulary(self.vocab_name)
+ model.Session.add(vocab)
+ model.Session.commit()
+
+ def package_form(self):
+ """
+ Returns a string representing the location of the template to be
+ rendered. e.g. "package/new_package_form.html".
+ """
+ return 'forms/dataset_form.html'
+
+ def is_fallback(self):
+ """
+ Returns true iff this provides the fallback behaviour, when no other
+ plugin instance matches a package's type.
+
+ As this is not the fallback controller we should return False. If
+ we were wanting to act as the fallback, we'd return True
+ """
+ return True
+
+ def package_types(self):
+ """
+ Returns an iterable of package type strings.
+
+ If a request involving a package of one of those types is made, then
+ this plugin instance will be delegated to.
+
+ There must only be one plugin registered to each package type. Any
+ attempts to register more than one plugin instance to a given package
+ type will raise an exception at startup.
+ """
+ return ["example_dataset_form"]
+
+ def setup_template_variables(self, context, data_dict=None):
+ """
+ Adds variables to c just prior to the template being rendered that can
+ then be used within the form
+ """
+ c.licences = [('', '')] + model.Package.get_license_options()
+ c.publishers = [('Example publisher', 'Example publisher 2')]
+ c.is_sysadmin = Authorizer().is_sysadmin(c.user)
+ c.resource_columns = model.Resource.get_columns()
+
+ ## This is messy as auths take domain object not data_dict
+ pkg = context.get('package') or c.pkg
+ if pkg:
+ c.auth_for_change_state = Authorizer().am_authorized(
+ c, model.Action.CHANGE_STATE, pkg)
+
+ def form_to_db_schema(self):
+ """
+ Returns the schema for mapping package data from a form to a format
+ suitable for the database.
+ """
+ schema = package_form_schema()
+ schema.update({
+ 'published_by': [not_empty, unicode, convert_to_extras],
+ 'vocab_tag_string': [ignore_missing, convert_to_tags(self.vocab_name)],
+ })
+ return schema
+
+ def db_to_form_schema(self):
+ """
+ Returns the schema for mapping package data from the database into a
+ format suitable for the form (optional)
+ """
+ schema = package_form_schema()
+ schema.update({
+ 'tags': {
+ '__extras': [keep_extras, free_tags_only]
+ },
+ 'vocab_tag_string': [convert_from_tags(self.vocab_name), ignore_missing],
+ 'published_by': [convert_from_extras, ignore_missing],
+ })
+ return schema
+
+ def check_data_dict(self, data_dict):
+ """
+ Check if the return data is correct and raises a DataError if not.
+ """
+ return
+
+
--- a/ckanext/example/plugin.py
+++ b/ckanext/example/plugin.py
@@ -21,9 +21,11 @@
found in the ``ini``-file. Here we use it to specify the site
title, and to tell CKAN to look in this package for templates
and resources that customise the core look and feel.
+
- ``IGenshiStreamFilter`` allows us to filter and transform the
HTML stream just before it is rendered. In this case we use
it to rename "frob" to "foobar"
+
- ``IRoutes`` allows us to add new URLs, or override existing
URLs. In this example we use it to override the default
``/register`` behaviour with a custom controller
@@ -54,8 +56,11 @@
config.get('extra_public_paths', '')])
config['extra_template_paths'] = ','.join([template_dir,
config.get('extra_template_paths', '')])
+ # add in the extra.css
+ config['ckan.template_head_end'] = config.get('ckan.template_head_end', '') +\
+ '<link rel="stylesheet" href="/css/extra.css" type="text/css"> '
# set the title
- config['ckan.site_title'] = "An example CKAN theme"
+ config['ckan.site_title'] = "Example CKAN theme"
# set the customised package form (see ``setup.py`` for entry point)
config['package_form'] = "example_form"
@@ -79,14 +84,18 @@
Note that we have also provided a custom register form
template at ``theme/templates/user/register.html``.
"""
- # Note that when we set up the route, we must use the form
- # that gives it a name (i.e. in this case, 'register'), so it
- # works correctly with the url_for helper::
- # h.url_for('register')
- map.connect('register',
- '/user/register',
+ # Hook in our custom user controller at the points of creation
+ # and edition.
+ map.connect('/user/register',
controller='ckanext.example.controller:CustomUserController',
- action='custom_register')
+ action='register')
+ map.connect('/user/edit',
+ controller='ckanext.example.controller:CustomUserController',
+ action='edit')
+ map.connect('/user/edit/{id:.*}',
+ controller='ckanext.example.controller:CustomUserController',
+ action='edit')
+
map.connect('/package/new', controller='package_formalchemy', action='new')
map.connect('/package/edit/{id}', controller='package_formalchemy', action='edit')
return map
--- /dev/null
+++ b/ckanext/example/theme/templates/forms/dataset_form.html
@@ -1,1 +1,251 @@
-
+<form id="dataset-edit" method="post"
+ py:attrs="{'class':'has-errors'} if errors else {}"
+ xmlns:i18n="http://genshi.edgewall.org/i18n"
+ xmlns:py="http://genshi.edgewall.org/"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+
+
+<div class="error-explanation" py:if="error_summary">
+<h2>Errors in form</h2>
+<p>The form contains invalid entries:</p>
+<ul>
+ <li py:for="key, error in error_summary.items()">${"%s: %s" % (key, error)}
+ <py:if test="key=='Resources'">
+ <ul>
+ <py:for each="idx, errordict in enumerate(errors.get('resources', []))">
+ <li py:if="errordict">
+ Resource ${idx}:
+ <ul>
+ <li py:for="thiskey, thiserror in errordict.items()">${thiskey}: <py:for each="errorinfo in thiserror">${errorinfo}; </py:for></li>
+ </ul>
+ </li>
+ </py:for>
+ </ul>
+ </py:if>
+ </li>
+</ul>
+</div>
+
+<fieldset id="basic-information">
+ <dl>
+ <dt class="title-label"><label class="field_opt" for="title">Title</label></dt>
+ <dd class="title-field">
+ <input id="title"
+ class="js-title"
+ name="title" type="text"
+ value="${data.get('title', '')}"
+ placeholder="${_('A short descriptive title for the dataset')}"
+ />
+ </dd>
+ <dd class="title-instructions field_error" py:if="errors.get('title', '')">${errors.get('title', '')}</dd>
+
+ <dt class="name-label"><label class="field_req" for="name">Url</label></dt>
+ <dd class="name-field">
+ <span class="js-url-text url-text">${url(controller='package', action='index')+'/'}<span class="js-url-viewmode js-url-suffix"> </span><a href="#" style="display: none;" class="url-edit js-url-editlink js-url-viewmode">(edit)</a></span>
+ <input style="display: none;" id="name" maxlength="100" name="name" type="text" class="url-input js-url-editmode js-url-input" value="${data.get('name', '')}" />
+ <p class="js-url-is-valid"> </p>
+ </dd>
+ <dd style="display: none;" class="js-url-editmode name-instructions basic">2+ characters, lowercase, using only 'a-z0-9' and '-_'</dd>
+ <dd class="js-url-editmode name-instructions field_error" py:if="errors.get('name', '')">${errors.get('name', '')}</dd>
+
+ <dt class="homepage-label"><label class="field_opt" for="url">Home Page</label></dt>
+ <dd class="homepage-field"><input id="url" name="url" type="text" value="${data.get('url', '')}"/></dd>
+ <dd class="homepage-instructions instructions basic">The URL for the web page describing the data (not the data itself).</dd>
+ <dd class="homepage-instructions hints">e.g. http://www.example.com/growth-figures.html</dd>
+ <dd class="homepage-instructions field_error" py:if="errors.get('url', '')">${errors.get('url', '')}</dd>
+
+ <dt class="license-label"><label class="field_opt" for="license_id">License</label></dt>
+ <dd class="license-field">
+ <select id="license_id" name="license_id">
+ <py:for each="licence_desc, licence_id in c.licences">
+ <option value="${licence_id}" py:attrs="{'selected': 'selected' if data.get('license_id', '') == licence_id else None}" >${licence_desc}</option>
+ </py:for>
+ </select>
+ </dd>
+ <dd class="license-instructions instructions basic">The licence under which the dataset is released.</dd>
+
+ <dt class="description-label"><label class="field_opt" for="notes">Description</label></dt>
+ <dd class="description-field"><div class="markdown-editor">
+ <ul class="button-row">
+ <li><button class="pretty-button js-markdown-edit depressed">Edit</button></li>
+ <li><button class="pretty-button js-markdown-preview">Preview</button></li>
+ </ul>
+ <textarea class="markdown-input" name="notes" id="notes" placeholder="${_('Start with a summary sentence ...')}">${data.get('notes','')}</textarea>
+ <div class="markdown-preview" style="display: none;"></div>
+ <span class="hints">You can use <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">Markdown formatting</a> here.</span>
+ <!--
+ <dd class="instructions basic">The main description of the dataset</dd>
+ <dd class="instructions further">It is often displayed with the dataset title. In particular, it should start with a short sentence that describes the dataset succinctly, because the first few words alone may be used in some views of the datasets.</dd>
+ -->
+ </div></dd>
+ </dl>
+</fieldset>
+
+<fieldset id="resources">
+ <div class="instructions basic"><h3>Resources: the files and APIs associated with this dataset</h3></div>
+ <table class="resource-table-edit">
+ <thead>
+ <tr>
+ <th class="field_req resource-url">Resource</th>
+ <th class="resource-delete-link"></th>
+ </tr>
+ </thead>
+ <tbody class="js-resource-editor">
+ </tbody>
+ </table>
+
+
+ <div class="resource-add">
+ <ul class="button-row">
+ <li><h4>Add a resource:</h4></li>
+ <li><button class="pretty-button js-link-file">Link to a file</button></li>
+ <li><button class="pretty-button js-link-api">Link to an API</button></li>
+ <li class="js-upload-file ckan-logged-in" style="display: none;"><button class="pretty-button js-upload-file">Upload a file</button></li>
+ </ul>
+ </div>
+</fieldset>
+
+<fieldset id="groups">
+ <h3>Groups</h3>
+ <dl>
+ <py:for each="num, group in enumerate(data.get('groups', []))">
+ <?python
+ authorized_group = [group_authz for group_authz in c.groups_authz if group_authz['id'] == group['id']]
+ authorized_group = authorized_group[0] if authorized_group else None
+ ?>
+
+ <dt py:if="'id' in group">
+ <input type="${'checkbox' if authorized_group else 'hidden'}" name="groups__${num}__id" checked="checked" value="${group['id']}" />
+ <input type="hidden" name="groups__${num}__name" value="${group.get('name', authorized_group['name'] if authorized_group else '')}" />
+ </dt>
+ <dd py:if="'id' in group"><label for="groups__${num}__checked">${group.get('name', authorized_group['name'] if authorized_group else '')}</label></dd>
+ </py:for>
+
+ <dt>Group</dt>
+ <dd py:if="c.groups_available">
+ <select id="groups__${len(data.get('groups', []))}__id" name="groups__${len(data.get('groups', []))}__id">
+ <option selected="selected" value="">(None)</option>
+ <py:for each="group in c.groups_available">
+ <option value="${group['id']}" >${group['name']}</option>
+ </py:for>
+ </select>
+ </dd>
+ <dd py:if="not c.groups_available"><em>Cannot add any groups.</em></dd>
+ </dl>
+ <h3>Tags</h3>
+ <dl>
+ <dt class="tags-label"><label class="field_opt" for="tags">Tags</label></dt>
+ <dd class="tags-field">
+ <input class="long autocomplete-tag" id="tag_string" name="tag_string" size="60" type="text"
+ value="${data.get('tag_string') or ', '.join([tag['name'] for tag in data.get('tags', []) if not tag.get('vocabulary_id')])}" />
+ </dd>
+ <dd class="tags-instructions instructions basic" i18n:msg="">Comma-separated terms that may link this dataset to similar ones. For more information on conventions, see <a href="http://wiki.okfn.org/ckan/doc/faq#TagConventions">this wiki page</a>.</dd>
+ <dd class="tags-instructions hints">e.g. pollution, rivers, water quality</dd>
+ <dd class="tags-instructions field_error" py:if="errors.get('tag_string', '')">${errors.get('tag_string', '')}</dd>
+ </dl>
+ <h3>Tags with Vocabulary</h3>
+ <dl>
+ <dt class="tags-label"><label class="field_opt" for="tags_vocab">Tags</label></dt>
+ <dd class="tags-field">
+ <input class="long autocomplete-tag" id="vocab_tag_string" name="vocab_tag_string" size="60" type="text"
+ value="${data.get('vocab_tag_string') or ', '.join([tag['name'] for tag in data.get('vocab_tags', [])])}" />
+ </dd>
+ <dd class="tags-instructions instructions basic" i18n:msg="">Similar to standard CKAN tags, but these use a fixed vocabulary.</dd>
+ <dd class="tags-instructions field_error" py:if="errors.get('vocab_tag_string', '')">${errors.get('vocab_tag_string', '')}</dd>
+ </dl>
+</fieldset>
+<fieldset id='further-information'>
+ <dl>
+ <dt><label class="field_opt" for="author">Author</label></dt>
+ <dd><input id="author" name="author" type="text" value="${data.get('author', '')}" /></dd>
+ <dd class="instructions basic">The name of the main contact, for enquiries about this particular dataset, using the e-mail address in the following field.</dd>
+
+ <dt><label class="field_opt" for="author_email">Author email</label></dt>
+ <dd><input id="author_email" name="author_email" type="text" value="${data.get('author_email', '')}" /></dd>
+
+ <dt><label class="field_opt" for="maintainer">Maintainer</label></dt>
+ <dd><input id="maintainer" name="maintainer" type="text" value="${data.get('maintainer', '')}" /></dd>
+ <dd class="instructions basic">If there is another important contact person (in addition to the person in the Author field) then provide details here.</dd>
+
+ <dt><label class="field_opt" for="maintainer_email">Maintainer email</label></dt>
+ <dd><input id="maintainer_email" name="maintainer_email" type="text" value="${data.get('maintainer_email', '')}" /></dd>
+
+ <dt><label class="field_opt" for="version">Version</label></dt>
+ <dd><input id="version" maxlength="100" name="version" type="text" value="${data.get('version', '')}" /></dd>
+ <dd class="instructions basic">A number representing the version (if applicable)</dd>
+ <dd class="hints">e.g. 1.2.0</dd>
+
+ <dt py:if="c.is_sysadmin or c.auth_for_change_state"><label class="field_opt" for="state">State</label></dt>
+ <dd py:if="c.is_sysadmin or c.auth_for_change_state">
+ <select id="state" name="state" >
+ <option py:attrs="{'selected': 'selected' if data.get('state') == 'active' else None}" value="active">active</option>
+ <option py:attrs="{'selected': 'selected' if data.get('state') == 'deleted' else None}" value="deleted">deleted</option>
+ </select>
+ </dd>
+
+ </dl>
+</fieldset>
+
+<fieldset id='extras'>
+ <dl>
+ <dt><label class="field_req" for="published_by">Published by *</label></dt>
+ <dd>
+ <select id="published_by" name="published_by">
+ <py:for each="published_name, published_desc in c.publishers">
+ <option value="${published_name}" py:attrs="{'selected': 'selected' if data.get('published_by', '') == published_name else None}" >
+ ${published_desc}
+ </option>
+ </py:for>
+ </select>
+ </dd>
+ <dd class="instructions basic">The organisation credited with or associated with the publication of this data.</dd>
+
+ <py:with vars="extras = data.get('extras', [])">
+ <py:for each="num, extra in enumerate(data.get('extras', []))">
+ <dt><label for="extras__${num}__value">${extra.get('key')}</label></dt>
+ <dd>
+ <input id="extras__${num}__key" name="extras__${num}__key" type="hidden" value="${extra.get('key')}" />
+ <input id="extras__${num}__value" name="extras__${num}__value" type="text" value="${extra.get('value')}" />
+ <input type="checkbox" name="extras__${num}__deleted" checked="${extra.get('deleted')}">Delete</input>
+ </dd>
+ </py:for>
+
+ <py:for each="num in range(len(extras), len(extras) + 4)">
+ <dt><label for="extras__${num}__key">New key</label></dt>
+ <dd>
+ <input class="medium-width" id="extras__${num}__key" name="extras__${num}__key" type="text" />
+ with value
+ <input class="medium-width" id="extras__${num}__value" name="extras__${num}__value" type="text" />
+ </dd>
+ </py:for>
+ </py:with>
+ </dl>
+</fieldset>
+
+<label for="log_message" class="edit-summary">Edit summary (briefly describe the changes you have made)</label>
+<textarea id="log_message" name="log_message" class="edit-summary short wide">${data.get('log_message', '')}</textarea>
+
+<div class="ckan-logged-in" style="display: none;">
+ <p>Author: ${c.author}</p>
+</div>
+<div class="ckan-logged-out">
+ <label>Author: ${c.author}</label>
+ <p i18n:msg="" class="hints">
+ Since you have not signed in this will just be your IP address.
+ <a href="${h.url_for(controller='user', action='login', id=None)}" target="_blank">Click here to sign in</a> before saving (opens in new window).
+ </p>
+</div>
+
+<div class="form-submit">
+ <input id="save" class="pretty-button primary" name="save" type="submit" value="${_('Save Changes')}" />
+ <py:if test="c.pkg">
+ <input id="cancel" class="pretty-button href-action" name="cancel" type="reset" value="${_('Cancel')}" action="${h.url_for(controller='package', action='read', id=c.pkg.name)}" />
+ </py:if>
+ <p i18n:msg="" class="hints">
+ <strong>Important:</strong> By submitting content, you agree to release your contributions under the <a href="http://opendatacommons.org/licenses/odbl/1.0/"