diff --git a/.travis.yml b/.travis.yml index debf9925c02..c6503aca704 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,8 @@ python: env: - PGVERSION=9.1 - PGVERSION=8.4 -script: ./bin/travis-build +install: ./bin/travis-install-dependencies +script: ./bin/travis-run-tests notifications: irc: channels: diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b97798a4522..d0eeaa96d98 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -12,10 +12,30 @@ v2.2 API changes and deprecations: +* The Solr schema file is now always named ``schema.xml`` regardless of the + CKAN version. Old schema files have been kept for backwards compatibility + but users are encouraged to point to the new unified one. +* The `ckan.api_url` has been completely removed and it can no longer be used * The edit() and after_update() methods of IPackageController plugins are now called when updating a resource using the web frontend or the resource_update API action [#1052] +v2.1.1 2013-11-8 +================ + +Bug fixes: + * Fix errors on preview on non-root locations (#960) + * Fix place-holder images on non-root locations (#1309) + * Don't accept invalid URLs in resource proxy (#1106) + * Make sure came_from url is local (#1039) + * Fix logout redirect in non-root locations (#1025) + * Wrong auth checks for sysadmins on package_create (#1184) + * Don't return private datasets on package_list (#1295) + * Stop tracking failing when no lang/encoding headers (#1192) + * Fix for paster db clean command getting frozen + * Fix organization not set when editing a dataset (#1199) + * Fix PDF previews (#1194) + * Fix preview failing on private datastore resources (#1221) v2.1 2013-08-13 =============== @@ -96,6 +116,18 @@ Known issues: * Under certain authorization setups the frontend for the groups functionality may not work as expected (See #1176 #1175). +v2.0.3 2013-11-8 +================ + +Bug fixes: + * Fix errors on preview on non-root locations (#960) + * Don't accept invalid URLs in resource proxy (#1106) + * Make sure came_from url is local (#1039) + * Fix logout redirect in non-root locations (#1025) + * Don't return private datasets on package_list (#1295) + * Stop tracking failing when no lang/encoding headers (#1192) + * Fix for paster db clean command getting frozen + v2.0.2 2013-08-13 ================= diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 7b15f8d5531..79aaa0214eb 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -23,7 +23,7 @@ contributions to CKAN. ---------------- -Reporting Issues +Reporting issues ---------------- If you've found a bug in CKAN, open a new issue on CKAN's `GitHub Issues`_ (try @@ -47,7 +47,7 @@ For contributing translations to CKAN, see .. _coding standards: ---------------- -Coding Standards +Coding standards ---------------- When writing code for CKAN, try to respect our coding standards: @@ -61,6 +61,7 @@ When writing code for CKAN, try to respect our coding standards: css-coding-standards javascript-coding-standards testing-coding-standards + upgrading-dependencies * `CKAN coding standards `_ * `Python coding standards `_ @@ -68,10 +69,11 @@ When writing code for CKAN, try to respect our coding standards: * `CSS coding standards `_ * `JavaScript coding standards `_ * `Testing coding standards `_ +* `Upgrading CKAN's dependencies `_ --------------- -Commit Messages +Commit messages --------------- Generally, follow the `commit guidelines from the Pro Git book`_: @@ -104,7 +106,7 @@ Here's an example of a good CKAN commit message:: ------------------------------- -Frontend Development Guidelines +Frontend development guidelines ------------------------------- .. toctree:: @@ -126,7 +128,7 @@ Frontend Development Guidelines --------------------- -Writing Documentation +Writing documentation --------------------- The quickest and easiest way to contribute documentation to CKAN is to sign up @@ -149,7 +151,7 @@ the `documentation guidelines = 9.0, we don't need to use datastore's legacy mode. -if [ $PGVERSION != '8.4' ] -then - psql -c 'CREATE USER datastore_default;' -U postgres - sed -i -e 's/.*datastore.read_url.*/ckan.datastore.read_url = postgresql:\/\/datastore_default@\/datastore_test/' test-core.ini - paster datastore set-permissions postgres -c test-core.ini -else - sed -i -e 's/.*datastore.read_url.*//' test-core.ini -fi - -cat test-core.ini - -# Run mocha front-end tests -# We need ckan to be running for some tests -paster serve test-core.ini & -sleep 5 # Make sure the server has fully started -mocha-phantomjs http://localhost:5000/base/test/index.html -# Did an error occur? -MOCHA_ERROR=$? -# We are done so kill ckan -killall paster - -# And finally, run the nosetests -nosetests --ckan --with-pylons=test-core.ini --nologcapture ckan ckanext --with-coverage --cover-package=ckanext --cover-package=ckan -# Did an error occur? -NOSE_ERROR=$? - -[ "0" -ne "$MOCHA_ERROR" ] && echo MOCKA tests have failed -[ "0" -ne "$NOSE_ERROR" ] && echo NOSE tests have failed - -# If an error occurred in our tests make sure travis knows -exit `expr $MOCHA_ERROR + $NOSE_ERROR` diff --git a/bin/travis-install-dependencies b/bin/travis-install-dependencies new file mode 100755 index 00000000000..e8cdeb89525 --- /dev/null +++ b/bin/travis-install-dependencies @@ -0,0 +1,53 @@ +#!/bin/bash + +# Exit immediately if any command fails +set -e + +# Drop Travis' postgres cluster if we're building using a different pg version +TRAVIS_PGVERSION='9.1' +if [ $PGVERSION != $TRAVIS_PGVERSION ] +then + sudo -u postgres pg_dropcluster --stop $TRAVIS_PGVERSION main + # Make psql use $PGVERSION + export PGCLUSTER=$PGVERSION/main +fi + +# Install postgres and solr +sudo apt-get update -qq +sudo apt-get install postgresql-$PGVERSION solr-jetty libcommons-fileupload-java:amd64=1.2.2-1 + +if [ $PGVERSION == '8.4' ] +then + # force postgres to use 5432 as it's port + sudo sed -i -e 's/port = 5433/port = 5432/g' /etc/postgresql/8.4/main/postgresql.conf +fi + +sudo service postgresql restart + +# Setup postgres' users and databases +sudo -u postgres psql -c "CREATE USER ckan_default WITH PASSWORD 'pass';" +sudo -u postgres psql -c "CREATE USER datastore_default WITH PASSWORD 'pass';" +sudo -u postgres psql -c 'CREATE DATABASE ckan_test WITH OWNER ckan_default;' +sudo -u postgres psql -c 'CREATE DATABASE datastore_test WITH OWNER ckan_default;' + +export PIP_USE_MIRRORS=true +pip install -r requirements.txt +pip install -r dev-requirements.txt + +python setup.py develop + +# Install npm dpes for mocha +npm install -g mocha-phantomjs phantomjs + +paster db init -c test-core.ini + +# If Postgres >= 9.0, we don't need to use datastore's legacy mode. +if [ $PGVERSION != '8.4' ] +then + sed -i -e 's/.*datastore.read_url.*/ckan.datastore.read_url = postgresql:\/\/datastore_default:pass@\/datastore_test/' test-core.ini + paster datastore set-permissions postgres -c test-core.ini +else + sed -i -e 's/.*datastore.read_url.*//' test-core.ini +fi + +cat test-core.ini diff --git a/bin/travis-run-tests b/bin/travis-run-tests new file mode 100755 index 00000000000..5d60ea0646d --- /dev/null +++ b/bin/travis-run-tests @@ -0,0 +1,27 @@ +#!/bin/sh + +# Configure Solr +echo "NO_START=0\nJETTY_HOST=127.0.0.1\nJETTY_PORT=8983\nJAVA_HOME=$JAVA_HOME" | sudo tee /etc/default/jetty +sudo cp ckan/config/solr/schema.xml /etc/solr/conf/schema.xml +sudo service jetty restart + +# Run mocha front-end tests +# We need ckan to be running for some tests +paster serve test-core.ini & +sleep 5 # Make sure the server has fully started +mocha-phantomjs http://localhost:5000/base/test/index.html +# Did an error occur? +MOCHA_ERROR=$? +# We are done so kill ckan +killall paster + +# And finally, run the nosetests +nosetests --ckan --reset-db --with-pylons=test-core.ini --nologcapture ckan ckanext +# Did an error occur? +NOSE_ERROR=$? + +[ "0" -ne "$MOCHA_ERROR" ] && echo MOCKA tests have failed +[ "0" -ne "$NOSE_ERROR" ] && echo NOSE tests have failed + +# If an error occurred in our tests make sure travis knows +exit `expr $MOCHA_ERROR + $NOSE_ERROR` diff --git a/ckan/ckan_nose_plugin.py b/ckan/ckan_nose_plugin.py index 2ec4d0988b9..877589a2204 100644 --- a/ckan/ckan_nose_plugin.py +++ b/ckan/ckan_nose_plugin.py @@ -19,21 +19,26 @@ def startContext(self, ctx): if 'new_tests' in repr(ctx): # We don't want to do the stuff below for new-style tests. + if not CkanNose.settings.reset_database: + model.repo.tables_created_and_initialised = True return if isclass(ctx): if hasattr(ctx, "no_db") and ctx.no_db: return - if self.is_first_test or CkanNose.settings.ckan_migration: + if (not CkanNose.settings.reset_database + and not CkanNose.settings.ckan_migration): + model.Session.close_all() + model.repo.tables_created_and_initialised = True + model.repo.rebuild_db() + self.is_first_test = False + elif self.is_first_test or CkanNose.settings.ckan_migration: model.Session.close_all() model.repo.clean_db() self.is_first_test = False if CkanNose.settings.ckan_migration: model.Session.close_all() model.repo.upgrade_db() - # init_db is run at the start of every class because - # when you use an in-memory sqlite db, it appears that - # the db is destroyed after every test when you Session.Remove(). ## This is to make sure the configuration is run again. ## Plugins use configure to make their own tables and they @@ -43,6 +48,9 @@ def startContext(self, ctx): for plugin in PluginImplementations(IConfigurable): plugin.configure(config) + # init_db is run at the start of every class because + # when you use an in-memory sqlite db, it appears that + # the db is destroyed after every test when you Session.Remove(). model.repo.init_db() def options(self, parser, env): @@ -66,6 +74,11 @@ def options(self, parser, env): dest='segments', help='A string containing a hex digits that represent which of' 'the 16 test segments to run. i.e 15af will run segments 1,5,a,f') + parser.add_option( + '--reset-db', + action='store_true', + dest='reset_database', + help='drop database and reinitialize before tests are run') def wantClass(self, cls): name = cls.__name__ diff --git a/ckan/config/deployment.ini_tmpl b/ckan/config/deployment.ini_tmpl index a9e5c56c0e2..b3148cc6d68 100644 --- a/ckan/config/deployment.ini_tmpl +++ b/ckan/config/deployment.ini_tmpl @@ -66,8 +66,10 @@ ckan.auth.user_create_organizations = true ckan.auth.user_delete_groups = true ckan.auth.user_delete_organizations = true ckan.auth.create_user_via_api = false +ckan.auth.create_user_via_web = true ckan.auth.roles_that_cascade_to_sub_groups = admin + ## Search Settings ckan.site_id = default @@ -120,28 +122,9 @@ ckan.feeds.author_link = ## Storage Settings -# Local file storage: -#ofs.impl = pairtree -#ofs.storage_dir = /var/lib/ckan/default - -# Google cloud storage: -#ofs.impl = google -#ofs.gs_access_key_id = -#ofs.gs_secret_access_key = - -# S3 cloud storage: -#ofs.impl = s3 -#ofs.aws_access_key_id = .... -#ofs.aws_secret_access_key = .... - -# 'Bucket' to use for file storage -#ckan.storage.bucket = default - -# Prefix for uploaded files (only used for pairtree) -#ckan.storage.key_prefix = file/ - -# The maximum content size, in bytes, for uploads -#ckan.storage.max_content_length = 50000000 +#ckan.storage_path = /var/lib/ckan +#ckan.max_resource_size = 10 +#ckan.max_image_size = 2 ## Datapusher settings diff --git a/ckan/config/middleware.py b/ckan/config/middleware.py index 4df0aa84cb0..5ba02933d46 100644 --- a/ckan/config/middleware.py +++ b/ckan/config/middleware.py @@ -4,6 +4,7 @@ import logging import json import hashlib +import os import sqlalchemy as sa from beaker.middleware import CacheMiddleware, SessionMiddleware @@ -22,6 +23,7 @@ from ckan.plugins import PluginImplementations from ckan.plugins.interfaces import IMiddleware from ckan.lib.i18n import get_locales_from_config +import ckan.lib.uploader as uploader from ckan.config.environment import load_environment import ckan.lib.app_globals as app_globals @@ -147,6 +149,20 @@ def make_app(conf, full_stack=True, static_files=True, **app_conf): cache_max_age=static_max_age) static_parsers = [static_app, app] + storage_directory = uploader.get_storage_path() + if storage_directory: + path = os.path.join(storage_directory, 'storage') + try: + os.makedirs(path) + except OSError, e: + ## errno 17 is file already exists + if e.errno != 17: + raise + + storage_app = StaticURLParser(path, + cache_max_age=static_max_age) + static_parsers.insert(0, storage_app) + # Configurable extra static file paths extra_static_parsers = [] for public_path in config.get('extra_public_paths', '').split(','): diff --git a/ckan/config/routing.py b/ckan/config/routing.py index 016c65ae0e4..345ff070724 100644 --- a/ckan/config/routing.py +++ b/ckan/config/routing.py @@ -229,6 +229,7 @@ def make_map(): 'history_ajax', 'follow', 'activity', + 'groups', 'unfollow', 'delete', 'api_data', @@ -240,6 +241,8 @@ def make_map(): m.connect('dataset_activity', '/dataset/activity/{id}', action='activity', ckan_icon='time') m.connect('/dataset/activity/{id}/{offset}', action='activity') + m.connect('dataset_groups', '/dataset/groups/{id}', + action='groups', ckan_icon='group') m.connect('/dataset/{id}.{format}', action='read') m.connect('dataset_resources', '/dataset/resources/{id}', action='resources', ckan_icon='reorder') @@ -253,6 +256,8 @@ def make_map(): action='resource_edit', ckan_icon='edit') m.connect('/dataset/{id}/resource/{resource_id}/download', action='resource_download') + m.connect('/dataset/{id}/resource/{resource_id}/download/{filename}', + action='resource_download') m.connect('/dataset/{id}/resource/{resource_id}/embed', action='resource_embedded_dataviewer') m.connect('/dataset/{id}/resource/{resource_id}/viewer', diff --git a/ckan/config/solr/CHANGELOG.txt b/ckan/config/solr/CHANGELOG.txt deleted file mode 100644 index 769c6b53735..00000000000 --- a/ckan/config/solr/CHANGELOG.txt +++ /dev/null @@ -1,29 +0,0 @@ -CKAN SOLR schemas changelog -=========================== - -v2.0 - (ckan>=2.0) --------------------- -* Add _version_ field to make it compatible with solr 4.0 -* Remove stopwords -* Add dataset_type field. -* Add *_date autofield. - -v1.4 - (ckan>=1.7) --------------------- -* Add Ascii folding filter to text fields. -* Add capacity field for public, private access. -* Add title_string so you can sort alphabetically on title. -* Fields related to analytics, access and view counts. -* Add data_dict field for the whole package_dict. -* Add vocab_* dynamic field so it is possible to facet by vocabulary tags -* Add copyField for text with source vocab_* - -v1.3 - (ckan>=1.5.1) --------------------- -* Use the index_id (hash of dataset id + site_id) as uniqueKey (#1430) -* Store extras (#1455) -* Store dataset creation and modification date (#191) - -v1.2 - (ckan<=1.5) --------------------- -* Original version diff --git a/ckan/config/solr/README.txt b/ckan/config/solr/README.txt index 9a3bccebfac..d8fcff40f42 100644 --- a/ckan/config/solr/README.txt +++ b/ckan/config/solr/README.txt @@ -1,30 +1,12 @@ -CKAN SOLR schemas -================= +CKAN Solr schema +================ -This folder contains the latest and previous versions of the SOLR XML -schema files used by CKAN. These can be use on the SOLR server to -override the default SOLR schema. Please note that not all schemas are -backwards compatible with old CKAN versions. Check the CHANGELOG.txt file -in this same folder to check which version of the schema should you use -depending on the CKAN version you are using. +This folder contains the Solr schema file used by CKAN (schema.xml). -Developers, when pushing changes to the SOLR schema: +Starting from 2.2 this is the only file that should be used by users and +modified by devs. The rest of files (schema-{version}.xml) are kept for +backwards compatibility purposes and should not be used, as they might be +removed in future versions. -* Note that updates on the schema are only release based, i.e. all changes - in the schema between releases will be part of the same new version of - the schema. - -* Name the new version of the file using the following convention:: - - schema-.xml - -* Update the `version` attribute of the `schema` tag in the new file:: - - - -* Update the SUPPORTED_SCHEMA_VERSIONS list in `ckan/lib/search/__init__.py` - Consider if the changes introduced are or are not compatible with - previous schema versions. - -* Update the CHANGELOG.txt file with the new version, the CKAN version - required and changes made to the schema. +When upgrading CKAN, always check the CHANGELOG on each release to see if +you need to update the schema file and reindex your datasets. diff --git a/ckan/config/solr/schema-1.2.xml b/ckan/config/solr/schema-1.2.xml index 2fb41dd96a1..4f9b11a580b 100644 --- a/ckan/config/solr/schema-1.2.xml +++ b/ckan/config/solr/schema-1.2.xml @@ -1,4 +1,12 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +index_id +text + + + + + + + + + + + + + + + + + + + + + diff --git a/ckan/controllers/api.py b/ckan/controllers/api.py index bcff15841a5..08ba3a8e641 100644 --- a/ckan/controllers/api.py +++ b/ckan/controllers/api.py @@ -839,7 +839,9 @@ def make_unicode(entity): cls.log.debug('Retrieving request POST: %r' % request.POST) cls.log.debug('Retrieving request GET: %r' % request.GET) request_data = None - if request.POST: + if request.POST and request.content_type == 'multipart/form-data': + request_data = dict(request.POST) + elif request.POST: try: keys = request.POST.keys() # Parsing breaks if there is a = in the value, so for now @@ -873,7 +875,7 @@ def make_unicode(entity): raise ValueError(msg) else: request_data = {} - if request_data: + if request_data and request.content_type != 'multipart/form-data': try: request_data = h.json.loads(request_data, encoding='utf8') except ValueError, e: diff --git a/ckan/controllers/group.py b/ckan/controllers/group.py index 484457bde26..2c5e293a074 100644 --- a/ckan/controllers/group.py +++ b/ckan/controllers/group.py @@ -1,6 +1,8 @@ import re +import os import logging import genshi +import cgi import datetime from urllib import urlencode @@ -425,6 +427,9 @@ def new(self, data=None, errors=None, error_summary=None): return self._save_new(context, group_type) data = data or {} + if not data.get('image_url', '').startswith('http'): + data.pop('image_url', None) + errors = errors or {} error_summary = error_summary or {} vars = {'data': data, 'errors': errors, @@ -524,7 +529,6 @@ def _save_edit(self, id, context): data_dict['id'] = id context['allow_partial_update'] = True group = self._action('group_update')(context, data_dict) - if id != group['name']: self._force_reindex(group) @@ -639,7 +643,7 @@ def member_new(self, id): else: c.user_role = 'member' c.group_dict = self._action('group_show')(context, {'id': id}) - c.roles = self._action('member_roles_list')(context, {}) + c.roles = self._action('member_roles_list')(context, {'group_type': 'group'}) except NotAuthorized: abort(401, _('Unauthorized to add member to group %s') % '') except NotFound: @@ -756,11 +760,8 @@ def activity(self, id, offset=0): context = {'model': model, 'session': model.Session, 'user': c.user or c.author, 'for_view': True} - data_dict = {'id': id} - try: - c.group_dict = get_action('group_show')(context, data_dict) - c.group = context['group'] + c.group_dict = self._get_group_dict(id) except NotFound: abort(404, _('Group not found')) except NotAuthorized: @@ -770,10 +771,9 @@ def activity(self, id, offset=0): # Add the group's activity stream (already rendered to HTML) to the # template context for the group/read.html template to retrieve later. - c.group_activity_stream = get_action('group_activity_list_html')( + c.group_activity_stream = self._action('group_activity_list_html')( context, {'id': c.group_dict['id'], 'offset': offset}) - #return render('group/activity_stream.html') return render(self._activity_template(c.group_dict['type'])) def follow(self, id): diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py index b0adf5c5ac5..689b8e64355 100644 --- a/ckan/controllers/package.py +++ b/ckan/controllers/package.py @@ -1,11 +1,15 @@ import logging from urllib import urlencode import datetime +import os +import mimetypes +import cgi from pylons import config from genshi.template import MarkupTemplate from genshi.template.text import NewTextTemplate from paste.deploy.converters import asbool +import paste.fileapp import ckan.logic as logic import ckan.lib.base as base @@ -18,6 +22,7 @@ import ckan.model as model import ckan.lib.datapreview as datapreview import ckan.lib.plugins +import ckan.lib.uploader as uploader import ckan.plugins as p import ckan.lib.render @@ -221,7 +226,7 @@ def pager_url(q=None, page=None): 'groups': _('Groups'), 'tags': _('Tags'), 'res_format': _('Formats'), - 'license_id': _('License'), + 'license_id': _('Licenses'), } for facet in g.facets: @@ -310,7 +315,7 @@ def resources(self, id): data_dict = {'id': id} try: - check_access('package_update', context) + check_access('package_update', context, data_dict) except NotAuthorized, e: abort(401, _('User %r not authorized to edit %s') % (c.user, id)) # check if package exists @@ -550,7 +555,7 @@ def resource_edit(self, id, resource_id, data=None, errors=None, del data['save'] context = {'model': model, 'session': model.Session, - 'api_version': 3, + 'api_version': 3, 'for_edit': True, 'user': c.user or c.author, 'auth_user_obj': c.userobj} data['package_id'] = id @@ -571,7 +576,7 @@ def resource_edit(self, id, resource_id, data=None, errors=None, id=id, resource_id=resource_id)) context = {'model': model, 'session': model.Session, - 'api_version': 3, + 'api_version': 3, 'for_edit': True, 'user': c.user or c.author, 'auth_user_obj': c.userobj} pkg_dict = get_action('package_show')(context, {'id': id}) if pkg_dict['state'].startswith('draft'): @@ -621,7 +626,8 @@ def new_resource(self, id, data=None, errors=None, error_summary=None): # see if we have any data that we are trying to save data_provided = False for key, value in data.iteritems(): - if value and key != 'resource_type': + if ((value or isinstance(value, cgi.FieldStorage)) + and key != 'resource_type'): data_provided = True break @@ -1204,10 +1210,10 @@ def _resource_preview(self, data_dict): or datapreview.get_preview_plugin( data_dict, return_first=True)) - def resource_download(self, id, resource_id): + def resource_download(self, id, resource_id, filename=None): """ - Provides a direct download by redirecting the user to the url stored - against this resource. + Provides a direct download by either redirecting the user to the url stored + or downloading an uploaded file directly. """ context = {'model': model, 'session': model.Session, 'user': c.user or c.author, 'auth_user_obj': c.userobj} @@ -1220,7 +1226,20 @@ def resource_download(self, id, resource_id): except NotAuthorized: abort(401, _('Unauthorized to read resource %s') % id) - if not 'url' in rsc: + if rsc.get('url_type') == 'upload': + upload = uploader.ResourceUpload(rsc) + filepath = upload.get_path(rsc['id']) + fileapp = paste.fileapp.FileApp(filepath) + try: + status, headers, app_iter = request.call_application(fileapp) + except OSError: + abort(404, _('Resource data not found')) + response.headers.update(dict(headers)) + content_type, content_enc = mimetypes.guess_type(rsc.get('url','')) + response.headers['Content-Type'] = content_type + response.status = status + return app_iter + elif not 'url' in rsc: abort(404, _('No download is available')) redirect(rsc['url']) @@ -1283,6 +1302,62 @@ def followers(self, id=None): return render('package/followers.html') + def groups(self, id): + context = {'model': model, 'session': model.Session, + 'user': c.user or c.author, 'for_view': True, + 'auth_user_obj': c.userobj, 'use_cache': False} + data_dict = {'id': id} + try: + c.pkg_dict = get_action('package_show')(context, data_dict) + except NotFound: + abort(404, _('Dataset not found')) + except NotAuthorized: + abort(401, _('Unauthorized to read dataset %s') % id) + + if request.method == 'POST': + new_group = request.POST.get('group_added') + if new_group: + data_dict = {"id": new_group, + "object": id, + "object_type": 'package', + "capacity": 'public'} + try: + get_action('member_create')(context, data_dict) + except NotFound: + abort(404, _('Group not found')) + + removed_group = request.POST.get('group_removed') + if removed_group: + data_dict = {"id": removed_group, + "object": id, + "object_type": 'package'} + + try: + get_action('member_delete')(context, data_dict) + except NotFound: + abort(404, _('Group not found')) + redirect(h.url_for(controller='package', + action='groups', id=id)) + + + + context['is_member'] = True + users_groups = get_action('group_list_authz')(context, data_dict) + + pkg_group_ids = set(group['id'] for group + in c.pkg_dict.get('groups', [])) + user_group_ids = set(group['id'] for group + in users_groups) + + c.group_dropdown = [[group['id'], group['display_name']] + for group in users_groups if + group['id'] not in pkg_group_ids] + + for group in c.pkg_dict.get('groups', []): + group['user_member'] = (group['id'] in user_group_ids) + + return render('package/group_list.html') + def activity(self, id): '''Render this package's public activity stream page.''' diff --git a/ckan/controllers/user.py b/ckan/controllers/user.py index 1c6fefff344..4f30bb4ed91 100644 --- a/ckan/controllers/user.py +++ b/ckan/controllers/user.py @@ -68,7 +68,7 @@ def _setup_template_variables(self, context, data_dict): try: user_dict = get_action('user_show')(context, data_dict) except NotFound: - h.redirect_to(controller='user', action='login', id=None) + abort(404, _('User not found')) except NotAuthorized: abort(401, _('Not authorized to see this page')) c.user_dict = user_dict @@ -117,10 +117,6 @@ def read(self, id=None): 'for_view': True} data_dict = {'id': id, 'user_obj': c.userobj} - try: - check_access('user_show', context, data_dict) - except NotAuthorized: - abort(401, _('Not authorized to see this page')) context['with_related'] = True @@ -455,7 +451,7 @@ def perform_reset(self, id): # reuse of the url context = {'model': model, 'session': model.Session, 'user': id, - 'keep_sensitive_data': True} + 'keep_email': True} try: check_access('user_reset', context) @@ -466,10 +462,6 @@ def perform_reset(self, id): data_dict = {'id': id} user_dict = get_action('user_show')(context, data_dict) - # Be a little paranoid, and get rid of sensitive data that's - # not needed. - user_dict.pop('apikey', None) - user_dict.pop('reset_key', None) user_obj = context['user_obj'] except NotFound, e: abort(404, _('User not found')) diff --git a/ckan/lib/app_globals.py b/ckan/lib/app_globals.py index 38c777f7555..38138e87815 100644 --- a/ckan/lib/app_globals.py +++ b/ckan/lib/app_globals.py @@ -44,7 +44,6 @@ 'ckan.template_footer_end': {}, 'ckan.dumps_url': {}, 'ckan.dumps_format': {}, - 'ckan.api_url': {}, 'ofs.impl': {'name': 'ofs_impl'}, 'ckan.homepage_style': {'default': '1'}, diff --git a/ckan/lib/cli.py b/ckan/lib/cli.py index 80f1615d675..0b0ebd84287 100644 --- a/ckan/lib/cli.py +++ b/ckan/lib/cli.py @@ -10,6 +10,8 @@ import ckan.include.rcssmin as rcssmin import ckan.lib.fanstatic_resources as fanstatic_resources import sqlalchemy as sa +import urlparse +import routes import paste.script from paste.registry import Registry @@ -99,6 +101,12 @@ def _load_config(self): self.translator_obj = MockTranslator() self.registry.register(pylons.translator, self.translator_obj) + ## give routes enough information to run url_for + parsed = urlparse.urlparse(conf.get('ckan.site_url', 'http://0.0.0.0')) + request_config = routes.request_config() + request_config.host = parsed.netloc + parsed.path + request_config.protocol = parsed.scheme + def _setup_app(self): cmd = paste.script.appinstall.SetupCommand('setup-app') cmd.run([self.filename]) @@ -122,6 +130,7 @@ class ManageDb(CkanCommand): db load-only FILE_PATH - load a pg_dump from a file but don\'t do the schema upgrade or search indexing db create-from-model - create database from the model (indexes not made) + db migrate-filestore - migrate all uploaded data from the 2.1 filesore. ''' summary = __doc__.split('\n')[0] usage = __doc__ @@ -179,6 +188,8 @@ def command(self): print 'Creating DB: SUCCESS' elif cmd == 'send-rdf': self.send_rdf() + elif cmd == 'migrate-filestore': + self.migrate_filestore() else: print 'Command %s not recognized' % cmd sys.exit(1) @@ -311,6 +322,45 @@ def send_rdf(self): talis = ckan.lib.talis.Talis() return talis.send_rdf(talis_store, username, password) + def migrate_filestore(self): + from ckan.model import Session + import requests + from ckan.lib.uploader import ResourceUpload + results = Session.execute("select id, revision_id, url from resource " + "where resource_type = 'file.upload' " + "and (url_type <> 'upload' or url_type is null)" + "and url like '%storage%'") + for id, revision_id, url in results: + response = requests.get(url, stream=True) + if response.status_code != 200: + print "failed to fetch %s (code %s)" % (url, + response.status_code) + continue + resource_upload = ResourceUpload({'id': id}) + assert resource_upload.storage_path, "no storage configured aborting" + + directory = resource_upload.get_directory(id) + filepath = resource_upload.get_path(id) + try: + os.makedirs(directory) + except OSError, e: + ## errno 17 is file already exists + if e.errno != 17: + raise + + with open(filepath, 'wb+') as out: + for chunk in response.iter_content(1024): + if chunk: + out.write(chunk) + + Session.execute("update resource set url_type = 'upload'" + "where id = '%s'" % id) + Session.execute("update resource_revision set url_type = 'upload'" + "where id = '%s' and " + "revision_id = '%s'" % (id, revision_id)) + Session.commit() + print "Saved url %s" % url + def version(self): from ckan.model import Session print Session.execute('select version from migrate_version;').fetchall() diff --git a/ckan/lib/dictization/model_dictize.py b/ckan/lib/dictization/model_dictize.py index 34fb738b950..ede1fd85c7f 100644 --- a/ckan/lib/dictization/model_dictize.py +++ b/ckan/lib/dictization/model_dictize.py @@ -10,22 +10,23 @@ import ckan.lib.dictization as d import ckan.new_authz as new_authz import ckan.lib.search as search +import ckan.lib.munge as munge ## package save def group_list_dictize(obj_list, context, - sort_key=lambda x:x['display_name'], reverse=False): + sort_key=lambda x:x['display_name'], reverse=False, + with_package_counts=True): active = context.get('active', True) with_private = context.get('include_private_packages', False) - query = search.PackageSearchQuery() - - q = {'q': '+capacity:public' if not with_private else '*:*', - 'fl': 'groups', 'facet.field': ['groups', 'owner_org'], - 'facet.limit': -1, 'rows': 1} - - query.run(q) + if with_package_counts: + query = search.PackageSearchQuery() + q = {'q': '+capacity:public' if not with_private else '*:*', + 'fl': 'groups', 'facet.field': ['groups', 'owner_org'], + 'facet.limit': -1, 'rows': 1} + query.run(q) result_list = [] @@ -39,12 +40,26 @@ def group_list_dictize(obj_list, context, if active and obj.state not in ('active', 'pending'): continue - group_dict['display_name'] = obj.display_name - - if obj.is_organization: - group_dict['packages'] = query.facets['owner_org'].get(obj.id, 0) - else: - group_dict['packages'] = query.facets['groups'].get(obj.name, 0) + group_dict['display_name'] = (group_dict.get('title') or + group_dict.get('name')) + + image_url = group_dict.get('image_url') + group_dict['image_display_url'] = image_url + if image_url and not image_url.startswith('http'): + #munge here should not have an effect only doing it incase + #of potential vulnerability of dodgy api input + image_url = munge.munge_filename(image_url) + group_dict['image_display_url'] = h.url_for_static( + 'uploads/group/%s' % group_dict.get('image_url'), + qualified=True + ) + + if with_package_counts: + facets = query.facets + if obj.is_organization: + group_dict['packages'] = facets['owner_org'].get(obj.id, 0) + else: + group_dict['packages'] = facets['groups'].get(obj.name, 0) if context.get('for_view'): if group_dict['is_organization']: @@ -128,14 +143,29 @@ def _unified_resource_format(format_): return format_new def resource_dictize(res, context): + model = context['model'] resource = d.table_dictize(res, context) + resource_group_id = resource['resource_group_id'] extras = resource.pop("extras", None) if extras: resource.update(extras) resource['format'] = _unified_resource_format(res.format) # some urls do not have the protocol this adds http:// to these url = resource['url'] - if not urlparse.urlsplit(url).scheme: + ## for_edit is only called at the times when the dataset is to be edited + ## in the frontend. Without for_edit the whole qualified url is returned. + if resource.get('url_type') == 'upload' and not context.get('for_edit'): + resource_group = model.Session.query( + model.ResourceGroup).get(resource_group_id) + last_part = url.split('/')[-1] + cleaned_name = munge.munge_filename(last_part) + resource['url'] = h.url_for(controller='package', + action='resource_download', + id=resource_group.package_id, + resource_id=res.id, + filename=cleaned_name, + qualified=True) + elif not urlparse.urlsplit(url).scheme and not context.get('for_edit'): resource['url'] = u'http://' + url.lstrip('/') return resource @@ -248,7 +278,11 @@ def package_dictize(pkg, context): .where(member_rev.c.state == 'active') \ .where(group.c.is_organization == False) result = _execute_with_revision(q, member_rev, context) - result_dict["groups"] = d.obj_list_dictize(result, context) + context['with_capacity'] = False + ## no package counts as cannot fetch from search index at the same + ## time as indexing to it. + result_dict["groups"] = group_list_dictize(result, context, + with_package_counts=False) #owning organization group_rev = model.group_revision_table q = select([group_rev] @@ -357,6 +391,16 @@ def group_dictize(group, context): for item in plugins.PluginImplementations(plugin): result_dict = item.before_view(result_dict) + image_url = result_dict.get('image_url') + result_dict['image_display_url'] = image_url + if image_url and not image_url.startswith('http'): + #munge here should not have an effect only doing it incase + #of potential vulnerability of dodgy api input + image_url = munge.munge_filename(image_url) + result_dict['image_display_url'] = h.url_for_static( + 'uploads/group/%s' % result_dict.get('image_url'), + qualified = True + ) return result_dict def tag_list_dictize(tag_list, context): @@ -431,6 +475,9 @@ def user_list_dictize(obj_list, context, for obj in obj_list: user_dict = user_dictize(obj, context) + user_dict.pop('reset_key', None) + user_dict.pop('apikey', None) + user_dict.pop('email', None) result_list.append(user_dict) return sorted(result_list, key=sort_key, reverse=reverse) @@ -455,13 +502,24 @@ def user_dictize(user, context): requester = context.get('user') - if not (new_authz.is_sysadmin(requester) or - requester == user.name or - context.get('keep_sensitive_data', False)): - # If not sysadmin or the same user, strip sensible info - result_dict.pop('apikey', None) - result_dict.pop('reset_key', None) - result_dict.pop('email', None) + reset_key = result_dict.pop('reset_key', None) + apikey = result_dict.pop('apikey', None) + email = result_dict.pop('email', None) + + if context.get('keep_email', False): + result_dict['email'] = email + + if context.get('keep_apikey', False): + result_dict['apikey'] = email + + if requester == user.name: + result_dict['apikey'] = apikey + result_dict['email'] = email + + ## this should not really really be needed but tests r it + if new_authz.is_sysadmin(requester): + result_dict['apikey'] = apikey + result_dict['email'] = email model = context['model'] session = model.Session @@ -632,3 +690,20 @@ def user_following_dataset_dictize(follower, context): def user_following_group_dictize(follower, context): return d.table_dictize(follower, context) + + base_columns = set(['id', 'resource_id', 'title', 'description', + 'view_type', 'order', 'config']) + +def resource_view_dictize(resource_view, context): + dictized = d.table_dictize(resource_view, context) + dictized.pop('order') + config = dictized.pop('config', {}) + dictized.update(config) + return dictized + +def resource_view_list_dictize(resource_views, context): + resource_view_dicts = [] + for view in resource_views: + resource_view_dicts.append(resource_view_dictize(view, context)) + return resource_view_dicts + diff --git a/ckan/lib/dictization/model_save.py b/ckan/lib/dictization/model_save.py index 88bc106bac9..56ba6ec0758 100644 --- a/ckan/lib/dictization/model_save.py +++ b/ckan/lib/dictization/model_save.py @@ -41,8 +41,8 @@ def resource_dict_save(res_dict, context): # this is an internal field so ignore # FIXME This helps get the tests to pass but is a hack and should # be fixed properly. basically don't update the format if not needed - if (key == 'format' and value == obj.format - or value == d.model_dictize._unified_resource_format(obj.format)): + if (key == 'format' and (value == obj.format + or value == d.model_dictize._unified_resource_format(obj.format))): continue setattr(obj, key, value) else: diff --git a/ckan/lib/email_notifications.py b/ckan/lib/email_notifications.py index ba245872531..7f24b978285 100644 --- a/ckan/lib/email_notifications.py +++ b/ckan/lib/email_notifications.py @@ -221,7 +221,7 @@ def get_and_send_notifications_for_user(user): def get_and_send_notifications_for_all_users(): context = {'model': model, 'session': model.Session, 'ignore_auth': True, - 'keep_sensitive_data': True} + 'keep_email': True} users = logic.get_action('user_list')(context, {}) for user in users: get_and_send_notifications_for_user(user) diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py index 9a2b83ddfb1..f5f0a7e197f 100644 --- a/ckan/lib/helpers.py +++ b/ckan/lib/helpers.py @@ -37,6 +37,7 @@ import ckan.lib.maintain as maintain import ckan.lib.datapreview as datapreview import ckan.logic as logic +import ckan.lib.uploader as uploader from ckan.common import ( _, ungettext, g, c, request, session, json, OrderedDict @@ -1664,6 +1665,10 @@ def new_activities(): action = logic.get_action('dashboard_new_activities_count') return action({}, {}) +def uploads_enabled(): + if uploader.get_storage_path(): + return True + return False def get_featured_organizations(count=1): '''Returns a list of favourite organization in the form @@ -1836,6 +1841,7 @@ def get_site_statistics(): 'radio', 'submit', 'asbool', + 'uploads_enabled', 'get_featured_organizations', 'get_featured_groups', 'get_site_statistics', diff --git a/ckan/lib/munge.py b/ckan/lib/munge.py index c943e1b113f..a47c8c02258 100644 --- a/ckan/lib/munge.py +++ b/ckan/lib/munge.py @@ -105,6 +105,13 @@ def munge_tag(tag): tag = _munge_to_length(tag, model.MIN_TAG_LENGTH, model.MAX_TAG_LENGTH) return tag +def munge_filename(filename): + filename = substitute_ascii_equivalents(filename) + filename = filename.lower().strip() + filename = re.sub(r'[^a-zA-Z0-9. ]', '', filename).replace(' ', '-') + filename = _munge_to_length(filename, 3, 100) + return filename + def _munge_to_length(string, min_length, max_length): '''Pad/truncates a string''' if len(string) < min_length: diff --git a/ckan/lib/uploader.py b/ckan/lib/uploader.py new file mode 100644 index 00000000000..a9c843a0d0d --- /dev/null +++ b/ckan/lib/uploader.py @@ -0,0 +1,225 @@ +import os +import cgi +import pylons +import datetime +import ckan.lib.munge as munge +import logging +import ckan.logic as logic + + +config = pylons.config +log = logging.getLogger(__name__) + +_storage_path = None +_max_resource_size = None +_max_image_size = None + + +def get_storage_path(): + '''Function to cache storage path''' + global _storage_path + + #None means it has not been set. False means not in config. + if _storage_path is None: + storage_path = config.get('ckan.storage_path') + ofs_impl = config.get('ofs.impl') + ofs_storage_dir = config.get('ofs.storage_dir') + if storage_path: + _storage_path = storage_path + elif ofs_impl == 'pairtree' and ofs_storage_dir: + log.warn('''Please use config option ckan.storage_path instaed of + ofs.storage_path''') + _storage_path = ofs_storage_dir + return _storage_path + elif ofs_impl: + log.critical('''We only support local file storage form version 2.2 + of ckan please specify ckan.storage_path in your + config for your uploads''') + _storage_path = False + else: + log.critical('''Please specify a ckan.storage_path in your config + for your uploads''') + _storage_path = False + + return _storage_path + + +def get_max_image_size(): + global _max_image_size + if _max_image_size is None: + _max_image_size = int(config.get('ckan.max_image_size', 2)) + return _max_image_size + + +def get_max_resource_size(): + global _max_resource_size + if _max_resource_size is None: + _max_resource_size = int(config.get('ckan.max_resource_size', 10)) + return _max_resource_size + + +class Upload(object): + def __init__(self, object_type, old_filename=None): + ''' Setup upload by creating a subdirectory of the storage directory + of name object_type. old_filename is the name of the file in the url + field last time''' + + self.storage_path = None + self.filename = None + self.filepath = None + path = get_storage_path() + if not path: + return + self.storage_path = os.path.join(path, 'storage', + 'uploads', object_type) + try: + os.makedirs(self.storage_path) + except OSError, e: + ## errno 17 is file already exists + if e.errno != 17: + raise + self.object_type = object_type + self.old_filename = old_filename + if old_filename: + self.old_filepath = os.path.join(self.storage_path, old_filename) + + def update_data_dict(self, data_dict, url_field, file_field, clear_field): + ''' Manipulate data from the data_dict. url_field is the name of the + field where the upload is going to be. file_field is name of the key + where the FieldStorage is kept (i.e the field where the file data + actually is). clear_field is the name of a boolean field which + requests the upload to be deleted. This needs to be called before + it reaches any validators''' + + self.url = data_dict.get(url_field, '') + self.clear = data_dict.pop(clear_field, None) + self.file_field = file_field + self.upload_field_storage = data_dict.pop(file_field, None) + + if not self.storage_path: + return + + if isinstance(self.upload_field_storage, cgi.FieldStorage): + self.filename = self.upload_field_storage.filename + self.filename = str(datetime.datetime.utcnow()) + self.filename + self.filename = munge.munge_filename(self.filename) + self.filepath = os.path.join(self.storage_path, self.filename) + data_dict[url_field] = self.filename + self.upload_file = self.upload_field_storage.file + self.tmp_filepath = self.filepath + '~' + ### keep the file if there has been no change + elif self.old_filename and not self.old_filename.startswith('http'): + if not self.clear: + data_dict[url_field] = self.old_filename + if self.clear and self.url == self.old_filename: + data_dict[url_field] = '' + + def upload(self, max_size=2): + ''' Actually upload the file. + This should happen just before a commit but after the data has + been validated and flushed to the db. This is so we do not store + anything unless the request is actually good. + max_size is size in MB maximum of the file''' + + if self.filename: + output_file = open(self.tmp_filepath, 'wb') + self.upload_file.seek(0) + current_size = 0 + while True: + current_size = current_size + 1 + # MB chuncks + data = self.upload_file.read(2 ** 20) + if not data: + break + output_file.write(data) + if current_size > max_size: + os.remove(self.tmp_filepath) + raise logic.ValidationError( + {self.file_field: ['File upload too large']} + ) + output_file.close() + os.rename(self.tmp_filepath, self.filepath) + self.clear = True + + if (self.clear and self.old_filename + and not self.old_filename.startswith('http')): + try: + os.remove(self.old_filepath) + except OSError, e: + pass + + +class ResourceUpload(object): + def __init__(self, resource): + path = get_storage_path() + if not path: + self.storage_path = None + return + self.storage_path = os.path.join(path, 'resources') + try: + os.makedirs(self.storage_path) + except OSError, e: + ## errno 17 is file already exists + if e.errno != 17: + raise + self.filename = None + + url = resource.get('url') + upload_field_storage = resource.pop('upload', None) + self.clear = resource.pop('clear_upload', None) + + if isinstance(upload_field_storage, cgi.FieldStorage): + self.filename = upload_field_storage.filename + self.filename = munge.munge_filename(self.filename) + resource['url'] = self.filename + resource['url_type'] = 'upload' + self.upload_file = upload_field_storage.file + elif self.clear: + resource['url_type'] = '' + + def get_directory(self, id): + directory = os.path.join(self.storage_path, + id[0:3], id[3:6]) + return directory + + def get_path(self, id): + directory = self.get_directory(id) + filepath = os.path.join(directory, id[6:]) + return filepath + + def upload(self, id, max_size=10): + if not self.storage_path: + return + directory = self.get_directory(id) + filepath = self.get_path(id) + if self.filename: + try: + os.makedirs(directory) + except OSError, e: + ## errno 17 is file already exists + if e.errno != 17: + raise + tmp_filepath = filepath + '~' + output_file = open(tmp_filepath, 'wb+') + self.upload_file.seek(0) + current_size = 0 + while True: + current_size = current_size + 1 + #MB chunks + data = self.upload_file.read(2 ** 20) + if not data: + break + output_file.write(data) + if current_size > max_size: + os.remove(tmp_filepath) + raise logic.ValidationError( + {'upload': ['File upload too large']} + ) + output_file.close() + os.rename(tmp_filepath, filepath) + + if self.clear: + try: + os.remove(filepath) + except OSError, e: + pass diff --git a/ckan/logic/__init__.py b/ckan/logic/__init__.py index 4a474e26432..c3d04665370 100644 --- a/ckan/logic/__init__.py +++ b/ckan/logic/__init__.py @@ -388,7 +388,7 @@ def get_action(action): resolved_action_plugins[name] ) ) - log.debug('Auth function %r was inserted', plugin.name) + log.debug('Action function {0} from plugin {1} was inserted'.format(name, plugin.name)) resolved_action_plugins[name] = plugin.name # Extensions are exempted from the auth audit for now # This needs to be resolved later diff --git a/ckan/logic/action/create.py b/ckan/logic/action/create.py index ce321b944e3..83500a28abc 100644 --- a/ckan/logic/action/create.py +++ b/ckan/logic/action/create.py @@ -17,6 +17,7 @@ import ckan.lib.dictization.model_dictize as model_dictize import ckan.lib.dictization.model_save as model_save import ckan.lib.navl.dictization_functions +import ckan.lib.uploader as uploader import ckan.lib.navl.validators as validators import ckan.lib.mailer as mailer @@ -90,7 +91,7 @@ def package_create(context, data_dict): :param extras: the dataset's extras (optional), extras are arbitrary (key: value) metadata items that can be added to datasets, each extra dictionary should have keys ``'key'`` (a string), ``'value'`` (a - string), and optionally ``'deleted'`` + string) :type extras: list of dataset extra dictionaries :param relationships_as_object: see ``package_relationship_create()`` for the format of relationship dictionaries (optional) @@ -238,6 +239,8 @@ def resource_create(context, data_dict): :type cache_last_updated: iso date string :param webstore_last_updated: (optional) :type webstore_last_updated: iso date string + :param upload: (optional) + :type upload: FieldStorage (optional) needs multipart/form-data :returns: the newly created resource :rtype: dictionary @@ -255,15 +258,31 @@ def resource_create(context, data_dict): if not 'resources' in pkg_dict: pkg_dict['resources'] = [] + + upload = uploader.ResourceUpload(data_dict) + pkg_dict['resources'].append(data_dict) try: - pkg_dict = _get_action('package_update')(context, pkg_dict) + context['defer_commit'] = True + context['use_cache'] = False + _get_action('package_update')(context, pkg_dict) + context.pop('defer_commit') except ValidationError, e: errors = e.error_dict['resources'][-1] raise ValidationError(errors) - return pkg_dict['resources'][-1] + ## Get out resource_id resource from model as it will not appear in + ## package_show until after commit + upload.upload(context['package'].resources[-1].id, + uploader.get_max_resource_size()) + model.repo.commit() + + ## Run package show again to get out actual last_resource + pkg_dict = _get_action('package_show')(context, {'id': package_id}) + resource = pkg_dict['resources'][-1] + + return resource def related_create(context, data_dict): @@ -450,8 +469,7 @@ def member_create(context, data_dict=None): if not obj: raise NotFound('%s was not found.' % obj_type.title()) - # User must be able to update the group to add a member to it - _check_access('group_update', context, data_dict) + _check_access('member_create', context, data_dict) # Look up existing, in case it exists member = model.Session.query(model.Member).\ @@ -478,7 +496,9 @@ def _group_or_org_create(context, data_dict, is_org=False): session = context['session'] data_dict['is_organization'] = is_org - + upload = uploader.Upload('group') + upload.update_data_dict(data_dict, 'image_url', + 'image_upload', 'clear_upload') # get the schema group_plugin = lib_plugins.lookup_group_plugin( group_type=data_dict.get('type')) @@ -556,6 +576,7 @@ def _group_or_org_create(context, data_dict, is_org=False): logic.get_action('activity_create')(activity_create_context, activity_dict) + upload.upload(uploader.get_max_image_size()) if not context.get('defer_commit'): model.repo.commit() context["group"] = group @@ -821,7 +842,8 @@ def user_create(context, data_dict): # # The context is copied so as not to clobber the caller's context dict. user_dictize_context = context.copy() - user_dictize_context['keep_sensitive_data'] = True + user_dictize_context['keep_apikey'] = True + user_dictize_context['keep_email'] = True user_dict = model_dictize.user_dictize(user, user_dictize_context) context['user_obj'] = user diff --git a/ckan/logic/action/delete.py b/ckan/logic/action/delete.py index 0ff4f058428..2fdaf2f6563 100644 --- a/ckan/logic/action/delete.py +++ b/ckan/logic/action/delete.py @@ -228,8 +228,7 @@ def member_delete(context, data_dict=None): if not obj: raise NotFound('%s was not found.' % obj_type.title()) - # User must be able to update the group to remove a member from it - _check_access('group_update', context, data_dict) + _check_access('member_create', context, data_dict) member = model.Session.query(model.Member).\ filter(model.Member.table_name == obj_type).\ diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py index ca46ac2ff57..502b1bf92c9 100644 --- a/ckan/logic/action/get.py +++ b/ckan/logic/action/get.py @@ -335,6 +335,7 @@ def translated_capacity(capacity): def _group_or_org_list(context, data_dict, is_org=False): model = context['model'] + user = context['user'] api = context.get('api_version') groups = data_dict.get('groups') ref_group_by = 'id' if api == 2 else 'name' @@ -464,7 +465,7 @@ def group_list_authz(context, data_dict): _check_access('group_list_authz',context, data_dict) sysadmin = new_authz.is_sysadmin(user) - roles = ckan.new_authz.get_roles_with_permission('edit_group') + roles = ckan.new_authz.get_roles_with_permission('manage_group') if not roles: return [] user_id = new_authz.get_user_id_for_username(user, allow_none=True) @@ -551,7 +552,8 @@ def organization_list_for_user(context, data_dict): orgs_list = model_dictize.group_list_dictize(orgs_q.all(), context) return orgs_list -def group_revision_list(context, data_dict): + +def _group_or_org_revision_list(context, data_dict): '''Return a group's revisions. :param id: the name or id of the group @@ -566,7 +568,6 @@ def group_revision_list(context, data_dict): if group is None: raise NotFound - _check_access('group_revision_list',context, data_dict) revision_dicts = [] for revision, object_revisions in group.all_related_revisions: @@ -575,6 +576,32 @@ def group_revision_list(context, data_dict): include_groups=False)) return revision_dicts +def group_revision_list(context, data_dict): + '''Return a group's revisions. + + :param id: the name or id of the group + :type id: string + + :rtype: list of dictionaries + + ''' + + _check_access('group_revision_list',context, data_dict) + return _group_or_org_revision_list(context, data_dict) + +def organization_revision_list(context, data_dict): + '''Return an organization's revisions. + + :param id: the name or id of the organization + :type id: string + + :rtype: list of dictionaries + + ''' + + _check_access('organization_revision_list',context, data_dict) + return _group_or_org_revision_list(context, data_dict) + def license_list(context, data_dict): '''Return the list of licenses available for datasets on the site. @@ -2329,7 +2356,16 @@ def organization_activity_list_html(context, data_dict): ''' activity_stream = organization_activity_list(context, data_dict) - return activity_streams.activity_list_to_html(context, activity_stream) + offset = int(data_dict.get('offset', 0)) + extra_vars = { + 'controller': 'organization', + 'action': 'activity', + 'id': data_dict['id'], + 'offset': offset, + } + + return activity_streams.activity_list_to_html(context, activity_stream, + extra_vars) def recently_changed_packages_activity_list_html(context, data_dict): '''Return the activity stream of all recently changed packages as HTML. @@ -2916,11 +2952,20 @@ def _unpick_search(sort, allowed_fields=None, total=None): def member_roles_list(context, data_dict): '''Return the possible roles for members of groups and organizations. + :param group_type: the group type, either "group" or "organization" + (optional, default "organization") + :type id: string :returns: a list of dictionaries each with two keys: "text" (the display name of the role, e.g. "Admin") and "value" (the internal name of the role, e.g. "admin") :rtype: list of dictionaries ''' + group_type = data_dict.get('group_type', 'organization') + roles_list = new_authz.roles_list() + if group_type == 'group': + roles_list = [role for role in roles_list + if role['value'] != 'editor'] + _check_access('member_roles_list', context, data_dict) - return new_authz.roles_list() + return roles_list diff --git a/ckan/logic/action/update.py b/ckan/logic/action/update.py index 84895f1d6f7..edf1ddcd548 100644 --- a/ckan/logic/action/update.py +++ b/ckan/logic/action/update.py @@ -19,6 +19,7 @@ import ckan.lib.plugins as lib_plugins import ckan.lib.email_notifications as email_notifications import ckan.lib.search as search +import ckan.lib.uploader as uploader from ckan.common import _, request @@ -218,15 +219,23 @@ def resource_update(context, data_dict): else: logging.error('Could not find resource ' + id) raise NotFound(_('Resource was not found.')) + + upload = uploader.ResourceUpload(data_dict) + pkg_dict['resources'][n] = data_dict try: + context['defer_commit'] = True + context['use_cache'] = False pkg_dict = _get_action('package_update')(context, pkg_dict) + context.pop('defer_commit') except ValidationError, e: errors = e.error_dict['resources'][n] raise ValidationError(errors) - return pkg_dict['resources'][n] + upload.upload(id, uploader.get_max_resource_size()) + model.repo.commit() + return _get_action('resource_show')(context, {'id': id}) def package_update(context, data_dict): @@ -423,6 +432,10 @@ def _group_or_org_update(context, data_dict, is_org=False): except AttributeError: schema = group_plugin.form_to_db_schema() + upload = uploader.Upload('group', group.image_url) + upload.update_data_dict(data_dict, 'image_url', + 'image_upload', 'clear_upload') + if is_org: _check_access('organization_update', context, data_dict) else: @@ -510,9 +523,11 @@ def _group_or_org_update(context, data_dict, is_org=False): # TODO: Also create an activity detail recording what exactly changed # in the group. + upload.upload(uploader.get_max_image_size()) if not context.get('defer_commit'): model.repo.commit() + return model_dictize.group_dictize(group, context) def group_update(context, data_dict): diff --git a/ckan/logic/auth/create.py b/ckan/logic/auth/create.py index 792c077670c..0c7be8de7a4 100644 --- a/ckan/logic/auth/create.py +++ b/ckan/logic/auth/create.py @@ -1,5 +1,6 @@ import ckan.logic as logic import ckan.new_authz as new_authz +import ckan.logic.auth as logic_auth from ckan.common import _ @@ -103,15 +104,22 @@ def rating_create(context, data_dict): # No authz check in the logic function return {'success': True} + @logic.auth_allow_anonymous_access def user_create(context, data_dict=None): - user = context['user'] - - if ('api_version' in context - and not new_authz.check_config_permission('create_user_via_api')): - return {'success': False, 'msg': _('User %s not authorized to create users') % user} - else: - return {'success': True} + using_api = 'api_version' in context + create_user_via_api = new_authz.check_config_permission( + 'create_user_via_api') + create_user_via_web = new_authz.check_config_permission( + 'create_user_via_web') + + if using_api and not create_user_via_api: + return {'success': False, 'msg': _('User {user} not authorized to ' + 'create users via the API').format(user=context.get('user'))} + if not using_api and not create_user_via_web: + return {'success': False, 'msg': _('Not authorized to ' + 'create users')} + return {'success': True} def user_invite(context, data_dict=None): context['id'] = context.get('group_id') @@ -208,3 +216,23 @@ def organization_member_create(context, data_dict): def group_member_create(context, data_dict): return _group_or_org_member_create(context, data_dict) + +def member_create(context, data_dict): + group = logic_auth.get_group_object(context, data_dict) + user = context['user'] + + # User must be able to update the group to add a member to it + permission = 'update' + # However if the user is member of group then they can add/remove datasets + if not group.is_organization and data_dict.get('object_type') == 'package': + permission = 'manage_group' + + authorized = new_authz.has_user_permission_for_group_or_org(group.id, + user, + permission) + if not authorized: + return {'success': False, + 'msg': _('User %s not authorized to edit group %s') % + (str(user), group.id)} + else: + return {'success': True} diff --git a/ckan/logic/auth/get.py b/ckan/logic/auth/get.py index c00624bb5d6..37de61d975a 100644 --- a/ckan/logic/auth/get.py +++ b/ckan/logic/auth/get.py @@ -39,6 +39,9 @@ def revision_list(context, data_dict): def group_revision_list(context, data_dict): return group_show(context, data_dict) +def organization_revision_list(context, data_dict): + return group_show(context, data_dict) + def package_revision_list(context, data_dict): return package_show(context, data_dict) diff --git a/ckan/logic/schema.py b/ckan/logic/schema.py index fc54b01990b..901121a95ea 100644 --- a/ckan/logic/schema.py +++ b/ckan/logic/schema.py @@ -224,6 +224,8 @@ def default_show_package_schema(): schema['groups'].update({ 'description': [ignore_missing], + 'display_name': [ignore_missing], + 'image_display_url': [ignore_missing], }) # Remove validators for several keys from the schema so validation doesn't @@ -264,6 +266,7 @@ def default_group_schema(): 'title': [ignore_missing, unicode], 'description': [ignore_missing, unicode], 'image_url': [ignore_missing, unicode], + 'image_display_url': [ignore_missing, unicode], 'type': [ignore_missing, unicode], 'state': [ignore_not_group_admin, ignore_missing], 'created': [ignore], @@ -346,6 +349,7 @@ def default_extras_schema(): 'state': [ignore], 'deleted': [ignore_missing], 'revision_timestamp': [ignore], + '__extras': [ignore], } return schema diff --git a/ckan/new_authz.py b/ckan/new_authz.py index e5ac46f8042..44eb09f5dc9 100644 --- a/ckan/new_authz.py +++ b/ckan/new_authz.py @@ -83,7 +83,7 @@ def _build(self): resolved_auth_function_plugins[name] ) ) - log.debug('Auth function %r was inserted', plugin.name) + log.debug('Auth function {0} from plugin {1} was inserted'.format(name, plugin.name)) resolved_auth_function_plugins[name] = plugin.name fetched_auth_functions[name] = auth_function # Use the updated ones in preference to the originals. @@ -96,6 +96,7 @@ def _build(self): def clear_auth_functions_cache(): _AuthFunctions.clear() + CONFIG_PERMISSIONS.clear() def auth_functions_list(): @@ -191,8 +192,8 @@ def is_authorized(action, context, data_dict=None): # these are the permissions that roles have ROLE_PERMISSIONS = OrderedDict([ ('admin', ['admin']), - ('editor', ['read', 'delete_dataset', 'create_dataset', 'update_dataset']), - ('member', ['read']), + ('editor', ['read', 'delete_dataset', 'create_dataset', 'update_dataset', 'manage_group']), + ('member', ['read', 'manage_group']), ]) @@ -379,6 +380,7 @@ def get_user_id_for_username(user_name, allow_none=False): 'user_delete_groups': True, 'user_delete_organizations': True, 'create_user_via_api': False, + 'create_user_via_web': True, 'roles_that_cascade_to_sub_groups': 'admin', } diff --git a/ckan/new_tests/helpers.py b/ckan/new_tests/helpers.py index 51640a7e3dd..4e1e1ffd0c7 100644 --- a/ckan/new_tests/helpers.py +++ b/ckan/new_tests/helpers.py @@ -38,7 +38,7 @@ def reset_db(): # This prevents CKAN from hanging waiting for some unclosed connection. model.Session.close_all() - model.repo.clean_db() + model.repo.rebuild_db() def call_action(action_name, context=None, **kwargs): diff --git a/ckan/plugins/interfaces.py b/ckan/plugins/interfaces.py index 14d64b01146..f3dfce7d962 100644 --- a/ckan/plugins/interfaces.py +++ b/ckan/plugins/interfaces.py @@ -770,7 +770,7 @@ def read_template(self): If the user requests the dataset in a format other than HTML (CKAN supports returning datasets in RDF or N3 format by appending .rdf - or .n3 to the dataset read URL, see :doc:`linked-data-and-rdf`) then + or .n3 to the dataset read URL, see :doc:`/linked-data-and-rdf`) then CKAN will try to render a template file with the same path as returned by this function, but a different filename extension, e.g. ``'package/read.rdf'``. diff --git a/ckan/public/base/css/fuchsia.css b/ckan/public/base/css/fuchsia.css index c87cd3b10a1..2017ab41be6 100644 --- a/ckan/public/base/css/fuchsia.css +++ b/ckan/public/base/css/fuchsia.css @@ -49,16 +49,12 @@ sub { } img { /* Responsive images (ensure images don't scale beyond their parents) */ - max-width: 100%; /* Part 1: Set a maxium relative to the parent */ - width: auto\9; /* IE7-8 need help adjusting responsive images */ - height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */ - vertical-align: middle; border: 0; -ms-interpolation-mode: bicubic; @@ -153,7 +149,7 @@ textarea { img { max-width: 100% !important; } - @page { + @page { margin: 0.5cm; } p, @@ -693,7 +689,6 @@ ol.inline > li { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; padding-left: 5px; padding-right: 5px; @@ -972,7 +967,6 @@ input[type="color"]:focus, outline: 0; outline: thin dotted \9; /* IE6-9 */ - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); @@ -982,10 +976,8 @@ input[type="checkbox"] { margin: 4px 0 0; *margin-top: 0; /* IE7 */ - margin-top: 1px \9; /* IE8-9 */ - line-height: normal; } input[type="file"], @@ -1001,10 +993,8 @@ select, input[type="file"] { height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ - *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 30px; } select { @@ -1402,7 +1392,6 @@ select:focus:invalid:focus { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; vertical-align: middle; padding-left: 5px; @@ -1553,7 +1542,6 @@ input.search-query { padding-left: 14px; padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */ - margin-bottom: 0; -webkit-border-radius: 15px; -moz-border-radius: 15px; @@ -1610,7 +1598,6 @@ input.search-query { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; margin-bottom: 0; vertical-align: middle; @@ -2220,7 +2207,6 @@ button.close { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; padding: 4px 12px; margin-bottom: 0; @@ -2243,7 +2229,6 @@ button.close { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #eaeaea; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); border: 1px solid #cccccc; *border: 0; @@ -2379,7 +2364,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #e73892; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-primary:hover, @@ -2411,7 +2395,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #f89406; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-warning:hover, @@ -2443,7 +2426,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #bd362f; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-danger:hover, @@ -2475,7 +2457,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #51a351; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-success:hover, @@ -2507,7 +2488,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #2f96b4; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-info:hover, @@ -2539,7 +2519,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #222222; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-inverse:hover, @@ -2614,7 +2593,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; font-size: 0; vertical-align: middle; @@ -2790,7 +2768,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .btn-group-vertical > .btn { @@ -3487,7 +3464,6 @@ input[type="submit"].btn.btn-mini { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #e5e5e5; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); @@ -3721,7 +3697,6 @@ input[type="submit"].btn.btn-mini { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #040404; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .navbar-inverse .btn-navbar:hover, @@ -3751,7 +3726,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; text-shadow: 0 1px 0 #ffffff; } @@ -3769,7 +3743,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; margin-left: 0; margin-bottom: 0; @@ -3970,7 +3943,6 @@ input[type="submit"].btn.btn-mini { border: 1px solid rgba(0, 0, 0, 0.3); *border: 1px solid #999; /* IE6-7 */ - -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -5575,6 +5547,12 @@ textarea { } .form-actions .control-required-message { float: left; + margin-left: 20px; + margin-bottom: 0; + line-height: 30px; +} +.form-actions .control-required-message:first-child { + margin-left: 0; } .form-actions { background: none; @@ -5692,27 +5670,24 @@ textarea { padding: 7px 5px; } .simple-input .field .btn-search { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - background-position: -51px -16px; position: absolute; display: block; height: 17px; width: 17px; + padding: 0; top: 50%; right: 0; - margin-top: -8px; + margin-top: -10px; background-color: transparent; border: none; - text-indent: -999em; + color: #999; + -webkit-transition: color 0.2s ease-in; + -moz-transition: color 0.2s ease-in; + -o-transition: color 0.2s ease-in; + transition: color 0.2s ease-in; +} +.simple-input .field .btn-search:hover { + color: #000; } .editor textarea { -webkit-border-radius: 3px 3px 0 0; @@ -5818,7 +5793,6 @@ textarea { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #e73892; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .control-custom.disabled .checkbox.btn:hover, @@ -6097,7 +6071,6 @@ textarea { outline: 0; outline: thin dotted \9; /* IE6-9 */ - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); @@ -6120,6 +6093,43 @@ textarea { -moz-box-shadow: none; box-shadow: none; } +.js .image-upload #field-image-upload { + cursor: pointer; + position: absolute; + z-index: 1; + opacity: 0; + filter: alpha(opacity=0); +} +.js .image-upload .controls { + position: relative; +} +.js .image-upload .btn { + position: relative; + top: 0; + margin-right: 10px; +} +.js .image-upload .btn.hover { + color: #333333; + text-decoration: none; + background-position: 0 -15px; + -webkit-transition: background-position 0.1s linear; + -moz-transition: background-position 0.1s linear; + -o-transition: background-position 0.1s linear; + transition: background-position 0.1s linear; +} +.js .image-upload .btn-remove-url { + position: absolute; + margin-right: 0; + top: 4px; + right: 5px; + padding: 0 4px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; +} +.js .image-upload .btn-remove-url .icon-remove { + margin-right: 0; +} .add-member-form .control-label { width: 100%; text-align: left; @@ -6414,6 +6424,10 @@ textarea { font-weight: normal; color: #000000; } +.search-form.no-bottom-border { + border-bottom-width: 0; + margin-bottom: 0; +} .tertiary .control-order-by { float: none; margin: 0; @@ -6534,7 +6548,6 @@ textarea { margin-right: 5px; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .actions li:last-of-type { @@ -7159,6 +7172,11 @@ h4 small { .context-info.editing .module-content { margin-top: 0; } +.flash-messages .alert { + -webkit-box-shadow: 0 0 0 1px #ffffff; + -moz-box-shadow: 0 0 0 1px #ffffff; + box-shadow: 0 0 0 1px #ffffff; +} .homepage [role=main] { padding: 20px 0; min-height: 0; @@ -7711,6 +7729,9 @@ h4 small { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } +.activity .item.no-avatar p { + margin-left: 40px; +} .activity .load-less { margin-bottom: 15px; } @@ -7728,9 +7749,28 @@ h4 small { float: right; text-decoration: none; } +.popover .popover-content { + font-size: 14px; + line-height: 20px; + color: #444444; + word-break: break-all; +} +.popover .popover-content dl { + margin: 0; +} +.popover .popover-content dl dd { + margin-left: 0; + margin-bottom: 10px; +} .activity .item .icon { background-color: #999999; } +.activity .item.failure .icon { + background-color: #b95252; +} +.activity .item.success .icon { + background-color: #69a67a; +} .activity .item.added-tag .icon { background-color: #6995a6; } @@ -7981,6 +8021,21 @@ h4 small { font-size: 16px; margin: 3px 0; } +.datapusher-status-link:hover { + text-decoration: none; +} +.datapusher-status.status-unknown { + color: #bbb; +} +.datapusher-status.status-pending { + color: #FFCC00; +} +.datapusher-status.status-error { + color: red; +} +.datapusher-status.status-complete { + color: #009900; +} body { background: #e73892 url("../../../base/images/bg.png"); } @@ -8182,7 +8237,6 @@ iframe { .ie7 .control-custom .checkbox { *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .ie7 .stages { @@ -8216,7 +8270,6 @@ iframe { .ie7 .masthead nav { *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .ie7 .masthead .header-image { diff --git a/ckan/public/base/css/green.css b/ckan/public/base/css/green.css index 6558ce82f8d..0b6f45d9109 100644 --- a/ckan/public/base/css/green.css +++ b/ckan/public/base/css/green.css @@ -49,16 +49,12 @@ sub { } img { /* Responsive images (ensure images don't scale beyond their parents) */ - max-width: 100%; /* Part 1: Set a maxium relative to the parent */ - width: auto\9; /* IE7-8 need help adjusting responsive images */ - height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */ - vertical-align: middle; border: 0; -ms-interpolation-mode: bicubic; @@ -153,7 +149,7 @@ textarea { img { max-width: 100% !important; } - @page { + @page { margin: 0.5cm; } p, @@ -693,7 +689,6 @@ ol.inline > li { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; padding-left: 5px; padding-right: 5px; @@ -972,7 +967,6 @@ input[type="color"]:focus, outline: 0; outline: thin dotted \9; /* IE6-9 */ - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); @@ -982,10 +976,8 @@ input[type="checkbox"] { margin: 4px 0 0; *margin-top: 0; /* IE7 */ - margin-top: 1px \9; /* IE8-9 */ - line-height: normal; } input[type="file"], @@ -1001,10 +993,8 @@ select, input[type="file"] { height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ - *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 30px; } select { @@ -1402,7 +1392,6 @@ select:focus:invalid:focus { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; vertical-align: middle; padding-left: 5px; @@ -1553,7 +1542,6 @@ input.search-query { padding-left: 14px; padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */ - margin-bottom: 0; -webkit-border-radius: 15px; -moz-border-radius: 15px; @@ -1610,7 +1598,6 @@ input.search-query { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; margin-bottom: 0; vertical-align: middle; @@ -2220,7 +2207,6 @@ button.close { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; padding: 4px 12px; margin-bottom: 0; @@ -2243,7 +2229,6 @@ button.close { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #eaeaea; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); border: 1px solid #cccccc; *border: 0; @@ -2379,7 +2364,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #2f9b45; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-primary:hover, @@ -2411,7 +2395,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #f89406; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-warning:hover, @@ -2443,7 +2426,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #bd362f; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-danger:hover, @@ -2475,7 +2457,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #51a351; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-success:hover, @@ -2507,7 +2488,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #2f96b4; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-info:hover, @@ -2539,7 +2519,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #222222; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-inverse:hover, @@ -2614,7 +2593,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; font-size: 0; vertical-align: middle; @@ -2790,7 +2768,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .btn-group-vertical > .btn { @@ -3487,7 +3464,6 @@ input[type="submit"].btn.btn-mini { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #e5e5e5; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); @@ -3721,7 +3697,6 @@ input[type="submit"].btn.btn-mini { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #040404; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .navbar-inverse .btn-navbar:hover, @@ -3751,7 +3726,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; text-shadow: 0 1px 0 #ffffff; } @@ -3769,7 +3743,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; margin-left: 0; margin-bottom: 0; @@ -3970,7 +3943,6 @@ input[type="submit"].btn.btn-mini { border: 1px solid rgba(0, 0, 0, 0.3); *border: 1px solid #999; /* IE6-7 */ - -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -5575,6 +5547,12 @@ textarea { } .form-actions .control-required-message { float: left; + margin-left: 20px; + margin-bottom: 0; + line-height: 30px; +} +.form-actions .control-required-message:first-child { + margin-left: 0; } .form-actions { background: none; @@ -5692,27 +5670,24 @@ textarea { padding: 7px 5px; } .simple-input .field .btn-search { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - background-position: -51px -16px; position: absolute; display: block; height: 17px; width: 17px; + padding: 0; top: 50%; right: 0; - margin-top: -8px; + margin-top: -10px; background-color: transparent; border: none; - text-indent: -999em; + color: #999; + -webkit-transition: color 0.2s ease-in; + -moz-transition: color 0.2s ease-in; + -o-transition: color 0.2s ease-in; + transition: color 0.2s ease-in; +} +.simple-input .field .btn-search:hover { + color: #000; } .editor textarea { -webkit-border-radius: 3px 3px 0 0; @@ -5818,7 +5793,6 @@ textarea { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #2f9b45; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .control-custom.disabled .checkbox.btn:hover, @@ -6097,7 +6071,6 @@ textarea { outline: 0; outline: thin dotted \9; /* IE6-9 */ - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); @@ -6120,6 +6093,43 @@ textarea { -moz-box-shadow: none; box-shadow: none; } +.js .image-upload #field-image-upload { + cursor: pointer; + position: absolute; + z-index: 1; + opacity: 0; + filter: alpha(opacity=0); +} +.js .image-upload .controls { + position: relative; +} +.js .image-upload .btn { + position: relative; + top: 0; + margin-right: 10px; +} +.js .image-upload .btn.hover { + color: #333333; + text-decoration: none; + background-position: 0 -15px; + -webkit-transition: background-position 0.1s linear; + -moz-transition: background-position 0.1s linear; + -o-transition: background-position 0.1s linear; + transition: background-position 0.1s linear; +} +.js .image-upload .btn-remove-url { + position: absolute; + margin-right: 0; + top: 4px; + right: 5px; + padding: 0 4px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; +} +.js .image-upload .btn-remove-url .icon-remove { + margin-right: 0; +} .add-member-form .control-label { width: 100%; text-align: left; @@ -6414,6 +6424,10 @@ textarea { font-weight: normal; color: #000000; } +.search-form.no-bottom-border { + border-bottom-width: 0; + margin-bottom: 0; +} .tertiary .control-order-by { float: none; margin: 0; @@ -6534,7 +6548,6 @@ textarea { margin-right: 5px; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .actions li:last-of-type { @@ -7159,6 +7172,11 @@ h4 small { .context-info.editing .module-content { margin-top: 0; } +.flash-messages .alert { + -webkit-box-shadow: 0 0 0 1px #ffffff; + -moz-box-shadow: 0 0 0 1px #ffffff; + box-shadow: 0 0 0 1px #ffffff; +} .homepage [role=main] { padding: 20px 0; min-height: 0; @@ -7711,6 +7729,9 @@ h4 small { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } +.activity .item.no-avatar p { + margin-left: 40px; +} .activity .load-less { margin-bottom: 15px; } @@ -7728,9 +7749,28 @@ h4 small { float: right; text-decoration: none; } +.popover .popover-content { + font-size: 14px; + line-height: 20px; + color: #444444; + word-break: break-all; +} +.popover .popover-content dl { + margin: 0; +} +.popover .popover-content dl dd { + margin-left: 0; + margin-bottom: 10px; +} .activity .item .icon { background-color: #999999; } +.activity .item.failure .icon { + background-color: #b95252; +} +.activity .item.success .icon { + background-color: #69a67a; +} .activity .item.added-tag .icon { background-color: #6995a6; } @@ -7981,6 +8021,21 @@ h4 small { font-size: 16px; margin: 3px 0; } +.datapusher-status-link:hover { + text-decoration: none; +} +.datapusher-status.status-unknown { + color: #bbb; +} +.datapusher-status.status-pending { + color: #FFCC00; +} +.datapusher-status.status-error { + color: red; +} +.datapusher-status.status-complete { + color: #009900; +} body { background: #2f9b45 url("../../../base/images/bg.png"); } @@ -8182,7 +8237,6 @@ iframe { .ie7 .control-custom .checkbox { *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .ie7 .stages { @@ -8216,7 +8270,6 @@ iframe { .ie7 .masthead nav { *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .ie7 .masthead .header-image { diff --git a/ckan/public/base/css/main.css b/ckan/public/base/css/main.css index d7635468324..df4c0110922 100644 --- a/ckan/public/base/css/main.css +++ b/ckan/public/base/css/main.css @@ -49,16 +49,12 @@ sub { } img { /* Responsive images (ensure images don't scale beyond their parents) */ - max-width: 100%; /* Part 1: Set a maxium relative to the parent */ - width: auto\9; /* IE7-8 need help adjusting responsive images */ - height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */ - vertical-align: middle; border: 0; -ms-interpolation-mode: bicubic; @@ -153,7 +149,7 @@ textarea { img { max-width: 100% !important; } - @page { + @page { margin: 0.5cm; } p, @@ -693,7 +689,6 @@ ol.inline > li { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; padding-left: 5px; padding-right: 5px; @@ -972,7 +967,6 @@ input[type="color"]:focus, outline: 0; outline: thin dotted \9; /* IE6-9 */ - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); @@ -982,10 +976,8 @@ input[type="checkbox"] { margin: 4px 0 0; *margin-top: 0; /* IE7 */ - margin-top: 1px \9; /* IE8-9 */ - line-height: normal; } input[type="file"], @@ -1001,10 +993,8 @@ select, input[type="file"] { height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ - *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 30px; } select { @@ -1402,7 +1392,6 @@ select:focus:invalid:focus { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; vertical-align: middle; padding-left: 5px; @@ -1553,7 +1542,6 @@ input.search-query { padding-left: 14px; padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */ - margin-bottom: 0; -webkit-border-radius: 15px; -moz-border-radius: 15px; @@ -1610,7 +1598,6 @@ input.search-query { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; margin-bottom: 0; vertical-align: middle; @@ -2220,7 +2207,6 @@ button.close { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; padding: 4px 12px; margin-bottom: 0; @@ -2243,7 +2229,6 @@ button.close { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #eaeaea; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); border: 1px solid #cccccc; *border: 0; @@ -2379,7 +2364,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #085871; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-primary:hover, @@ -2411,7 +2395,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #f89406; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-warning:hover, @@ -2443,7 +2426,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #bd362f; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-danger:hover, @@ -2475,7 +2457,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #51a351; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-success:hover, @@ -2507,7 +2488,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #2f96b4; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-info:hover, @@ -2539,7 +2519,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #222222; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-inverse:hover, @@ -2614,7 +2593,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; font-size: 0; vertical-align: middle; @@ -2790,7 +2768,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .btn-group-vertical > .btn { @@ -3487,7 +3464,6 @@ input[type="submit"].btn.btn-mini { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #e5e5e5; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); @@ -3721,7 +3697,6 @@ input[type="submit"].btn.btn-mini { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #040404; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .navbar-inverse .btn-navbar:hover, @@ -3751,7 +3726,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; text-shadow: 0 1px 0 #ffffff; } @@ -3769,7 +3743,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; margin-left: 0; margin-bottom: 0; @@ -3970,7 +3943,6 @@ input[type="submit"].btn.btn-mini { border: 1px solid rgba(0, 0, 0, 0.3); *border: 1px solid #999; /* IE6-7 */ - -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -5575,6 +5547,12 @@ textarea { } .form-actions .control-required-message { float: left; + margin-left: 20px; + margin-bottom: 0; + line-height: 30px; +} +.form-actions .control-required-message:first-child { + margin-left: 0; } .form-actions { background: none; @@ -5692,27 +5670,24 @@ textarea { padding: 7px 5px; } .simple-input .field .btn-search { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - background-position: -51px -16px; position: absolute; display: block; height: 17px; width: 17px; + padding: 0; top: 50%; right: 0; - margin-top: -8px; + margin-top: -10px; background-color: transparent; border: none; - text-indent: -999em; + color: #999; + -webkit-transition: color 0.2s ease-in; + -moz-transition: color 0.2s ease-in; + -o-transition: color 0.2s ease-in; + transition: color 0.2s ease-in; +} +.simple-input .field .btn-search:hover { + color: #000; } .editor textarea { -webkit-border-radius: 3px 3px 0 0; @@ -5818,7 +5793,6 @@ textarea { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #085871; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .control-custom.disabled .checkbox.btn:hover, @@ -6097,7 +6071,6 @@ textarea { outline: 0; outline: thin dotted \9; /* IE6-9 */ - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); @@ -6120,6 +6093,43 @@ textarea { -moz-box-shadow: none; box-shadow: none; } +.js .image-upload #field-image-upload { + cursor: pointer; + position: absolute; + z-index: 1; + opacity: 0; + filter: alpha(opacity=0); +} +.js .image-upload .controls { + position: relative; +} +.js .image-upload .btn { + position: relative; + top: 0; + margin-right: 10px; +} +.js .image-upload .btn.hover { + color: #333333; + text-decoration: none; + background-position: 0 -15px; + -webkit-transition: background-position 0.1s linear; + -moz-transition: background-position 0.1s linear; + -o-transition: background-position 0.1s linear; + transition: background-position 0.1s linear; +} +.js .image-upload .btn-remove-url { + position: absolute; + margin-right: 0; + top: 4px; + right: 5px; + padding: 0 4px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; +} +.js .image-upload .btn-remove-url .icon-remove { + margin-right: 0; +} .add-member-form .control-label { width: 100%; text-align: left; @@ -6414,6 +6424,10 @@ textarea { font-weight: normal; color: #000000; } +.search-form.no-bottom-border { + border-bottom-width: 0; + margin-bottom: 0; +} .tertiary .control-order-by { float: none; margin: 0; @@ -6534,7 +6548,6 @@ textarea { margin-right: 5px; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .actions li:last-of-type { @@ -7159,6 +7172,11 @@ h4 small { .context-info.editing .module-content { margin-top: 0; } +.flash-messages .alert { + -webkit-box-shadow: 0 0 0 1px #ffffff; + -moz-box-shadow: 0 0 0 1px #ffffff; + box-shadow: 0 0 0 1px #ffffff; +} .homepage [role=main] { padding: 20px 0; min-height: 0; @@ -7711,6 +7729,9 @@ h4 small { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } +.activity .item.no-avatar p { + margin-left: 40px; +} .activity .load-less { margin-bottom: 15px; } @@ -7728,9 +7749,28 @@ h4 small { float: right; text-decoration: none; } +.popover .popover-content { + font-size: 14px; + line-height: 20px; + color: #444444; + word-break: break-all; +} +.popover .popover-content dl { + margin: 0; +} +.popover .popover-content dl dd { + margin-left: 0; + margin-bottom: 10px; +} .activity .item .icon { background-color: #999999; } +.activity .item.failure .icon { + background-color: #b95252; +} +.activity .item.success .icon { + background-color: #69a67a; +} .activity .item.added-tag .icon { background-color: #6995a6; } @@ -7981,6 +8021,21 @@ h4 small { font-size: 16px; margin: 3px 0; } +.datapusher-status-link:hover { + text-decoration: none; +} +.datapusher-status.status-unknown { + color: #bbb; +} +.datapusher-status.status-pending { + color: #FFCC00; +} +.datapusher-status.status-error { + color: red; +} +.datapusher-status.status-complete { + color: #009900; +} body { background: #005d7a url("../../../base/images/bg.png"); } @@ -8182,7 +8237,6 @@ iframe { .ie7 .control-custom .checkbox { *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .ie7 .stages { @@ -8216,7 +8270,6 @@ iframe { .ie7 .masthead nav { *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .ie7 .masthead .header-image { diff --git a/ckan/public/base/css/maroon.css b/ckan/public/base/css/maroon.css index 4de9736ff0e..c93b5426b72 100644 --- a/ckan/public/base/css/maroon.css +++ b/ckan/public/base/css/maroon.css @@ -49,16 +49,12 @@ sub { } img { /* Responsive images (ensure images don't scale beyond their parents) */ - max-width: 100%; /* Part 1: Set a maxium relative to the parent */ - width: auto\9; /* IE7-8 need help adjusting responsive images */ - height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */ - vertical-align: middle; border: 0; -ms-interpolation-mode: bicubic; @@ -153,7 +149,7 @@ textarea { img { max-width: 100% !important; } - @page { + @page { margin: 0.5cm; } p, @@ -693,7 +689,6 @@ ol.inline > li { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; padding-left: 5px; padding-right: 5px; @@ -972,7 +967,6 @@ input[type="color"]:focus, outline: 0; outline: thin dotted \9; /* IE6-9 */ - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); @@ -982,10 +976,8 @@ input[type="checkbox"] { margin: 4px 0 0; *margin-top: 0; /* IE7 */ - margin-top: 1px \9; /* IE8-9 */ - line-height: normal; } input[type="file"], @@ -1001,10 +993,8 @@ select, input[type="file"] { height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ - *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 30px; } select { @@ -1402,7 +1392,6 @@ select:focus:invalid:focus { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; vertical-align: middle; padding-left: 5px; @@ -1553,7 +1542,6 @@ input.search-query { padding-left: 14px; padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */ - margin-bottom: 0; -webkit-border-radius: 15px; -moz-border-radius: 15px; @@ -1610,7 +1598,6 @@ input.search-query { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; margin-bottom: 0; vertical-align: middle; @@ -2220,7 +2207,6 @@ button.close { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; padding: 4px 12px; margin-bottom: 0; @@ -2243,7 +2229,6 @@ button.close { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #eaeaea; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); border: 1px solid #cccccc; *border: 0; @@ -2379,7 +2364,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #810606; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-primary:hover, @@ -2411,7 +2395,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #f89406; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-warning:hover, @@ -2443,7 +2426,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #bd362f; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-danger:hover, @@ -2475,7 +2457,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #51a351; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-success:hover, @@ -2507,7 +2488,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #2f96b4; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-info:hover, @@ -2539,7 +2519,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #222222; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-inverse:hover, @@ -2614,7 +2593,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; font-size: 0; vertical-align: middle; @@ -2790,7 +2768,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .btn-group-vertical > .btn { @@ -3487,7 +3464,6 @@ input[type="submit"].btn.btn-mini { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #e5e5e5; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); @@ -3721,7 +3697,6 @@ input[type="submit"].btn.btn-mini { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #040404; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .navbar-inverse .btn-navbar:hover, @@ -3751,7 +3726,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; text-shadow: 0 1px 0 #ffffff; } @@ -3769,7 +3743,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; margin-left: 0; margin-bottom: 0; @@ -3970,7 +3943,6 @@ input[type="submit"].btn.btn-mini { border: 1px solid rgba(0, 0, 0, 0.3); *border: 1px solid #999; /* IE6-7 */ - -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -5575,6 +5547,12 @@ textarea { } .form-actions .control-required-message { float: left; + margin-left: 20px; + margin-bottom: 0; + line-height: 30px; +} +.form-actions .control-required-message:first-child { + margin-left: 0; } .form-actions { background: none; @@ -5692,27 +5670,24 @@ textarea { padding: 7px 5px; } .simple-input .field .btn-search { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - background-position: -51px -16px; position: absolute; display: block; height: 17px; width: 17px; + padding: 0; top: 50%; right: 0; - margin-top: -8px; + margin-top: -10px; background-color: transparent; border: none; - text-indent: -999em; + color: #999; + -webkit-transition: color 0.2s ease-in; + -moz-transition: color 0.2s ease-in; + -o-transition: color 0.2s ease-in; + transition: color 0.2s ease-in; +} +.simple-input .field .btn-search:hover { + color: #000; } .editor textarea { -webkit-border-radius: 3px 3px 0 0; @@ -5818,7 +5793,6 @@ textarea { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #810606; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .control-custom.disabled .checkbox.btn:hover, @@ -6097,7 +6071,6 @@ textarea { outline: 0; outline: thin dotted \9; /* IE6-9 */ - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); @@ -6120,6 +6093,43 @@ textarea { -moz-box-shadow: none; box-shadow: none; } +.js .image-upload #field-image-upload { + cursor: pointer; + position: absolute; + z-index: 1; + opacity: 0; + filter: alpha(opacity=0); +} +.js .image-upload .controls { + position: relative; +} +.js .image-upload .btn { + position: relative; + top: 0; + margin-right: 10px; +} +.js .image-upload .btn.hover { + color: #333333; + text-decoration: none; + background-position: 0 -15px; + -webkit-transition: background-position 0.1s linear; + -moz-transition: background-position 0.1s linear; + -o-transition: background-position 0.1s linear; + transition: background-position 0.1s linear; +} +.js .image-upload .btn-remove-url { + position: absolute; + margin-right: 0; + top: 4px; + right: 5px; + padding: 0 4px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; +} +.js .image-upload .btn-remove-url .icon-remove { + margin-right: 0; +} .add-member-form .control-label { width: 100%; text-align: left; @@ -6414,6 +6424,10 @@ textarea { font-weight: normal; color: #000000; } +.search-form.no-bottom-border { + border-bottom-width: 0; + margin-bottom: 0; +} .tertiary .control-order-by { float: none; margin: 0; @@ -6534,7 +6548,6 @@ textarea { margin-right: 5px; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .actions li:last-of-type { @@ -7159,6 +7172,11 @@ h4 small { .context-info.editing .module-content { margin-top: 0; } +.flash-messages .alert { + -webkit-box-shadow: 0 0 0 1px #ffffff; + -moz-box-shadow: 0 0 0 1px #ffffff; + box-shadow: 0 0 0 1px #ffffff; +} .homepage [role=main] { padding: 20px 0; min-height: 0; @@ -7711,6 +7729,9 @@ h4 small { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } +.activity .item.no-avatar p { + margin-left: 40px; +} .activity .load-less { margin-bottom: 15px; } @@ -7728,9 +7749,28 @@ h4 small { float: right; text-decoration: none; } +.popover .popover-content { + font-size: 14px; + line-height: 20px; + color: #444444; + word-break: break-all; +} +.popover .popover-content dl { + margin: 0; +} +.popover .popover-content dl dd { + margin-left: 0; + margin-bottom: 10px; +} .activity .item .icon { background-color: #999999; } +.activity .item.failure .icon { + background-color: #b95252; +} +.activity .item.success .icon { + background-color: #69a67a; +} .activity .item.added-tag .icon { background-color: #6995a6; } @@ -7981,6 +8021,21 @@ h4 small { font-size: 16px; margin: 3px 0; } +.datapusher-status-link:hover { + text-decoration: none; +} +.datapusher-status.status-unknown { + color: #bbb; +} +.datapusher-status.status-pending { + color: #FFCC00; +} +.datapusher-status.status-error { + color: red; +} +.datapusher-status.status-complete { + color: #009900; +} body { background: #810606 url("../../../base/images/bg.png"); } @@ -8182,7 +8237,6 @@ iframe { .ie7 .control-custom .checkbox { *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .ie7 .stages { @@ -8216,7 +8270,6 @@ iframe { .ie7 .masthead nav { *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .ie7 .masthead .header-image { diff --git a/ckan/public/base/css/red.css b/ckan/public/base/css/red.css index 4b1a9181328..975d4d07065 100644 --- a/ckan/public/base/css/red.css +++ b/ckan/public/base/css/red.css @@ -49,16 +49,12 @@ sub { } img { /* Responsive images (ensure images don't scale beyond their parents) */ - max-width: 100%; /* Part 1: Set a maxium relative to the parent */ - width: auto\9; /* IE7-8 need help adjusting responsive images */ - height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */ - vertical-align: middle; border: 0; -ms-interpolation-mode: bicubic; @@ -153,7 +149,7 @@ textarea { img { max-width: 100% !important; } - @page { + @page { margin: 0.5cm; } p, @@ -693,7 +689,6 @@ ol.inline > li { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; padding-left: 5px; padding-right: 5px; @@ -972,7 +967,6 @@ input[type="color"]:focus, outline: 0; outline: thin dotted \9; /* IE6-9 */ - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); @@ -982,10 +976,8 @@ input[type="checkbox"] { margin: 4px 0 0; *margin-top: 0; /* IE7 */ - margin-top: 1px \9; /* IE8-9 */ - line-height: normal; } input[type="file"], @@ -1001,10 +993,8 @@ select, input[type="file"] { height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ - *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 30px; } select { @@ -1402,7 +1392,6 @@ select:focus:invalid:focus { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; vertical-align: middle; padding-left: 5px; @@ -1553,7 +1542,6 @@ input.search-query { padding-left: 14px; padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */ - margin-bottom: 0; -webkit-border-radius: 15px; -moz-border-radius: 15px; @@ -1610,7 +1598,6 @@ input.search-query { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; margin-bottom: 0; vertical-align: middle; @@ -2220,7 +2207,6 @@ button.close { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; padding: 4px 12px; margin-bottom: 0; @@ -2243,7 +2229,6 @@ button.close { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #eaeaea; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); border: 1px solid #cccccc; *border: 0; @@ -2379,7 +2364,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #c14531; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-primary:hover, @@ -2411,7 +2395,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #f89406; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-warning:hover, @@ -2443,7 +2426,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #bd362f; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-danger:hover, @@ -2475,7 +2457,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #51a351; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-success:hover, @@ -2507,7 +2488,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #2f96b4; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-info:hover, @@ -2539,7 +2519,6 @@ input[type="button"].btn-block { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #222222; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-inverse:hover, @@ -2614,7 +2593,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; font-size: 0; vertical-align: middle; @@ -2790,7 +2768,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .btn-group-vertical > .btn { @@ -3487,7 +3464,6 @@ input[type="submit"].btn.btn-mini { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #e5e5e5; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); @@ -3721,7 +3697,6 @@ input[type="submit"].btn.btn-mini { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #040404; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .navbar-inverse .btn-navbar:hover, @@ -3751,7 +3726,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; text-shadow: 0 1px 0 #ffffff; } @@ -3769,7 +3743,6 @@ input[type="submit"].btn.btn-mini { display: inline-block; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; margin-left: 0; margin-bottom: 0; @@ -3970,7 +3943,6 @@ input[type="submit"].btn.btn-mini { border: 1px solid rgba(0, 0, 0, 0.3); *border: 1px solid #999; /* IE6-7 */ - -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -5575,6 +5547,12 @@ textarea { } .form-actions .control-required-message { float: left; + margin-left: 20px; + margin-bottom: 0; + line-height: 30px; +} +.form-actions .control-required-message:first-child { + margin-left: 0; } .form-actions { background: none; @@ -5692,27 +5670,24 @@ textarea { padding: 7px 5px; } .simple-input .field .btn-search { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - background-position: -51px -16px; position: absolute; display: block; height: 17px; width: 17px; + padding: 0; top: 50%; right: 0; - margin-top: -8px; + margin-top: -10px; background-color: transparent; border: none; - text-indent: -999em; + color: #999; + -webkit-transition: color 0.2s ease-in; + -moz-transition: color 0.2s ease-in; + -o-transition: color 0.2s ease-in; + transition: color 0.2s ease-in; +} +.simple-input .field .btn-search:hover { + color: #000; } .editor textarea { -webkit-border-radius: 3px 3px 0 0; @@ -5818,7 +5793,6 @@ textarea { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #c14531; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .control-custom.disabled .checkbox.btn:hover, @@ -6097,7 +6071,6 @@ textarea { outline: 0; outline: thin dotted \9; /* IE6-9 */ - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); @@ -6120,6 +6093,43 @@ textarea { -moz-box-shadow: none; box-shadow: none; } +.js .image-upload #field-image-upload { + cursor: pointer; + position: absolute; + z-index: 1; + opacity: 0; + filter: alpha(opacity=0); +} +.js .image-upload .controls { + position: relative; +} +.js .image-upload .btn { + position: relative; + top: 0; + margin-right: 10px; +} +.js .image-upload .btn.hover { + color: #333333; + text-decoration: none; + background-position: 0 -15px; + -webkit-transition: background-position 0.1s linear; + -moz-transition: background-position 0.1s linear; + -o-transition: background-position 0.1s linear; + transition: background-position 0.1s linear; +} +.js .image-upload .btn-remove-url { + position: absolute; + margin-right: 0; + top: 4px; + right: 5px; + padding: 0 4px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; +} +.js .image-upload .btn-remove-url .icon-remove { + margin-right: 0; +} .add-member-form .control-label { width: 100%; text-align: left; @@ -6414,6 +6424,10 @@ textarea { font-weight: normal; color: #000000; } +.search-form.no-bottom-border { + border-bottom-width: 0; + margin-bottom: 0; +} .tertiary .control-order-by { float: none; margin: 0; @@ -6534,7 +6548,6 @@ textarea { margin-right: 5px; *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .actions li:last-of-type { @@ -7159,6 +7172,11 @@ h4 small { .context-info.editing .module-content { margin-top: 0; } +.flash-messages .alert { + -webkit-box-shadow: 0 0 0 1px #ffffff; + -moz-box-shadow: 0 0 0 1px #ffffff; + box-shadow: 0 0 0 1px #ffffff; +} .homepage [role=main] { padding: 20px 0; min-height: 0; @@ -7711,6 +7729,9 @@ h4 small { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } +.activity .item.no-avatar p { + margin-left: 40px; +} .activity .load-less { margin-bottom: 15px; } @@ -7728,9 +7749,28 @@ h4 small { float: right; text-decoration: none; } +.popover .popover-content { + font-size: 14px; + line-height: 20px; + color: #444444; + word-break: break-all; +} +.popover .popover-content dl { + margin: 0; +} +.popover .popover-content dl dd { + margin-left: 0; + margin-bottom: 10px; +} .activity .item .icon { background-color: #999999; } +.activity .item.failure .icon { + background-color: #b95252; +} +.activity .item.success .icon { + background-color: #69a67a; +} .activity .item.added-tag .icon { background-color: #6995a6; } @@ -7981,6 +8021,21 @@ h4 small { font-size: 16px; margin: 3px 0; } +.datapusher-status-link:hover { + text-decoration: none; +} +.datapusher-status.status-unknown { + color: #bbb; +} +.datapusher-status.status-pending { + color: #FFCC00; +} +.datapusher-status.status-error { + color: red; +} +.datapusher-status.status-complete { + color: #009900; +} body { background: #c14531 url("../../../base/images/bg.png"); } @@ -8182,7 +8237,6 @@ iframe { .ie7 .control-custom .checkbox { *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .ie7 .stages { @@ -8216,7 +8270,6 @@ iframe { .ie7 .masthead nav { *display: inline; /* IE7 inline-block hack */ - *zoom: 1; } .ie7 .masthead .header-image { diff --git a/ckan/public/base/javascript/client.js b/ckan/public/base/javascript/client.js index 45940c0086d..e1c60ccf24e 100644 --- a/ckan/public/base/javascript/client.js +++ b/ckan/public/base/javascript/client.js @@ -370,7 +370,7 @@ }); ckan.sandbox.setup(function (instance) { - instance.client = new Client({endpoint: ckan.API_ROOT}); + instance.client = new Client({endpoint: ckan.SITE_ROOT}); }); ckan.Client = Client; diff --git a/ckan/public/base/javascript/main.js b/ckan/public/base/javascript/main.js index 42c76dfd15f..e3d1e42282a 100644 --- a/ckan/public/base/javascript/main.js +++ b/ckan/public/base/javascript/main.js @@ -29,14 +29,17 @@ this.ckan = this.ckan || {}; ckan.SITE_ROOT = getRootFromData('siteRoot'); ckan.LOCALE_ROOT = getRootFromData('localeRoot'); - ckan.API_ROOT = getRootFromData('apiRoot'); // Load the localisations before instantiating the modules. ckan.sandbox().client.getLocaleData(locale).done(function (data) { ckan.i18n.load(data); ckan.module.initialize(); }); - jQuery('[data-target="popover"]').popover(); + + if (jQuery.fn.popover !== undefined) { + jQuery('[data-target="popover"]').popover(); + } + }; /* Returns a full url for the current site with the provided path appended. diff --git a/ckan/public/base/javascript/modules/image-upload.js b/ckan/public/base/javascript/modules/image-upload.js new file mode 100644 index 00000000000..1872a051fbb --- /dev/null +++ b/ckan/public/base/javascript/modules/image-upload.js @@ -0,0 +1,188 @@ +/* Image Upload + * + */ +this.ckan.module('image-upload', function($, _) { + return { + /* options object can be extended using data-module-* attributes */ + options: { + is_url: true, + is_upload: false, + field_upload: 'image_upload', + field_url: 'image_url', + field_clear: 'clear_upload', + upload_label: '', + i18n: { + upload: _('From computer'), + url: _('From web'), + remove: _('Remove'), + upload_label: _('Upload image'), + remove_tooltip: _('Reset this') + }, + template: [ + '' + ].join("\n") + }, + + state: { + attached: 1, + blank: 2, + web: 3 + }, + + /* Initialises the module setting up elements and event listeners. + * + * Returns nothing. + */ + initialize: function () { + $.proxyAll(this, /_on/); + var options = this.options; + + // firstly setup the fields + var field_upload = 'input[name="' + options.field_upload + '"]'; + var field_url = 'input[name="' + options.field_url + '"]'; + var field_clear = 'input[name="' + options.field_clear + '"]'; + + this.input = $(field_upload, this.el); + this.field_url = $(field_url, this.el).parents('.control-group'); + this.field_image = this.input.parents('.control-group'); + + // Is there a clear checkbox on the form already? + var checkbox = $(field_clear, this.el); + if (checkbox.length > 0) { + options.is_upload = true; + checkbox.parents('.control-group').remove(); + } + + // Adds the hidden clear input to the form + this.field_clear = $('') + .appendTo(this.el); + + // Button to set the field to be a URL + this.button_url = $(' '+this.i18n('url')+'') + .on('click', this._onFromWeb) + .insertAfter(this.input); + + // Button to attach local file to the form + this.button_upload = $(''+this.i18n('upload')+'') + .insertAfter(this.input); + + // Button to reset the form back to the first from when there is a image uploaded + this.button_remove = $('') + .text(this.i18n('remove')) + .on('click', this._onRemove) + .insertAfter(this.button_upload); + + // Button for resetting the form when there is a URL set + $('') + .prop('title', this.i18n('remove_tooltip')) + .on('click', this._onRemove) + .insertBefore($('input', this.field_url)); + + // Update the main label + $('label[for="field-image-upload"]').text(options.upload_label || this.i18n('upload_label')); + + // Setup the file input + this.input + .on('mouseover', this._onInputMouseOver) + .on('mouseout', this._onInputMouseOut) + .on('change', this._onInputChange) + .css('width', this.button_upload.outerWidth()); + + // Fields storage. Used in this.changeState + this.fields = $('') + .add(this.button_remove) + .add(this.button_upload) + .add(this.button_url) + .add(this.input) + .add(this.field_url) + .add(this.field_image); + + // Setup the initial state + if (options.is_url) { + this.changeState(this.state.web); + } else if (options.is_upload) { + this.changeState(this.state.attached); + } else { + this.changeState(this.state.blank); + } + + }, + + /* Method to change the display state of the image fields + * + * state - Pseudo constant for passing the state we should be in now + * + * Examples + * + * this.changeState(this.state.web); // Sets the state in URL mode + * + * Returns nothing. + */ + changeState: function(state) { + this.fields.hide(); + if (state == this.state.blank) { + this.button_upload + .add(this.field_image) + .add(this.button_url) + .add(this.input) + .show(); + } else if (state == this.state.attached) { + this.button_remove + .add(this.field_image) + .show(); + } else if (state == this.state.web) { + this.field_url + .show(); + } + }, + + /* Event listener for when someone sets the field to URL mode + * + * Returns nothing. + */ + _onFromWeb: function() { + this.changeState(this.state.web); + $('input', this.field_url).focus(); + if (this.options.is_upload) { + this.field_clear.val('true'); + } + }, + + /* Event listener for resetting the field back to the blank state + * + * Returns nothing. + */ + _onRemove: function() { + this.changeState(this.state.blank); + $('input', this.field_url).val(''); + this.field_clear.val('true'); + }, + + /* Event listener for when someone chooses a file to upload + * + * Returns nothing. + */ + _onInputChange: function() { + this.file_name = this.input.val(); + this.field_clear.val(''); + this.changeState(this.state.attached); + }, + + /* Event listener for when a user mouseovers the hidden file input + * + * Returns nothing. + */ + _onInputMouseOver: function() { + this.button_upload.addClass('hover'); + }, + + /* Event listener for when a user mouseouts the hidden file input + * + * Returns nothing. + */ + _onInputMouseOut: function() { + this.button_upload.removeClass('hover'); + } + + } +}); diff --git a/ckan/public/base/javascript/modules/slug-preview.js b/ckan/public/base/javascript/modules/slug-preview.js index e622401ee09..63fb08d94e7 100644 --- a/ckan/public/base/javascript/modules/slug-preview.js +++ b/ckan/public/base/javascript/modules/slug-preview.js @@ -9,17 +9,20 @@ this.ckan.module('slug-preview-target', { el.after(preview); }); - // Once the preview box is modified stop watching it. - sandbox.subscribe('slug-preview-modified', function () { - el.off('.slug-preview'); - }); + // Make sure there isn't a value in the field already... + if (el.val() == '') { + // Once the preview box is modified stop watching it. + sandbox.subscribe('slug-preview-modified', function () { + el.off('.slug-preview'); + }); - // Watch for updates to the target field and update the hidden slug field - // triggering the "change" event manually. - el.on('keyup.slug-preview', function (event) { - sandbox.publish('slug-target-changed', this.value); - //slug.val(this.value).trigger('change'); - }); + // Watch for updates to the target field and update the hidden slug field + // triggering the "change" event manually. + el.on('keyup.slug-preview', function (event) { + sandbox.publish('slug-target-changed', this.value); + //slug.val(this.value).trigger('change'); + }); + } } }); diff --git a/ckan/public/base/javascript/resource.config b/ckan/public/base/javascript/resource.config index b1a7302d9e8..564da811a6e 100644 --- a/ckan/public/base/javascript/resource.config +++ b/ckan/public/base/javascript/resource.config @@ -38,6 +38,7 @@ ckan = modules/table-toggle-more.js modules/dataset-visibility.js modules/media-grid.js + modules/image-upload.js main = apply_html_class diff --git a/ckan/public/base/less/dataset.less b/ckan/public/base/less/dataset.less index 29b07d6b8a1..a102e3040a6 100644 --- a/ckan/public/base/less/dataset.less +++ b/ckan/public/base/less/dataset.less @@ -95,44 +95,6 @@ // Dataset Forms -.dataset-resource-form .dataset-form-resource-types { - margin-bottom: 5px; -} - -.dataset-form-resource-types .ckan-icon { - position: relative; - top: 3px; -} - -.dataset-form-resource-types .radio { - font-weight: normal; - padding-left: 0; - padding-right: 18px; -} - -.dataset-form-resource-types label { - position: relative; -} - -.dataset-form-resource-types input[type=radio]:checked+label { - font-weight: bold; -} - -.dataset-form-resource-types input[type=radio]:checked+label:after { - .ckan-icon; - .ckan-icon-callout; - display: block; - content: ""; - position: absolute; - top: auto; - left: 0; - bottom: -12px; -} - -.dataset-form-resource-types input[type=radio] { - display: none; -} - // Tag List .tag-list { diff --git a/ckan/public/base/less/forms.less b/ckan/public/base/less/forms.less index fc8c7c86987..bf45350340f 100644 --- a/ckan/public/base/less/forms.less +++ b/ckan/public/base/less/forms.less @@ -85,6 +85,12 @@ textarea { .form-actions .control-required-message { float: left; + margin-left: 20px; + margin-bottom: 0; + line-height: 30px; + &:first-child { + margin-left: 0; + } } .form-actions { @@ -237,18 +243,21 @@ textarea { } .simple-input .field .btn-search { - .ckan-icon; - .ckan-icon-search; position: absolute; display: block; height: 17px; width: 17px; + padding: 0; top: 50%; right: 0; - margin-top: -8px; + margin-top: -10px; background-color: transparent; border: none; - text-indent: -999em; + color: #999; + .transition(color 0.2s ease-in); + &:hover { + color: #000; + } } .editor textarea { @@ -671,6 +680,39 @@ textarea { } } +.js .image-upload { + #field-image-upload { + cursor: pointer; + position: absolute; + z-index: 1; + .opacity(0); + } + .controls { + position: relative; + } + .btn { + position: relative; + top: 0; + margin-right: 10px; + &.hover { + color: @grayDark; + text-decoration: none; + background-position: 0 -15px; + .transition(background-position .1s linear); + } + } + .btn-remove-url { + position: absolute; + margin-right: 0; + top: 4px; + right: 5px; + padding: 0 4px; + .border-radius(100px); + .icon-remove { + margin-right: 0; + } + } +} .add-member-form .control-label { width: 100%; text-align: left; diff --git a/ckan/public/base/less/layout.less b/ckan/public/base/less/layout.less index 78905c89eee..0a74dfbe311 100644 --- a/ckan/public/base/less/layout.less +++ b/ckan/public/base/less/layout.less @@ -165,3 +165,10 @@ } } } + +.flash-messages { + .alert { + .box-shadow(0 0 0 1px white); + } +} + diff --git a/ckan/public/base/less/search.less b/ckan/public/base/less/search.less index a9e4193eb83..fffe049ff29 100644 --- a/ckan/public/base/less/search.less +++ b/ckan/public/base/less/search.less @@ -84,6 +84,10 @@ color: @layoutBoldColor; } } + &.no-bottom-border { + border-bottom-width: 0; + margin-bottom: 0; + } } .tertiary { diff --git a/ckan/templates/admin/config.html b/ckan/templates/admin/config.html index bfa9b3a2ee5..81a322b3997 100644 --- a/ckan/templates/admin/config.html +++ b/ckan/templates/admin/config.html @@ -10,7 +10,7 @@
{% set locale = h.dump_json({'content': _('Are you sure you want to reset the config?')}) %} {{ _('Reset') }} - +
{% endblock %} diff --git a/ckan/templates/base.html b/ckan/templates/base.html index 6012bf65928..9ab7a69d973 100644 --- a/ckan/templates/base.html +++ b/ckan/templates/base.html @@ -85,7 +85,7 @@ {# Allows custom attributes to be added to the tag #} - + {# The page block allows you to add content to the page. Most of the time it is @@ -102,17 +102,9 @@ {%- block page %}{% endblock -%} {# - The scripts block allows you to add additonal scripts to the page. Use the - super() function to load the default scripts before/after your own. - NOTE: Scripts should be loaded by the {% resource %} tag except - in very special circumstances DO NOT USE THIS METHOD FOR ADDING SCRIPTS. - - Example: - - {% block scripts %} - {{ super() }} - - {% endblock %} + DO NOT USE THIS BLOCK FOR ADDING SCRIPTS + Scripts should be loaded by the {% resource %} tag except in very special + circumstances #} {%- block scripts %} {% endblock -%} diff --git a/ckan/templates/group/about.html b/ckan/templates/group/about.html index 69259e22ec3..a7d3683700d 100644 --- a/ckan/templates/group/about.html +++ b/ckan/templates/group/about.html @@ -1,6 +1,6 @@ {% extends "group/read_base.html" %} -{% block subtitle %}{{ _('About') }} - {{ c.group_dict.display_name }}{% endblock %} +{% block subtitle %}{{ _('About') }} - {{ super() }}{% endblock %} {% block primary_content_inner %}

{% block page_heading %}{{ c.group_dict.display_name }}{% endblock %}

diff --git a/ckan/templates/group/activity_stream.html b/ckan/templates/group/activity_stream.html index 800ed24db9b..47a6d029bb4 100644 --- a/ckan/templates/group/activity_stream.html +++ b/ckan/templates/group/activity_stream.html @@ -1,6 +1,6 @@ {% extends "group/read_base.html" %} -{% block subtitle %}{{ _('Activity Stream') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %} +{% block subtitle %}{{ _('Activity Stream') }} - {{ super() }}{% endblock %} {% block primary_content_inner %}

{% block page_heading %}{{ _('Activity Stream') }}{% endblock %}

diff --git a/ckan/templates/group/edit.html b/ckan/templates/group/edit.html index 57808056d54..ff5c0b96989 100644 --- a/ckan/templates/group/edit.html +++ b/ckan/templates/group/edit.html @@ -4,11 +4,9 @@
  • {% link_for _('Groups'), controller='group', action='index' %}
    • {% block breadcrumb_content_inner %}
  • {% link_for group.display_name|truncate(35), controller='group', action='read', id=group.name %}
    • -
  • {% link_for _('Edit'), controller='group', action='edit', id=group.name %}
    • +
  • {% link_for _('Manage'), controller='group', action='edit', id=group.name %}
    • {% endblock %} {% endblock %} -{% block subtitle %}{{ _('Edit Group') }}{% endblock %} - {% block page_heading_class %}hide-heading{% endblock %} {% block page_heading %}{{ _('Edit Group') }}{% endblock %} diff --git a/ckan/templates/group/edit_base.html b/ckan/templates/group/edit_base.html index a5f1203d529..566da231192 100644 --- a/ckan/templates/group/edit_base.html +++ b/ckan/templates/group/edit_base.html @@ -1,17 +1,19 @@ {% extends "page.html" %} +{% block subtitle %}{{ _('Manage') }} - {{ c.group_dict.display_name }} - {{ _('Groups') }}{% endblock %} + {% set group = c.group_dict %} {% block breadcrumb_content %}
  • {% link_for _('Groups'), controller='group', action='index' %}
    • {% block breadcrumb_content_inner %}
  • {% link_for group.display_name|truncate(35), controller='group', action='read', id=group.name %}
    • -
  • {% link_for _('Edit'), controller='group', action='edit', id=group.name %}
    • +
  • {% link_for _('Manage'), controller='group', action='edit', id=group.name %}
    • {% endblock %} {% endblock %} {% block content_action %} - {% link_for _('View group'), controller='group', action='read', id=c.group_dict.name, class_='btn', icon='eye-open' %} + {% link_for _('View'), controller='group', action='read', id=c.group_dict.name, class_='btn', icon='eye-open' %} {% endblock %} {% block content_primary_nav %} diff --git a/ckan/templates/group/index.html b/ckan/templates/group/index.html index 6298cb5a120..514c12bb961 100644 --- a/ckan/templates/group/index.html +++ b/ckan/templates/group/index.html @@ -1,6 +1,6 @@ {% extends "page.html" %} -{% block subtitle %}{{ _('Groups of Datasets') }}{% endblock %} +{% block subtitle %}{{ _('Groups') }}{% endblock %} {% block breadcrumb_content %}
  • {% link_for _('Groups'), controller='group', action='index' %}
    • @@ -17,11 +17,13 @@ {% block primary_content_inner %}

    {{ _('Groups') }}

    {% block groups_search_form %} - {% snippet 'snippets/search_form.html', type='group', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, placeholder=_('Search groups...'), show_empty=request.params %} + {% snippet 'snippets/search_form.html', type='group', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, placeholder=_('Search groups...'), show_empty=request.params, no_bottom_border=true if c.page.items %} {% endblock %} {% block groups_list %} {% if c.page.items or request.params %} - {% snippet "group/snippets/group_list.html", groups=c.page.items %} + {% if c.page.items %} + {% snippet "group/snippets/group_list.html", groups=c.page.items %} + {% endif %} {% else %}

    {{ _('There are currently no groups for this site') }}. diff --git a/ckan/templates/group/member_new.html b/ckan/templates/group/member_new.html index 6a8fa691c29..bead208c5ec 100644 --- a/ckan/templates/group/member_new.html +++ b/ckan/templates/group/member_new.html @@ -85,12 +85,9 @@

    {% trans %} -

    Admin: Can add/edit and delete datasets, as well as - manage group members.

    -

    Editor: Can add and edit datasets, but not manage - group members.

    -

    Member: Can view the group's private - datasets, but not add new datasets.

    +

    Admin: Can edit group information, as well as + manage organization members.

    +

    Member: Can add/remove datasets from groups

    {% endtrans %}
    diff --git a/ckan/templates/group/members.html b/ckan/templates/group/members.html index 600c6d1bf54..c758972d54b 100644 --- a/ckan/templates/group/members.html +++ b/ckan/templates/group/members.html @@ -1,6 +1,6 @@ {% extends "group/edit_base.html" %} -{% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }}{% endblock %} +{% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }} - {{ _('Groups') }}{% endblock %} {% block primary_content_inner %} {% link_for _('Add Member'), controller='group', action='member_new', id=c.group_dict.id, class_='btn pull-right', icon='plus-sign-alt' %} diff --git a/ckan/templates/group/new.html b/ckan/templates/group/new.html index 23d66facb05..1d78ac40010 100644 --- a/ckan/templates/group/new.html +++ b/ckan/templates/group/new.html @@ -2,7 +2,7 @@ {% block subtitle %}{{ _('Create a Group') }}{% endblock %} -{% block breadcrumb_link %}{{ h.nav_link(_('Create Group'), controller='group', action='edit', id=c.group.name) }}{% endblock %} +{% block breadcrumb_link %}{{ h.nav_link(_('Create a Group'), controller='group', action='edit', id=c.group.name) }}{% endblock %} {% block page_heading %}{{ _('Create a Group') }}{% endblock %} diff --git a/ckan/templates/group/read.html b/ckan/templates/group/read.html index 8218edb4b37..81b967e53d7 100644 --- a/ckan/templates/group/read.html +++ b/ckan/templates/group/read.html @@ -2,10 +2,6 @@ {% block subtitle %}{{ c.group_dict.display_name }}{% endblock %} -{% block page_primary_action %} - {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %} -{% endblock %} - {% block primary_content_inner %} {% block groups_search_form %} {% set facets = { diff --git a/ckan/templates/group/read_base.html b/ckan/templates/group/read_base.html index afa92f2038f..9164f28ed64 100644 --- a/ckan/templates/group/read_base.html +++ b/ckan/templates/group/read_base.html @@ -1,6 +1,6 @@ {% extends "page.html" %} -{% block subtitle %}{{ c.group_dict.display_name }}{% endblock %} +{% block subtitle %}{{ c.group_dict.display_name }} - {{ _('Groups') }}{% endblock %} {% block breadcrumb_content %}
  • {% link_for _('Groups'), controller='group', action='index' %}
    • @@ -9,7 +9,7 @@ {% block content_action %} {% if h.check_access('group_update', {'id': c.group_dict.id}) %} - {% link_for _('Edit'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %} + {% link_for _('Manage'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %} {% endif %} {% endblock %} diff --git a/ckan/templates/group/snippets/group_form.html b/ckan/templates/group/snippets/group_form.html index 6d4d3216b26..a6d5fbcbf95 100644 --- a/ckan/templates/group/snippets/group_form.html +++ b/ckan/templates/group/snippets/group_form.html @@ -1,6 +1,6 @@ {% import 'macros/form.html' as form %} -
    + {% block error_summary %} {{ form.errors(error_summary) }} {% endblock %} @@ -19,7 +19,10 @@ {{ form.markdown('description', label=_('Description'), id='field-description', placeholder=_('A little information about my group...'), value=data.description, error=errors.description) }} - {{ form.input('image_url', label=_('Image URL'), id='field-image-url', type='url', placeholder=_('http://example.com/my-image.jpg'), value=data.image_url, error=errors.image_url, classes=['control-full']) }} + {% set is_upload = data.image_url and not data.image_url.startswith('http') %} + {% set is_url = data.image_url and data.image_url.startswith('http') %} + + {{ form.image_upload(data, errors, is_upload_enabled=h.uploads_enabled(), is_url=is_url, is_upload=is_upload) }} {% endblock %} @@ -48,6 +51,8 @@ ) }} {% endfor %} {% endblock %} + + {{ form.required_message() }} {# Do not update datasets here {% block dataset_fields %} {% if data.packages %} @@ -70,13 +75,13 @@ #}
    + {% block delete_button %} + {% if h.check_access('group_delete', {'id': data.id}) %} + {% set locale = h.dump_json({'content': _('Are you sure you want to delete this Group?')}) %} + {% block delete_button_text %}{{ _('Delete') }}{% endblock %} + {% endif %} + {% endblock %} {{ form.required_message() }} - {% block delete_button %} - {% if h.check_access('group_delete', {'id': data.id}) %} - {% set locale = h.dump_json({'content': _('Are you sure you want to delete this Group?')}) %} - {% block delete_button_text %}{{ _('Delete') }}{% endblock %} - {% endif %} - {% endblock %}
    diff --git a/ckan/templates/group/snippets/group_item.html b/ckan/templates/group/snippets/group_item.html index 9e32ce86e6a..04351329f2b 100644 --- a/ckan/templates/group/snippets/group_item.html +++ b/ckan/templates/group/snippets/group_item.html @@ -11,10 +11,11 @@ {% endfor %} #} -{% set url = h.url_for(group.type ~ '_read', action='read', id=group.name) %} +{% set type = group.type or 'group' %} +{% set url = h.url_for(type ~ '_read', action='read', id=group.name) %}
  • {% block image %} - {{ group.name }} + {{ group.name }} {% endblock %} {% block title %}

    {{ group.display_name }}

    @@ -29,13 +30,16 @@

    {{ group.display_name }}

    {% block datasets %} {% if group.packages %} {{ ungettext('{num} Dataset', '{num} Datasets', group.packages).format(num=group.packages) }} - {% else %} + {% elif group.packages == 0 %} {{ _('0 Datasets') }} {% endif %} {% endblock %} {{ _('View {name}').format(name=group.display_name) }} + {% if group.user_member %} + + {% endif %}
    • {% if position is divisibleby 3 %}
  • diff --git a/ckan/templates/group/snippets/info.html b/ckan/templates/group/snippets/info.html index b7c749ab147..dc86036bb4c 100644 --- a/ckan/templates/group/snippets/info.html +++ b/ckan/templates/group/snippets/info.html @@ -2,7 +2,7 @@
    - {{ group.name }} + {{ group.name }}

    {{ group.display_name }}

    diff --git a/ckan/templates/header.html b/ckan/templates/header.html index e8aa9321098..dd0d5c07c57 100644 --- a/ckan/templates/header.html +++ b/ckan/templates/header.html @@ -50,7 +50,9 @@
      {% block header_account_notlogged %}
    • {% link_for _('Log in'), controller='user', action='login' %}
      • -
    • {% link_for _('Register'), controller='user', action='register', class_='sub' %}
      • + {% if h.check_access('user_create') %} +
    • {% link_for _('Register'), controller='user', action='register', class_='sub' %}
      • + {% endif %} {% endblock %}
    @@ -103,8 +105,8 @@

    - - + +
    {% endblock %} diff --git a/ckan/templates/macros/form.html b/ckan/templates/macros/form.html index 497dea6bf02..0c0062c873b 100644 --- a/ckan/templates/macros/form.html +++ b/ckan/templates/macros/form.html @@ -395,3 +395,35 @@

    {% endmacro %} +{# +Builds a file upload for input + +Example + {% import 'macros/form.html' as form %} + {{ form.image_upload(data, errors, is_upload_enabled=true) }} + +#} +{% macro image_upload(data, errors, field_url='image_url', field_upload='image_upload', field_clear='clear_upload', + is_url=false, is_upload=false, is_upload_enabled=false, placeholder=false, + url_label='', upload_label='') %} + {% set placeholder = placeholder if placeholder else _('http://example.com/my-image.jpg') %} + {% set url_label = url_label or _('Image URL') %} + {% set upload_label = upload_label or _('Upload Image') %} + + {% if is_upload_enabled %} +
    + {% endif %} + + {{ input(field_url, label=url_label, id='field-image-url', placeholder=placeholder, value=data.get(field_url), error=errors.get(field_url), classes=['control-full']) }} + + {% if is_upload_enabled %} + {{ input(field_upload, label=upload_label, id='field-image-upload', type='file', placeholder='', value='', error='', classes=['control-full']) }} + {% if is_upload %} + {{ checkbox(field_clear, label=_('Clear Upload'), id='field-clear-upload', value='true', error='', classes=['control-full']) }} + {% endif %} + {% endif %} + + {% if is_upload_enabled %}
    {% endif %} + +{% endmacro %} diff --git a/ckan/templates/organization/about.html b/ckan/templates/organization/about.html index 6848ed9ede7..6d3fcfe1bfd 100644 --- a/ckan/templates/organization/about.html +++ b/ckan/templates/organization/about.html @@ -1,6 +1,6 @@ {% extends "organization/read_base.html" %} -{% block subtitle %}{{ _('About') }} - {{ c.group_dict.display_name }}{% endblock %} +{% block subtitle %}{{ _('About') }} - {{ super() }}{% endblock %} {% block primary_content_inner %}

    {% block page_heading %}{{ c.group_dict.display_name }}{% endblock %}

    diff --git a/ckan/templates/organization/activity_stream.html b/ckan/templates/organization/activity_stream.html index dc8e711c5c8..ffa029d951b 100644 --- a/ckan/templates/organization/activity_stream.html +++ b/ckan/templates/organization/activity_stream.html @@ -1,6 +1,6 @@ {% extends "organization/read_base.html" %} -{% block subtitle %}{{ _('Activity Stream') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %} +{% block subtitle %}{{ _('Activity Stream') }} - {{ super() }}{% endblock %} {% block primary_content_inner %}

    {% block page_heading %}{{ _('Activity Stream') }}{% endblock %}

    diff --git a/ckan/templates/organization/edit.html b/ckan/templates/organization/edit.html index 06f7c7ee8ed..3fde80a2ab0 100644 --- a/ckan/templates/organization/edit.html +++ b/ckan/templates/organization/edit.html @@ -1,6 +1,6 @@ {% extends "organization/base_form_page.html" %} -{% block subtitle %}{{ _('Edit Organization') }}{% endblock %} +{% block subtitle %}{{ _('Edit') }} - {{ super() }}{% endblock %} {% block page_heading_class %}hide-heading{% endblock %} {% block page_heading %}{{ _('Edit Organization') }}{% endblock %} diff --git a/ckan/templates/organization/edit_base.html b/ckan/templates/organization/edit_base.html index 6f29a82b1f8..daaeef556e5 100644 --- a/ckan/templates/organization/edit_base.html +++ b/ckan/templates/organization/edit_base.html @@ -2,21 +2,20 @@ {% set organization = c.group_dict %} -{% block subtitle %}{{ organization.display_name }}{% endblock %} +{% block subtitle %}{{ c.group_dict.display_name }} - {{ _('Organizations') }}{% endblock %} {% block breadcrumb_content %}
  • {% link_for _('Organizations'), controller='organization', action='index' %}
    • {% block breadcrumb_content_inner %}
  • {% link_for organization.display_name|truncate(35), controller='organization', action='read', id=organization.name %}
    • -
  • {% link_for _('Admin'), controller='organization', action='edit', id=organization.name %}
    • +
  • {% link_for _('Manage'), controller='organization', action='edit', id=organization.name %}
    • {% endblock %} {% endblock %} {% block content_action %} {% if organization and h.check_access('organization_update', {'id': organization.id}) %} - {% link_for _('View organization'), controller='organization', action='read', id=organization.name, class_='btn', icon='eye-open' %} + {% link_for _('View'), controller='organization', action='read', id=organization.name, class_='btn', icon='eye-open' %} {% endif %} - {#
  • {% link_for _('History'), controller='organization', action='history', id=organization.name, class_='btn', icon='undo' %}
    • #} {% endblock %} {% block content_primary_nav %} diff --git a/ckan/templates/organization/index.html b/ckan/templates/organization/index.html index ae2fb2bc49b..3b317ec701c 100644 --- a/ckan/templates/organization/index.html +++ b/ckan/templates/organization/index.html @@ -17,11 +17,13 @@ {% block primary_content_inner %}

    {% block page_heading %}{{ _('Organizations') }}{% endblock %}

    {% block organizations_search_form %} - {% snippet 'snippets/search_form.html', type='organization', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, placeholder=_('Search organizations...'), show_empty=request.params %} + {% snippet 'snippets/search_form.html', type='organization', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, placeholder=_('Search organizations...'), show_empty=request.params, no_bottom_border=true if c.page.items %} {% endblock %} {% block organizations_list %} {% if c.page.items or request.params %} - {% snippet "organization/snippets/organization_list.html", organizations=c.page.items %} + {% if c.page.items %} + {% snippet "organization/snippets/organization_list.html", organizations=c.page.items %} + {% endif %} {% else %}

    {{ _('There are currently no organizations for this site') }}. diff --git a/ckan/templates/organization/member_new.html b/ckan/templates/organization/member_new.html index a121549dab4..cc4ac8c7dd4 100644 --- a/ckan/templates/organization/member_new.html +++ b/ckan/templates/organization/member_new.html @@ -4,7 +4,7 @@ {% set user = c.user_dict %} -{% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }}{% endblock %} +{% block subtitle %}{{ _('Edit Member') if user else _('Add Member') }} - {{ super() }}{% endblock %} {% block primary_content_inner %} {% link_for _('Back to all members'), controller='organization', action='members', id=organization.name, class_='btn pull-right', icon='arrow-left' %} @@ -55,11 +55,11 @@

    {% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %} {{ _('Delete') }} {% else %} {% endif %} diff --git a/ckan/templates/organization/members.html b/ckan/templates/organization/members.html index c5dcd0ebdae..6e3f4446b9f 100644 --- a/ckan/templates/organization/members.html +++ b/ckan/templates/organization/members.html @@ -1,6 +1,6 @@ {% extends "organization/edit_base.html" %} -{% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }}{% endblock %} +{% block subtitle %}{{ _('Members') }} - {{ super() }}{% endblock %} {% block page_primary_action %} {% link_for _('Add Member'), controller='organization', action='member_new', id=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %} diff --git a/ckan/templates/organization/read_base.html b/ckan/templates/organization/read_base.html index d5a0f8120d5..1c9454f4729 100644 --- a/ckan/templates/organization/read_base.html +++ b/ckan/templates/organization/read_base.html @@ -1,6 +1,6 @@ {% extends "page.html" %} -{% block subtitle %}{{ c.group_dict.display_name }}{% endblock %} +{% block subtitle %}{{ c.group_dict.display_name }} - {{ _('Organizations') }}{% endblock %} {% block breadcrumb_content %}
  • {% link_for _('Organizations'), controller='organization', action='index' %}
    • @@ -9,7 +9,7 @@ {% block content_action %} {% if h.check_access('organization_update', {'id': c.group_dict.id}) %} - {% link_for _('Admin'), controller='organization', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %} + {% link_for _('Manage'), controller='organization', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %} {% endif %} {% endblock %} diff --git a/ckan/templates/organization/snippets/organization_form.html b/ckan/templates/organization/snippets/organization_form.html index 7b05e7d1542..f98cb3d9b09 100644 --- a/ckan/templates/organization/snippets/organization_form.html +++ b/ckan/templates/organization/snippets/organization_form.html @@ -1,6 +1,6 @@ {% import 'macros/form.html' as form %} -
    + {% block error_summary %} {{ form.errors(error_summary) }} {% endblock %} @@ -19,7 +19,10 @@ {{ form.markdown('description', label=_('Description'), id='field-description', placeholder=_('A little information about my organization...'), value=data.description, error=errors.description) }} - {{ form.input('image_url', label=_('Image URL'), id='field-image-url', type='url', placeholder=_('http://example.com/my-image.jpg'), value=data.image_url, error=errors.image_url, classes=['control-full']) }} + {% set is_upload = data.image_url and not data.image_url.startswith('http') %} + {% set is_url = data.image_url and data.image_url.startswith('http') %} + + {{ form.image_upload(data, errors, is_upload_enabled=h.uploads_enabled(), is_url=is_url, is_upload=is_upload) }} {% endblock %} @@ -71,14 +74,14 @@ {% endblock %} #} -
    {{ form.required_message() }} - {% block delete_button %} - {% if h.check_access('organization_delete', {'id': data.id}) %} - {% set locale = h.dump_json({'content': _('Are you sure you want to delete this Organization? This will delete all the public and private datasets belonging to this organization.')}) %} - {% block delete_button_text %}{{ _('Delete') }}{% endblock %} - {% endif %} - {% endblock %} +
    + {% block delete_button %} + {% if h.check_access('organization_delete', {'id': data.id}) %} + {% set locale = h.dump_json({'content': _('Are you sure you want to delete this Organization? This will delete all the public and private datasets belonging to this organization.')}) %} + {% block delete_button_text %}{{ _('Delete') }}{% endblock %} + {% endif %} + {% endblock %}
    diff --git a/ckan/templates/organization/snippets/organization_item.html b/ckan/templates/organization/snippets/organization_item.html index 818d5cc338a..5d774cb7f39 100644 --- a/ckan/templates/organization/snippets/organization_item.html +++ b/ckan/templates/organization/snippets/organization_item.html @@ -14,7 +14,7 @@ {% set url = h.url_for(organization.type ~ '_read', action='read', id=organization.name) %}
  • {% block image %} - {{ organization.name }} + {{ organization.name }} {% endblock %} {% block title %}

    {{ organization.display_name }}

    diff --git a/ckan/templates/package/activity.html b/ckan/templates/package/activity.html index 52c0f8eade7..3941a6dda02 100644 --- a/ckan/templates/package/activity.html +++ b/ckan/templates/package/activity.html @@ -1,6 +1,6 @@ {% extends "package/read_base.html" %} -{% block subtitle %}{{ _('Activity Stream') }} - {{ c.pkg_dict.title or c.pkg_dict.name }}{% endblock %} +{% block subtitle %}{{ _('Activity Stream') }} - {{ super() }}{% endblock %} {% block primary_content_inner %}

    {% block page_heading %}{{ _('Activity Stream') }}{% endblock %}

    diff --git a/ckan/templates/package/activity_stream.html b/ckan/templates/package/activity_stream.html deleted file mode 100644 index af67b063a7b..00000000000 --- a/ckan/templates/package/activity_stream.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "package/read.html" %} - -{% block subtitle %}{{ _('Activity Stream') }}{% endblock %} - -{% block package_content %} -

    {% block page_heading %}{{ _('Activity Stream') }}{% endblock %}

    - {% block activity_stream %} - {{ c.package_activity_stream | safe }} - {% endblock %} -{% endblock %} diff --git a/ckan/templates/package/base.html b/ckan/templates/package/base.html index b51f78faaa6..20dd0b1db27 100644 --- a/ckan/templates/package/base.html +++ b/ckan/templates/package/base.html @@ -4,6 +4,8 @@ {% block breadcrumb_content_selected %} class="active"{% endblock %} +{% block subtitle %}{{ _('Datasets') }}{% endblock %} + {% block breadcrumb_content %} {% if pkg %} {% set dataset = pkg.title or pkg.name %} diff --git a/ckan/templates/package/base_form_page.html b/ckan/templates/package/base_form_page.html index b4d7dc440c0..832fbbb2554 100644 --- a/ckan/templates/package/base_form_page.html +++ b/ckan/templates/package/base_form_page.html @@ -1,4 +1,4 @@ -{% extends "package/base.html" %} +{% extends "package/edit_base.html" %} {% block primary_content %}
    diff --git a/ckan/templates/package/group_list.html b/ckan/templates/package/group_list.html new file mode 100644 index 00000000000..34b29496c11 --- /dev/null +++ b/ckan/templates/package/group_list.html @@ -0,0 +1,26 @@ +{% extends "package/read_base.html" %} +{% import 'macros/form.html' as form %} + +{% block primary_content_inner %} +

    {{ _('Groups') }}

    + + {% if c.group_dropdown %} +
    + + +
    + {% endif %} + + {% if c.pkg_dict.groups %} +
    + {% snippet 'group/snippets/group_list.html', groups=c.pkg_dict.groups %} +
    + {% else %} +

    {{ _('There are no groups associated with this dataset') }}

    + {% endif %} + +{% endblock %} diff --git a/ckan/templates/package/new.html b/ckan/templates/package/new.html index a3e7bae8e1c..a8eea92ca48 100644 --- a/ckan/templates/package/new.html +++ b/ckan/templates/package/new.html @@ -1,3 +1,3 @@ {% extends "package/base_form_page.html" %} -{% block subtitle %}{{ _('Create dataset') }}{% endblock %} +{% block subtitle %}{{ _('Create Dataset') }}{% endblock %} diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html index d70cc3e5bf2..9f178b198ec 100644 --- a/ckan/templates/package/read.html +++ b/ckan/templates/package/read.html @@ -2,8 +2,6 @@ {% set pkg = c.pkg_dict %} -{% block subtitle %}{{ pkg.title or pkg.name }}{% endblock %} - {% block primary_content_inner %} {{ super() }} {% block package_description %} diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html index f0a58a21018..8cd14492cd9 100644 --- a/ckan/templates/package/read_base.html +++ b/ckan/templates/package/read_base.html @@ -1,6 +1,6 @@ {% extends "package/base.html" %} -{% block subtitle %}{{ pkg.title or pkg.name }}{% endblock %} +{% block subtitle %}{{ pkg.title or pkg.name }} - {{ super() }}{% endblock %} {% block links -%} {{ super() }} @@ -16,12 +16,13 @@ {% block content_action %} {% if h.check_access('package_update', {'id':pkg.id }) %} - {% link_for _('Edit'), controller='package', action='edit', id=pkg.name, class_='btn', icon='wrench' %} + {% link_for _('Manage'), controller='package', action='edit', id=pkg.name, class_='btn', icon='wrench' %} {% endif %} {% endblock %} {% block content_primary_nav %} {{ h.build_nav_icon('dataset_read', _('Dataset'), id=pkg.name) }} + {{ h.build_nav_icon('dataset_groups', _('Groups'), id=pkg.name) }} {{ h.build_nav_icon('dataset_activity', _('Activity Stream'), id=pkg.name) }} {{ h.build_nav_icon('related_list', _('Related'), id=pkg.name) }} {% endblock %} @@ -59,23 +60,6 @@ {% endif %} {% endblock %} - {% block package_groups %} - {% if pkg.groups %} -
    -

    {{ _('Groups') }}

    - -
    - {% endif %} - {% endblock %} - {% block package_social %} {% snippet "snippets/social.html" %} {% endblock %} diff --git a/ckan/templates/package/related_list.html b/ckan/templates/package/related_list.html index 0f31cb0e790..affdd974372 100644 --- a/ckan/templates/package/related_list.html +++ b/ckan/templates/package/related_list.html @@ -2,6 +2,8 @@ {% set pkg = c.pkg %} +{% block subtitle %}{{ _('Related') }} - {{ super() }}{% endblock %} + {% block primary_content_inner %}

    {% block page_heading %}{{ _('Related Media for {dataset}').format(dataset=h.dataset_display_name(c.pkg)) }}{% endblock %}

    {% block related_list %} diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html index 46406746a6f..dee83c32e0d 100644 --- a/ckan/templates/package/resource_read.html +++ b/ckan/templates/package/resource_read.html @@ -27,7 +27,7 @@
      {% block resource_actions_inner %} {% if h.check_access('package_update', {'id':pkg.id }) %} -
    • {% link_for _('Edit'), controller='package', action='resource_edit', id=pkg.name, resource_id=res.id, class_='btn', icon='wrench' %}
      • +
    • {% link_for _('Manage'), controller='package', action='resource_edit', id=pkg.name, resource_id=res.id, class_='btn', icon='wrench' %}
      • {% endif %} {% if res.url %}
    • diff --git a/ckan/templates/package/search.html b/ckan/templates/package/search.html index 6274ecc0798..6c8173eb772 100644 --- a/ckan/templates/package/search.html +++ b/ckan/templates/package/search.html @@ -1,7 +1,7 @@ {% extends "page.html" %} {% import 'macros/form.html' as form %} -{% block subtitle %}{{ _("Search for a Dataset") }}{% endblock %} +{% block subtitle %}{{ _("Datasets") }}{% endblock %} {% block breadcrumb_content %}
    • {{ h.nav_link(_('Datasets'), controller='package', action='search', highlight_actions = 'new index') }}
      • diff --git a/ckan/templates/package/snippets/package_basic_fields.html b/ckan/templates/package/snippets/package_basic_fields.html index d1ac7e25577..56d12253516 100644 --- a/ckan/templates/package/snippets/package_basic_fields.html +++ b/ckan/templates/package/snippets/package_basic_fields.html @@ -64,7 +64,7 @@ {% endif %} {% if show_organizations_selector %} - {% set existing_org = data.owner_org %} + {% set existing_org = data.owner_org or data.group_id %}
      @@ -99,6 +99,4 @@
      {% endif %} - {{ form.required_message() }} - {% endblock %} diff --git a/ckan/templates/package/snippets/package_form.html b/ckan/templates/package/snippets/package_form.html index 33d726639f1..d6f3b285f56 100644 --- a/ckan/templates/package/snippets/package_form.html +++ b/ckan/templates/package/snippets/package_form.html @@ -38,10 +38,8 @@ {% block delete_button_text %}{{ _('Delete') }}{% endblock %} {% endif %} {% endblock %} - {% block cancel_button %} - {% block cancel_button_text %}{{ _('Cancel') }}{% endblock %} - {% endblock %} + {{ form.required_message() }}
      {% endblock %} diff --git a/ckan/templates/package/snippets/package_metadata_fields.html b/ckan/templates/package/snippets/package_metadata_fields.html index 4805e6637f9..b398818b297 100644 --- a/ckan/templates/package/snippets/package_metadata_fields.html +++ b/ckan/templates/package/snippets/package_metadata_fields.html @@ -29,22 +29,6 @@ {% endblock %} {% block dataset_fields %} - {% if data.groups %} -
      - -
      - {% for group in data.groups %} - - {% endfor %} -
      -
      - {% endif %} - {% set group_name = 'groups__%s__id' % data.groups|length %} - {% set group_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/group/autocomplete?q=?', 'data-module-key': 'id', 'data-module-label': 'title'} %} - {{ form.input(group_name, label=_('Add Group'), id="field-group", value=data[group_name], classes=['control-medium'], attrs=group_attrs) }} {% endblock %} {% endblock %} diff --git a/ckan/templates/package/snippets/resource_form.html b/ckan/templates/package/snippets/resource_form.html index f3bb2bddc91..5d327c3c0f4 100644 --- a/ckan/templates/package/snippets/resource_form.html +++ b/ckan/templates/package/snippets/resource_form.html @@ -4,7 +4,7 @@ {% set errors = errors or {} %} {% set action = form_action or h.url_for(controller='package', action='new_resource', id=pkg_name) %} -
      + {% block stages %} {# An empty stages variable will not show the stages #} {% if stage %} @@ -16,29 +16,12 @@ -
      - {% block basic_fields %} - - {% block basic_fields_data %} -
      - {# - This block uses a slightly odd pattern. Unlike the rest of the radio - buttons which are wrapped _inside_ the labels here we place the label - after the input. This enables us to style the label based on the state - of the radio using css. eg. input[type=radio]+label {} - #} - - - - - - -
      -
      - {% endblock %} {% block basic_fields_url %} - {{ form.input('url', id='field-url', label=_('Resource'), placeholder=_('eg. http://example.com/gold-prices-jan-2011.json'), value=data.url, error=errors.url, classes=['control-full', 'control-large'], is_required=true) }} + {% set is_upload = (data.url_type == 'upload') %} + {{ form.image_upload(data, errors, field_url='url', field_upload='upload', field_clear='clear_upload', + is_upload_enabled=h.uploads_enabled(), is_url=data.url and not is_upload, is_upload=is_upload, + upload_label=_('File Upload'), url_label=_('URL')) }} {% endblock %} {% block basic_fields_name %} @@ -61,7 +44,6 @@ {{ form.required_message() }} - {% endblock %} {% block metadata_fields %} {% if include_metadata %} diff --git a/ckan/templates/related/snippets/related_item.html b/ckan/templates/related/snippets/related_item.html index 39231a7a217..df1c1300025 100644 --- a/ckan/templates/related/snippets/related_item.html +++ b/ckan/templates/related/snippets/related_item.html @@ -11,11 +11,11 @@ #} {% set placeholder_map = { -'application':'/base/images/placeholder-application.png' +'application': h.url_for_static('/base/images/placeholder-application.png') } %} {% set tooltip = _('Go to {related_item_type}').format(related_item_type=related.type|replace('_', ' ')|title) %}
    • - {{ related.title }} + {{ related.title }}

      {{ related.title }}

      {% if related.description %}
      {{ h.render_markdown(related.description) }}
      diff --git a/ckan/templates/snippets/group.html b/ckan/templates/snippets/group.html index db549fda75a..db758d9bc96 100644 --- a/ckan/templates/snippets/group.html +++ b/ckan/templates/snippets/group.html @@ -14,7 +14,7 @@
      - {{ group.name }} + {{ group.name }}

      {{ group.title or group.name }}

      diff --git a/ckan/templates/snippets/group_item.html b/ckan/templates/snippets/group_item.html index 74c68fbca28..60f43f63b79 100644 --- a/ckan/templates/snippets/group_item.html +++ b/ckan/templates/snippets/group_item.html @@ -5,7 +5,7 @@ {% set truncate_title = truncate_title or 0 %} {% set title = group.title or group.name %} - {{ group.name }} + {{ group.name }}

      {{ group.title or group.name }}

      {% if group.description %} diff --git a/ckan/templates/snippets/organization.html b/ckan/templates/snippets/organization.html index ef08a9ed440..ec191850c73 100644 --- a/ckan/templates/snippets/organization.html +++ b/ckan/templates/snippets/organization.html @@ -23,7 +23,7 @@

      {{ _('Organization') }} {% block image %}
      - {{ organization.name }} + {{ organization.name }}
      {% endblock %} @@ -42,10 +42,6 @@

      {{ organization.title or organization.name }}

      {{ _('Followers') }}
      {{ h.SI_number_span(organization.num_followers) }}
      -
      -
      {{ _('Members') }}
      -
      {{ h.SI_number_span(organization.members|length) }}
      -
      {{ _('Datasets') }}
      {{ h.SI_number_span(organization.package_count) }}
      diff --git a/ckan/templates/snippets/organization_item.html b/ckan/templates/snippets/organization_item.html index 0213723defa..06579756f32 100644 --- a/ckan/templates/snippets/organization_item.html +++ b/ckan/templates/snippets/organization_item.html @@ -3,7 +3,7 @@ {% set url=h.url_for(controller='organization', action='read', id=organization.name) %} {% set truncate=truncate or 0 %} - {{ organization.name }} + {{ organization.name }}

      {{ organization.title or organization.name }}

      {% if organization.description %} diff --git a/ckan/templates/snippets/package_list.html b/ckan/templates/snippets/package_list.html index 99aed748242..75213d535a3 100644 --- a/ckan/templates/snippets/package_list.html +++ b/ckan/templates/snippets/package_list.html @@ -15,7 +15,7 @@ #} {% if packages %} -
        +
          {% for package in packages %} {% snippet 'snippets/package_item.html', package=package, item_class=item_class, hide_resources=hide_resources, banner=banner, truncate=truncate, truncate_title=truncate_title %} {% endfor %} diff --git a/ckan/templates/snippets/search_form.html b/ckan/templates/snippets/search_form.html index 6fdd9e1638e..d0c6bd95887 100644 --- a/ckan/templates/snippets/search_form.html +++ b/ckan/templates/snippets/search_form.html @@ -1,10 +1,11 @@ {% import 'macros/form.html' as form %} -{% set placeholder = placeholder if placeholder else _('Search...') %} +{% set placeholder = placeholder if placeholder else _('Search datasets...') %} {% set sorting = sorting if sorting else [(_('Name Ascending'), 'name asc'), (_('Name Descending'), 'name desc')] %} {% set search_class = search_class if search_class else 'search-giant' %} +{% set no_bottom_border = no_bottom_border if no_bottom_border else false %} - + {% block search_input %}
          diff --git a/ckan/templates/snippets/search_result_text.html b/ckan/templates/snippets/search_result_text.html index 0cd48bf2d06..2cdc1f0859a 100644 --- a/ckan/templates/snippets/search_result_text.html +++ b/ckan/templates/snippets/search_result_text.html @@ -13,21 +13,21 @@ #} {% if type == 'dataset' %} {% set text_query = ungettext('{number} dataset found for "{query}"', '{number} datasets found for "{query}"', count) %} - {% set text_query_none = _('Sorry no datasets found for "{query}"') %} + {% set text_query_none = _('No datasets found for "{query}"') %} {% set text_no_query = ungettext('{number} dataset found', '{number} datasets found', count) %} - {% set text_no_query_none = _('Sorry no datasets found') %} + {% set text_no_query_none = _('No datasets found') %} {% elif type == 'group' %} {% set text_query = ungettext('{number} group found for "{query}"', '{number} groups found for "{query}"', count) %} - {% set text_query_none = _('Sorry no groups found for "{query}"') %} + {% set text_query_none = _('No groups found for "{query}"') %} {% set text_no_query = ungettext('{number} group found', '{number} groups found', count) %} - {% set text_no_query_none = _('Sorry no groups found') %} + {% set text_no_query_none = _('No groups found') %} {% elif type == 'organization' %} {% set text_query = ungettext('{number} organization found for "{query}"', '{number} organizations found for "{query}"', count) %} - {% set text_query_none = _('Sorry no organizations found for "{query}"') %} + {% set text_query_none = _('No organizations found for "{query}"') %} {% set text_no_query = ungettext('{number} organization found', '{number} organizations found', count) %} - {% set text_no_query_none = _('Sorry no organizations found') %} + {% set text_no_query_none = _('No organizations found') %} {%- endif -%} {% if query %} diff --git a/ckan/templates/user/activity_stream.html b/ckan/templates/user/activity_stream.html index 092e6ea8485..290d34d5fa6 100644 --- a/ckan/templates/user/activity_stream.html +++ b/ckan/templates/user/activity_stream.html @@ -1,6 +1,6 @@ {% extends "user/read.html" %} -{% block subtitle %}{{ _('Activity Stream') }}{% endblock %} +{% block subtitle %}{{ _('Activity Stream') }} - {{ super() }}{% endblock %} {% block primary_content_inner %}

          {% block page_heading %}{{ _('Activity Stream') }}{% endblock %}

          diff --git a/ckan/templates/user/dashboard.html b/ckan/templates/user/dashboard.html index 3109a632036..dd6c346e6ec 100644 --- a/ckan/templates/user/dashboard.html +++ b/ckan/templates/user/dashboard.html @@ -1,5 +1,7 @@ {% extends "user/edit_base.html" %} +{% set user = c.userobj %} + {% block breadcrumb_content %}
        • {{ _('Dashboard') }}
          • {% endblock %} diff --git a/ckan/templates/user/edit.html b/ckan/templates/user/edit.html index 3845684f78d..1f5b7251b7a 100644 --- a/ckan/templates/user/edit.html +++ b/ckan/templates/user/edit.html @@ -3,14 +3,9 @@ {% block actions_content %}{% endblock %} {% block breadcrumb_content %} - {% if c.userobj.name == c.user_dict.name %} -
        • {{ _('Dashboard') }}
          • -
        • {{ _('Edit settings') }}
          • - {% else %} -
        • {{ _('Users') }}
          • -
        • {{ c.user_dict.display_name }}
          • -
        • {{ _('Edit') }}
          • - {% endif %} +
        • {{ _('Users') }}
          • +
        • {{ c.user_dict.display_name }}
          • +
        • {{ _('Manage') }}
          • {% endblock %} {% block primary_content_inner %} diff --git a/ckan/templates/user/edit_base.html b/ckan/templates/user/edit_base.html index 7e29720a60d..5ca813fe31d 100644 --- a/ckan/templates/user/edit_base.html +++ b/ckan/templates/user/edit_base.html @@ -1,8 +1,6 @@ {% extends "page.html" %} -{% set user = c.userobj %} - -{% block subtitle %}{{ _('Dashboard') }}{% endblock %} +{% block subtitle %}{{ _('Manage') }} - {{ c.user_dict.display_name }} - {{ _('Users') }}{% endblock %} {% block primary_content %}
          diff --git a/ckan/templates/user/edit_user_form.html b/ckan/templates/user/edit_user_form.html index ce31e34b583..b62f5fd9f08 100644 --- a/ckan/templates/user/edit_user_form.html +++ b/ckan/templates/user/edit_user_form.html @@ -4,7 +4,7 @@ {{ form.errors(error_summary) }}
          - {{ _('Change your details') }} + {{ _('Change details') }} {{ form.input('name', label=_('Username'), id='field-username', value=data.name, error=errors.name, classes=['control-medium'], is_required=true) }} @@ -20,12 +20,10 @@ {% endcall %} {% endif %} - {{ form.required_message() }} -
          - {{ _('Change your password') }} + {{ _('Change password') }} {{ form.input('password1', type='password', label=_('Password'), id='field-password', value=data.password1, error=errors.password1, classes=['control-medium'], attrs={'autocomplete': 'off'} ) }} @@ -39,6 +37,7 @@ {% block delete_button_text %}{{ _('Delete') }}{% endblock %} {% endif %} {% endblock %} + {{ form.required_message() }}
          diff --git a/ckan/templates/user/login.html b/ckan/templates/user/login.html index a00796b4586..03131dfe5f4 100644 --- a/ckan/templates/user/login.html +++ b/ckan/templates/user/login.html @@ -18,15 +18,17 @@

          {% block page_heading %}{{ _('Login') }}{% endblock %}< {% endblock %} {% block secondary_content %} -
          -

          {{ _('Need an Account?') }}

          -
          -

          {% trans %}Then sign right up, it only takes a minute.{% endtrans %}

          -

          - {{ _('Create an Account') }} -

          -
          -
          + {% if h.check_access('user_create') %} +
          +

          {{ _('Need an Account?') }}

          +
          +

          {% trans %}Then sign right up, it only takes a minute.{% endtrans %}

          +

          + {{ _('Create an Account') }} +

          +
          +
          + {% endif %}

          {{ _('Forgotten your password?') }}

          diff --git a/ckan/templates/user/read.html b/ckan/templates/user/read.html index 13f58fc3054..2ca0a920f41 100644 --- a/ckan/templates/user/read.html +++ b/ckan/templates/user/read.html @@ -1,7 +1,5 @@ {% extends "user/read_base.html" %} -{% block subtitle %}{{ user.display_name }}{% endblock %} - {% block primary_content_inner %}

          {% block page_heading %}{{ _('Datasets') }}{% endblock %} diff --git a/ckan/templates/user/read_base.html b/ckan/templates/user/read_base.html index 3a24c21c5a1..9fb39fd2998 100644 --- a/ckan/templates/user/read_base.html +++ b/ckan/templates/user/read_base.html @@ -2,7 +2,7 @@ {% set user = c.user_dict %} -{% block subtitle %}{{ user.display_name }}{% endblock %} +{% block subtitle %}{{ user.display_name }} - {{ _('Users') }}{% endblock %} {% block breadcrumb_content %} {{ h.build_nav('user_index', _('Users')) }} @@ -10,9 +10,9 @@ {% endblock %} {% block content_action %} -{% if h.check_access('user_update', user) %} - {% link_for _('Edit'), controller='user', action='edit', id=user.name, class_='btn', icon='wrench' %} -{% endif %} + {% if h.check_access('user_update', user) %} + {% link_for _('Manage'), controller='user', action='edit', id=user.name, class_='btn', icon='wrench' %} + {% endif %} {% endblock %} {% block content_primary_nav %} diff --git a/ckan/templates/user/snippets/back_to_user_action.html b/ckan/templates/user/snippets/back_to_user_action.html deleted file mode 100644 index 8ca7494916f..00000000000 --- a/ckan/templates/user/snippets/back_to_user_action.html +++ /dev/null @@ -1 +0,0 @@ -
        • {% link_for _('View my profile'), controller='user', action='read', id=user.name, class_='btn', icon='eye-open' %}
          • diff --git a/ckan/templates/user/snippets/login_form.html b/ckan/templates/user/snippets/login_form.html index d1b54251137..e6a88d95902 100644 --- a/ckan/templates/user/snippets/login_form.html +++ b/ckan/templates/user/snippets/login_form.html @@ -24,6 +24,6 @@ {{ form.checkbox('remember', label=_("Remember me"), id='field-remember', checked=true, value="63072000") }}
          - +
          diff --git a/ckan/tests/functional/api/test_activity.py b/ckan/tests/functional/api/test_activity.py index bd42409edd6..f093a200a7c 100644 --- a/ckan/tests/functional/api/test_activity.py +++ b/ckan/tests/functional/api/test_activity.py @@ -573,17 +573,17 @@ def _update_extra(self, package_dict, user): [group['name'] for group in package_dict['groups']], apikey=apikey) - extras_before = package_dict['extras'] + import copy + extras_before = copy.deepcopy(package_dict['extras']) assert len(extras_before) > 0, ( "Can't update an extra if the package doesn't have any") # Update the package's first extra. - extras = list(extras_before) - if extras[0]['value'] != '"edited"': - extras[0]['value'] = '"edited"' + if package_dict['extras'][0]['value'] != '"edited"': + package_dict['extras'][0]['value'] = '"edited"' else: - assert extras[0]['value'] != '"edited again"' - extras[0]['value'] = '"edited again"' + assert package_dict['extras'][0]['value'] != '"edited again"' + package_dict['extras'][0]['value'] = '"edited again"' updated_package = package_update(self.app, package_dict, user['apikey']) diff --git a/ckan/tests/functional/api/test_user.py b/ckan/tests/functional/api/test_user.py index 317428de865..875e8a668ab 100644 --- a/ckan/tests/functional/api/test_user.py +++ b/ckan/tests/functional/api/test_user.py @@ -1,20 +1,27 @@ +import paste +from pylons import config from nose.tools import assert_equal import ckan.logic as logic +import ckan.new_authz as new_authz from ckan import model from ckan.lib.create_test_data import CreateTestData from ckan.tests import TestController as ControllerTestCase +from ckan.tests.pylons_controller import PylonsTestCase from ckan.tests import url_for +import ckan.config.middleware +from ckan.common import json + class TestUserApi(ControllerTestCase): @classmethod def setup_class(cls): CreateTestData.create() - + @classmethod def teardown_class(cls): model.repo.rebuild_db() - + def test_autocomplete(self): response = self.app.get( url=url_for(controller='api', action='user_autocomplete', ver=2), @@ -51,8 +58,186 @@ def test_autocomplete_limit(self): print response.json assert_equal(len(response.json), 1) + +class TestCreateUserApiDisabled(PylonsTestCase): + ''' + Tests for the creating user when create_user_via_api is disabled. + ''' + + @classmethod + def setup_class(cls): + CreateTestData.create() + cls._original_config = config.copy() + new_authz.clear_auth_functions_cache() + wsgiapp = ckan.config.middleware.make_app( + config['global_conf'], **config) + cls.app = paste.fixture.TestApp(wsgiapp) + cls.sysadmin_user = model.User.get('testsysadmin') + PylonsTestCase.setup_class() + + @classmethod + def teardown_class(cls): + config.clear() + config.update(cls._original_config) + new_authz.clear_auth_functions_cache() + PylonsTestCase.teardown_class() + + model.repo.rebuild_db() + + def test_user_create_api_enabled_sysadmin(self): + params = { + 'name': 'testinganewusersysadmin', + 'email': 'testinganewuser@ckan.org', + 'password': 'random', + } + res = self.app.post( + '/api/3/action/user_create', + json.dumps(params), + extra_environ={'Authorization': str(self.sysadmin_user.apikey)}, + expect_errors=True) + res_dict = res.json + assert res_dict['success'] is True + + def test_user_create_api_disabled_anon(self): + params = { + 'name': 'testinganewuseranon', + 'email': 'testinganewuser@ckan.org', + 'password': 'random', + } + res = self.app.post('/api/3/action/user_create', json.dumps(params), + expect_errors=True) + res_dict = res.json + assert res_dict['success'] is False + + +class TestCreateUserApiEnabled(PylonsTestCase): + ''' + Tests for the creating user when create_user_via_api is enabled. + ''' + + @classmethod + def setup_class(cls): + CreateTestData.create() + cls._original_config = config.copy() + config['ckan.auth.create_user_via_api'] = True + new_authz.clear_auth_functions_cache() + wsgiapp = ckan.config.middleware.make_app( + config['global_conf'], **config) + cls.app = paste.fixture.TestApp(wsgiapp) + PylonsTestCase.setup_class() + cls.sysadmin_user = model.User.get('testsysadmin') + + @classmethod + def teardown_class(cls): + config.clear() + config.update(cls._original_config) + new_authz.clear_auth_functions_cache() + PylonsTestCase.teardown_class() + + model.repo.rebuild_db() + + def test_user_create_api_enabled_sysadmin(self): + params = { + 'name': 'testinganewusersysadmin', + 'email': 'testinganewuser@ckan.org', + 'password': 'random', + } + res = self.app.post( + '/api/3/action/user_create', + json.dumps(params), + extra_environ={'Authorization': str(self.sysadmin_user.apikey)}) + res_dict = res.json + assert res_dict['success'] is True + + def test_user_create_api_enabled_anon(self): + params = { + 'name': 'testinganewuseranon', + 'email': 'testinganewuser@ckan.org', + 'password': 'random', + } + res = self.app.post('/api/3/action/user_create', json.dumps(params)) + res_dict = res.json + assert res_dict['success'] is True + + +class TestCreateUserWebDisabled(PylonsTestCase): + ''' + Tests for the creating user by create_user_via_web is disabled. + ''' + + @classmethod + def setup_class(cls): + CreateTestData.create() + cls._original_config = config.copy() + config['ckan.auth.create_user_via_web'] = False + new_authz.clear_auth_functions_cache() + wsgiapp = ckan.config.middleware.make_app( + config['global_conf'], **config) + cls.app = paste.fixture.TestApp(wsgiapp) + cls.sysadmin_user = model.User.get('testsysadmin') + PylonsTestCase.setup_class() + + @classmethod + def teardown_class(cls): + config.clear() + config.update(cls._original_config) + new_authz.clear_auth_functions_cache() + PylonsTestCase.teardown_class() + + model.repo.rebuild_db() + + def test_user_create_api_disabled(self): + params = { + 'name': 'testinganewuser', + 'email': 'testinganewuser@ckan.org', + 'password': 'random', + } + res = self.app.post('/api/3/action/user_create', json.dumps(params), + expect_errors=True) + res_dict = res.json + assert res_dict['success'] is False + + +class TestCreateUserWebEnabled(PylonsTestCase): + ''' + Tests for the creating user by create_user_via_web is enabled. + ''' + + @classmethod + def setup_class(cls): + CreateTestData.create() + cls._original_config = config.copy() + config['ckan.auth.create_user_via_web'] = True + new_authz.clear_auth_functions_cache() + wsgiapp = ckan.config.middleware.make_app( + config['global_conf'], **config) + cls.app = paste.fixture.TestApp(wsgiapp) + cls.sysadmin_user = model.User.get('testsysadmin') + PylonsTestCase.setup_class() + + @classmethod + def teardown_class(cls): + config.clear() + config.update(cls._original_config) + new_authz.clear_auth_functions_cache() + PylonsTestCase.teardown_class() + + model.repo.rebuild_db() + + def test_user_create_api_disabled(self): + params = { + 'name': 'testinganewuser', + 'email': 'testinganewuser@ckan.org', + 'password': 'random', + } + res = self.app.post('/api/3/action/user_create', json.dumps(params), + expect_errors=True) + res_dict = res.json + assert res_dict['success'] is False + + class TestUserActions(object): - + @classmethod def setup_class(cls): CreateTestData.create() diff --git a/ckan/tests/functional/test_package.py b/ckan/tests/functional/test_package.py index 662ad0c2458..23a8bb48247 100644 --- a/ckan/tests/functional/test_package.py +++ b/ckan/tests/functional/test_package.py @@ -6,6 +6,7 @@ from nose.tools import assert_equal from ckan.tests import * +import ckan.tests as tests from ckan.tests.html_check import HtmlCheckMethods from ckan.tests.pylons_controller import PylonsTestCase from base import FunctionalTestCase @@ -1505,3 +1506,43 @@ def test_package_autocomplete(self): expected = ['A Wonderful Story (warandpeace)|warandpeace','annakarenina|annakarenina'] received = sorted(res.body.split('\n')) assert expected == received + +class TestResourceListing(TestPackageBase): + @classmethod + def setup_class(cls): + + CreateTestData.create() + cls.tester_user = model.User.by_name(u'tester') + cls.extra_environ_admin = {'REMOTE_USER': 'testsysadmin'} + cls.extra_environ_tester = {'REMOTE_USER': 'tester'} + cls.extra_environ_someone_else = {'REMOTE_USER': 'someone_else'} + + tests.call_action_api(cls.app, 'organization_create', + name='test_org_2', + apikey=cls.tester_user.apikey) + + tests.call_action_api(cls.app, 'package_create', + name='crimeandpunishment', + owner_org='test_org_2', + apikey=cls.tester_user.apikey) + + @classmethod + def teardown_class(cls): + model.repo.rebuild_db() + + def test_resource_listing_premissions_sysadmin(self): + # sysadmin 200 + self.app.get('/dataset/resources/crimeandpunishment', extra_environ=self.extra_environ_admin, status=200) + + def test_resource_listing_premissions_auth_user(self): + # auth user 200 + self.app.get('/dataset/resources/crimeandpunishment', extra_environ=self.extra_environ_tester, status=200) + + def test_resource_listing_premissions_non_auth_user(self): + # non auth user 401 + self.app.get('/dataset/resources/crimeandpunishment', extra_environ=self.extra_environ_someone_else, status=[302,401]) + + def test_resource_listing_premissions_not_logged_in(self): + # not logged in 401 + self.app.get('/dataset/resources/crimeandpunishment', status=[302,401]) + diff --git a/ckan/tests/lib/test_dictization.py b/ckan/tests/lib/test_dictization.py index ff376e628b8..de720731261 100644 --- a/ckan/tests/lib/test_dictization.py +++ b/ckan/tests/lib/test_dictization.py @@ -48,6 +48,8 @@ def setup_class(cls): 'name': u'david', 'capacity': 'public', 'image_url': u'', + 'image_display_url': u'', + 'display_name': u"Dave's books", 'type': u'group', 'state': u'active', 'is_organization': False, @@ -57,6 +59,8 @@ def setup_class(cls): 'name': u'roger', 'capacity': 'public', 'image_url': u'', + 'image_display_url': u'', + 'display_name': u"Roger's books", 'type': u'group', 'state': u'active', 'is_organization': False, @@ -923,6 +927,7 @@ def test_16_group_dictized(self): 'capacity' : 'public', 'display_name': u'simple', 'image_url': u'', + 'image_display_url': u'', 'name': u'simple', 'packages': 0, 'state': u'active', @@ -945,6 +950,7 @@ def test_16_group_dictized(self): 'name': u'help', 'display_name': u'help', 'image_url': u'', + 'image_display_url': u'', 'package_count': 2, 'is_organization': False, 'packages': [{'author': None, diff --git a/ckan/tests/lib/test_dictization_schema.py b/ckan/tests/lib/test_dictization_schema.py index 5a94d2e54e8..9507be2806f 100644 --- a/ckan/tests/lib/test_dictization_schema.py +++ b/ckan/tests/lib/test_dictization_schema.py @@ -160,6 +160,7 @@ def test_2_group_schema(self): 'is_organization': False, 'type': u'group', 'image_url': u'', + 'image_display_url': u'', 'packages': sorted([{'id': group_pack[0].id, 'name': group_pack[0].name, 'title': group_pack[0].title}, diff --git a/ckan/tests/lib/test_solr_schema_version.py b/ckan/tests/lib/test_solr_schema_version.py index 2dbc06f5bc7..344603274c4 100644 --- a/ckan/tests/lib/test_solr_schema_version.py +++ b/ckan/tests/lib/test_solr_schema_version.py @@ -1,5 +1,4 @@ import os -from pylons import config from ckan.tests import TestController class TestSolrSchemaVersionCheck(TestController): @@ -11,11 +10,7 @@ def setup_class(cls): def _get_current_schema(self): - from ckan.lib.search import SUPPORTED_SCHEMA_VERSIONS - - current_version = sorted(SUPPORTED_SCHEMA_VERSIONS).pop() - - current_schema = os.path.join(self.root_dir,'..','..','config','solr','schema-%s.xml' % current_version) + current_schema = os.path.join(self.root_dir,'..','..','config','solr','schema.xml') return current_schema diff --git a/ckan/tests/logic/test_action.py b/ckan/tests/logic/test_action.py index 70857c5eda2..316d6533a5e 100644 --- a/ckan/tests/logic/test_action.py +++ b/ckan/tests/logic/test_action.py @@ -832,10 +832,10 @@ def test_19_update_resource(self): resource_updated.pop('url') resource_updated.pop('revision_id') - resource_updated.pop('revision_timestamp') + resource_updated.pop('revision_timestamp', None) resource_created.pop('url') resource_created.pop('revision_id') - resource_created.pop('revision_timestamp') + resource_created.pop('revision_timestamp', None) assert_equal(resource_updated, resource_created) def test_20_task_status_update(self): diff --git a/ckan/tests/logic/test_auth.py b/ckan/tests/logic/test_auth.py index 57b4573de79..e44cf60efd3 100644 --- a/ckan/tests/logic/test_auth.py +++ b/ckan/tests/logic/test_auth.py @@ -4,7 +4,7 @@ from ckan.logic import get_action import ckan.model as model import ckan.new_authz as new_authz -from ckan.lib.create_test_data import CreateTestData, group_hierarchy_groups +from ckan.lib.create_test_data import CreateTestData import json INITIAL_TEST_CONFIG_PERMISSIONS = { @@ -14,8 +14,9 @@ 'user_create_organizations': False, 'user_delete_groups': False, 'user_delete_organizations': False, - 'create_user_via_api': False, 'create_unowned_dataset': False, + 'create_user_via_api': False, + 'create_user_via_web': True, 'roles_that_cascade_to_sub_groups': ['admin'], } diff --git a/ckan/tests/test_coding_standards.py b/ckan/tests/test_coding_standards.py index 5f618e45244..a3fb044c7f2 100644 --- a/ckan/tests/test_coding_standards.py +++ b/ckan/tests/test_coding_standards.py @@ -907,7 +907,6 @@ class TestActionAuth(object): 'create: follow_dataset', 'create: follow_group', 'create: follow_user', - 'create: member_create', 'create: package_relationship_create_rest', 'delete: member_delete', 'delete: package_relationship_delete_rest', diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py index 4dc41ff974d..414e0935321 100644 --- a/ckanext/datastore/db.py +++ b/ckanext/datastore/db.py @@ -292,6 +292,8 @@ def convert(data, type_name): if type_name.startswith('_'): sub_type = type_name[1:] return [convert(item, sub_type) for item in data] + if type_name == 'tsvector': + return unicode(data, 'utf-8') if isinstance(data, datetime.datetime): return data.isoformat() if isinstance(data, (int, float)): diff --git a/ckanext/datastore/logic/action.py b/ckanext/datastore/logic/action.py index 804fec1a197..1b90193a1bb 100644 --- a/ckanext/datastore/logic/action.py +++ b/ckanext/datastore/logic/action.py @@ -380,7 +380,7 @@ def datastore_search_sql(context, data_dict): '(; equals chr(59)) and string concatenation (||). ')] }) - p.toolkit.check_access('datastore_search', context, data_dict) + p.toolkit.check_access('datastore_search_sql', context, data_dict) data_dict['connection_url'] = pylons.config['ckan.datastore.read_url'] diff --git a/ckanext/datastore/logic/auth.py b/ckanext/datastore/logic/auth.py index f99d7f45ae3..d002d106fda 100644 --- a/ckanext/datastore/logic/auth.py +++ b/ckanext/datastore/logic/auth.py @@ -35,5 +35,10 @@ def datastore_search(context, data_dict): return datastore_auth(context, data_dict, 'resource_show') +@p.toolkit.auth_allow_anonymous_access +def datastore_search_sql(context, data_dict): + return {'success': True} + + def datastore_change_permissions(context, data_dict): return datastore_auth(context, data_dict) diff --git a/ckanext/datastore/plugin.py b/ckanext/datastore/plugin.py index f91310ecdec..73103e67121 100644 --- a/ckanext/datastore/plugin.py +++ b/ckanext/datastore/plugin.py @@ -221,6 +221,7 @@ def get_auth_functions(self): 'datastore_upsert': auth.datastore_upsert, 'datastore_delete': auth.datastore_delete, 'datastore_search': auth.datastore_search, + 'datastore_search_sql': auth.datastore_search_sql, 'datastore_change_permissions': auth.datastore_change_permissions} def before_map(self, m): diff --git a/doc/_static/ckanlogo.png b/doc/_static/ckanlogo.png new file mode 100644 index 00000000000..a234cc085bb Binary files /dev/null and b/doc/_static/ckanlogo.png differ diff --git a/doc/_themes/sphinx-theme-okfn b/doc/_themes/sphinx-theme-okfn index 320555990b6..4628f26abf4 160000 --- a/doc/_themes/sphinx-theme-okfn +++ b/doc/_themes/sphinx-theme-okfn @@ -1 +1 @@ -Subproject commit 320555990b639c99ac3bcc79024140c9588e2bdf +Subproject commit 4628f26abf401fdb63ec099384bff44a27dcda4c diff --git a/doc/api.rst b/doc/api.rst index 6ce5a14639c..8bab62b558b 100644 --- a/doc/api.rst +++ b/doc/api.rst @@ -56,7 +56,7 @@ code that calls the CKAN API. For example, using the CKAN API your app can: --------------------- -Making an API Request +Making an API request --------------------- To call the CKAN API, post a JSON dictionary in an HTTP POST request to one of @@ -152,7 +152,7 @@ with this Python code:: --------------------------------------------- -Example: Importing Datasets with the CKAN API +Example: Importing datasets with the CKAN API --------------------------------------------- You can add datasets using CKAN's web interface, but when importing many @@ -207,7 +207,7 @@ to import datasets into CKAN. ------------ -API Versions +API versions ------------ The CKAN APIs are versioned. If you make a request to an API URL without a @@ -234,7 +234,7 @@ request that doesn't specify the API version number cannot be relied on. .. _api authentication: --------------------------- -Authentication and API Keys +Authentication and API keys --------------------------- Some API functions require authorization. The API uses the same authorization @@ -268,7 +268,7 @@ run this Python code:: ---------------------- -GET-able API Functions +GET-able API functions ---------------------- Functions defined in `ckan.logic.action.get`_ can also be called with an HTTP @@ -301,7 +301,7 @@ http://demo.ckan.org/api/3/action/term_translation_show?terms=russian&terms=roma ------------- -JSONP Support +JSONP support ------------- To cater for scripts from other sites that wish to access the API, the data can @@ -315,7 +315,7 @@ http://demo.ckan.org/api/3/action/package_show?id=adur_district_spending&callbac .. _api-reference: -------------------- -Action API Reference +Action API reference -------------------- .. note:: diff --git a/doc/appendices/index.rst b/doc/appendices/index.rst new file mode 100644 index 00000000000..371b7eb61a9 --- /dev/null +++ b/doc/appendices/index.rst @@ -0,0 +1,7 @@ +========== +Appendices +========== + +.. toctree:: + + solr-multicore diff --git a/doc/appendices/solr-multicore.rst b/doc/appendices/solr-multicore.rst new file mode 100644 index 00000000000..0d81ecd06fa --- /dev/null +++ b/doc/appendices/solr-multicore.rst @@ -0,0 +1,218 @@ +.. _multicore solr setup: + +==================== +Multicore Solr setup +==================== + +Solr can be set up to have multiple configurations and search indexes on the +same machine. Each configuration is called a Solr *core*. Having multiple cores +is useful when you want different applications or different versions of CKAN to +share the same Solr instance, each application can have its own Solr core so +each can use a different ``schema.xml`` file. This is necessary, for example, +if you want two CKAN instances to share the same |solr| server and those two +instances are running different versions of CKAN that require differemt +``schema.xml`` files, or if the two instances have different |solr| schema +customizations. + +Each |solr| core in a multicore setup will have a different URL, for example:: + + http://localhost:8983/solr/ckan_default + http://localhost:8983/solr/some_other_site + +This section will show you how to create a multicore |solr| setup and create +your first core. If you already have a multicore setup and now you've setup a +second CKAN instance on the same machine and want to create a second |solr| +core for it, see :ref:`creating another solr core`. + +#. Create the file ``/usr/share/solr/solr.xml``, with the following contents:: + + + + + + + + + + This file lists the different Solr cores, in this example we have just a + single core called ``ckan_default``. + +#. Create the data directory for your Solr core, run this command in a + terminal:: + + sudo -u jetty mkdir /var/lib/solr/data/ckan_default + + This is the directory where Solr will store the search index files for + our core. + +#. Create the directory ``/etc/solr/ckan_default``, and move the + ``/etc/solr/conf`` directory into it:: + + sudo mkdir /etc/solr/ckan_default + sudo mv /etc/solr/conf /etc/solr/ckan_default/ + + This directory holds the configuration files for your Solr core. + +#. Replace the ``/etc/solr/ckan_default/schema.xml`` file with a symlink to + CKAN's ``schema.xml`` file:: + + sudo mv /etc/solr/ckan_default/conf/schema.xml /etc/solr/ckan_default/conf/schema.xml.bak + sudo ln -s /usr/lib/ckan/default/src/ckan/ckan/config/solr/schema.xml /etc/solr/ckan_default/conf/schema.xml + +#. Edit ``/etc/solr/ckan_default/conf/solrconfig.xml`` and change the + ```` tag to this:: + + ${dataDir} + + This configures our ``ckan_default`` core to use the data directory you + specified for it in ``solr.xml``. + +#. Create the directory ``/usr/share/solr/ckan_default`` and put a symlink + to the ``conf`` directory in it:: + + sudo mkdir /usr/share/solr/ckan_default + sudo ln -s /etc/solr/ckan_default/conf /usr/share/solr/ckan_default/conf + +#. Restart Solr: + + .. parsed-literal:: + + |restart_solr| + + You should now see your newly created ``ckan_default`` core if you open + http://localhost:8983/solr/ckan_default/admin/ in your web browser. + You can click on the *schema* link on this page to check that the core is + using the right schema (you should see ```` + near the top of the ``schema.xml`` file). The http://localhost:8983/solr/ + page will list all of your configured Solr cores. + +#. Finally, change the ``solr_url`` setting in your |development.ini| or + |production.ini| file to point to your new Solr core, for example:: + + solr_url = http://127.0.0.1:8983/solr/ckan_default + +If you have trouble when setting up Solr, see +:ref:`multicore solr troubleshooting` below. + + +.. _creating another solr core: + +-------------------------- +Creating another Solr core +-------------------------- + +.. The name of the second CKAN instance that we're going to setup a second core + for: +.. |ckan| replace:: my-second-ckan-instance + +.. The name of the second CKAN core we're going to set up: +.. |core| replace:: my-second-solr-core + +In this example we'll assume that: + +#. You've followed the instructions in :ref:`multicore solr setup` to create + a multicore setup and create your first core for your first CKAN instance. + +#. You've installed a second instance of CKAN in a second virtual environment + at /usr/lib/ckan/|ckan|, and now want to setup a second Solr core for it. + +You can of course follow these instructions again to setup further Solr cores. + +#. Add the core to ``/usr/share/solr/solr.xml``. This file should now list + two cores. For example: + + .. parsed-literal:: + + + + + + + + + + + + +#. Create the data directory for your new core: + + .. parsed-literal:: + + sudo -u jetty mkdir /var/lib/solr/data/|core| + +#. Create the configuration directory for your new core, and copy the config + from your first core into it: + + .. parsed-literal:: + + sudo mkdir /etc/solr/|core| + sudo cp -R /etc/solr/ckan_default/conf /etc/solr/|core|/ + +#. Replace the /etc/solr/|core|/schema.xml file with a symlink to the + ``schema.xml`` file from your second CKAN instance: + + .. parsed-literal:: + + sudo rm /etc/solr/|core|/conf/schema.xml + sudo ln -s /usr/lib/ckan/|ckan|/src/ckan/ckan/config/solr/schema.xml /etc/solr/|core|/conf/schema.xml + +#. Create the /usr/share/solr/|core| directory and put a symlink to the + ``conf`` directory in it: + + .. parsed-literal:: + + sudo mkdir /usr/share/solr/|core| + sudo ln -s /etc/solr/|core|/conf /usr/share/solr/|core|/conf + +#. Restart |solr|: + + .. parsed-literal:: + + |restart_solr| + + You should now see both your Solr cores when you open + http://localhost:8983/solr/ in your web browser. + +#. Finally, change the :ref:`solr_url` setting in your + /etc/ckan/|ckan|/development.ini or /etc/ckan/|ckan|/production.ini file to + point to your new Solr core: + + .. parsed-literal:: + + solr_url = http://127.0.0.1:8983/solr/|core| + +If you have trouble when setting up Solr, see +:ref:`multicore solr troubleshooting`. + + +.. _multicore solr troubleshooting: + +-------------------------------------- +Multicore |solr| setup troubleshooting +-------------------------------------- + +.. seealso:: + + :ref:`Troubleshooting for single-core Solr setups ` + Most of these tips also apply to multi-core setups. + +No cores shown on |solr| index page +=================================== + +If no cores are shown when you visit the |solr| index page, and the admin +interface returns a 404 error, check the web server error log +(``/var/log/jetty/.stderrout.log`` if you're using Jetty, or +``/var/log/tomcat6/catalina..log`` for Tomcat). If you can find an error +similar to this one:: + + WARNING: [iatiregistry.org] Solr index directory '/usr/share/solr/iatiregistry.org/data/index' doesn't exist. Creating new index... + 07-Dec-2011 18:06:33 org.apache.solr.common.SolrException log + SEVERE: java.lang.RuntimeException: Cannot create directory: /usr/share/solr/iatiregistry.org/data/index + [...] + +Then ``dataDir`` is not properly configured. With our setup the data directory +should be under ``/var/lib/solr/data``. Make sure that you defined the correct +``dataDir`` in the ``solr.xml`` file and that in the ``solrconfig.xml`` file +you have the following configuration option:: + + ${dataDir} diff --git a/doc/authorization.rst b/doc/authorization.rst index 937a833e29e..900d02e52fb 100644 --- a/doc/authorization.rst +++ b/doc/authorization.rst @@ -1,6 +1,6 @@ -============= -Authorization -============= +=============================== +Organizations and authorization +=============================== .. versionchanged:: 2.0 Previous versions of CKAN used a different authorization system. diff --git a/doc/background-tasks.rst b/doc/background-tasks.rst index 600534db7fe..b2ff80e8d87 100644 --- a/doc/background-tasks.rst +++ b/doc/background-tasks.rst @@ -1,5 +1,5 @@ ================ -Background Tasks +Background tasks ================ .. version-added: 1.5.1 @@ -18,7 +18,7 @@ for example: DataStorer Extensions) -Enabling Background Tasks +Enabling background tasks ========================= To manage and run background tasks requires a job queue and CKAN uses celery_ @@ -54,7 +54,7 @@ To run the celery daemon you have two options: paster celeryd --config=/path/to/file.ini -Writing Background Tasks +Writing background tasks ========================== These instructions should show you how to write an background task and how to diff --git a/doc/conf.py b/doc/conf.py index 118df583f33..e5c33312cfc 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -47,8 +47,10 @@ .. |sstore| replace:: |config_dir|/sstore .. |storage_parent_dir| replace:: /var/lib/ckan .. |storage_dir| replace:: |storage_parent_dir|/default +.. |storage_path| replace:: |storage_parent_dir|/default .. |reload_apache| replace:: sudo service apache2 reload .. |restart_apache| replace:: sudo service apache2 restart +.. |restart_solr| replace:: sudo service jetty restart .. |solr| replace:: Solr .. |restructuredtext| replace:: reStructuredText .. |nginx| replace:: Nginx @@ -57,6 +59,8 @@ .. |sqlalchemy| replace:: SQLAlchemy .. |javascript| replace:: JavaScript .. |apache| replace:: Apache +.. |nginx_config_file| replace:: /etc/nginx/sites-available/ckan_default +.. |reload_nginx| replace:: sudo service nginx reload ''' @@ -77,17 +81,17 @@ #source_encoding = 'utf-8' # The master toctree document. -master_doc = 'index' +master_doc = 'contents' # General information about the project. -project = u'CKAN Documentation' +project = u'CKAN' project_short_name = u'CKAN' copyright = u'''© 2009-2013, Open Knowledge Foundation. Licensed under Creative Commons Attribution ShareAlike (Unported) v3.0 License.
          CC License Logo - {{ _('Open Content') }} ''' html_show_sphinx = False @@ -146,21 +150,18 @@ #'sidebarbgcolor': '#F2F2F2', #'sidebartextcolor': 'black', #'sidebarlinkcolor': '#355F7C', -#'headfont': 'Trebuchet MS' +#'headfont': 'Trebuchet MS' #} sys.path.append(os.path.abspath('_themes')) html_theme_path = ['_themes'] html_theme = 'sphinx-theme-okfn' html_theme_options = { - 'logo_icon': 'http://assets.okfn.org/p/opendatahandbook/img/data-wrench-inverted.png', + 'logo_icon': 'ckanlogo.png', 'show_version': True } html_sidebars = { - '**': ['relations.html', 'globaltoc.html'], - # There's no point in showing the table of contents in the sidebar on the - # table of contents page! So: - 'index': ['relations.html'], + '**': ['globaltoc.html'], } # The style sheet to use for HTML and HTML Help pages. A file of that name @@ -187,7 +188,7 @@ # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -#html_static_path = ['.static'] +html_static_path = ['_static'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. @@ -237,7 +238,7 @@ # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, document class [howto/manual]). latex_documents = [ - ('index', 'ComprehensiveKnowledgeArchiveNetworkCKAN.tex', ur'Comprehensive Knowledge Archive Network (CKAN) Developer Documentation', + ('contents', 'ComprehensiveKnowledgeArchiveNetworkCKAN.tex', ur'Comprehensive Knowledge Archive Network (CKAN) Developer Documentation', ur'Open Knowledge Foundation', 'manual'), ] diff --git a/doc/configuration.rst b/doc/configuration.rst index d110126f35a..40c88b6f7db 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -130,24 +130,6 @@ site use this setting. This setting should not have a trailing / on the end. -.. _ckan.api_url: - -ckan.api_url -^^^^^^^^^^^^ - -.. deprecated:: 2 - No longer used. - -Example:: - - ckan.api_url = http://scotdata.ckan.net/api - -Default value: ``/api`` - -The URL that resolves to the CKAN API part of the site. This is useful if the -API is hosted on a different domain, for example when a third-party site uses -the forms API. - .. _apikey_header_name: apikey_header_name @@ -355,6 +337,20 @@ Default value: ``False`` Allow new user accounts to be created via the API. +.. _ckan.auth.create_user_via_web: + +ckan.auth.create_user_via_web +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Example:: + + ckan.auth.create_user_via_web = True + +Default value: ``True`` + + +Allow new user accounts to be created via the Web. + .. _ckan.auth.roles_that_cascade_to_sub_groups: ckan.auth.roles_that_cascade_to_sub_groups @@ -414,7 +410,7 @@ Example:: solr_url = http://solr.okfn.org:8983/solr/ckan-schema-2.0 -Default value: ``http://solr.okfn.org:8983/solr`` +Default value: ``http://127.0.0.1:8983/solr`` This configures the Solr server used for search. The Solr schema found at that URL must be one of the ones in ``ckan/config/solr`` (generally the most recent one). A check of the schema version number occurs when CKAN starts. @@ -991,31 +987,41 @@ For more information on theming, see :doc:`theming`. Storage Settings ---------------- -.. _ckan.storage.bucket: +.. _ckan.storage_path: -ckan.storage.bucket -^^^^^^^^^^^^^^^^^^^ +ckan.storage_path +^^^^^^^^^^^^^^^^^ Example:: - - ckan.storage.bucket = ckan + ckan.storage_path = /var/lib/ckan Default value: ``None`` -This changes the bucket name for the uploaded files. +This defines the location of where CKAN will store all uploaded data. -.. _ckan.storage.max_content_length: +.. _ckan.max_resource_size: -ckan.storage.max_content_length -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +ckan.max_resource_size +^^^^^^^^^^^^^^^^^^^^^^ Example:: + ckan.max_resource_size = 100 - ckan.storage.max_content_length = 500000 +Default value: ``10`` -Default value: ``50000000`` +The maximum in megabytes a resources upload can be. + +.. _ckan.max_image_size: + +ckan.max_image_size +^^^^^^^^^^^^^^^^^^^^ + +Example:: + ckan.max_image_size = 10 -This defines the maximum content size, in bytes, for uploads. +Default value: ``2`` + +The maximum in megabytes an image upload can be. .. _ofs.impl: @@ -1030,6 +1036,9 @@ Default value: ``None`` Defines the storage backend used by CKAN: ``pairtree`` for local storage, ``s3`` for Amazon S3 Cloud Storage or ``google`` for Google Cloud Storage. Note that each of these must be accompanied by the relevant settings for each backend described below. +Deprecated, only available option is now pairtree. This must be used nonetheless if upgrading for CKAN 2.1 in order to keep access to your old pairtree files. + + .. _ofs.storage_dir: ofs.storage_dir @@ -1043,72 +1052,9 @@ Default value: ``None`` Only used with the local storage backend. Use this to specify where uploaded files should be stored, and also to turn on the handling of file storage. The folder should exist, and will automatically be turned into a valid pairtree repository if it is not already. -.. _ckan.storage.key_prefix: +Deprecated, please use ckan.storage_path. This must be used nonetheless if upgrading for CKAN 2.1 in order to keep access to your old pairtree files. -ckan.storage.key_prefix -^^^^^^^^^^^^^^^^^^^^^^^ -Example:: - - ckan.storage.key_prefix = ckan-file/ - -Default value: ``file/`` - -Only used with the local storage backend. This changes the prefix for the uploaded files. - -.. _ofs.aws_access_key_id: - -ofs.aws_access_key_id -^^^^^^^^^^^^^^^^^^^^^ - -Example:: - - ofs.aws_access_key_id = 022QF06E7MXBSH9DHM02 - -Default value: ``None`` - -Only used with the Amazon S3 storage backend. Configure with your AWS Access Key ID. - -.. _ofs.aws_secret_access_key: - -ofs.aws_secret_access_key -^^^^^^^^^^^^^^^^^^^^^^^^^ - -Example:: - - ofs.aws_secret_access_key = kWcrlUX5JEDGM/LtmEENI/aVmYvHNif5zB+d9+ct - -Default value: ``None`` - -Only used with the Amazon S3 storage backend. Configure with your AWS Secret Access Key. - -.. _ofs.gs_access_key_id: - -ofs.gs_access_key_id -^^^^^^^^^^^^^^^^^^^^^ - -Example:: - - ofs.gs_access_key_id = GOOGTS7C7FUP3AIRVJTE - -Default value: ``None`` - -Only used with the Google storage backend. Configure with your Google Storage -Access Key ID. - -.. _ofs.gs_secret_access_key: - -ofs.gs_secret_access_key -^^^^^^^^^^^^^^^^^^^^^^^^^ - -Example:: - - ofs.gs_secret_access_key = bGoa+V7g/yqDXvKRqq+JTFn4uQZbPiQJo4pf9RzJ - -Default value: ``None`` - -Only used with the Google storage backend. Configure with your Google Storage -Secret Access Key. DataPusher Settings @@ -1117,7 +1063,7 @@ DataPusher Settings .. _ckan.datapusher.formats: ckan.datapusher.formats -^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^ Example:: ckan.datapusher.formats = csv xls xlsx diff --git a/doc/contents.rst b/doc/contents.rst new file mode 100644 index 00000000000..b49c030c1ab --- /dev/null +++ b/doc/contents.rst @@ -0,0 +1,21 @@ +====================== +Full table of contents +====================== + +.. toctree:: + + index + user-guide + sysadmin-guide + installing + upgrading + getting-started + features + extensions/index + theming + api + contributing + test + configuration + changelog + appendices/index diff --git a/doc/css-coding-standards.rst b/doc/css-coding-standards.rst index a32dcc322a1..9d5fbf6df28 100644 --- a/doc/css-coding-standards.rst +++ b/doc/css-coding-standards.rst @@ -1,4 +1,4 @@ -CSS Coding Standards +CSS coding standards ==================== .. Note:: diff --git a/doc/data-viewer.rst b/doc/data-viewer.rst index b3c66e506f6..5f6ec34e444 100644 --- a/doc/data-viewer.rst +++ b/doc/data-viewer.rst @@ -205,7 +205,7 @@ from the config. You can find a complete example in the .. _embed-previews: -Embedding Previews In Other Web Pages +Embedding previews in other web pages ------------------------------------- .. versionchanged:: 2.0 diff --git a/doc/datastore.rst b/doc/datastore.rst index a0a38b3be3c..80fe5955bc3 100644 --- a/doc/datastore.rst +++ b/doc/datastore.rst @@ -1,5 +1,5 @@ =================== -DataStore Extension +DataStore extension =================== @@ -114,7 +114,7 @@ if necessary, for example: Replace ``pass`` with the passwords you created for your |database_user| and |datastore_user| database users. -Set Permissions +Set permissions --------------- .. tip:: See :ref:`legacy-mode` if these steps continue to fail or seem too complicated for your set-up. However, keep in mind that the legacy mode is limited in its capabilities. @@ -218,6 +218,23 @@ The set-up for legacy mode is analogous to the normal set-up as described above There is no need for a read-only user or special permissions. Therefore the legacy mode can be used for simple set-ups as well. +.. _datapusher: + +--------------------------------------------------- +DataPusher: Automatically Add Data to the DataStore +--------------------------------------------------- + +Often, one wants data that is added to CKAN (whether it is linked to or +uploaded to the :doc:`FileStore `) to be automatically added to the +DataStore. This requires some processing, to extract the data from your files +and to add it to the DataStore in the format the DataStore can handle. + +This task of automatically parsing and then adding data to the DataStore is +performed by a DataPusher, a service that runs asynchronously and can be installed +allongside CKAN. + +To install this please look at the docs here: http://datapusher.readthedocs.org + ----------------- The DataStore API @@ -242,7 +259,7 @@ associated CKAN resource. If data is stored in the DataStore, it will automatica previewed by the :ref:`recline preview extension `. -Making a DataStore API Request +Making a DataStore API request ============================== Making a DataStore API request is the same as making an Action API request: you @@ -250,7 +267,7 @@ post a JSON dictionary in an HTTP POST request to an API URL, and the API also returns its response in a JSON dictionary. See the :doc:`api` for details. -API Reference +API reference ============= .. note:: Lists can always be expressed in different ways. It is possible to use lists, comma separated strings or single items. These are valid lists: ``['foo', 'bar']``, ``'foo, bar'``, ``"foo", "bar"`` and ``'foo'``. Additionally, there are several ways to define a boolean value. ``True``, ``on`` and ``1`` are all vaid boolean values. @@ -366,7 +383,7 @@ A resource in the DataStore can have multiple aliases that are easier to remembe .. _datastore_search_htsql: -HTSQL Support +HTSQL support ------------- @@ -411,20 +428,3 @@ name Contains the name of the alias if alias_of is not null. Otherwise, this is the resource id of the CKAN resource for the DataStore resource. oid The PostgreSQL object ID of the table that belongs to name. - - -.. _datastorer: - ---------------------------------------------------- -DataStorer: Automatically Add Data to the DataStore ---------------------------------------------------- - -Often, one wants data that is added to CKAN (whether it is linked to or -uploaded to the :doc:`FileStore `) to be automatically added to the -DataStore. This requires some processing, to extract the data from your files -and to add it to the DataStore in the format the DataStore can handle. - -This task of automatically parsing and then adding data to the DataStore is -performed by a DataStorer, a queue process that runs asynchronously and can be -triggered by uploads or other activities. The DataStorer is an extension and can -be found, along with installation instructions, at: https://github.com/okfn/ckanext-datastorer diff --git a/doc/deployment.rst b/doc/deployment.rst index e6aaef4fd12..078edca05a2 100644 --- a/doc/deployment.rst +++ b/doc/deployment.rst @@ -1,5 +1,5 @@ ========================== -Deploying a Source Install +Deploying a source install ========================== Once you've installed CKAN from source by following the instructions in @@ -16,6 +16,7 @@ Because CKAN uses WSGI, a standard interface between web servers and Python web applications, CKAN can be used with a number of different web server and deployment configurations including: +* Apache_ with the modwsgi Apache module proxied with Nginx_ for caching * Apache_ with the modwsgi Apache module * Apache_ with paster and reverse proxy * Nginx_ with paster and reverse proxy @@ -24,8 +25,9 @@ deployment configurations including: .. _Apache: http://httpd.apache.org/ .. _Nginx: http://nginx.org/ -This guide explains how to deploy CKAN using Apache and modwsgi on an Ubuntu -server. These instructions have been tested on Ubuntu 12.04. +This guide explains how to deploy CKAN using Apache and modwsgi and proxied +with Nginx on an Ubuntu server. These instructions have been tested on Ubuntu +12.04. If run into any problems following these instructions, see `Troubleshooting`_ below. @@ -51,11 +53,20 @@ support to Apache):: sudo apt-get install apache2 libapache2-mod-wsgi -.. _modwsgi: https://code.google.com/p/modwsgi/ +.. _modwsgi: https://code.google.com/p/modwsgi/ +---------------- +3. Install Nginx +---------------- + +Install Nginx_ (a web server) which will proxy the content from Apache_ and add +a layer of caching:: + + sudo apt-get install nginx + -------------------------- -3. Install an Email Server +4. Install an email server -------------------------- If one isn't installed already, install an email server to enable CKAN's email @@ -71,7 +82,7 @@ return. ------------------------------ -4. Create the WSGI Script File +5. Create the WSGI script file ------------------------------ Create your site's WSGI script file |apache.wsgi| with the following @@ -96,7 +107,7 @@ CKAN to run in). -------------------------------- -5. Create the Apache Config File +6. Create the Apache config file -------------------------------- Create your site's Apache config file at |apache_config_file|, with the @@ -104,7 +115,7 @@ following contents: .. parsed-literal:: - + ServerName default.ckanhosted.com ServerAlias www.default.ckanhosted.com WSGIScriptAlias / |apache.wsgi| @@ -128,9 +139,37 @@ This tells the Apache modwsgi module to redirect any requests to the web server to the WSGI script that you created above. Your WSGI script in turn directs the requests to your CKAN instance. +------------------------------- +7. Create the Nginx config file +------------------------------- + +Create your site's Nginx config file at |nginx_config_file|, with the +following contents: + +.. parsed-literal:: + + proxy_cache_path /tmp/nginx_cache levels=1:2 keys_zone=cache:30m max_size=250m; + proxy_temp_path /tmp/nginx_proxy 1 2; + + server { + client_max_body_size 100M; + location / { + proxy_pass http://127.0.0.1:8080/; + proxy_set_header Host $host; + proxy_cache cache; + proxy_cache_bypass $cookie_auth_tkt; + proxy_no_cache $cookie_auth_tkt; + proxy_cache_valid 30m; + proxy_cache_key $host$scheme$proxy_host$request_uri; + # In emergency comment out line to force caching + # proxy_ignore_headers X-Accel-Expires Expires Cache-Control; + } + + } + ------------------------ -6. Enable Your CKAN Site +8. Enable your CKAN site ------------------------ Finally, enable your CKAN site in Apache: @@ -138,7 +177,9 @@ Finally, enable your CKAN site in Apache: .. parsed-literal:: sudo a2ensite ckan_default + sudo ln -s |nginx_config_file| /etc/nginx/sites-enabled/ckan_default |reload_apache| + |reload_nginx| You should now be able to visit your server in a web browser and see your new CKAN instance. @@ -148,7 +189,7 @@ CKAN instance. Troubleshooting --------------- -Default Apache Welcome Page +Default Apache welcome page =========================== If you see a default Apache welcome page where your CKAN front page should be, @@ -192,7 +233,7 @@ not allowed to write to stdout. Possible solutions include: Also see https://code.google.com/p/modwsgi/wiki/ApplicationIssues -Log Files +Log files ========= In general, if it's not working look in the log files in ``/var/log/apache2`` diff --git a/doc/documentation-guidelines.rst b/doc/documentation-guidelines.rst index 6014c645016..ddfcc23b19f 100644 --- a/doc/documentation-guidelines.rst +++ b/doc/documentation-guidelines.rst @@ -161,6 +161,12 @@ customize, initialize, color, etc. There's a list here: https://wiki.ubuntu.com/EnglishTranslation/WordSubstitution +Spellcheck +========== + +Please spellcheck documentation before merging it into master! + + Commonly used terms =================== @@ -342,13 +348,33 @@ As with Python code, try to limit all lines to a maximum of 79 characters. Cross-references and links ========================== +Whenever mentioning another page or section in the docs, an external website, a +configuration setting, or a class, exception or function, etc. try to +cross-reference it. Using proper Sphinx cross-references is better than just +typing things like "see above/below" or "see section foo" because Sphinx +cross-refs are hyperlinked, and because if the thing you're referencing to gets +moved or deleted Sphinx will update the cross-reference or print a warning. + + +Cross-referencing to another file +--------------------------------- + Use ``:doc:`` to cross-reference to other files by filename:: - See :doc:`theming` + See :doc:`configuration` + +If the file you're editing is in a subdir within the ``doc`` dir, you may need +to use an absolute reference (starting with a ``/``):: -see `Cross-referencing documents `_ + See :doc:`/configuration` + +See `Cross-referencing documents `_ for details. + +Cross-referencing a section within a file +----------------------------------------- + Use ``:ref:`` to cross-reference to particular sections within the same or another file. First you have to add a label before the section you want to cross-reference to:: @@ -365,13 +391,59 @@ then from elsewhere cross-reference to the section like this:: see `Cross-referencing arbitrary locations `_. -With both ``:doc:`` and ``:ref:`` if you want the link text to be different -from the title of the section you're referencing, do this:: + +Cross-referencing to CKAN config settings +----------------------------------------- + +Whenever you mention a CKAN config setting, make it link to the docs for that +setting in :doc:`/configuration` by using ``:ref:`` and the name of the config +setting:: + + :ref:`ckan.site_title` + +This works because all CKAN config settings are documented in +:doc:`/configuration`, and every setting has a Sphinx label that is exactly +the same as the name of the setting, for example:: + + .. _ckan.site_title: + + ckan.site_title + ^^^^^^^^^^^^^^^ + + Example:: + + ckan.site_title = Open Data Scotland + + Default value: ``CKAN`` + + This sets the name of the site, as displayed in the CKAN web interface. + +If you add a new config setting to CKAN, make sure to document like this it in +:doc:`configuration`. + + +Cross-referencing to a Python object +------------------------------------ + +Whenever you mention a Python function, method, object, class, exception, etc. +cross-reference it using a Sphinx domain object cross-reference. +See :ref:`Referencing other code objects`. + + +Changing the link text of a cross-reference +------------------------------------------- + +With ``:doc:`` ``:ref:`` and other kinds of link, if you want the link text to +be different from the title of the thing you're referencing, do this:: :doc:`the theming document ` :ref:`the getting started section ` + +Cross-referencing to an external page +------------------------------------- + The syntax for linking to external URLs is slightly different from cross-referencing, you have to add a trailing underscore:: @@ -386,9 +458,6 @@ or to define a URL once and then link to it in multiple places, do:: see `Hyperlinks `_ for details. -Use ``:py:`` to reference other Python or JavaScript functions, modules, -classes, etc. See :ref:`Referencing other code objects`. - .. _sphinx substitutions: diff --git a/doc/email-notifications.rst b/doc/email-notifications.rst index dbb96f1cf88..2af8bb16bb4 100644 --- a/doc/email-notifications.rst +++ b/doc/email-notifications.rst @@ -1,7 +1,7 @@ .. _email-notifications: =================== -Email Notifications +Email notifications =================== CKAN can send email notifications to users, for example when a user has new diff --git a/doc/filestore.rst b/doc/filestore.rst index 498626dbec0..f57057ebd97 100644 --- a/doc/filestore.rst +++ b/doc/filestore.rst @@ -1,172 +1,139 @@ ========================== -FileStore and File Uploads +FileStore and file uploads ========================== -CKAN allows users to upload files directly to file storage either on the local -file system or to online 'cloud' storage like Amazon S3 or Google Storage. The -uploaded files will be stored in the configured location. +When enabled, CKAN's FileStore allows users to upload data files to CKAN +resources, and to upload logo images for groups and organizations. Users will +see an upload button when creating or updating a resource, group or +organization. -------------------------------------------- -Setup the FileStore with Local File Storage -------------------------------------------- +.. versionadded:: 2.2 + Uploading logo images for groups and organizations was added in CKAN 2.2. -To setup CKAN's FileStore with local file storage: +.. versionchanged:: 2.2 + Previous versions of CKAN used to allow uploads to remote cloud hosting but + we have simplified this to only allow local file uploads (see + :ref:`filestore_21_to_22_migration` for details on how to migrate). This is + to give CKAN more control over the files and make access control possible. -1. Create the directory where CKAN will store uploaded files: +.. seealso:: - .. parsed-literal:: + :ref:`datapusher` - sudo mkdir -p |storage_dir| + Resource files linked-to from CKAN or uploaded to CKAN's FileStore can + also be pushed into CKAN's DataStore, which then enables data previews and + a data API for the resources. -2. Add the following lines to your CKAN config file, after the ``[app:main]`` - line: - .. parsed-literal:: +------------------ +Setup file uploads +------------------ - ofs.impl = pairtree - ofs.storage_dir = |storage_dir| +To setup CKAN's FileStore with local file storage: -3. Set the permissions of the ``storage_dir``. For example if you're running - CKAN with Apache, then Apache's user (``www-data`` on Ubuntu) must have - read, write and execute permissions for the ``storage_dir``: +1. Create the directory where CKAN will store uploaded files: .. parsed-literal:: - sudo chown www-data |storage_dir| - sudo chmod u+rwx |storage_dir| + sudo mkdir -p |storage_path| -4. Make sure you've set :ref:`ckan.site_url` in your config file. - -5. Restart your web server, for example to restart Apache: +2. Add the following line to your CKAN config file, after the ``[app:main]`` + line: .. parsed-literal:: - |reload_apache| - - --------------------------------------- -Setup the FileStore with Cloud Storage --------------------------------------- - -Important: you must install boto library for cloud storage to function:: + ckan.storage_path = |storage_path| - pip install boto +3. Set the permissions of your :ref:`ckan.storage_path` directory. + For example if you're running CKAN with Apache, then Apache's user + (``www-data`` on Ubuntu) must have read, write and execute permissions for + the :ref:`ckan.storage_path`: -In your config for google:: - - ## OFS configuration - ofs.impl = google - ofs.gs_access_key_id = GOOG.... - ofs.gs_secret_access_key = .... + .. parsed-literal:: -For S3:: + sudo chown www-data |storage_path| + sudo chmod u+rwx |storage_path| - ## OFS configuration - ofs.impl = s3 - ofs.aws_access_key_id = .... - ofs.aws_secret_access_key = .... +4. Restart your web server, for example to restart Apache: + .. parsed-literal:: ------------------------ -FileStore Web Interface ------------------------ + |reload_apache| -Upload of files to storage is integrated directly into the the Dataset creation -and editing system with files being associated to Resources. ------------- FileStore API ------------- -CKAN's FileStore API lets you upload files to CKAN's -:doc:`FileStore `. If you're looking for an example, -`ckanclient `_ contains -`Python code for uploading a file to CKAN using the FileStore API `_. - - -FileStore Metadata API -====================== - -The API is located at:: - - /api/storage/metadata/{label} - -It supports the following methods: - -* GET will return the metadata -* POST will add/update metadata -* PUT will replace metadata - -Metadata is a json dict of key values which for POST and PUT should be send in body of request. - -A standard response looks like:: - - { - "_bucket": "ckannet-storage", - _content_length: 1074 - _format: "text/plain" - _label: "/file/8630a664-0ae4-485f-99c2-126dae95653a" - _last_modified: "Fri, 29 Apr 2011 19:27:31 GMT" - _location: "some-location" - _owner: null - uploaded-by: "bff737ef-b84c-4519-914c-b4285144d8e6" - } +.. versionchanged:: 2.2 + The FileStore API was redesigned for CKAN 2.2. + The previous API has been deprecated. -Note that values with '_' are standard OFS metadata and are mostly read-only -- _format i.e. content-type can be set). +Files can be uploaded to the FileStore using the +:py:func:`~ckan.logic.action.create.resource_create` and +:py:func:`~ckan.logic.action.update.resource_update` action API +functions. You can post multipart/form-data to the API and the key, value +pairs will treated as as if they are a JSON object. +The extra key ``upload`` is used to actually post the binary data. +For example, to create a new CKAN resource and upload a file to it using +`curl `_: -FileStore Form Authentication API -================================= +.. parsed-literal:: -Provides credentials for doing operations on storage directly from a client -(using web form style POSTs). + curl -H'Authorization: your-api-key' 'http://yourhost/api/action/resource_create' --form upload=@filetoupload --form package_id=my_dataset -The API is located at:: +(Curl automatically sends a ``multipart-form-data`` heading with you use the +``--form`` option.) - /api/storage/auth/form/{label} +To create a new resource and upload a file to it using the Python library +`requests `_: -Provide fields for a form upload to storage including authentication:: +.. parsed-literal:: - :param label: label. - :return: json-encoded dictionary with action parameter and fields list. + import requests + requests.post('http://0.0.0.0:5000/api/action/resource_create', + data={"package_id":"my_dataset}", + headers={"X-CKAN-API-Key": "21a47217-6d7b-49c5-88f9-72ebd5a4d4bb"}, + files=[('upload', file('/path/to/file/to/upload.csv'))]) +(Requests automatically sends a ``multipart-form-data`` heading when you use the +``files=`` parameter.) -FileStore Request Authentication API -==================================== +To overwrite an uploaded file with a new version of the file, post to the +:py:func:`~ckan.logic.action.update.resource_update` action and use the +``upload`` field:: -Provides credentials for doing operations on storage directly from a client. + curl -H'Authorization: your-api-key' 'http://yourhost/api/action/resource_update' --form upload=@newfiletoupload --form id=resourceid -.. warning:: This API is currently disabled and will likely be deprecated. - Use the form authentication instead. +To replace an uploaded file with a link to a file at a remote URL, use the +``clear_upload`` field:: -The API is at:: + curl -H'Authorization: your-api-key' 'http://yourhost/api/action/resource_update' --form url=http://expample.com --form clear_upload=true --form id=resourceid - /api/storage/auth/request/{label} -Provide authentication information for a request so a client can -interact with backend storage directly:: +.. _filestore_21_to_22_migration: - :param label: label. - :param kwargs: sent either via query string for GET or json-encoded - dict for POST). Interpreted as http headers for request plus an - (optional) method parameter (being the HTTP method). +-------------------------- +Migration from 2.1 to 2.2 +-------------------------- - Examples of headers are: +If you are using pairtree local file storage then you can keep your current settings +without issue. The pairtree and new storage can live side by side but you are still +encouraged to migrate. If you change your config options to the ones specified in +this docs you will need to run the migration below. - Content-Type - Content-Encoding (optional) - Content-Length - Content-MD5 - Expect (should be '100-Continue') +If you are running remote storage then all previous links will still be accessible +but if you want to move the remote storage documents to the local storage you will +run the migration also. - :return: is a json hash containing various attributes including a - headers dictionary containing an Authorization field which is good for - 15m. +In order to migrate make sure your CKAN instance is running as the script will +request the data from the instance using APIs. You need to run the following +on the command line to do the migration:: ---------------------- -DataStore Integration ---------------------- + paster db migrate-filestore -It is also possible to have uploaded files (if of a suitable format) stored in -the DataStore which will then provides an API to the data. See :ref:`datastorer` for more details. +This may take a long time especially if you have a lot of files remotely. +If the remote hosting goes down or the job is interrupted it is save to run it again +and it will try all the unsuccessful ones again. diff --git a/doc/getting-started.rst b/doc/getting-started.rst index a3b2269ce44..3191f340903 100644 --- a/doc/getting-started.rst +++ b/doc/getting-started.rst @@ -1,17 +1,17 @@ =============== -Getting Started +Getting started =============== Once you've finished :doc:`installing CKAN `, this section will walk you through getting started with your new CKAN website, including -creating a CKAN sysadmin user and some test data, and the basics of -administering and configuring your CKAN site. +creating a CKAN sysadmin user, some test data, and the basics of configuring +your CKAN site. .. _create-admin-user: ------------------------ -Creating a Sysadmin User +Creating a sysadmin user ------------------------ You have to use CKAN's command line interface to create your first sysadmin @@ -46,10 +46,12 @@ For a list of other command line commands for managing sysadmins, run:: paster sysadmin --help +Read the :doc:`sysadmin-guide` to learn what you can do as a CKAN sysadmin. + .. _create-test-data: ------------------ -Creating Test Data +Creating test data ------------------ It can be handy to have some test data to start with, to quickly check that @@ -67,26 +69,9 @@ For a list of other command line commands for creating tests data, run:: paster create-test-data --help - --------------- -The Admin Page --------------- - -If you login with a sysadmin account (see :ref:`create-admin-user`) you'll see -a link in the top-right corner of the site to the administration page: - -.. image :: images/admin-page.png - :align: center - :alt: The admin page - -From the admin page you can set various CKAN options including the site title -and logo, the about page text, the intro text on the front page, custom CSS, -etc. - - ---------------- -The Config File ---------------- +----------- +Config file +----------- All of the options that can be set in the admin page and many more can be set by editing CKAN's config file. By default, the config file is located at diff --git a/doc/images/add_dataset_1.jpg b/doc/images/add_dataset_1.jpg new file mode 100644 index 00000000000..2fa85f65d84 Binary files /dev/null and b/doc/images/add_dataset_1.jpg differ diff --git a/doc/images/add_dataset_2.jpg b/doc/images/add_dataset_2.jpg new file mode 100644 index 00000000000..4bf4718a1d7 Binary files /dev/null and b/doc/images/add_dataset_2.jpg differ diff --git a/doc/images/add_dataset_3.jpg b/doc/images/add_dataset_3.jpg new file mode 100644 index 00000000000..4f46594a1b6 Binary files /dev/null and b/doc/images/add_dataset_3.jpg differ diff --git a/doc/images/admin-page.png b/doc/images/admin-page.png deleted file mode 100644 index c4131fc7d26..00000000000 Binary files a/doc/images/admin-page.png and /dev/null differ diff --git a/doc/images/ckan_logo_box.png b/doc/images/ckan_logo_box.png deleted file mode 100644 index b759085234a..00000000000 Binary files a/doc/images/ckan_logo_box.png and /dev/null differ diff --git a/doc/images/create_organization.jpg b/doc/images/create_organization.jpg new file mode 100644 index 00000000000..c4ec1a776e9 Binary files /dev/null and b/doc/images/create_organization.jpg differ diff --git a/doc/images/customize_look_and_feel.jpg b/doc/images/customize_look_and_feel.jpg new file mode 100644 index 00000000000..a461c1c6b99 Binary files /dev/null and b/doc/images/customize_look_and_feel.jpg differ diff --git a/doc/images/edit_dataset.jpg b/doc/images/edit_dataset.jpg new file mode 100644 index 00000000000..907f6c55f44 Binary files /dev/null and b/doc/images/edit_dataset.jpg differ diff --git a/doc/images/exploring_datasets.jpg b/doc/images/exploring_datasets.jpg new file mode 100644 index 00000000000..e7f9b400ffa Binary files /dev/null and b/doc/images/exploring_datasets.jpg differ diff --git a/doc/images/manage_news_feed.jpg b/doc/images/manage_news_feed.jpg new file mode 100644 index 00000000000..e3785187a92 Binary files /dev/null and b/doc/images/manage_news_feed.jpg differ diff --git a/doc/images/manage_organization.jpg b/doc/images/manage_organization.jpg new file mode 100644 index 00000000000..7a636b1c0bc Binary files /dev/null and b/doc/images/manage_organization.jpg differ diff --git a/doc/images/manage_user_profile.jpg b/doc/images/manage_user_profile.jpg new file mode 100644 index 00000000000..59d01012e9f Binary files /dev/null and b/doc/images/manage_user_profile.jpg differ diff --git a/doc/images/manage_users.jpg b/doc/images/manage_users.jpg new file mode 100644 index 00000000000..0be4a650dc2 Binary files /dev/null and b/doc/images/manage_users.jpg differ diff --git a/doc/images/move_dataset_between_organizations.jpg b/doc/images/move_dataset_between_organizations.jpg new file mode 100644 index 00000000000..edcce1efa62 Binary files /dev/null and b/doc/images/move_dataset_between_organizations.jpg differ diff --git a/doc/images/register_account.jpg b/doc/images/register_account.jpg new file mode 100644 index 00000000000..b912f2dde4d Binary files /dev/null and b/doc/images/register_account.jpg differ diff --git a/doc/images/search_the_site.jpg b/doc/images/search_the_site.jpg new file mode 100644 index 00000000000..637d109336c Binary files /dev/null and b/doc/images/search_the_site.jpg differ diff --git a/doc/index.rst b/doc/index.rst index d5be74de521..d5de7ff3c4f 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -11,8 +11,12 @@ For high-level information on what CKAN is, see the These docs are ordered with the beginner documentation first, and the most advanced documentation last: +* :doc:`user-guide` and :doc:`sysadmin-guide` are what most people will need. + They explain the CKAN functionalities that **users** and **sysadmins** will + encounter when using its web interface. + * :doc:`installing` and :doc:`getting-started` walk you through installing CKAN - and setting up your own CKAN site with some basic customizations. These docs + and setting up your own CKAN site with some basic customizations. These are for **sysadmins** who're new to CKAN and want go get started with it. * The sections under :doc:`features` cover setting up and using CKAN features, @@ -30,19 +34,3 @@ advanced documentation last: covering CKAN's config file options and the differences between CKAN releases. ----- - -.. toctree:: - :maxdepth: 2 - - installing - upgrading - getting-started - features - extensions/index - theming - api - contributing - test - configuration - changelog diff --git a/doc/install-from-package.rst b/doc/install-from-package.rst index 0c1a3a27eb5..8447b3bf1af 100644 --- a/doc/install-from-package.rst +++ b/doc/install-from-package.rst @@ -1,4 +1,5 @@ -Installing CKAN from Package +============================ +Installing CKAN from package ============================ This section describes how to install CKAN from package. This is the quickest @@ -8,7 +9,8 @@ development, you should follow :doc:`install-from-source` instead. .. _run-package-installer: -1. Install the CKAN Package +--------------------------- +1. Install the CKAN package --------------------------- On your Ubuntu 12.04 system, open a terminal and run these commands to install @@ -50,6 +52,7 @@ CKAN: sudo service apache2 restart +------------------------------ 2. Install PostgreSQL and Solr ------------------------------ @@ -67,8 +70,7 @@ CKAN: * Not starting jetty - edit /etc/default/jetty and change NO_START to be 0 (or comment it out). -#. Follow the instructions in :ref:`solr-single` or :ref:`solr-multi-core` to - setup |solr|. +#. Follow the instructions in :ref:`setting up solr` to setup |solr|. #. Follow the instructions in :ref:`postgres-setup` to setup |postgres|, then edit the :ref:`sqlalchemy.url` option in your |production.ini| file and @@ -84,6 +86,7 @@ CKAN: #. Also optionally, you can enable file uploads by following the instructions in :doc:`filestore`. +--------------- 3. You're done! --------------- diff --git a/doc/install-from-source.rst b/doc/install-from-source.rst index e94a818721a..f34449f9105 100644 --- a/doc/install-from-source.rst +++ b/doc/install-from-source.rst @@ -1,4 +1,5 @@ -Installing CKAN from Source +=========================== +Installing CKAN from source =========================== This section describes how to install CKAN from source. Although @@ -12,8 +13,9 @@ wiki page. From source is also the right installation method for developers who want to work on CKAN. +-------------------------------- 1. Install the required packages -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-------------------------------- If you're using a Debian-based operating system (such as Ubuntu) install the required packages with this command:: @@ -34,16 +36,17 @@ libpq `The C programmer's interface to PostgreSQL `_ virtualenv `The virtual Python environment builder `_ Git `A distributed version control system `_ -Apache Solr `A search platform `_ -Jetty `An HTTP server `_ (used for Solr) +Apache Solr `A search platform `_ +Jetty `An HTTP server `_ (used for Solr). OpenJDK 6 JDK `The Java Development Kit `_ ===================== =============================================== .. _install-ckan-in-virtualenv: +------------------------------------------------- 2. Install CKAN into a Python virtual environment -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +------------------------------------------------- .. tip:: @@ -122,8 +125,9 @@ d. Deactivate and reactivate your virtualenv, to make sure you're using the .. _postgres-setup: +------------------------------ 3. Setup a PostgreSQL database -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +------------------------------ List existing databases:: @@ -149,9 +153,9 @@ database user you just created: sudo -u postgres createdb -O |database_user| |database| -E utf-8 - +---------------------------- 4. Create a CKAN config file -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +---------------------------- Create a directory to contain the site's config files: @@ -196,24 +200,86 @@ site_id ckan.site_id = default +.. _setting up solr: + +------------- 5. Setup Solr -~~~~~~~~~~~~~ +------------- -Follow the instructions in :ref:`solr-single` or :ref:`solr-multi-core` to -setup Solr, then change the ``solr_url`` option in your CKAN config file to -point to your Solr server, for example:: +CKAN uses Solr_ as its search platform, and uses a customized Solr schema file +that takes into account CKAN's specific search needs. Now that we have CKAN +installed, we need to install and configure Solr. - solr_url=http://127.0.0.1:8983/solr +.. _Solr: http://lucene.apache.org/solr/ + +.. note:: + + These instructions explain how to setup |solr| with a single core. + If you want multiple applications, or multiple instances of CKAN, to share + the same |solr| server then you probably want a multi-core |solr| setup + instead. See :doc:`/appendices/solr-multicore`. + +.. note:: + + These instructions explain how to deploy Solr using the Jetty web + server, but CKAN doesn't require Jetty - you can deploy Solr to another web + server, such as Tomcat, if that's convenient on your operating system. + +#. Edit the Jetty configuration file (``/etc/default/jetty``) and change the + following variables:: + + NO_START=0 # (line 4) + JETTY_HOST=127.0.0.1 # (line 15) + JETTY_PORT=8983 # (line 18) + + Start the Jetty server:: + + sudo service jetty start + + You should now see a welcome page from Solr if you open + http://localhost:8983/solr/ in your web browser (replace localhost with + your server address if needed). + + .. note:: + + If you get the message ``Could not start Jetty servlet engine because no + Java Development Kit (JDK) was found.`` then you will have to edit the + ``JAVA_HOME`` setting in ``/etc/default/jetty`` to point to your machine's + JDK install location. For example:: + + JAVA_HOME=/usr/lib/jvm/java-6-openjdk-amd64/ + + or:: + + JAVA_HOME=/usr/lib/jvm/java-6-openjdk-i386/ + +#. Replace the default ``schema.xml`` file with a symlink to the CKAN schema + file included in the sources. + + .. parsed-literal:: + + sudo mv /etc/solr/conf/schema.xml /etc/solr/conf/schema.xml.bak + sudo ln -s |virtualenv|/src/ckan/ckan/config/solr/schema.xml /etc/solr/conf/schema.xml + + Now restart Solr: + + .. parsed-literal:: -.. toctree:: - :hidden: + |restart_solr| - solr-setup + and check that Solr is running by opening http://localhost:8983/solr/. + + +#. Finally, change the :ref:`solr_url` setting in your CKAN config file to + point to your Solr server, for example:: + + solr_url=http://127.0.0.1:8983/solr .. _postgres-init: +------------------------- 6. Create database tables -~~~~~~~~~~~~~~~~~~~~~~~~~ +------------------------- Now that you have a configuration file that has the correct settings for your database, you can create the database tables: @@ -231,8 +297,9 @@ You should see ``Initialising DB: SUCCESS``. ``sqlalchemy.url`` option in your CKAN configuration file properly. See `4. Create a CKAN config file`_. +----------------------- 7. Set up the DataStore -~~~~~~~~~~~~~~~~~~~~~~~ +----------------------- .. note :: Setting up the DataStore is optional. However, if you do skip this step, @@ -243,8 +310,9 @@ Follow the instructions in :doc:`datastore` to create the required databases and users, set the right permissions and set the appropriate values in your CKAN config file. +---------------------- 8. Link to ``who.ini`` -~~~~~~~~~~~~~~~~~~~~~~ +---------------------- ``who.ini`` (the Repoze.who configuration file) needs to be accessible in the same directory as your CKAN config file, so create a symlink to it: @@ -253,8 +321,9 @@ same directory as your CKAN config file, so create a symlink to it: ln -s |virtualenv|/src/ckan/who.ini |config_dir|/who.ini +--------------- 9. You're done! -~~~~~~~~~~~~~~~ +--------------- You can now use the Paste development server to serve CKAN from the command-line. This is a simple and lightweight way to serve CKAN that is @@ -277,3 +346,46 @@ Now that you've installed CKAN, you should: as Apache or Nginx. See :doc:`deployment`. * Begin using and customizing your site, see :doc:`/getting-started`. + + +------------------------------ +Source install troubleshooting +------------------------------ + +.. _solr troubleshooting: + +Solr setup troubleshooting +========================== + +Solr requests and errors are logged in the web server log files. + +* For Jetty servers, the log files are:: + + /var/log/jetty/.stderrout.log + +* For Tomcat servers, they're:: + + /var/log/tomcat6/catalina..log + +Unable to find a javac compiler +------------------------------- + +If when running Solr it says: + + Unable to find a javac compiler; com.sun.tools.javac.Main is not on the classpath. Perhaps JAVA_HOME does not point to the JDK. + +See the note in :ref:`setting up solr` about ``JAVA_HOME``. +Alternatively you may not have installed the JDK. +Check by seeing if ``javac`` is installed:: + + which javac + +If ``javac`` isn't installed, do:: + + sudo apt-get install openjdk-6-jdk + +and then restart Solr: + +.. parsed-literal:: + + |restart_solr| diff --git a/doc/legacy-api.rst b/doc/legacy-api.rst index b10841fc976..7ab990dc371 100644 --- a/doc/legacy-api.rst +++ b/doc/legacy-api.rst @@ -434,12 +434,6 @@ front-end javascript. All Util APIs are read-only. The response format is JSON. Javascript calls may want to use the JSONP formatting. -.. Note:: - - Some CKAN deployments have the API deployed at a different domain to the main CKAN website. To make sure that the AJAX calls in the Web UI work, you'll need to configue the ckan.api_url. e.g.:: - - ckan.api_url = http://api.example.com/ - dataset autocomplete ```````````````````` diff --git a/doc/release-process.rst b/doc/release-process.rst index 2d0046fbd05..4b427d2cf03 100644 --- a/doc/release-process.rst +++ b/doc/release-process.rst @@ -12,7 +12,7 @@ Doing a Beta Release Beta releases are branched off a certain point in master and will eventually become stable releases. -1. Create a new release branch:: +#. Create a new release branch:: git checkout -b release-v1.8 @@ -26,11 +26,22 @@ become stable releases. You will probably need to update the same file on master to increase the version number, in this case ending with an *a* (for alpha). -2. During the beta process, all changes to the release branch must be +#. Check if there have been changes in the |solr| schema at + ``ckan/config/solr/schema.xml``, and if so: + + * Update the ``version`` attribute of the ``schema`` with the current CKAN + version:: + + + + * Update the ``SUPPORTED_SCHEMA_VERSIONS`` list in + ``ckan/lib/search/__init__.py`` + +#. During the beta process, all changes to the release branch must be cherry-picked from master (or merged from special branches based on the release branch if the original branch was not compatible). -3. As in the master branch, if some commits involving CSS changes are +#. As in the master branch, if some commits involving CSS changes are cherry-picked from master, the less compiling command needs to be run on the release branch. This will update the ``main.css`` file:: @@ -40,10 +51,10 @@ become stable releases. There will be a final front-end build before the actual release. -4. The beta staging site (http://beta.ckan.org, currently on s084) should be +#. The beta staging site (http://beta.ckan.org, currently on s084) should be updated regularly to allow user testing. -5. Once the translation freeze is in place (ie no changes to the translatable +#. Once the translation freeze is in place (ie no changes to the translatable strings are allowed), strings need to be extracted and uploaded to Transifex_: diff --git a/doc/solr-setup.rst b/doc/solr-setup.rst deleted file mode 100644 index 422ce76f5c5..00000000000 --- a/doc/solr-setup.rst +++ /dev/null @@ -1,266 +0,0 @@ -.. _setting up solr: - -=============== -Setting up Solr -=============== - -CKAN uses Solr_ as search platform. This document describes different -topics related with the deployment and management of Solr from a CKAN -point of view. - -.. _Solr: http://lucene.apache.org/solr/ - -CKAN uses customized schema files that take into account its specific -search needs. Different versions of the schema file are found in -``ckan/ckan/config/solr`` - -The following instructions apply to Ubuntu 12.04 (Precise), the recommended -platform by the CKAN team. Other versions or distributions may need -slightly different instructions. - -.. note:: - - The following instructions deploy Solr on the Jetty server, but CKAN does - not require it, you can use Tomcat if that is more convenient on your - distribution. - - -.. _solr-single: - -Single Solr instance --------------------- - -In this case, there will be only one Solr endpoint that uses a single schema file. -This can be useful for a Solr server used by only a single CKAN instance, or -different instances that share the same schema version. - -To install Solr (if you are following the :doc:`install-from-source` or -:doc:`install-from-package` instructions, you already did this):: - - sudo apt-get install solr-jetty openjdk-6-jdk - -You'll need to edit the Jetty configuration file (``/etc/default/jetty``) with -the suitable values:: - - NO_START=0 # (line 4) - JETTY_HOST=127.0.0.1 # (line 15) - JETTY_PORT=8983 # (line 18) - -Start the Jetty server:: - - sudo service jetty start - -You should see welcome page from Solr when visiting (replace localhost with your -server address if needed):: - - http://localhost:8983/solr/ - -and the admin site:: - - http://localhost:8983/solr/admin - -.. note:: - - If you get the message ``Could not start Jetty servlet engine because no - Java Development Kit (JDK) was found.`` then you will have to edit the - ``JAVA_HOME`` setting in ``/etc/default/jetty`` to point to your machine's - JDK install location. For example:: - - JAVA_HOME=/usr/lib/jvm/java-6-openjdk-amd64/ - - or:: - - JAVA_HOME=/usr/lib/jvm/java-6-openjdk-i386/ - -This default setup will use the following locations in your file system: - -``/usr/share/solr`` - Solr home, with a symlink pointing to the configuration dir in ``/etc``. -``/etc/solr/conf`` - Solr configuration files. The more important ones are ``schema.xml`` and - ``solrconfig.xml``. -``/var/lib/solr/data/`` - This is where the index files are physically stored. - -You will obviously need to replace the default ``schema.xml`` file with the -CKAN one. To do so, create a symbolic link to the schema file in the config -folder. Use the latest schema version supported by the CKAN version you are -installing (it will generally be the highest one): - -.. parsed-literal:: - - sudo mv /etc/solr/conf/schema.xml /etc/solr/conf/schema.xml.bak - sudo ln -s |virtualenv|/src/ckan/ckan/config/solr/schema-2.0.xml /etc/solr/conf/schema.xml - -Now restart jetty:: - - sudo service jetty restart - -And check that Solr is running by browsing http://localhost:8983/solr/ which should offer the Administration link. - - -.. _solr-multi-core: - -Multiple Solr cores -------------------- - -Solr can also be set up to have multiple configurations and indexes on the -same instance. This is specially useful when you want other applications than CKAN -or different CKAN versions to use the same Solr instance. The different cores -will have different paths in the Solr server URL:: - - http://localhost:8983/solr/ckan-schema-1.2 # Used by CKAN up to 1.5 - http://localhost:8983/solr/ckan-schema-1.3 # Used by CKAN 1.5.1 - http://localhost:8983/solr/ckan-schema-1.4 # Used by CKAN 1.7 - http://localhost:8983/solr/ckan-schema-2.0 # Used by CKAN 2.0 - http://localhost:8983/solr/some-other-site # Used by another site - -To set up a multicore Solr instance, repeat the steps on the previous section -to configure a single Solr instance. - -Create a ``solr.xml`` file in ``/usr/share/solr``. This file will list the -different cores, and allows also to define some configuration options. -This is how cores are defined:: - - - - - - - - - - - - -Adjust the names to match the CKAN schema versions you want to run. - -Note that each core is configured with its own data directory. This is really important to prevent conflicts between cores. Now create them like this:: - - sudo -u jetty mkdir /var/lib/solr/data/ckan-schema-1.4 - sudo -u jetty mkdir /var/lib/solr/data/ckan-schema-2.0 - -For each core, we will create a folder in ``/usr/share/solr``, -with a symbolic link to a specific configuration folder in ``/etc/solr/``. -Copy the existing conf directory to the core directory and link it from -the home dir like this:: - - sudo mkdir /etc/solr/ckan-schema-1.4 - sudo mv /etc/solr/conf /etc/solr/ckan-schema-1.4/ - - sudo mkdir /usr/share/solr/ckan-schema-1.4 - sudo ln -s /etc/solr/ckan-schema-1.4/conf /usr/share/solr/ckan-schema-1.4/conf - -Now configure the core to use the data directory you have created. Edit ``/etc/solr/ckan-schema-1.4/conf/solrconfig.xml`` and change the ```` to this variable:: - - ${dataDir} - -This will ensure the core uses the data directory specified earlier in ``solr.xml``. - -Once you have your first core configured, to create new ones, you just need to -add them to the ``solr.xml`` file and copy the existing configuration dir:: - - sudo mkdir /etc/solr/ckan-schema-2.0 - sudo cp -R /etc/solr/ckan-schema-1.4/conf /etc/solr/ckan-schema-2.0 - - sudo mkdir /usr/share/solr/ckan-schema-2.0 - sudo ln -s /etc/solr/ckan-schema-2.0/conf /usr/share/solr/ckan-schema-2.0/conf - -Remember to ensure that each core points to the correct CKAN schema. To link -each schema to the relevant file on the CKAN source use the following: - -.. parsed-literal:: - - sudo rm /etc/solr/ckan-schema-2.0/conf/schema.xml - sudo ln -s |virtualenv|/src/ckan/ckan/config/solr/schema-2.0.xml /etc/solr/ckan-schema-2.0/conf/schema.xml - -Now restart jetty:: - - sudo service jetty restart - -And check that Solr is listing all the cores when browsing http://localhost:8983/solr/ - -Troubleshooting ---------------- - -Solr requests and errors are logged in the web server log. - -* For jetty servers, they are located in:: - - /var/log/jetty/.stderrout.log - -* For Tomcat servers, they are located in:: - - /var/log/tomcat6/catalina..log - -Some problems that can be found during the install: - -* When setting up a multi-core Solr instance, no cores are shown when visiting the - Solr index page, and the admin interface returns a 404 error. - - Check the web server error log if you can find an error similar to this one:: - - WARNING: [iatiregistry.org] Solr index directory '/usr/share/solr/iatiregistry.org/data/index' doesn't exist. Creating new index... - 07-Dec-2011 18:06:33 org.apache.solr.common.SolrException log - SEVERE: java.lang.RuntimeException: Cannot create directory: /usr/share/solr/iatiregistry.org/data/index - [...] - - The ``dataDir`` is not properly configured. With our setup the data directory should - be under ``/var/lib/solr/data``. Make sure that you defined the correct ``dataDir`` - in the ``solr.xml`` file and that in the ``solrconfig.xml`` file you have the - following configuration option:: - - ${dataDir} - -* When running Solr it says ``Unable to find a javac compiler; com.sun.tools.javac.Main is not on the classpath. Perhaps JAVA_HOME does not point to the JDK.`` - - See the note above about ``JAVA_HOME``. Alternatively you may not have installed the JDK. Check by seeing if javac is installed:: - - which javac - - If it isn't do:: - - sudo apt-get install openjdk-6-jdk - - and restart Solr. - -Handling changes in the CKAN schema ------------------------------------ - -At some point, changes in new CKAN versions will mean modifications in the schema -to support new features or fix defects. These changes won't be always backwards -compatible, so some changes in the Solr servers will need to be performed. - -If a CKAN instance is using a Solr server for itself, the schema can just be updated -on the Solr server and the index rebuilt. But if a Solr server is shared between -different CKAN instances, there may be conflicts if the schema is updated. - -CKAN uses the following conventions for supporting different schemas: - -* If needed, create a new schema file when releasing a new version of CKAN (i.e if there - are two or more different modifications in the schema file between CKAN releases, - only one new schema file is created). - -* Keep different versions of the Solr schema in the CKAN source, with a naming convention, - `schema-.xml`:: - - ckan/config/solr/schema-1.2.xml - ckan/config/solr/schema-1.3.xml - ckan/config/solr/schema-2.0.xml - -* Each new version of the schema file must include its version in the main `` tag:: - - - -* Solr servers used by more than one CKAN instance should be configured as multiple cores, - and provide a core for each schema version needed. The cores should be named following the - convention `schema-`, e.g.:: - - http:///solr/ckan-schema-1.4/ - http:///solr/ckan-schema-2.0/ - -When a new version of the schema becomes available, a new core is created, with a link to the -latest schema.xml file in the CKAN source. That way, CKAN instances that use an older version -of the schema can still point to the core that uses it, while more recent versions can point -to the latest one. When old versions of CKAN are updated, they only need to change their -:ref:`solr_url` setting to point to the suitable Solr core. diff --git a/doc/sysadmin-guide.rst b/doc/sysadmin-guide.rst new file mode 100644 index 00000000000..9f46b1c890e --- /dev/null +++ b/doc/sysadmin-guide.rst @@ -0,0 +1,148 @@ +============== +Sysadmin guide +============== + +This guide covers the administration features of CKAN 2.0, such as managing +users and datasets. These features are available via the web user interface to +a user with sysadmin rights. The guide assumes familiarity with the +:doc:`user-guide`. + +Certain administration tasks are not available through the web UI but need +access to the server where CKAN is installed. These include the range of +configuration options using the site's "config" file, documented in +:doc:`configuration`, and those available via the :doc:`paster`. + +.. warning:: + + A sysadmin user can access and edit any organizations, view and change user + details, and permanently delete datasets. You should carefully consider who has + access to a sysadmin account on your CKAN system. + +--------------------------- +Creating a sysadmin account +--------------------------- + +Normally, a sysadmin account is created as part of the process of setting up +CKAN. If one does not already exist, you will need to create a sysadmin user, +or give sysadmin rights to an existing user. To do this requires access to the +server; see :ref:`create-admin-user` for details. If another organization is hosting +CKAN, you will need to ask them to create a sysadmin user. + +Adding more sysadmin accounts is done in the same way. It cannot be done via +the web UI. + +------------------------- +Customizing look and feel +------------------------- + +Some simple customizations to customize the 'look and feel' of your CKAN site +are available via the UI, at ``http:///ckan-admin/config/``. + +.. image:: images/customize_look_and_feel.jpg + +Here you can edit the following: + +Site title + This title is used in the HTML of pages served by CKAN (which may + be displayed on your browser's title bar). For example if your site title is + "CKAN Demo", the home page is called "Welcome - CKAN Demo". The site title is + also used in a few other places, e.g. in the alt-text of the main site logo. + +Style + Choose one of five colour schemes for the default theme. + +Site tag line + This is not used in CKAN's current default themes, but may be used in + future. + +Site tag logo + A URL for the site logo, used at the head of every page of CKAN. + +About + Text that appears on the "about" page, ``http://<my-ckan-url>/about``. You + can use `Markdown`_ here. If it is left empty, a standard text describing CKAN + will appear. + +.. _Markdown: http://daringfireball.net/projects/markdown/basics + +Intro text + This text appears prominently on the home page of your site. + +Custom CSS + For simple style changes, you can add CSS code here which will be added to + the ``<head>`` of every page. + +----------------------------------- +Managing organizations and datasets +----------------------------------- + +A sysadmin user has full access to user accounts, organizations and datasets. +For example, you have access to every organization as if you were a member of +that organization. Thus most management operations are done in exactly the same +way as in the normal web interface. + +For example, to add or delete users to an organization, change a user's role in +the organization, delete the organization or edit its description, etc, visit +the organization's home page. You will see the 'Admin' button as if you were a +member of the organization. You can use this to perform all organization admin +functions. For details, see the :doc:`user-guide`. + +Similarly, to edit, update or delete a dataset, go to the dataset page and use +the 'Edit' button. As an admin user you can see all datasets including those +that are private to an organization. They will show up when doing a dataset +search. + +Moving a dataset between organizations +====================================== + +To move a dataset between organizations, visit the dataset's Edit page. Choose +the appropriate entry from the "organization" drop-down list, and press "Save". + +.. image:: images/move_dataset_between_organizations.jpg + +----------------------------- +Permanently deleting datasets +----------------------------- + +A dataset which has been deleted is not permanently removed from CKAN; it is +simply marked as 'deleted' and will no longer show up in search, etc. The +dataset's URL cannot be re-used for a new dataset. + +To permanently delete ("purge") a dataset: + +* Navigate to the dataset's "Edit" page, and delete it. +* Visit ``http://<my-ckan-url>/ckan-admin/trash/``. + +This page shows all deleted datasets and allows you to delete them permanently. + +.. warning:: + + This operation cannot be reversed! + +.. note:: + + At present, it is not possible to purge organizations or groups using the + web UI. This can only be done with access to the server, by directly deleting + them from CKAN's database. + +-------------- +Managing users +-------------- + +To find a user's profile, go to ``http://<my-ckan-url>/user/``. You can search +for users in the search box provided. + +You can search by any part of the user profile, including their e-mail address. +This is useful if, for example, a user has forgotten their user ID. For +non-sysadmin users, the search on this page will only match public parts of the +profile, so they cannot search by e-mail address. + +On their user profile, you will see an "Edit" button. CKAN displays the user +settings page. You can change any settings for the user, including their +username, name and password. + +.. image:: images/manage_users.jpg + +.. note:: + + At present, it is not possible to delete users. diff --git a/doc/test.rst b/doc/test.rst index cdd9b928e0a..f9d2f6bc805 100644 --- a/doc/test.rst +++ b/doc/test.rst @@ -65,6 +65,15 @@ The speed of the PostgreSQL tests can be improved by running PostgreSQL in memory and turning off durability, as described `in the PostgreSQL documentation <http://www.postgresql.org/docs/9.0/static/non-durability.html>`_. +By default the tests will keep the database between test runs. If you wish to +drop and reinitialize the database before the run you can use the ``reset-db`` +option:: + + nosetests --ckan --reset-db --with-pylons=test-core.ini ckan + +If you are have the ``ckan-migration`` option on the tests will reset the +reset the database before the test run. + .. _migrationtesting: diff --git a/doc/upgrade-package-to-minor-release.rst b/doc/upgrade-package-to-minor-release.rst index cf2f5fe7335..c7754352589 100644 --- a/doc/upgrade-package-to-minor-release.rst +++ b/doc/upgrade-package-to-minor-release.rst @@ -74,22 +74,7 @@ respectively. command. #. If there have been changes in the Solr schema (check the :doc:`changelog` - to find out) you need to update your Solr schema symlink. - - When :ref:`setting up solr` you created a symlink - ``/etc/solr/conf/schema.xml`` linking to a CKAN Solr schema file such as - |virtualenv|/src/ckan/ckan/config/solr/schema-2.0.xml. This symlink - should be updated to point to the latest schema file in - |virtualenv|/src/ckan/ckan/config/solr/, if it doesn't already. - - For example, to update the symlink: - - .. parsed-literal:: - - sudo rm /etc/solr/conf/schema.xml - sudo ln -s |virtualenv|/src/ckan/ckan/config/solr/schema-2.0.xml /etc/solr/conf/schema.xml - - You will need to restart Jetty for the changes to take effect: + to find out) you need to restart Jetty for the changes to take effect: .. parsed-literal:: diff --git a/doc/upgrade-source.rst b/doc/upgrade-source.rst index 539b96dcb62..82fac09ed5f 100644 --- a/doc/upgrade-source.rst +++ b/doc/upgrade-source.rst @@ -43,23 +43,8 @@ CKAN release you're upgrading to: python setup.py develop -#. If you are upgrading to a new :ref:`major release <releases>` you need to - update your Solr schema symlink. - - When :ref:`setting up solr` you created a symlink - ``/etc/solr/conf/schema.xml`` linking to a CKAN Solr schema file such as - |virtualenv|/src/ckan/ckan/config/solr/schema-2.0.xml. This symlink - should be updated to point to the latest schema file in - |virtualenv|/src/ckan/ckan/config/solr/, if it doesn't already. - - For example, to update the symlink: - - .. parsed-literal:: - - sudo rm /etc/solr/conf/schema.xml - sudo ln -s |virtualenv|/src/ckan/ckan/config/solr/schema-2.0.xml /etc/solr/conf/schema.xml - - You will need to restart Jetty for the changes to take effect: +#. If there have been changes in the Solr schema (check the :doc:`changelog` + to find out) you need to restart Jetty for the changes to take effect: .. parsed-literal:: diff --git a/doc/upgrading-dependencies.rst b/doc/upgrading-dependencies.rst new file mode 100644 index 00000000000..6d55201d7fb --- /dev/null +++ b/doc/upgrading-dependencies.rst @@ -0,0 +1,62 @@ +-------------------------- +Upgrading the dependencies +-------------------------- + +The Python modules that CKAN depends on are pinned to specific versions, so we +can guarantee that whenever anyone installs CKAN, they'll always get the same +versions of the Python modules in their virtual environment. + +Our dependencies are defined in three files: + +requirements.in + This file is only used to create a new version of the ``requirements.txt`` + file when upgrading the dependencies. + Contains our direct dependencies only (not dependencies of dependencies) + with loosely defined versions. For example, ``apachemiddleware>=0.1.1,<0.2``. + +requirements.txt + This is the file that people actually use to install CKAN's dependencies into + their virtualenvs. It contains every dependency, including dependencies of + dependencies, each pinned to a specific version. + For example, ``simplejson==3.3.1``. + +dev-requirements.txt + Contains those dependencies only needed by developers, not needed for + production sites. These are pinned to a specific version. For example, + ``factory-boy==2.1.1``. + +We haven't created a ``dev-requirements.in`` file because we have too few dev +dependencies, we don't update them often, and none of them have a known +incompatible version. + +Steps to upgrade +================ + +These steps will upgrade all of CKAN's dependencies to the latest versions that +work with CKAN: + +#. Create a new virtualenv: ``virtualenv --no-site-packages upgrading`` + +#. Install the requirements with unpinned versions: ``pip install -r + requirements.in`` + +#. Save the new dependencies versions: ``pip freeze > requirements.txt``. We + have to do this before installing the other dependencies so we get only what + was in ``requirements.in`` + +#. Install CKAN: ``python setup.py develop`` + +#. Install the development dependencies: ``pip install -r + dev-requirements.txt`` + +#. Run the tests to make sure everything still works (see :doc:`test`). + + - If not, try to fix the problem. If it's too complicated, pinpoint which + dependency's version broke our tests, find an older version that still + works, and add it to ``requirements.in`` (i.e., if ``python-dateutil`` + 2.0.0 broke CKAN, you'd add ``python-dateutil>=1.5.0,<2.0.0``). Go back to + step 1. + +#. Navigate a bit on CKAN to make sure the tests didn't miss anything. Review + the dependencies changes and their changelogs. If everything seems fine, go + ahead and make a pull request (see :ref:`making a pull request`). diff --git a/doc/user-guide.rst b/doc/user-guide.rst new file mode 100644 index 00000000000..e7ab33d4f66 --- /dev/null +++ b/doc/user-guide.rst @@ -0,0 +1,520 @@ +========== +User guide +========== + +This user guide covers using CKAN's web interface to organize, publish and find +data. CKAN also has a powerful API (machine interface), which makes it easy to +develop extensions and links with other information systems. The API is +documented in :doc:`api`. + +Some web UI features relating to site administration are available only to +users with sysadmin status, and are documented in :doc:`sysadmin-guide`. + +------------- +What is CKAN? +------------- + +CKAN is a tool for making open data websites. (Think of a content management +system like WordPress - but for data, instead of pages and blog posts.) It +helps you manage and publish collections of data. It is used by national and +local governments, research institutions, and other organizations who collect a +lot of data. + +Once your data is published, users can use its faceted search features to +browse and find the data they need, and preview it using maps, graphs and +tables - whether they are developers, journalists, researchers, NGOs, citizens, +or even your own staff. + +Datasets and resources +====================== + +For CKAN purposes, data is published in units called "datasets". A dataset is a +parcel of data - for example, it could be the crime statistics for a region, +the spending figures for a government department, or temperature readings from +various weather stations. When users search for data, the search results they +see will be individual datasets. + +A dataset contains two things: + +* Information or "metadata" about the data. For example, the title and + publisher, date, what formats it is available in, what license it is released + under, etc. + +* A number of "resources", which hold the data itself. CKAN does not mind what + format the data is in. A resource can be a CSV or Excel spreadsheet, XML file, + PDF document, image file, linked data in RDF format, etc. CKAN can store the + resource internally, or store it simply as a link, the resource itself being + elsewhere on the web. A dataset can contain any number of resources. For + example, different resources might contain the data for different years, or + they might contain the same data in different formats. + +Users, organizations and authorization +====================================== + +CKAN users can register user accounts and log in. Normally (depending on the +site setup), login is not needed to search for and find data, but is needed for +all publishing functions: datasets can be created, edited, etc by users with +the appropriate permissions. + +Normally, each dataset is owned by an "organization". A CKAN instance can have +any number of organizations. For example, if CKAN is being used as a data +portal by a national government, the organizations might be different +government departments, each of which publishes data. Each organization can +have its own workflow and authorizations, allowing it to manage its own +publishing process. + +An organization's administrators can add add individual users to it, with +different roles depending on the level of authorization needed. A user in an +organization can create a dataset owned by that organization. In the default +setup, this dataset is initially private, and visible only to other users in +the same organization. When it is ready for publication, it can be published at +the press of a button. This may require a higher authorization level within the +organization. + +Datasets cannot normally be created except within organizations. It is +possible, however, to set up CKAN to allow datasets not owned by any +organization. Such datasets can be edited by any logged-in user, creating the +possibility of a wiki-like datahub. + +.. note:: + + The user guide covers all the main features of the web user interface (UI). + In practice, depending on how the site is configured, some of these functions + may be slightly different or unavailable. For example, in an official CKAN + instance in a production setting, the site administrator will probably have + made it impossible for users to create new organizations via the UI. You can + try out all the features described at http://demo.ckan.org. + +---------- +Using CKAN +---------- + +Registering and logging in +========================== + +.. note:: + + Registration is needed for most publishing features and for personalization + features, such as "following" datasets. It is not needed to search for and + download data. + +To create a user ID, use the "Register" link at the top of any page. CKAN will +ask for the following: + +* *Username* -- choose a username using only letters, numbers, - and _ characters. + For example, "jbloggs" or "joe_bloggs93". + +* *Full name* -- to be displayed on your user profile + +* *E-mail address* -- this will not be visible to other users + +* *Password* -- enter the same password in both boxes + +.. image:: images/register_account.jpg + +If there are problems with any of the fields, CKAN will tell you the problem +and enable you to correct it. When the fields are filled in correctly, CKAN +will create your user account and automatically log you in. + +.. note:: + + It is perfectly possible to have more than one user account attached to the + same e-mail address. For this reason, choose a username you will remember, as + you will need it when logging in. + +Features for publishers +======================= + +.. _adding_a_new_dataset: + +Adding a new dataset +-------------------- + +.. note:: + + You may need to be a member of an organization in order to add and edit + datsets. See the section :ref:`creating_an_organization` below. On + http://demo.ckan.org, you can add a dataset without being in an organization, + but dataset features relating to authorization and organizations will not be + available. + +**Step 1**. You can access CKAN's "Create dataset" screen in two ways. + +a) Select the "Datasets" link at the top of any page. From this, above the + search box, select the "Add Dataset" button. + +b) Alternatively, select the "organizations" link at the top of a page. Now + select the page for the organization that should own your new dataset. Provided + that you are a member of this organization, you can now select the "Add + Dataset" button above the search box. + +**Step 2**. CKAN will ask for the following information about your data. (The +actual data will be added in step 4.) + +* *Title* -- this title will be unique across CKAN, so make it brief but specific. + E.g. "UK population density by region" is better than "Population figures". + +* *Description* -- You can add a longer description of the dataset here, including + information such as where the data is from and any information that people will + need to know when using the data. + +* *Tags* -- here you may add tags that will help people find the data and link it + with other related data. Examples could be "population", "crime", "East + Anglia". Hit the <return> key between tags. If you enter a tag wrongly, you can + use its delete button to remove it before saving the dataset. + +* *License* -- it is important to include license information so that people know + how they can use the data. This field should be a drop-down box. If you need to + use a license not on the list, contact your site administrator. + +* *Organization* - If you are a member of any organizations, this drop-down will + enable you to choose which one should own the dataset. Ensure the default + chosen is the correct one before you proceed. (Probably most users will be in + only one organization. If this is you, CKAN will have chosen your organization + by default and you need not do anything.) + +.. image:: images/add_dataset_1.jpg + +.. note:: + + By default, the only required field on this page is the title. However, it + is good practice to include, at the minimum, a short description and, if + possible, the license information. You should ensure that you choose the + correct organization for the dataset, since at present, this cannot be changed + later. You can edit or add to the other fields later. + +**Step 3**. When you have filled in the information on this page, select the "Next: Add +Data" button. (Alternatively select "Cancel" to discard the information filled +in.) + +**Step 4**. CKAN will display the "Add data" screen. + +.. image:: images/add_dataset_2.jpg + +This is where you will add one or more "resources" which contain the data for +this dataset. Choose a file or link for your data resource and select the +appropriate choice at the top of the screen: + +* If you are giving CKAN a link to the data, like + ``http://example.com/mydata.csv``, then select "Link to a file" or "Link to an + API". (If you don't know what an API is, you don't need to worry about this + option - select "Link to a file".) + +* If the data to be added to CKAN is in a file on your computer, select "Upload + a file". CKAN will give you a file browser to select it. + +**Step 5**. Add the other information on the page. CKAN does not require this +information, but it is good practice to add it: + +* *Name* -- a name for this resource, e.g. "Population density 2011, CSV". + Different resources in the dataset should have different names. + +* *Description* -- a short description of the resource. + +* *Format* -- the file format of the resource, e.g. CSV (comma-separated + values), XLS, JSON, PDF, etc. + +**Step 6**. If you have more resources (files or links) to add to the dataset, select +the "Save & add another" button. When you have finished adding resources, +select "Next: Additional Info". + +**Step 7**. CKAN displays the "Additional data" screen. + +* *Visibility* -- a ``Public`` dataset is public and can be seen by any user of the + site. A ``Private`` dataset can only be seen by members of the organization owning + the dataset and will not show up in searches by other users. + +* *Author* -- The name of the person or organization responsible for producing + the data. + +* *Author e-mail* -- an e-mail address for the author, to which queries about + the data should be sent. + +* *Maintainer / maintainer e-mail* -- If necessary, details for a second person + responsible for the data. + +* *Custom fields* -- If you want the dataset to have another field, you can add + the field name and value here. E.g. "Year of publication". Note that if there + is an extra field that is needed for a large number of datasets, you should + talk to your site administrator about changing the default schema and dataset + forms. + +* *Group* -- Moderated collection of datasets. You can add the dataset to + an existing group here. + +.. image:: images/add_dataset_3.jpg + +.. note:: + + Everything on this screen is optional, but you should ensure the + "Visibility" is set correctly. It is also good practice to ensure an Author is + named. + +**Step 8**. Select the 'Finish' button. CKAN creates the dataset and shows you +the result. You have finished! + +You should be able to find your dataset by typing the title, or some relevant +words from the description, into the search box on any page in your CKAN +instance. For more information about finding data, see the section +:ref:`finding_data`. + + +Editing a dataset +----------------- + +You can edit the dataset you have created, or any dataset owned by an +organization that you are a member of. (If a dataset is not owned by any +organization, then any registered user can edit it.) + +#. Go to the dataset's page. You can find it by entering the title in the search box on any page. + +#. Select the "Edit" button, which you should see above the dataset title. + +#. CKAN displays the "Edit dataset" screen. You can edit any of the fields + (Title, Description, Dataset, etc), change the visibility (Private/Public), and + add or delete tags or custom fields. For details of these fields, see + :ref:`adding_a_new_dataset`. + +#. When you have finished, select the "Update dataset" button to save your changes. + +.. image:: images/edit_dataset.jpg + + +Adding, deleting and editing resources +-------------------------------------- + +#. Go to the dataset's "Edit dataset" page (steps 1-2 above). + +#. In the left sidebar, there are options for editing resources. You can select + an existing resource (to edit or delete it), or select "Add new resource". + +#. You can edit the information about the resource or change the linked or + uploaded file. For details, see steps 4-5 of "Adding a new resource", above. + +#. When you have finished editing, select the button marked "Update resource" + (or "Add", for a new resource) to save your changes. Alternatively, to delete + the resource, select the "Delete resource" button. + + +Deleting a dataset +------------------ + +#. Go to the dataset's "Edit dataset" page (see "Editing a dataset", above). + +#. Select the "Delete" button. + +#. CKAN displays a confirmation dialog box. To complete deletion of the + dataset, select "Confirm". + +.. note:: + + The "Deleted" dataset is not completely deleted. It is hidden, so it does + not show up in any searches, etc. However, by visiting the URL for the + dataset's page, it can still be seen (by users with appropriate authorization), + and "undeleted" if necessary. If it is important to completely delete the + dataset, contact your site administrator. + + +.. _creating_an_organization: + +Creating an organization +------------------------ + +In general, each dataset is owned by one organization. Each organization +includes certain users, who can modify its datasets and create new ones. +Different levels of access privileges within an organization can be given to +users, e.g. some users might be able to edit datasets but not create new ones, +or to create datasets but not publish them. Each organization has a home page, +where users can find some information about the organization and search within +its datasets. This allows different data publishing departments, bodies, etc to +control their own publishing policies. + +To create an organization: + +#. Select the "Organizations" link at the top of any page. + +#. Select the "Add Organization" button below the search box. + +#. CKAN displays the "Create an Organization" page. + +#. Enter a name for the organization, and, optionally, a description and image + URL for the organization's home page. + +#. Select the "Create Organization" button. CKAN creates your organization and + displays its home page. Initially, of course, the organization has no datasets. + +.. image:: images/create_organization.jpg + +You can now change the access privileges to the organization for other users - +see :ref:`managing_an_organization` below. You can also create datasets owned by the +organization; see :ref:`adding_a_new_dataset` above. + +.. note:: + + Depending on how CKAN is set up, you may not be authorized to create new + organizations. In this case, if you need a new organization, you will need to + contact your site administrator. + + +.. _managing_an_organization: + +Managing an organization +------------------------ + +When you create an organization, CKAN automatically makes you its "Admin". +From the organization's page you should see an "Admin" button above the search +box. When you select this, CKAN displays the organization admin page. This page +has two tabs: + +* *Info* -- Here you can edit the information supplied when the organization + was created (title, description and image). + +* *Members* -- Here you can add, remove and change access roles for different + users in the organization. Note: you will need to know their username on CKAN. + +.. image:: images/manage_organization.jpg + +By default CKAN allows members of organizations with three roles: + +* *Member* -- can see the organization's private datasets + +* *Editor* -- can edit and publish datasets + +* *Admin* -- can add, remove and change roles for organization members + +.. _finding_data: + +Finding data +============ + +Searching the site +------------------ + +To find datasets in CKAN, type any combination of search words (e.g. "health", +"transport", etc) in the search box on any page. CKAN displays the first page +of results for your search. You can: + +* View more pages of results + +* Repeat the search, altering some terms + +* Restrict the search to datasets with particular tags, data formats, etc using + the filters in the left-hand column + +If there are a large number of results, the filters can be very helpful, since +you can combine filters, selectively adding and removing them, and modify and +repeat the search with existing filters still in place. + +If datasets are tagged by geographical area, it is also possible to run CKAN +with an extension which allows searching and filtering of datasets by selecting +an area on a map. + +.. image:: images/search_the_site.jpg + + +Searching within an organization +-------------------------------- + +If you want to look for data owned by a particular organization, you can search +within that organization from its home page in CKAN. + +#. Select the "Organizations" link at the top of any page. + +#. Select the organization you are interested in. CKAN will display your + organization's home page. + +#. Type your search query in the main search box on the page. + +CKAN will return search results as normal, but restricted to datasets from the +organization. + +If the organization is of interest, you can opt to be notified of changes to it +(such as new datasets and modifications to datasets) by using the "Follow" +button on the organization page. See the section :ref:`managing_your_news_feed` +below. You must have a user account and be logged in to use this feature. + + +Exploring datasets +------------------ + +When you have found a dataset you are interested and selected it, CKAN will +display the dataset page. This includes + +* The name, description, and other information about the dataset + +* Links to and brief descriptions of each of the resources + +.. image:: images/exploring_datasets.jpg + +The resource descriptions link to a dedicated page for each resource. This +resource page includes information about the resource, and enables it to be +downloaded. Many types of resource can also be previewed directly on the +resource page. .CSV and .XLS spreadsheets are previewed in a grid view, with +map and graph views also available if the data is suitable. The resource page +will also preview resources if they are common image types, PDF, or HTML. + +The dataset page also has two other tabs: + +* *Activity stream* -- see the history of recent changes to the dataset + +* *Related items* -- see any links to web pages related to this dataset, or add + your own links. + +If the dataset is of interest, you can opt to be notified of changes to it by +using the "Follow" button on the dataset page. See the section +:ref:`managing_your_news_feed` below. You must have a user account and be +logged in to use this feature. + +Personalization +=============== + +CKAN provides features to personalize the experience of both searching for and +publishing data. You must be logged in to use these features. + +.. _managing_your_news_feed: + +Managing your news feed +----------------------- + +At the top of any page, select the dashboard symbol (next to your name). CKAN +displays your News feed. This shows changes to datasets that you follow, and +any changed or new datasets in organizations that you follow. The number by the +dashboard symbol shows the number of new notifications in your News feed since +you last looked at it. As well as datasets and organizations, it is possible to +follow individual users (to be notified of changes that they make to datasets). + +.. image:: images/manage_news_feed.jpg + +If you want to stop following a dataset (or organization or user), go to the +dataset's page (e.g. by selecting a link to it in your News feed) and select +the "Unfollow" button. + +Managing your user profile +-------------------------- + +You can change the information that CKAN holds about you, including what other +users see about you by editing your user profile. (Users are most likely to see +your profile when you edit a dataset or upload data to an organization that +they are following.) To do this, select the gearwheel symbol at the top of any +page. + +.. image:: images/manage_user_profile.jpg + +CKAN displays the user settings page. Here you can change: + +* Your username + +* Your full name + +* Your e-mail address (note: this is not displayed to other users) + +* Your profile text - an optional short paragraph about yourself + +* Your password + +Make the changes you require and then select the "Update Profile" button. + +.. note:: + + If you change your username, CKAN will log you out. You will need to log + back in using your new username. diff --git a/test-core.ini b/test-core.ini index ac493b5461f..74e35eb5ef0 100644 --- a/test-core.ini +++ b/test-core.ini @@ -33,6 +33,7 @@ solr_url = http://127.0.0.1:8983/solr ckan.auth.user_create_organizations = true ckan.auth.user_create_groups = true ckan.auth.create_user_via_api = false +ckan.auth.create_user_via_web = true ckan.auth.create_dataset_if_not_in_organization = true ckan.auth.anon_create_dataset = false ckan.auth.user_delete_groups=true @@ -82,7 +83,7 @@ smtp.mail_from = info@test.ckan.net ckan.locale_default = en ckan.locale_order = en pt_BR ja it cs_CZ ca es fr el sv sr sr@latin no sk fi ru de pl nl bg ko_KR hu sa sl lv -ckan.locales_filtered_out = +ckan.locales_filtered_out = ckan.datastore.enabled = 1