From: Sean Hammond Date: Tue, 20 Mar 2012 18:32:46 +0000 Subject: Update dataset_form.html X-Git-Url: https://maxious.lambdacomplex.org/git/?p=ckanext-datagovau.git&a=commitdiff&h=15dae57208a75ca6ed8a774b3fb679798a1fd904 --- Update dataset_form.html Copy new_package_form.html from CKAN core over to dataset_form.html, then add the Musical Genre and Composers vocabs back in. --- --- a/README.rst +++ b/README.rst @@ -31,7 +31,6 @@ Then activate it by setting ``ckan.plugins = example`` in your main ``ini``-file. - Orientation =========== @@ -39,7 +38,7 @@ * To understand the nuts and bolts of this file, which is a CKAN *Extension*, read in conjunction with the "Extension - documentation": http://docs.ckan.org/en/latest/plugins.html + documentation": http://docs.ckan.org/en/latest/extensions.html * One thing the extension does is set the values of ``extra_public_paths`` and ``extra_template_paths`` in the CKAN @@ -61,6 +60,21 @@ * 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 + http://docs.ckan.org/en/latest/forms.html + +Example Tags With Vocabularies +============================== + +To add example tag vocabulary data to the database, from the ckanext-example directory run: + +:: + + paster example create-example-vocabs -c + +This data can be removed with + +:: + + paster example clean -c --- a/ckanext/example/forms.py +++ b/ckanext/example/forms.py @@ -11,6 +11,7 @@ from ckan.plugins import IGenshiStreamFilter from ckan.plugins import implements, SingletonPlugin from ckan.lib.navl.validators import ignore_missing, keep_extras +import ckan.lib.plugins log = logging.getLogger(__name__) @@ -107,7 +108,7 @@ """ -class ExampleDatasetForm(SingletonPlugin): +class ExampleDatasetForm(SingletonPlugin, ckan.lib.plugins.DefaultDatasetForm): """This plugin demonstrates how a theme packaged as a CKAN extension might extend CKAN behaviour. @@ -249,7 +250,10 @@ continue html = '
  • ' - html = html + '

    %s

    ' % vocab['name'] + if vocab['name'] == GENRE_VOCAB: + html = html + '

    Musical Genre

    ' + elif vocab['name'] == COMPOSER_VOCAB: + html = html + '

    Composer

    ' html = html + '
      ' for tag in vocab_tags: html = html + '
    • %s
      • ' % tag['name'] --- a/ckanext/example/plugin.py +++ b/ckanext/example/plugin.py @@ -51,8 +51,7 @@ our_public_dir = os.path.join(rootdir, 'ckanext', 'example', 'theme', 'public') template_dir = os.path.join(rootdir, 'ckanext', - 'example', 'theme', - 'templates') + 'example', 'theme', 'templates') # set our local template and resource overrides config['extra_public_paths'] = ','.join([our_public_dir, config.get('extra_public_paths', '')]) --- a/ckanext/example/theme/templates/forms/dataset_form.html +++ b/ckanext/example/theme/templates/forms/dataset_form.html @@ -9,7 +9,7 @@

      Errors in form

      The form contains invalid entries:

        -
      • ${"%s: %s" % (key, error)} +
      • ${"%s: %s" % (key if not key=='Name' else 'URL', error)}
          @@ -23,6 +23,7 @@
        • +
      @@ -41,9 +42,10 @@
      - ${url(controller='package', action='index')+'/'}  + ${h.url(controller='package', action='search')+'/'} (edit)

       

      +

      Warning: URL is very long. Consider changing it to something shorter.

      ${errors.get('name', '')}
      @@ -62,7 +64,7 @@ -
      The licence under which the dataset is released.
      +
      (Don't worry if you don't know which license the data has been released under).
      @@ -78,76 +80,51 @@
      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.
      --> - - - -
      -

      Resources: the files and APIs associated with this dataset

      - - - - - - - - - -
      Resource
      - - -
      -
        -

      • Add a resource:

        • -
        • -
        • - -
      -
      -
      - -
      -

      Groups

      -
      - - - -
      - - -
      -
      -       - -
      Group
      -
      - -
      -
      Cannot add any groups.
      -
      -

      Tags

      -
      -
      +
      + Groups +
      +
      +
      + + + +
      + + +
      +
      +       + +
      Add to:
      +
      + +
      +
      Cannot add any groups.
      +
      +
      +
      + Tags +
      -
      Comma-separated terms that may link this dataset to similar ones. For more information on conventions, see this wiki page.
      +
      Comma-separated terms that may link this dataset to similar ones. For more information on conventions, see this wiki page.
      e.g. pollution, rivers, water quality
      ${errors.get('tag_string', '')}
      -

      Musical Genre

      -
      -
      +
      +
      @@ -175,8 +151,40 @@
      ${errors.get('composer_tag_string', '')}
      - -
      + + +
      +
      +

      Add resources:

      +

      Upload or link data files, APIs and other materials related to your dataset.

      +
      +
      + + + + + + +
      +
        +
      + + +
      +
      @@ -198,31 +206,12 @@
      A number representing the version (if applicable)
      e.g. 1.2.0
      -
      -
      - -
      -
      -
      -
      -
      - -
      -
      The organisation credited with or associated with the publication of this data.
      - +

      Adding custom fields to the dataset such as "location:uk" can help users find it in the search engine. This data will also appear under Additional Information when viewing the dataset.

      +
      @@ -244,14 +233,31 @@
      - - - - -