From 205592741cec8a7f367fe19499dfe8fff9183fe3 Mon Sep 17 00:00:00 2001 From: Alexandru Artimon Date: Mon, 27 Oct 2014 15:21:09 +0200 Subject: [PATCH 01/31] fixes #1566 - Search/Data List: Change style of dataset/indicator titles - set the default link color as well --- .../ckanext/hdx_theme/fanstatic/css/header.css | 10 +++++++++- .../ckanext/hdx_theme/fanstatic/css/search.css | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css index 32e2681cb2..a30396afc8 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css +++ b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css @@ -256,6 +256,12 @@ } /* END Header */ +/* Default link style */ + a, a:hover, a:focus { + color: #007ce0; + } +/* END Default link style */ + /* HDX Version display */ .logo #hdxVersion{ color: #888888; @@ -1345,6 +1351,8 @@ a, a:hover, a:focus{ } /* END Style indicator graph */ + + /* Style Show-more */ /span.is-more a.more-link, .more-link { background-color: transparent; @@ -1353,4 +1361,4 @@ a, a:hover, a:focus{ margin-left: 0; padding: 0; } -/* END Style Show-more */ \ No newline at end of file +/* END Style Show-more */ diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/search.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/search.css index d211ae2489..269ad896b2 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/search.css +++ b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/search.css @@ -46,7 +46,7 @@ font-family: 'Source Sans Pro', sans-serif; font-weight: 400; font-size: 14px; - color: #000000; + color: #007ce0; letter-spacing: 0.01em; line-height: 1; } From 450be0e5a9cdaaefdcc4ce5513c0ba382f292081 Mon Sep 17 00:00:00 2001 From: Alexandru Artimon Date: Mon, 27 Oct 2014 16:55:29 +0200 Subject: [PATCH 02/31] fixes #1564 - Search/Data List: change "Preview" to "Hide Preview" when graph is shown - added functionality to swap callbacks and texts on the link - added animation when hiding graph - created set of callbacks to fix the case when a user opens a graph then opens another one without hiding the first one - fix animation on the above case --- .../hdx_theme/fanstatic/indicator_graph.js | 37 ++++++++++++++++--- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/indicator_graph.js b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/indicator_graph.js index b5308870ec..7b0e97594d 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/indicator_graph.js +++ b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/indicator_graph.js @@ -12,7 +12,7 @@ ckan.module('hdx-indicator-graph', function ($, _) { if (!this.options.click_only) this._init(); else - $(this.el).click(this._onClick); + $(this.el).click(this._onClickPreview); }, c3_chart: null, filteredLocations: null, @@ -35,7 +35,7 @@ ckan.module('hdx-indicator-graph', function ($, _) { _period_type_default: "LATEST_YEAR_BY_COUNTRY", _continuous_location_initialize: true, _chart_initialized: false, - _onClick: function(){ + _onClickPreview: function(){ /** * Reset Module state */ @@ -45,13 +45,38 @@ ckan.module('hdx-indicator-graph', function ($, _) { * Click Only callback */ var container = this.ckanModule.options.container; - const cont = $("#" + container); - cont.slideUp(100); - cont.dequeue(); + var cont = $("#" + container); + if (cont.length > 0){ + $(cont.context.previewLink).trigger("click", $.proxy(this.ckanModule._onClickPreviewGenerate, this)); + } + else{ + $.proxy(this.ckanModule._onClickPreviewGenerate, this)(); + } + }, + _onClickPreviewGenerate: function (){ + var container = this.ckanModule.options.container; var parent = $(this).parents(this.ckanModule.options.parent_selector); - cont.remove(); parent.append('
'); + var cont = $("#" + container); + cont.context.previewLink = this; this.ckanModule._init(); + $(this).text("Hide preview"); + $(this).unbind("click"); + + $(this).click(this.ckanModule._onClickHidePreview); + }, + _onClickHidePreview: function (context, callback){ + $(this).text("Preview"); + $(this).unbind("click"); + $(this).click(this.ckanModule._onClickPreview); + + var container = $("#"+this.ckanModule.options.container); + container.slideUp(300, function (){ + container.remove(); + if (callback){ + callback(); + } + }); }, _init: function(){ /** From 3748838690eb18010f1d758484a5e31c003b1536 Mon Sep 17 00:00:00 2001 From: Alexandru Artimon Date: Tue, 28 Oct 2014 15:05:22 +0200 Subject: [PATCH 03/31] fixes #1517 - Main Nav changes to accomodate "Feedback" button - removed "Contact" from main menu - added Feedback button - changed new dataset button caption to "Share data" - fixed secondary menu positioning --- .../hdx_theme/fanstatic/css/header.css | 28 ++++++++++++++----- .../hdx_theme/templates/header-new.html | 6 ++-- .../ckanext/hdx_theme/templates/header.html | 6 ++-- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css index a30396afc8..7c321fe985 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css +++ b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css @@ -189,8 +189,6 @@ .newHeader .content .navbar nav li.submitData{ background-color: #f2645a; border-radius: 6px; - position: relative; - top: -16px; width: 200px; margin-right: 20px; } @@ -199,14 +197,17 @@ margin: 0; } - .newHeader .content .navbar nav .pull-right li.dropdown{ + .newHeader .content .navbar .pull-right { position: relative; - top: -12px; + top: -15px; + } + + .newHeader .content .navbar nav .pull-right li.dropdown{ + margin-top: 5px; } .newHeader .content .navbar nav .pull-right li.newLogin{ - position: relative; - top: -12px; + margin-top: 5px; } .navbar .nav > li.newLogin > a.btn:hover, .navbar .nav > li.newLogin > a.btn:focus{ @@ -1354,7 +1355,7 @@ a, a:hover, a:focus{ /* Style Show-more */ -/span.is-more a.more-link, .more-link { +span.is-more a.more-link, .more-link { background-color: transparent; border: 0 none; border-radius: 0; @@ -1362,3 +1363,16 @@ a, a:hover, a:focus{ padding: 0; } /* END Style Show-more */ + + +/* Feedback Button */ + #feedback-button { + background-color: #888888; + color: #ffffff; + line-height: 20px; + text-shadow: none; + border-radius: 20px; + margin-top: 10px; + margin-right: 15px; + } +/* END Feedback Button */ \ No newline at end of file diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/header-new.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/header-new.html index ef81dcf9e1..92a516a2da 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/header-new.html +++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/header-new.html @@ -28,7 +28,6 @@

  • {{ _("Countries")}}
  • {{ _('Organizations') }}
  • {{ _('Blog') }}
    • -
  • {{ _('Contact') }}
  • {{ _('About') }}
    • {% endblock %} @@ -36,9 +35,12 @@

      +
    • + Feedback +
    • - {{ _("Submit data") }} + {{ _("Share data") }}
      • From 90f4306fe57de60cdbbb6b6acfcb67e8d8bb4095 Mon Sep 17 00:00:00 2001 From: Alexandru Artimon Date: Tue, 28 Oct 2014 15:20:27 +0200 Subject: [PATCH 04/31] fixes #1455 - Indicator Detail>Country Selection: handle appearance of long country names more nicely --- .../ckanext/hdx_theme/fanstatic/indicator_graph.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/indicator_graph.js b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/indicator_graph.js index 7b0e97594d..9ebd355e71 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/indicator_graph.js +++ b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/indicator_graph.js @@ -285,9 +285,13 @@ ckan.module('hdx-indicator-graph', function ($, _) { var code = data[i]['locationCode']; var id = "sidePanelLocation" + i; var checked = ""; + var fullname = name; + if (name.length > 28){ + name = name.substring(0, 25) + "..."; + } if (this.filteredLocations[code]) checked = "checked"; - locationContainer.append("
      • "); + locationContainer.append("
      • "); var element = $("#"+id); element.data("ckanModule", this); } From 1906b15fdc8335478e2da15d13120c00e7ecd526 Mon Sep 17 00:00:00 2001 From: Alexandru Artimon Date: Tue, 28 Oct 2014 15:38:02 +0200 Subject: [PATCH 05/31] fixes #1582 - Dataset/Indicator Detail: panel separator line length behavior - after fixing the line length, had to remove the margin top 60px of the Continuous Browsing - CB has mTop15 and both primary and secondary containers now have a padding-bottom of 45px; --- .../ckanext/hdx_theme/fanstatic/css/header.css | 3 +++ .../ckanext/hdx_theme/fanstatic/css/indicator.css | 8 +++++++- .../templates/indicator/snippets/continuous_browsing.html | 2 +- .../ckanext/hdx_theme/templates/page-new.html | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css index 7c321fe985..2605b39134 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css +++ b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css @@ -541,6 +541,9 @@ .mTop20{ margin-top: 20px; } + .mTop15{ + margin-top: 20px; + } .mTop8{ margin-top: 8px; } diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/indicator.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/indicator.css index 6f09118d4f..ebd7d5e178 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/indicator.css +++ b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/indicator.css @@ -8,8 +8,14 @@ /* activity stream */ + .wrapper-primary{ + border-left: 1px solid #dddddd; + margin-left: -1px; + padding-bottom: 45px; + } .wrapper-secondary{ - border-right: 1px solid #dddddd; + border-right: 1px solid #dddddd; + padding-bottom: 45px; } .activity { diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/indicator/snippets/continuous_browsing.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/indicator/snippets/continuous_browsing.html index e0bc9d64c2..124d723a28 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/indicator/snippets/continuous_browsing.html +++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/indicator/snippets/continuous_browsing.html @@ -5,7 +5,7 @@ #}
      -
      +
      diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/page-new.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/page-new.html index 65161f126f..ba94c4ed19 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/page-new.html +++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/page-new.html @@ -84,7 +84,7 @@ {{ self.secondary() }}
      {% endif %} -
      +
      {{ self.primary() }}
      {% if self.secondary()|trim != '' and secondary_right_side %} From bce3b60e93b86475c30dfec850a5ddf5ad563bba Mon Sep 17 00:00:00 2001 From: Dan Mihaila Date: Wed, 29 Oct 2014 10:07:34 +0200 Subject: [PATCH 06/31] closes #1576 --- .../organization/snippets/member_item.html | 2 +- .../templates/package/snippets/resource_item.html | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/member_item.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/member_item.html index c1610c86f2..57aa659ed3 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/member_item.html +++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/snippets/member_item.html @@ -34,7 +34,7 @@

      - {% block delete_button_text %} {{ _('Download') }}{% endblock %} + {% block delete_button_text %} {{ _('Delete') }}{% endblock %} {% set confirm_delete_message = _('Are you sure you want to delete this member?') %} diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/snippets/resource_item.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/snippets/resource_item.html index 07bc700857..63642bd63b 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/snippets/resource_item.html +++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/snippets/resource_item.html @@ -20,6 +20,21 @@ {{ _('No description for this resource') }} {% endif %}

      + + {% block resource_item_edit %} + {% if url_is_edit and can_edit %} +
      + {{ _('Edit') }} + {% if res.id and h.check_access('resource_delete', {'id': res.id}) %} + {% set locale = h.dump_json({'content': _('Are you sure you want to delete this resource?')}) %} + + {{ _('Delete Resource') }} + + {% endif %} +
      + {% endif %} + {% endblock %} + {% block resource_item_explore %} {% if not url_is_edit %} {# Adding classes ga-download, ga-preview, and ga-share for easy Google Analytics tracking. PLEASE DO NOT REMOVE #} From 2abadbcb2bbd94acb643e21f9fa265f9e5cad347 Mon Sep 17 00:00:00 2001 From: Dan Mihaila Date: Wed, 29 Oct 2014 12:23:48 +0200 Subject: [PATCH 07/31] closes #1578 --- ckan/controllers/package.py | 85 ++++++------ .../controllers/dataset_controller.py | 30 +++++ .../ckanext/hdx_package/plugin.py | 122 ++++++++++-------- 3 files changed, 142 insertions(+), 95 deletions(-) diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py index 32ce8f69ee..50d430c512 100644 --- a/ckan/controllers/package.py +++ b/ckan/controllers/package.py @@ -148,7 +148,7 @@ def drill_down_url(alternative_url=None, **by): def remove_field(key, value=None, replace=None): return h.remove_url_param(key, value=value, replace=replace, - controller='package', action='search') + controller='package', action='search') c.remove_field = remove_field @@ -222,12 +222,12 @@ def pager_url(q=None, page=None): facets = OrderedDict() default_facet_titles = { - 'organization': _('Organizations'), - 'groups': _('Groups'), - 'tags': _('Tags'), - 'res_format': _('Formats'), - 'license_id': _('Licenses'), - } + 'organization': _('Organizations'), + 'groups': _('Groups'), + 'tags': _('Tags'), + 'res_format': _('Formats'), + 'license_id': _('Licenses'), + } for facet in g.facets: if facet in default_facet_titles: @@ -279,12 +279,12 @@ def pager_url(q=None, page=None): abort(400, _('Parameter "{parameter_name}" is not ' 'an integer').format( parameter_name='_%s_limit' % facet - )) + )) c.search_facets_limits[facet] = limit maintain.deprecate_context_item( - 'facets', - 'Use `c.search_facets` instead.') + 'facets', + 'Use `c.search_facets` instead.') self._setup_template_variables(context, {}, package_type=package_type) @@ -402,7 +402,7 @@ def read(self, id, format='html'): except ckan.lib.render.TemplateNotFound: msg = _("Viewing {package_type} datasets in {format} format is " "not supported (template file {file} not found).".format( - package_type=package_type, format=format, file=template)) + package_type=package_type, format=format, file=template)) abort(404, msg) assert False, "We should never get here" @@ -581,15 +581,18 @@ def resource_edit(self, id, resource_id, data=None, errors=None, pkg_dict = get_action('package_show')(context, {'id': id}) if pkg_dict['state'].startswith('draft'): # dataset has not yet been fully created - resource_dict = get_action('resource_show')(context, {'id': resource_id}) - fields = ['url', 'resource_type', 'format', 'name', 'description', 'id'] + resource_dict = get_action('resource_show')( + context, {'id': resource_id}) + fields = [ + 'url', 'resource_type', 'format', 'name', 'description', 'id'] data = {} for field in fields: data[field] = resource_dict[field] return self.new_resource(id, data=data) # resource is fully created try: - resource_dict = get_action('resource_show')(context, {'id': resource_id}) + resource_dict = get_action('resource_show')( + context, {'id': resource_id}) except NotFound: abort(404, _('Resource not found')) c.pkg_dict = pkg_dict @@ -627,7 +630,7 @@ def new_resource(self, id, data=None, errors=None, error_summary=None): data_provided = False for key, value in data.iteritems(): if ((value or isinstance(value, cgi.FieldStorage)) - and key != 'resource_type'): + and key != 'resource_type'): data_provided = True break @@ -643,7 +646,7 @@ def new_resource(self, id, data=None, errors=None, error_summary=None): abort(401, _('Unauthorized to update dataset')) except NotFound: abort(404, - _('The dataset {id} could not be found.').format(id=id)) + _('The dataset {id} could not be found.').format(id=id)) if not len(data_dict['resources']): # no data so keep on page msg = _('You must add at least one data resource') @@ -675,7 +678,7 @@ def new_resource(self, id, data=None, errors=None, error_summary=None): abort(401, _('Unauthorized to create a resource')) except NotFound: abort(404, - _('The dataset {id} could not be found.').format(id=id)) + _('The dataset {id} could not be found.').format(id=id)) if save_action == 'go-metadata': # go to final stage of add dataset redirect(h.url_for(controller='package', @@ -962,7 +965,8 @@ def _save_new(self, context, package_type=None): id=pkg_dict['name']) redirect(url) - self._form_save_redirect(pkg_dict['name'], 'new', package_type=package_type) + self._form_save_redirect( + pkg_dict['name'], 'new', package_type=package_type) except NotAuthorized: abort(401, _('Unauthorized to read package %s') % '') except NotFound, e: @@ -1013,7 +1017,8 @@ def _save_edit(self, name_or_id, context, package_type=None): c.pkg = context['package'] c.pkg_dict = pkg - self._form_save_redirect(pkg['name'], 'edit', package_type=package_type) + self._form_save_redirect( + pkg['name'], 'edit', package_type=package_type) except NotAuthorized: abort(401, _('Unauthorized to read package %s') % id) except NotFound, e: @@ -1045,7 +1050,8 @@ def _form_save_redirect(self, pkgname, action, package_type=None): url = url.replace('', pkgname) else: if package_type is None or package_type == 'dataset': - url = h.url_for(controller='package', action='read', id=pkgname) + url = h.url_for( + controller='package', action='read', id=pkgname) else: url = h.url_for('{0}_read'.format(package_type), id=pkgname) redirect(url) @@ -1088,7 +1094,8 @@ def delete(self, id): def resource_delete(self, id, resource_id): if 'cancel' in request.params: - h.redirect_to(controller='package', action='resource_edit', resource_id=resource_id, id=id) + h.redirect_to( + controller='package', action='resource_edit', resource_id=resource_id, id=id) context = {'model': model, 'session': model.Session, 'user': c.user or c.author, 'auth_user_obj': c.userobj} @@ -1103,7 +1110,8 @@ def resource_delete(self, id, resource_id): get_action('resource_delete')(context, {'id': resource_id}) h.flash_notice(_('Resource has been deleted.')) h.redirect_to(controller='package', action='read', id=id) - c.resource_dict = get_action('resource_show')(context, {'id': resource_id}) + c.resource_dict = get_action('resource_show')( + context, {'id': resource_id}) c.pkg_id = id except NotAuthorized: abort(401, _('Unauthorized to delete resource %s') % '') @@ -1196,7 +1204,8 @@ def resource_read(self, id, resource_id): c.package['isopen'] = False # TODO: find a nicer way of doing this - c.datastore_api = '%s/api/action' % config.get('ckan.site_url', '').rstrip('/') + c.datastore_api = '%s/api/action' % config.get( + 'ckan.site_url', '').rstrip('/') c.related_count = c.pkg.related_count @@ -1231,11 +1240,12 @@ def resource_download(self, id, resource_id, filename=None): filepath = upload.get_path(rsc['id']) fileapp = paste.fileapp.FileApp(filepath) try: - status, headers, app_iter = request.call_application(fileapp) + status, headers, app_iter = request.call_application(fileapp) except OSError: - abort(404, _('Resource data not found')) + abort(404, _('Resource data not found')) response.headers.update(dict(headers)) - content_type, content_enc = mimetypes.guess_type(rsc.get('url','')) + content_type, content_enc = mimetypes.guess_type( + rsc.get('url', '')) response.headers['Content-Type'] = content_type response.status = status return app_iter @@ -1256,7 +1266,7 @@ def follow(self, id): package_dict['title'])) except ValidationError as e: error_message = (e.extra_msg or e.message or e.error_summary - or e.error_dict) + or e.error_dict) h.flash_error(error_message) except NotAuthorized as e: h.flash_error(e.extra_msg) @@ -1275,7 +1285,7 @@ def unfollow(self, id): package_dict['title'])) except ValidationError as e: error_message = (e.extra_msg or e.message or e.error_summary - or e.error_dict) + or e.error_dict) h.flash_error(error_message) except (NotFound, NotAuthorized) as e: error_message = e.extra_msg or e.message @@ -1292,7 +1302,7 @@ def followers(self, id=None): c.pkg_dict = get_action('package_show')(context, data_dict) c.pkg = context['package'] c.followers = get_action('dataset_follower_list')(context, - {'id': c.pkg_dict['id']}) + {'id': c.pkg_dict['id']}) c.related_count = c.pkg.related_count except NotFound: @@ -1343,19 +1353,17 @@ def groups(self, id): 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', [])) + in c.pkg_dict.get('groups', [])) user_group_ids = set(group['id'] for group - in users_groups) + 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 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) @@ -1373,8 +1381,8 @@ def activity(self, id): c.pkg_dict = get_action('package_show')(context, data_dict) c.pkg = context['package'] c.package_activity_stream = get_action( - 'package_activity_list_html')(context, - {'id': c.pkg_dict['id']}) + 'package_activity_list_html')(context, + {'id': c.pkg_dict['id']}) c.related_count = c.pkg.related_count except NotFound: abort(404, _('Dataset not found')) @@ -1445,7 +1453,8 @@ def _parse_recline_state(self, params): # for data api url - see http://trac.ckan.org/ticket/2639 # fix by relocating this to url attribute which is the default location if 'dataset' in recline_state and 'elasticsearch_url' in recline_state['dataset']: - recline_state['dataset']['url'] = recline_state['dataset']['elasticsearch_url'] + recline_state['dataset']['url'] = recline_state[ + 'dataset']['elasticsearch_url'] # Ensure only the currentView is available # default to grid view if none specified diff --git a/ckanext-hdx_package/ckanext/hdx_package/controllers/dataset_controller.py b/ckanext-hdx_package/ckanext/hdx_package/controllers/dataset_controller.py index 1d305c9a4a..d97988ab05 100644 --- a/ckanext-hdx_package/ckanext/hdx_package/controllers/dataset_controller.py +++ b/ckanext-hdx_package/ckanext/hdx_package/controllers/dataset_controller.py @@ -612,3 +612,33 @@ def _resource_preview(self, data_dict): in datapreview.direct() + datapreview.loadable() or datapreview.get_preview_plugin( data_dict, return_first=True)) + +# copy from package.py:1094 + def resource_delete(self, id, resource_id): + + if 'cancel' in request.params: + h.redirect_to( + controller='package', action='resource_edit', resource_id=resource_id, id=id) + + context = {'model': model, 'session': model.Session, + 'user': c.user or c.author, 'auth_user_obj': c.userobj} + + try: + check_access('package_delete', context, {'id': id}) + except NotAuthorized: + abort(401, _('Unauthorized to delete package %s') % '') + + try: + if request.method == 'POST': + get_action('resource_delete')(context, {'id': resource_id}) + h.flash_notice(_('Resource has been deleted.')) + h.redirect_to(controller='package', action='resources', + id=id) + c.resource_dict = get_action('resource_show')( + context, {'id': resource_id}) + c.pkg_id = id + except NotAuthorized: + abort(401, _('Unauthorized to delete resource %s') % '') + except NotFound: + abort(404, _('Resource not found')) + return render('package/confirm_delete_resource.html') diff --git a/ckanext-hdx_package/ckanext/hdx_package/plugin.py b/ckanext-hdx_package/ckanext/hdx_package/plugin.py index e765b9656a..419429d961 100644 --- a/ckanext-hdx_package/ckanext/hdx_package/plugin.py +++ b/ckanext-hdx_package/ckanext/hdx_package/plugin.py @@ -20,6 +20,7 @@ import ckanext.hdx_package.actions.authorize as authorize import ckanext.hdx_package.helpers.helpers as hdx_helpers + def run_on_startup(): cache_on_startup = config.get('hdx.cache.onstartup', 'true') if 'true' == cache_on_startup: @@ -28,15 +29,16 @@ def run_on_startup(): def _generate_license_list(): - package.Package._license_register = license.LicenseRegister() + package.Package._license_register = license.LicenseRegister() package.Package._license_register.licenses = [ - license.License(hdx_licenses.LicenseCreativeCommonsIntergovernmentalOrgs()), - license.License(license.LicenseCreativeCommonsAttribution()), - license.License(license.LicenseCreativeCommonsAttributionShareAlike()), - license.License(hdx_licenses.LicenseOtherPublicDomainNoRestrictions()), - license.License(hdx_licenses.LicenseHdxMultiple()), - license.License(hdx_licenses.LicenseHdxOther()) - ] + license.License( + hdx_licenses.LicenseCreativeCommonsIntergovernmentalOrgs()), + license.License(license.LicenseCreativeCommonsAttribution()), + license.License(license.LicenseCreativeCommonsAttributionShareAlike()), + license.License(hdx_licenses.LicenseOtherPublicDomainNoRestrictions()), + license.License(hdx_licenses.LicenseHdxMultiple()), + license.License(hdx_licenses.LicenseHdxOther()) + ] def cached_group_list(): @@ -57,23 +59,28 @@ def update_config(self, config): def before_map(self, map): map.connect('storage_file', '/storage/f/{label:.*}', controller='ckanext.hdx_package.controllers.storage_controller:FileDownloadController', - action='file') - map.connect('dataset_preselect','/dataset/preselect', controller='ckanext.hdx_package.controllers.dataset_controller:DatasetController', action='preselect') - map.connect('resource_edit', '/dataset/{id}/resource_edit/{resource_id}', controller='ckanext.hdx_package.controllers.dataset_controller:DatasetController', action='resource_edit', ckan_icon='edit') + action='file') + map.connect('dataset_preselect', '/dataset/preselect', + controller='ckanext.hdx_package.controllers.dataset_controller:DatasetController', action='preselect') + map.connect('resource_edit', '/dataset/{id}/resource_edit/{resource_id}', + controller='ckanext.hdx_package.controllers.dataset_controller:DatasetController', action='resource_edit', ckan_icon='edit') with SubMapper(map, controller='ckanext.hdx_package.controllers.dataset_controller:DatasetController') as m: m.connect('add dataset', '/dataset/new', action='new') + m.connect( + '/dataset/{id}/resource_delete/{resource_id}', action='resource_delete') m.connect('/dataset/{id}.{format}', action='read') m.connect('dataset_read', '/dataset/{id}', action='read', - ckan_icon='sitemap') + ckan_icon='sitemap') m.connect('/dataset/{action}/{id}', - requirements=dict(action='|'.join([ - 'new_metadata', - 'new_resource', + requirements=dict(action='|'.join([ + 'new_metadata', + 'new_resource', ]))) - map.connect('/indicator/{id}', controller='ckanext.hdx_package.controllers.indicator:IndicatorController', action='read') + map.connect( + '/indicator/{id}', controller='ckanext.hdx_package.controllers.indicator:IndicatorController', action='read') return map - + def is_fallback(self): return True @@ -82,29 +89,29 @@ def package_types(self): return [] def _modify_package_schema(self, schema): - + schema.update({ - 'notes': [tk.get_validator('not_empty')], #Notes == description. Makes description required - 'package_creator': [tk.get_validator('not_empty'), - tk.get_converter('convert_to_extras')], - 'groups_list': [vd.groups_not_empty], - 'indicator':[tk.get_validator('ignore_missing'), - tk.get_converter('convert_to_extras')], - 'caveats' : [tk.get_validator('ignore_missing'), - tk.get_converter('convert_to_extras')], - 'dataset_source' : [tk.get_validator('not_empty'), - tk.get_converter('convert_to_extras')], - 'dataset_date' : [tk.get_validator('ignore_missing'), - tk.get_converter('convert_to_extras')], - 'methodology' : [tk.get_validator('ignore_missing'), - tk.get_converter('convert_to_extras')], - 'license_other' : [tk.get_validator('ignore_missing'), - tk.get_converter('convert_to_extras')], - }) + # Notes == description. Makes description required + 'notes': [tk.get_validator('not_empty')], + 'package_creator': [tk.get_validator('not_empty'), + tk.get_converter('convert_to_extras')], + 'groups_list': [vd.groups_not_empty], + 'indicator': [tk.get_validator('ignore_missing'), + tk.get_converter('convert_to_extras')], + 'caveats': [tk.get_validator('ignore_missing'), + tk.get_converter('convert_to_extras')], + 'dataset_source': [tk.get_validator('not_empty'), + tk.get_converter('convert_to_extras')], + 'dataset_date': [tk.get_validator('ignore_missing'), + tk.get_converter('convert_to_extras')], + 'methodology': [tk.get_validator('ignore_missing'), + tk.get_converter('convert_to_extras')], + 'license_other': [tk.get_validator('ignore_missing'), + tk.get_converter('convert_to_extras')], + }) return schema - def create_package_schema(self): schema = super(HDXPackagePlugin, self).create_package_schema() schema = self._modify_package_schema(schema) @@ -118,22 +125,23 @@ def update_package_schema(self): def show_package_schema(self): schema = super(HDXPackagePlugin, self).show_package_schema() schema.update({ - 'notes': [tk.get_validator('not_empty')], #Notes == description. Makes description required + # Notes == description. Makes description required + 'notes': [tk.get_validator('not_empty')], 'package_creator': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_missing')], - 'indicator':[tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_missing')], - 'caveats' : [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_missing')], - 'dataset_source' : [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_missing')], - 'dataset_date' : [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_missing')], - 'methodology' : [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_missing')], - 'license_other' : [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_missing')], - }) + tk.get_validator('ignore_missing')], + 'indicator': [tk.get_converter('convert_from_extras'), + tk.get_validator('ignore_missing')], + 'caveats': [tk.get_converter('convert_from_extras'), + tk.get_validator('ignore_missing')], + 'dataset_source': [tk.get_converter('convert_from_extras'), + tk.get_validator('ignore_missing')], + 'dataset_date': [tk.get_converter('convert_from_extras'), + tk.get_validator('ignore_missing')], + 'methodology': [tk.get_converter('convert_from_extras'), + tk.get_validator('ignore_missing')], + 'license_other': [tk.get_converter('convert_from_extras'), + tk.get_validator('ignore_missing')], + }) return schema def get_helpers(self): @@ -143,12 +151,12 @@ def get_helpers(self): def get_actions(self): from ckanext.hdx_package.helpers import helpers as hdx_actions return { - 'package_update': update.package_update, - 'hdx_get_activity_list': hdx_actions.hdx_get_activity_list, - 'hdx_package_update_metadata': update.hdx_package_update_metadata, - 'tag_autocomplete': hdx_actions.hdx_tag_autocomplete_list, - 'package_create': hdx_actions.package_create - } + 'package_update': update.package_update, + 'hdx_get_activity_list': hdx_actions.hdx_get_activity_list, + 'hdx_package_update_metadata': update.hdx_package_update_metadata, + 'tag_autocomplete': hdx_actions.hdx_tag_autocomplete_list, + 'package_create': hdx_actions.package_create + } def get_auth_functions(self): return {'package_create': authorize.package_create, From a24122e70f0c7ce71fa52f3611524c306ca8a7fb Mon Sep 17 00:00:00 2001 From: Dan Mihaila Date: Wed, 29 Oct 2014 12:52:57 +0200 Subject: [PATCH 08/31] closes #1458 --- who.ini | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) mode change 100644 => 100755 who.ini diff --git a/who.ini b/who.ini old mode 100644 new mode 100755 index 3a04195939..5282e20d9b --- a/who.ini +++ b/who.ini @@ -1,6 +1,7 @@ [plugin:auth_tkt] -use = repoze.who.plugins.auth_tkt:make_plugin -secret = somesecret +use = ckan.config.middleware:ckan_auth_tkt_make_app +# If no secret key is defined here, beaker.session.secret will be used +#secret = somesecret [plugin:friendlyform] use = repoze.who.plugins.friendlyform:FriendlyFormPlugin @@ -56,3 +57,4 @@ plugins = openid friendlyform;browser # basicauth + From d255ed09fa9e56004c4f433d18f7cc35557fc428 Mon Sep 17 00:00:00 2001 From: Dan Mihaila Date: Wed, 29 Oct 2014 13:08:24 +0200 Subject: [PATCH 09/31] closes #1458 --- common-config-ini.txt | 2 +- who.ini | 60 ------------------------------------------- 2 files changed, 1 insertion(+), 61 deletions(-) delete mode 100755 who.ini diff --git a/common-config-ini.txt b/common-config-ini.txt index e59dc0aeb3..44d73b13ab 100644 --- a/common-config-ini.txt +++ b/common-config-ini.txt @@ -29,7 +29,7 @@ beaker.session.key = ckan #!app_instance_uuid = {0b55a427-a808-470f-a341-37abcd46ba1} # repoze.who config -who.config_file = %(here)s/who.ini +who.config_file = %(here)s/ckan/config/who.ini who.log_level = warning who.log_file = %(cache_dir)s/who_log.ini diff --git a/who.ini b/who.ini deleted file mode 100755 index 5282e20d9b..0000000000 --- a/who.ini +++ /dev/null @@ -1,60 +0,0 @@ -[plugin:auth_tkt] -use = ckan.config.middleware:ckan_auth_tkt_make_app -# If no secret key is defined here, beaker.session.secret will be used -#secret = somesecret - -[plugin:friendlyform] -use = repoze.who.plugins.friendlyform:FriendlyFormPlugin -login_form_url= /user/login -login_handler_path = /login_generic -logout_handler_path = /user/logout -rememberer_name = auth_tkt -post_login_url = /user/logged_in -post_logout_url = /user/logged_out - -#[plugin:basicauth] -#use = repoze.who.plugins.basicauth:make_plugin -#realm = 'CKAN' - -[plugin:openid] -use = repoze.who.plugins.openid:make_identification_plugin -store = file -store_file_path = /tmp/sstore -#openid_field = openid -openid_field = openid_identifier -came_from_field = came_from -error_field = error -session_name = beaker.session -login_form_url = /user/login -login_handler_path = /login_openid -logout_handler_path = /user/logout -# important they go via here after login -logged_in_url = /user/logged_in -logged_out_url = /user/logged_out -rememberer_name = auth_tkt -# Not supported without an upgrade to "repoze.who.plugins.openid>=0.5.3" -#ax_optional = nickname=http://axschema.org/namePerson/friendly email=http://schema.openid.net/contact/email fullname=http://axschema.org/namePerson -#sreg_optional = nickname email fullname - -[general] -request_classifier = repoze.who.classifiers:default_request_classifier -# challenge_decider = repoze.who.classifiers:default_challenge_decider -challenge_decider = repoze.who.plugins.openid.classifiers:openid_challenge_decider - -[identifiers] -plugins = - friendlyform;browser - openid - auth_tkt - -[authenticators] -plugins = - ckan.lib.authenticator:OpenIDAuthenticator - ckan.lib.authenticator:UsernamePasswordAuthenticator - -[challengers] -plugins = - openid - friendlyform;browser -# basicauth - From 4d721f9007fe526ea472011e067c32af12ab2a36 Mon Sep 17 00:00:00 2001 From: Dan Mihaila Date: Wed, 29 Oct 2014 13:23:14 +0200 Subject: [PATCH 10/31] #1458 --- test-core.ini.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-core.ini.sample b/test-core.ini.sample index 3d1f31a72f..52f3bcba95 100644 --- a/test-core.ini.sample +++ b/test-core.ini.sample @@ -102,7 +102,7 @@ ckan.tracking_enabled = true beaker.session.key = ckan beaker.session.secret = This_is_a_secret_or_is_it # repoze.who config -who.config_file = %(here)s/who.ini +who.config_file = %(here)s/ckan/config/who.ini who.log_level = warning who.log_file = %(cache_dir)s/who_log.ini From 57c63a7e722ad1fcb4ac9dc31068ea7edcf762ce Mon Sep 17 00:00:00 2001 From: Marianne Bellotti Date: Wed, 29 Oct 2014 10:59:11 -0400 Subject: [PATCH 11/31] making sort by title the default so that we can FINALLY close #1484 --- .../ckanext/hdx_search/tests/test_search.py | 19 ++++++++++++++++++- .../hdx_theme/templates/group/index.html | 2 +- .../templates/organization/index.html | 2 +- .../templates/snippets/search_form.html | 2 +- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ckanext-hdx_search/ckanext/hdx_search/tests/test_search.py b/ckanext-hdx_search/ckanext/hdx_search/tests/test_search.py index 281bb6c38a..715dfe5d9d 100644 --- a/ckanext-hdx_search/ckanext/hdx_search/tests/test_search.py +++ b/ckanext-hdx_search/ckanext/hdx_search/tests/test_search.py @@ -8,6 +8,7 @@ import logging as logging import ckan.lib.helpers as h import ckan.model as model +import ckan.plugins as p import ckanext.hdx_theme.tests.hdx_test_base as hdx_test_base @@ -18,7 +19,11 @@ class TestHDXSearch(hdx_test_base.HdxBaseTest): @classmethod def _load_plugins(cls): - hdx_test_base.load_plugin('hdx_search hdx_theme') + try: + p.load('hdx_search') + except Exception as e: + log.warn('Module already loaded') + log.info(str(e)) def test_search(self): user = model.User.by_name('tester') @@ -70,3 +75,15 @@ def test_package_search(self): 'user': user, 'for_view': True, 'auth_user_obj': user} s = search.package_search(context, data_dict) assert len(s['results']) > 0 + + def test_new_sort_org(self): + org = h.url_for( + controller='organization', action='list') + response = self.app.get(org, params={'sort':'title+asc'}) + assert '200' in response.status + + def test_new_sort_grp(self): + grp = h.url_for( + controller='group', action='list') + response = self.app.get(grp, params={'sort':'title+asc'}) + assert '200' in response.status diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/group/index.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/group/index.html index 42d6cfc21b..feb7993ea0 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/group/index.html +++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/group/index.html @@ -19,7 +19,7 @@ {% block primary_content_inner %}

      {{ _('Groups') }}

      {% block groups_search_form %} - {% set sorting_option = c.sort_by_selected or 'name asc' %} + {% set sorting_option = c.sort_by_selected or 'title asc' %} {% snippet 'snippets/search_form.html', type='group', query=c.q, sorting_selected=sorting_option, count=c.page.item_count, placeholder=_('Search groups...'), show_empty=request.params %} {% endblock %} {% block groups_list %} diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/index.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/index.html index e96b1bac4a..9dce475964 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/index.html +++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/organization/index.html @@ -21,7 +21,7 @@ {% block primary_content_inner %}

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

      {% block organizations_search_form %} - {% set sorting_option = c.sort_by_selected or 'name asc' %} + {% set sorting_option = c.sort_by_selected or 'title asc' %} {% snippet 'snippets/search_form.html', type='organization', query=c.q, sorting_selected=sorting_option, count=c.page.item_count, placeholder=_('Search organisations...'), show_empty=request.params %} {% endblock %} {% block organizations_list %} diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/snippets/search_form.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/snippets/search_form.html index cb6bafded1..87e5831447 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/snippets/search_form.html +++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/snippets/search_form.html @@ -1,7 +1,7 @@ {% import 'macros/form.html' as form %} {% set placeholder = placeholder if placeholder else _('Search...') %} -{% set sorting = sorting if sorting else [(_('Default Sort'), 'name asc'), (_('Name Ascending'), 'title asc'), (_('Name Descending'), 'title desc')] %} +{% set sorting = sorting if sorting else [(_('Name Ascending'), 'title asc'), (_('Name Descending'), 'title desc')] %} {% set search_class = search_class if search_class else 'search-giant' %} {% set is_display_search_input = display_search_input if display_search_input==False else True %} {% set is_dataset = ('dataset' == type) %} From f205799d48c3012d4b758e9d9d9ba8a810fdd9d8 Mon Sep 17 00:00:00 2001 From: Marianne Bellotti Date: Wed, 29 Oct 2014 11:58:00 -0400 Subject: [PATCH 12/31] make url shortener degrade gracefully --- ckanext-hdx_theme/ckanext/hdx_theme/helpers/helpers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/helpers/helpers.py b/ckanext-hdx_theme/ckanext/hdx_theme/helpers/helpers.py index 2e9bcfd388..40b1ce4468 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/helpers/helpers.py +++ b/ckanext-hdx_theme/ckanext/hdx_theme/helpers/helpers.py @@ -350,7 +350,10 @@ def shorten(url): r = requests.post("https://www.googleapis.com/urlshortener/v1/url", data=json.dumps({'longUrl':url}), headers={'content-type':'application/json'}) item = r.json() - return item['id'] + try: + return item['id'] + except: + return url def hdx_follow_button(obj_type, obj_id, **kw): ''' This is a modified version of the ckan core follow_button() helper From 0d568a63afdd5a747887fc092b2a7ad893613e7e Mon Sep 17 00:00:00 2001 From: Alexandru Artimon Date: Thu, 30 Oct 2014 13:03:44 +0200 Subject: [PATCH 13/31] fixes #1517 - changed the style of the feedback button - compatibility change for BS 2.3 - icon is replaced with an img "paperPlane.png" --- .../ckanext/hdx_theme/fanstatic/css/header.css | 10 ++++------ .../public/images/homepage-new/paperPlane.png | Bin 0 -> 757 bytes .../ckanext/hdx_theme/templates/header-new.html | 2 +- .../ckanext/hdx_theme/templates/header.html | 4 +++- 4 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 ckanext-hdx_theme/ckanext/hdx_theme/public/images/homepage-new/paperPlane.png diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css index 2605b39134..cec95d6ac5 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css +++ b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/css/header.css @@ -1370,12 +1370,10 @@ span.is-more a.more-link, .more-link { /* Feedback Button */ #feedback-button { - background-color: #888888; - color: #ffffff; - line-height: 20px; - text-shadow: none; - border-radius: 20px; - margin-top: 10px; + line-height: 60px; + padding: 0; margin-right: 15px; + font-size: 25px; + color: #888888; } /* END Feedback Button */ \ No newline at end of file diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/public/images/homepage-new/paperPlane.png b/ckanext-hdx_theme/ckanext/hdx_theme/public/images/homepage-new/paperPlane.png new file mode 100644 index 0000000000000000000000000000000000000000..7e2b3d37d320fd5f69c5d32ffc9ee96017ff8778 GIT binary patch literal 757 zcmVPx#32;bRa{vGf6951U69E94oEQKA0-8xgK~z`??UlQ0VnGzfSK|YsiG_vuXpNAN z!dQq1Vo*U55eycB*!gc+2GS-%h>t?85(E*FhzcSiqJ@fxCZOVea>LzW93N{o#lp2Z z=giFSetvV#y`trE`RiwX;-A5;r~;buRxm^`gmQpNg%0@-4f*{1e0X>uh5wsttk>(e zx3`r_g+xopCc*qocF4vtqGGDLW9&iG6>6KR!Ob zzP?T-lN1-}A?RAImP(~2lZjj|4~0UHkB^JR;=5>GEI?AJG#n1Uy}kAO{dMl&spiGv z82r7txtUI-4_k9>2#X!EwNY}3sE-x?LZZ`rvxLhtXLF>gY zbhTQ=fbnfW?lYN8KA#Vj@pz2EBbTOzH-nm>ZYHPdQ#za6e8V+wYyeRNemPjP? z`JCFxOjl@yLV-8jPJ>HGxx(zQ+3^zucLuj?yXfzrK1Wr#+*P&eH>l!yLqmJnqjYg431bV4$ zun`{tc!eJnP^-ID4~Ike05_9n!0j=)eDUPu1m<9@_zHp@ zsx=yo*Xtz@Y>9O`9l5${STZN$Mx%k3vPz{Qi~Gmh(EC%EJ9ikuJhNv}KvPBuh6sjG n4p6DkA%Y>415_$>2xZ7`%@iI9?0pi200000NkvXXu0mjfZ&F_* literal 0 HcmV?d00001 diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/header-new.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/header-new.html index 92a516a2da..98dec475c3 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/header-new.html +++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/header-new.html @@ -36,7 +36,7 @@

      #} - {% endblock %}

    + + +
    - + Feedback
    diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/header.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/header.html index 96a7b1dda1..cfcb98daf4 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/header.html +++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/header.html @@ -52,7 +52,7 @@

    {% endblock %} - + Feedback
    From d8e160bfe5eca029edd657d01f553517b9ca2c47 Mon Sep 17 00:00:00 2001 From: Dan Mihaila Date: Mon, 3 Nov 2014 15:19:05 +0200 Subject: [PATCH 28/31] fixing sitemap name plugin --- ckanext-sitemap/setup.py | 47 ++++++++++++++++++++-------------------- common-config-ini.txt | 2 +- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/ckanext-sitemap/setup.py b/ckanext-sitemap/setup.py index 0b591644f3..723f003c6d 100644 --- a/ckanext-sitemap/setup.py +++ b/ckanext-sitemap/setup.py @@ -1,32 +1,33 @@ from setuptools import setup, find_packages -import sys, os +import sys +import os version = '0.1' setup( - name='ckanext-sitemap', - version=version, - description="Sitemap extension for CKAN", - long_description="""\ + name='ckanext-sitemap', + version=version, + description="Sitemap extension for CKAN", + long_description="""\ """, - classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers - keywords='', - author='Aleksi Suomalainen', - author_email='aleksi.suomalainen@nomovok.com', - url='https://github.com/locusf/ckanext-sitemap', - license='AGPL', - packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), - namespace_packages=['ckanext', 'ckanext.sitemap'], - include_package_data=True, - zip_safe=False, - install_requires=[ - # -*- Extra requirements: -*- - ], - setup_requires=[ - 'nose' - ], - entry_points=\ - """ + classifiers=[ + ], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers + keywords='', + author='Aleksi Suomalainen', + author_email='aleksi.suomalainen@nomovok.com', + url='https://github.com/locusf/ckanext-sitemap', + license='AGPL', + packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), + namespace_packages=['ckanext', 'ckanext.sitemap'], + include_package_data=True, + zip_safe=False, + install_requires=[ + # -*- Extra requirements: -*- + ], + setup_requires=[ + 'nose' + ], + entry_points=""" [ckan.plugins] # Add plugins here, eg sitemap=ckanext.sitemap.plugin:SitemapPlugin diff --git a/common-config-ini.txt b/common-config-ini.txt index a59b4dbce7..a1176bdfba 100644 --- a/common-config-ini.txt +++ b/common-config-ini.txt @@ -76,7 +76,7 @@ ckan.site_id = default # Add ``resource_proxy`` to enable resorce proxying and get around the # same origin policy #ckan.plugins_deprecated = hdx_orgs register metadata_fields dataset_auth ungroups hdx_theme stats text_preview recline_preview -ckan.plugins = hdx_search hdx_sitemap hdx_org_group hdx_package hdx_users hdx_theme stats text_preview recline_preview +ckan.plugins = hdx_search sitemap hdx_org_group hdx_package hdx_users hdx_theme stats text_preview recline_preview ## Front-End Settings From 82451d3b3e93f9a41bd5972b63d03fc118e6e6be Mon Sep 17 00:00:00 2001 From: Marianne Bellotti Date: Mon, 3 Nov 2014 08:59:51 -0500 Subject: [PATCH 29/31] should be private= False not private = 0 --- ckanext-pages/.gitignore | 10 + ckanext-pages/README.md | 33 +++ ckanext-pages/ckanext/__init__.py | 8 + ckanext-pages/ckanext/pages/__init__.py | 7 + ckanext-pages/ckanext/pages/actions.py | 219 ++++++++++++++ ckanext-pages/ckanext/pages/auth.py | 64 ++++ ckanext-pages/ckanext/pages/controller.py | 279 ++++++++++++++++++ ckanext-pages/ckanext/pages/db.py | 123 ++++++++ ckanext-pages/ckanext/pages/plugin.py | 147 +++++++++ .../templates_group/group/read_base.html | 6 + .../templates_main/ckanext_pages/base.html | 17 ++ .../ckanext_pages/base_form.html | 117 ++++++++ .../ckanext_pages/confirm_delete.html | 22 ++ .../ckanext_pages/edit_base.html | 3 + .../ckanext_pages/group_page.html | 13 + .../ckanext_pages/group_page_edit.html | 7 + .../ckanext_pages/group_page_list.html | 14 + .../ckanext_pages/organization_page.html | 13 + .../ckanext_pages/organization_page_edit.html | 7 + .../ckanext_pages/organization_page_list.html | 14 + .../templates_main/ckanext_pages/page.html | 19 ++ .../ckanext_pages/pages_edit.html | 7 + .../ckanext_pages/pages_list.html | 12 + .../ckanext_pages/snippets/pages_list.html | 28 ++ .../pages/theme/templates_main/header.html | 10 + .../organization/read_base.html | 6 + ckanext-pages/setup.py | 29 ++ ckanext-sitemap/ckanext/sitemap/controller.py | 4 +- 28 files changed, 1236 insertions(+), 2 deletions(-) create mode 100644 ckanext-pages/.gitignore create mode 100644 ckanext-pages/README.md create mode 100644 ckanext-pages/ckanext/__init__.py create mode 100644 ckanext-pages/ckanext/pages/__init__.py create mode 100644 ckanext-pages/ckanext/pages/actions.py create mode 100644 ckanext-pages/ckanext/pages/auth.py create mode 100644 ckanext-pages/ckanext/pages/controller.py create mode 100644 ckanext-pages/ckanext/pages/db.py create mode 100644 ckanext-pages/ckanext/pages/plugin.py create mode 100644 ckanext-pages/ckanext/pages/theme/templates_group/group/read_base.html create mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/base.html create mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/base_form.html create mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/confirm_delete.html create mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/edit_base.html create mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page.html create mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page_edit.html create mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page_list.html create mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page.html create mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_edit.html create mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_list.html create mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/page.html create mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/pages_edit.html create mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/pages_list.html create mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/snippets/pages_list.html create mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/header.html create mode 100644 ckanext-pages/ckanext/pages/theme/templates_organization/organization/read_base.html create mode 100644 ckanext-pages/setup.py diff --git a/ckanext-pages/.gitignore b/ckanext-pages/.gitignore new file mode 100644 index 0000000000..595975452c --- /dev/null +++ b/ckanext-pages/.gitignore @@ -0,0 +1,10 @@ +*.egg-info +*.pyc +*.swp +*.swo +*~ +#* +.#* +build/ +dist/ +distribute-* \ No newline at end of file diff --git a/ckanext-pages/README.md b/ckanext-pages/README.md new file mode 100644 index 0000000000..30cb98b272 --- /dev/null +++ b/ckanext-pages/README.md @@ -0,0 +1,33 @@ +ckanext-pages +============= + +This extension gives you an easy way to add simple pages to CKAN. + +By default you can add pages to the main CKAN menu. + + + +Extra config options allow you to control the creation of extra pages against groups and organizations. + +To swich on this behaviour, to your config add: + +``` +ckanext.pages.organization = True +ckanext.pages.group = True +``` + +These options are False by default and this feature is experimental. + + +This module also gives you a quick way to remove default elements from the CKAN menu and you may need todo this +in order for you to have space for the new items you add. These options are: + +``` +ckanext.pages.about_menu = False +ckanext.pages.group_menu = False +ckanext.pages.organization_menu = False +``` + +By default these are all set to True, like on a default install. + + diff --git a/ckanext-pages/ckanext/__init__.py b/ckanext-pages/ckanext/__init__.py new file mode 100644 index 0000000000..bf99a9da02 --- /dev/null +++ b/ckanext-pages/ckanext/__init__.py @@ -0,0 +1,8 @@ +# this is a namespace package +try: + import pkg_resources + pkg_resources.declare_namespace(__name__) +except ImportError: + import pkgutil + __path__ = pkgutil.extend_path(__path__, __name__) + diff --git a/ckanext-pages/ckanext/pages/__init__.py b/ckanext-pages/ckanext/pages/__init__.py new file mode 100644 index 0000000000..2e2033b3c0 --- /dev/null +++ b/ckanext-pages/ckanext/pages/__init__.py @@ -0,0 +1,7 @@ +# this is a namespace package +try: + import pkg_resources + pkg_resources.declare_namespace(__name__) +except ImportError: + import pkgutil + __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/ckanext-pages/ckanext/pages/actions.py b/ckanext-pages/ckanext/pages/actions.py new file mode 100644 index 0000000000..a52d37f264 --- /dev/null +++ b/ckanext-pages/ckanext/pages/actions.py @@ -0,0 +1,219 @@ +import datetime + +import ckan.plugins as p +import ckan.lib.navl.dictization_functions as df +import ckan.new_authz as new_authz + +import db +def page_name_validator(key, data, errors, context): + session = context['session'] + page = context.get('page') + group_id = context.get('group_id') + if page and page == data[key]: + return + + query = session.query(db.Page.name).filter_by(name=data[key], group_id=group_id) + result = query.first() + if result: + errors[key].append( + p.toolkit._('Page name already exists in database')) + +schema = { + 'id': [p.toolkit.get_validator('ignore_empty'), unicode], + 'title': [p.toolkit.get_validator('not_empty'), unicode], + 'name': [p.toolkit.get_validator('not_empty'), unicode, + p.toolkit.get_validator('name_validator'), page_name_validator], + 'content': [p.toolkit.get_validator('ignore_missing'), unicode], + # 'lang': [p.toolkit.get_validator('not_empty'), unicode], + 'order': [p.toolkit.get_validator('ignore_missing'), + unicode], + 'private': [p.toolkit.get_validator('ignore_missing'), + p.toolkit.get_validator('boolean_validator')], + 'group_id': [p.toolkit.get_validator('ignore_missing'), unicode], + 'user_id': [p.toolkit.get_validator('ignore_missing'), unicode], + 'created': [p.toolkit.get_validator('ignore_missing'), + p.toolkit.get_validator('isodate')], +} + + +def _pages_show(context, data_dict): + if db.pages_table is None: + db.init_db(context['model']) + org_id = data_dict.get('org_id') + page = data_dict.get('page') + out = db.Page.get(group_id=org_id, name=page) + if out: + out = db.table_dictize(out, context) + return out + + +def _pages_list(context, data_dict): + search = {} + if db.pages_table is None: + db.init_db(context['model']) + org_id = data_dict.get('org_id') + ordered = data_dict.get('order') + private = data_dict.get('private', True) + if ordered: + search['order'] = True + if not org_id: + search['group_id'] = None + try: + p.toolkit.check_access('ckanext_pages_update', context, data_dict) + if not private: + search['private'] = False + except p.toolkit.NotAuthorized: + search['private'] = False + else: + group = context['model'].Group.get(org_id) + user = context['user'] + member = new_authz.has_user_permission_for_group_or_org( + group.id, user, 'read') + search['group_id'] = org_id + if not member: + search['private'] = False + out = db.Page.pages(**search) + return [{'title': pg.title, + 'content': pg.content, + 'name': pg.name, + 'group_id': pg.group_id, + } for pg in out] + + +def _pages_delete(context, data_dict): + if db.pages_table is None: + db.init_db(context['model']) + org_id = data_dict.get('org_id') + page = data_dict.get('page') + out = db.Page.get(group_id=org_id, name=page) + if out: + session = context['session'] + session.delete(out) + session.commit() + + +def _pages_update(context, data_dict): + if db.pages_table is None: + db.init_db(context['model']) + org_id = data_dict.get('org_id') + page = data_dict.get('page') + # we need the page in the context for name validation + context['page'] = page + context['group_id'] = org_id + + data, errors = df.validate(data_dict, schema, context) + + if errors: + raise p.toolkit.ValidationError(errors) + + out = db.Page.get(group_id=org_id, name=page) + if not out: + out = db.Page() + out.group_id = org_id + out.name = page + items = ['title', 'content', 'name', 'private', 'order'] + for item in items: + setattr(out, item, data.get(item)) + + out.modified = datetime.datetime.utcnow() + out.user_id = p.toolkit.c.userobj.id + out.save() + session = context['session'] + session.add(out) + session.commit() + + +def pages_show(context, data_dict): + try: + p.toolkit.check_access('ckanext_pages_show', context, data_dict) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) + return _pages_show(context, data_dict) + + +def pages_update(context, data_dict): + try: + p.toolkit.check_access('ckanext_pages_update', context, data_dict) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) + return _pages_update(context, data_dict) + + +def pages_delete(context, data_dict): + try: + p.toolkit.check_access('ckanext_pages_delete', context, data_dict) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) + return _pages_delete(context, data_dict) + + +def pages_list(context, data_dict): + try: + p.toolkit.check_access('ckanext_pages_list', context, data_dict) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) + return _pages_list(context, data_dict) + + +def org_pages_show(context, data_dict): + try: + p.toolkit.check_access('ckanext_org_pages_show', context, data_dict) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) + return _pages_show(context, data_dict) + + +def org_pages_update(context, data_dict): + try: + p.toolkit.check_access('ckanext_org_pages_update', context, data_dict) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) + return _pages_update(context, data_dict) + + +def org_pages_delete(context, data_dict): + try: + p.toolkit.check_access('ckanext_org_pages_delete', context, data_dict) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) + return _pages_delete(context, data_dict) + + +def org_pages_list(context, data_dict): + try: + p.toolkit.check_access('ckanext_org_pages_list', context, data_dict) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) + return _pages_list(context, data_dict) + + +def group_pages_show(context, data_dict): + try: + p.toolkit.check_access('ckanext_group_pages_show', context, data_dict) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) + return _pages_show(context, data_dict) + + +def group_pages_update(context, data_dict): + try: + p.toolkit.check_access('ckanext_group_pages_update', context, data_dict) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) + return _pages_update(context, data_dict) + + +def group_pages_delete(context, data_dict): + try: + p.toolkit.check_access('ckanext_group_pages_delete', context, data_dict) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) + return _pages_delete(context, data_dict) + + +def group_pages_list(context, data_dict): + try: + p.toolkit.check_access('ckanext_group_pages_list', context, data_dict) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) + return _pages_list(context, data_dict) diff --git a/ckanext-pages/ckanext/pages/auth.py b/ckanext-pages/ckanext/pages/auth.py new file mode 100644 index 0000000000..7449b78aa2 --- /dev/null +++ b/ckanext-pages/ckanext/pages/auth.py @@ -0,0 +1,64 @@ +import ckan.plugins as p +import ckan.new_authz as new_authz + +import db + + +def sysadmin(context, data_dict): + return {'success': False} + +def anyone(context, data_dict): + return {'success': True} + +def group_admin(context, data_dict): + return p.toolkit.check_access('group_update', context, data_dict) + + +def org_admin(context, data_dict): + return p.toolkit.check_access('group_update', context, data_dict) + + +def page_privacy(context, data_dict): + if db.pages_table is None: + db.init_db(context['model']) + org_id = data_dict.get('org_id') + page = data_dict.get('page') + out = db.Page.get(group_id=org_id, name=page) + if out and out.private == False: + return {'success': True} + # no org_id means it's a universal page + if not org_id: + if out and out.private: + return {'success': False} + return {'success': True} + group = context['model'].Group.get(org_id) + user = context['user'] + authorized = new_authz.has_user_permission_for_group_or_org(group.id, + user, + 'read') + if not authorized: + return {'success': False, + 'msg': p.toolkit._( + 'User %s not authorized to read this page') % user} + else: + return {'success': True} + +# Starting from 2.2 you need to explicitly flag auth functions that allow +# anonymous access +if p.toolkit.check_ckan_version(min_version='2.2'): + anyone = p.toolkit.auth_allow_anonymous_access(anyone) + page_privacy = p.toolkit.auth_allow_anonymous_access(page_privacy) + + +pages_show = page_privacy +pages_update = sysadmin +pages_delete = sysadmin +pages_list = anyone +org_pages_show = page_privacy +org_pages_update = org_admin +org_pages_delete = org_admin +org_pages_list = anyone +group_pages_show = page_privacy +group_pages_update = group_admin +group_pages_delete = group_admin +group_pages_list = anyone diff --git a/ckanext-pages/ckanext/pages/controller.py b/ckanext-pages/ckanext/pages/controller.py new file mode 100644 index 0000000000..c832883f14 --- /dev/null +++ b/ckanext-pages/ckanext/pages/controller.py @@ -0,0 +1,279 @@ +import ckan.plugins as p + +_ = p.toolkit._ + +class PagesController(p.toolkit.BaseController): + controller = 'ckanext.pages.controller:PagesController' + + def _get_group_dict(self, id): + ''' returns the result of group_show action or aborts if there is a + problem ''' + + def _template_setup_org(self, id): + if not id: + return + # we need the org for the rest of the page + context = {'for_view': True} + try: + p.toolkit.c.group_dict = p.toolkit.get_action('organization_show')(context, {'id': id}) + except p.toolkit.ObjectNotFound: + p.toolkit.abort(404, _('Organization not found')) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, _('Unauthorized to read organization %s') % id) + + def org_show(self, id, page=None): + if page: + page = page[1:] + self._template_setup_org(id) + if page is '': + return self._org_list_pages(id) + _page = p.toolkit.get_action('ckanext_pages_show')( + data_dict={'org_id': p.toolkit.c.group_dict['id'], + 'page': page,} + ) + if _page is None: + return self._org_list_pages(id) + p.toolkit.c.page = _page + return p.toolkit.render('ckanext_pages/organization_page.html') + + def _org_list_pages(self, id): + p.toolkit.c.pages_dict = p.toolkit.get_action('ckanext_pages_list')( + data_dict={'org_id': p.toolkit.c.group_dict['id']} + ) + return p.toolkit.render('ckanext_pages/organization_page_list.html') + + + def org_delete(self, id, page): + self._template_setup_org(id) + page = page[1:] + if 'cancel' in p.toolkit.request.params: + p.toolkit.redirect_to(controller=self.controller, action='org_edit', id=p.toolkit.c.group_dict['name'], page='/' + page) + + ## try: + ## self._check_access('group_delete', {}, {'id': id}) + ## except p.toolkit.NotAuthorized: + ## p.toolkit.abort(401, _('Unauthorized to delete page')) + + try: + if p.toolkit.request.method == 'POST': + p.toolkit.get_action('ckanext_pages_delete')({}, {'org_id': p.toolkit.c.group_dict['id'], 'page': page}) + p.toolkit.redirect_to(controller=self.controller, action='org_show', id=id, page='') + else: + p.toolkit.abort(404, _('Page Not Found')) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, _('Unauthorized to delete page')) + except p.toolkit.ObjectNotFound: + p.toolkit.abort(404, _('Group not found')) + return p.toolkit.render('ckanext_pages/confirm_delete.html', {'page': page}) + + + def org_edit(self, id, page=None, data=None, errors=None, error_summary=None): + self._template_setup_org(id) + if page: + page = page[1:] + _page = p.toolkit.get_action('ckanext_pages_show')( + data_dict={'org_id': p.toolkit.c.group_dict['id'], + 'page': page,} + ) + if _page is None: + _page = {} + + if p.toolkit.request.method == 'POST' and not data: + data = p.toolkit.request.POST + items = ['title', 'name', 'content', 'private'] + # update config from form + for item in items: + if item in data: + _page[item] = data[item] + _page['org_id'] = p.toolkit.c.group_dict['id'], + _page['page'] = page + try: + junk = p.toolkit.get_action('ckanext_pages_update')( + data_dict=_page + ) + except p.toolkit.ValidationError, e: + errors = e.error_dict + error_summary = e.error_summary + return self.org_edit(id, '/' + page, data, + errors, error_summary) + p.toolkit.redirect_to(p.toolkit.url_for('organization_pages', id=id, page='/' + _page['name'])) + + if not data: + data = _page + + errors = errors or {} + error_summary = error_summary or {} + + vars = {'data': data, 'errors': errors, + 'error_summary': error_summary, 'page': page} + + return p.toolkit.render('ckanext_pages/organization_page_edit.html', + extra_vars=vars) + + def _template_setup_group(self, id): + if not id: + return + # we need the org for the rest of the page + context = {'for_view': True} + try: + p.toolkit.c.group_dict = p.toolkit.get_action('group_show')(context, {'id': id}) + except p.toolkit.ObjectNotFound: + p.toolkit.abort(404, _('Group not found')) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, _('Unauthorized to read group %s') % id) + + + def group_show(self, id, page=None): + if page: + page = page[1:] + self._template_setup_group(id) + if page is '': + return self._group_list_pages(id) + _page = p.toolkit.get_action('ckanext_pages_show')( + data_dict={'org_id': p.toolkit.c.group_dict['id'], + 'page': page,} + ) + if _page is None: + return self._group_list_pages(id) + p.toolkit.c.page = _page + return p.toolkit.render('ckanext_pages/group_page.html') + + def _group_list_pages(self, id): + p.toolkit.c.pages_dict = p.toolkit.get_action('ckanext_pages_list')( + data_dict={'org_id': p.toolkit.c.group_dict['id']} + ) + return p.toolkit.render('ckanext_pages/group_page_list.html') + + def group_edit(self, id, page=None, data=None, errors=None, error_summary=None): + self._template_setup_group(id) + if page: + page = page[1:] + _page = p.toolkit.get_action('ckanext_pages_show')( + data_dict={'org_id': p.toolkit.c.group_dict['id'], + 'page': page,} + ) + if _page is None: + _page = {} + + if p.toolkit.request.method == 'POST' and not data: + data = p.toolkit.request.POST + items = ['title', 'name', 'content', 'private'] + # update config from form + for item in items: + if item in data: + _page[item] = data[item] + _page['org_id'] = p.toolkit.c.group_dict['id'] + _page['page'] = page + try: + junk = p.toolkit.get_action('ckanext_pages_update')( + data_dict=_page + ) + except p.toolkit.ValidationError, e: + errors = e.error_dict + error_summary = e.error_summary + return self.group_edit(id, '/' + page, data, + errors, error_summary) + p.toolkit.redirect_to(p.toolkit.url_for('group_pages', id=id, page='/' + _page['name'])) + + if not data: + data = _page + + errors = errors or {} + error_summary = error_summary or {} + + vars = {'data': data, 'errors': errors, + 'error_summary': error_summary, 'page': page} + + return p.toolkit.render('ckanext_pages/group_page_edit.html', + extra_vars=vars) + + + def pages_show(self, page=None): + if page: + page = page[1:] + if not page: + return self._pages_list_pages() + _page = p.toolkit.get_action('ckanext_pages_show')( + data_dict={'org_id': None, + 'page': page,} + ) + if _page is None: + return self._pages_list_pages() + p.toolkit.c.page = _page + return p.toolkit.render('ckanext_pages/page.html') + + def _pages_list_pages(self): + p.toolkit.c.pages_dict = p.toolkit.get_action('ckanext_pages_list')( + data_dict={'org_id': None} + ) + return p.toolkit.render('ckanext_pages/pages_list.html') + + def pages_delete(self, page): + page = page[1:] + if 'cancel' in p.toolkit.request.params: + p.toolkit.redirect_to(controller=self.controller, action='pages_edit', page='/' + page) + + + try: + if p.toolkit.request.method == 'POST': + p.toolkit.get_action('ckanext_pages_delete')({}, {'page': page}) + p.toolkit.redirect_to(controller=self.controller, action='pages_show', page='') + else: + p.toolkit.abort(404, _('Page Not Found')) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, _('Unauthorized to delete page')) + except p.toolkit.ObjectNotFound: + p.toolkit.abort(404, _('Group not found')) + return p.toolkit.render('ckanext_pages/confirm_delete.html', {'page': page}) + + + def pages_edit(self, page=None, data=None, errors=None, error_summary=None): + if page: + page = page[1:] + _page = p.toolkit.get_action('ckanext_pages_show')( + data_dict={'org_id': None, + 'page': page,} + ) + if _page is None: + _page = {} + + if p.toolkit.request.method == 'POST' and not data: + data = p.toolkit.request.POST + items = ['title', 'name', 'content', 'private', 'order'] + + # update config from form + for item in items: + if item in data: + _page[item] = data[item] + _page['org_id'] = None + _page['page'] = page + try: + junk = p.toolkit.get_action('ckanext_pages_update')( + data_dict=_page + ) + except p.toolkit.ValidationError, e: + errors = e.error_dict + error_summary = e.error_summary + return self.pages_edit('/' + page, data, + errors, error_summary) + p.toolkit.redirect_to(p.toolkit.url_for('pages_show', page='/' + _page['name'])) + + try: + p.toolkit.check_access('ckanext_pages_update', {'user': p.toolkit.c.user or p.toolkit.c.author}) + except p.toolkit.NotAuthorized: + p.toolkit.abort(401, _('Unauthorized to create or edit a page')) + + if not data: + data = _page + + errors = errors or {} + error_summary = error_summary or {} + + vars = {'data': data, 'errors': errors, + 'error_summary': error_summary, 'page': page} + + return p.toolkit.render('ckanext_pages/pages_edit.html', + extra_vars=vars) + + + diff --git a/ckanext-pages/ckanext/pages/db.py b/ckanext-pages/ckanext/pages/db.py new file mode 100644 index 0000000000..0695c58d55 --- /dev/null +++ b/ckanext-pages/ckanext/pages/db.py @@ -0,0 +1,123 @@ +import datetime +import uuid + +import sqlalchemy as sa +from sqlalchemy.orm import class_mapper + + +pages_table = None +Page = None + + +def make_uuid(): + return unicode(uuid.uuid4()) + + +def init_db(model): + class _Page(model.DomainObject): + + @classmethod + def get(cls, **kw): + '''Finds a single entity in the register.''' + query = model.Session.query(cls).autoflush(False) + return query.filter_by(**kw).first() + + @classmethod + def pages(cls, **kw): + '''Finds a single entity in the register.''' + order = kw.pop('order', False) + + query = model.Session.query(cls).autoflush(False) + query = query.filter_by(**kw) + if order: + query = query.order_by(cls.order).filter(cls.order != '') + return query.all() + + global Page + Page = _Page + # We will just try to create the table. If it already exists we get an + # error but we can just skip it and carry on. + sql = ''' + CREATE TABLE ckanext_pages ( + id text NOT NULL, + title text, + name text, + content text, + lang text, + "order" text, + private boolean, + group_id text, + user_id text NOT NULL, + created timestamp without time zone, + modified timestamp without time zone + ); + ''' + conn = model.Session.connection() + try: + conn.execute(sql) + except sa.exc.ProgrammingError: + pass + model.Session.commit() + + types = sa.types + global pages_table + pages_table = sa.Table('ckanext_pages', model.meta.metadata, + sa.Column('id', types.UnicodeText, primary_key=True, default=make_uuid), + sa.Column('title', types.UnicodeText, default=u''), + sa.Column('name', types.UnicodeText, default=u''), + sa.Column('content', types.UnicodeText, default=u''), + sa.Column('lang', types.UnicodeText, default=u''), + sa.Column('order', types.UnicodeText, default=u''), + sa.Column('private',types.Boolean,default=True), + sa.Column('group_id', types.UnicodeText, default=None), + sa.Column('user_id', types.UnicodeText, default=u''), + sa.Column('created', types.DateTime, default=datetime.datetime.utcnow), + sa.Column('modified', types.DateTime, default=datetime.datetime.utcnow), + ) + + model.meta.mapper( + Page, + pages_table, + ) + + +def table_dictize(obj, context, **kw): + '''Get any model object and represent it as a dict''' + result_dict = {} + + if isinstance(obj, sa.engine.base.RowProxy): + fields = obj.keys() + else: + ModelClass = obj.__class__ + table = class_mapper(ModelClass).mapped_table + fields = [field.name for field in table.c] + + for field in fields: + name = field + if name in ('current', 'expired_timestamp', 'expired_id'): + continue + if name == 'continuity_id': + continue + value = getattr(obj, name) + if value is None: + result_dict[name] = value + elif isinstance(value, dict): + result_dict[name] = value + elif isinstance(value, int): + result_dict[name] = value + elif isinstance(value, datetime.datetime): + result_dict[name] = value.isoformat() + elif isinstance(value, list): + result_dict[name] = value + else: + result_dict[name] = unicode(value) + + result_dict.update(kw) + + ##HACK For optimisation to get metadata_modified created faster. + + context['metadata_modified'] = max(result_dict.get('revision_timestamp', ''), + context.get('metadata_modified', '')) + + return result_dict + diff --git a/ckanext-pages/ckanext/pages/plugin.py b/ckanext-pages/ckanext/pages/plugin.py new file mode 100644 index 0000000000..194b89d0cf --- /dev/null +++ b/ckanext-pages/ckanext/pages/plugin.py @@ -0,0 +1,147 @@ +import logging +from pylons import config + +import ckan.plugins as p +import ckan.lib.helpers as h + +import actions +import auth + +log = logging.getLogger(__name__) + +def build_pages_nav_main(*args): + + about_menu = p.toolkit.asbool(config.get('ckanext.pages.about_menu', True)) + group_menu = p.toolkit.asbool(config.get('ckanext.pages.group_menu', True)) + org_menu = p.toolkit.asbool(config.get('ckanext.pages.organization_menu', True)) + + new_args = [] + for arg in args: + if arg[0] == 'about' and not about_menu: + continue + if arg[0] == 'organizations_index' and not org_menu: + continue + if arg[0] == 'group_index' and not group_menu: + continue + new_args.append(arg) + + output = h.build_nav_main(*new_args) + + # do not display any private datasets in menu even for sysadmins + pages_list = p.toolkit.get_action('ckanext_pages_list')(None, {'order': True, 'private': False}) + + page_name = '' + + if (p.toolkit.c.action == 'pages_show' + and p.toolkit.c.controller == 'ckanext.pages.controller:PagesController'): + page_name = p.toolkit.c.environ['routes.url'].current().split('/')[-1] + + for page in pages_list: + link = h.link_to(page.get('title'), + h.url_for('/pages/' + str(page['name']))) + + if page['name'] == page_name: + li = h.literal('
  • ') + link + h.literal('
    • ') + else: + li = h.literal('
  • ') + link + h.literal('
    • ') + output = output + li + + return output + + + +class PagesPlugin(p.SingletonPlugin): + p.implements(p.IConfigurer, inherit=True) + p.implements(p.ITemplateHelpers, inherit=True) + p.implements(p.IConfigurable, inherit=True) + p.implements(p.IRoutes, inherit=True) + p.implements(p.IActions, inherit=True) + p.implements(p.IAuthFunctions, inherit=True) + + def update_config(self, config): + self.organization_pages = p.toolkit.asbool(config.get('ckanext.pages.organization', False)) + self.group_pages = p.toolkit.asbool(config.get('ckanext.pages.group', False)) + + p.toolkit.add_template_directory(config, 'theme/templates_main') + if self.group_pages: + p.toolkit.add_template_directory(config, 'theme/templates_group') + if self.organization_pages: + p.toolkit.add_template_directory(config, 'theme/templates_organization') + + + def configure(self, config): + return + + def get_helpers(self): + return { + 'build_nav_main': build_pages_nav_main + } + + def after_map(self, map): + controller = 'ckanext.pages.controller:PagesController' + + if self.organization_pages: + map.connect('organization_pages_delete', '/organization/pages_delete/{id}{page:/.*|}', + action='org_delete', ckan_icon='delete', controller=controller) + map.connect('organization_pages_edit', '/organization/pages_edit/{id}{page:/.*|}', + action='org_edit', ckan_icon='edit', controller=controller) + map.connect('organization_pages', '/organization/pages/{id}{page:/.*|}', + action='org_show', ckan_icon='file', controller=controller, highlight_actions='org_edit org_show') + + if self.group_pages: + map.connect('group_pages_delete', '/group/pages_delete/{id}{page:/.*|}', + action='group_delete', ckan_icon='delete', controller=controller) + map.connect('group_pages_edit', '/group/pages_edit/{id}{page:/.*|}', + action='group_edit', ckan_icon='edit', controller=controller) + map.connect('group_pages', '/group/pages/{id}{page:/.*|}', + action='group_show', ckan_icon='file', controller=controller, highlight_actions='group_edit group_show') + + + map.connect('pages_delete', '/pages_delete{page:/.*|}', + action='pages_delete', ckan_icon='delete', controller=controller) + map.connect('pages_edit', '/pages_edit{page:/.*|}', + action='pages_edit', ckan_icon='edit', controller=controller) + map.connect('pages_show', '/pages{page:/.*|}', + action='pages_show', ckan_icon='file', controller=controller, highlight_actions='pages_edit pages_show') + return map + + def get_actions(self): + actions_dict = { + 'ckanext_pages_show': actions.pages_show, + 'ckanext_pages_update': actions.pages_update, + 'ckanext_pages_delete': actions.pages_delete, + 'ckanext_pages_list': actions.pages_list, + } + if self.organization_pages: + org_actions={ + 'ckanext_org_pages_show': actions.org_pages_show, + 'ckanext_org_pages_update': actions.org_pages_update, + 'ckanext_org_pages_delete': actions.org_pages_delete, + 'ckanext_org_pages_list': actions.org_pages_list, + } + actions_dict.update(org_actions) + if self.group_pages: + group_actions={ + 'ckanext_group_pages_show': actions.group_pages_show, + 'ckanext_group_pages_update': actions.group_pages_update, + 'ckanext_group_pages_delete': actions.group_pages_delete, + 'ckanext_group_pages_list': actions.group_pages_list, + } + actions_dict.update(group_actions) + return actions_dict + + def get_auth_functions(self): + return { + 'ckanext_pages_show': auth.pages_show, + 'ckanext_pages_update': auth.pages_update, + 'ckanext_pages_delete': auth.pages_delete, + 'ckanext_pages_list': auth.pages_list, + 'ckanext_org_pages_show': auth.org_pages_show, + 'ckanext_org_pages_update': auth.org_pages_update, + 'ckanext_org_pages_delete': auth.org_pages_delete, + 'ckanext_org_pages_list': auth.org_pages_list, + 'ckanext_group_pages_show': auth.group_pages_show, + 'ckanext_group_pages_update': auth.group_pages_update, + 'ckanext_group_pages_delete': auth.group_pages_delete, + 'ckanext_group_pages_list': auth.group_pages_list, + } diff --git a/ckanext-pages/ckanext/pages/theme/templates_group/group/read_base.html b/ckanext-pages/ckanext/pages/theme/templates_group/group/read_base.html new file mode 100644 index 0000000000..62c2bffa3d --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_group/group/read_base.html @@ -0,0 +1,6 @@ +{% ckan_extends %} + +{% block content_primary_nav %} + {{ super() }} + {{ h.build_nav_icon('group_pages', _('Pages'), id=c.group_dict.name, page='') }} +{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/base.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/base.html new file mode 100644 index 0000000000..a639da7682 --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/base.html @@ -0,0 +1,17 @@ +{% extends 'page.html' %} + +{% block page_header %}{% endblock %} + +{% block secondary_content %} +
    +

    + + {{ _('What are Pages?') }} +

    +
    + {% trans %} +

    Pages are are simple way to add extra pages to your ckan instance. You can assign an order to them.

    + {% endtrans %} +
    +
    +{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/base_form.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/base_form.html new file mode 100644 index 0000000000..8ebc0dc4ef --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/base_form.html @@ -0,0 +1,117 @@ +{% import 'macros/form.html' as form %} + +{% if type == 'org' %} + {% set action_url = h.url_for('organization_pages_edit', id=id, page='/' + page) %} + {% set cancel_url = h.url_for('organization_pages', id=id, page='') %} + {% set slug_prefix = cancel_url ~ '/' %} + {% set slug_domain = h.url_for('organization_pages', id=id, page='', qualified=true) %} + {% set hide_field_order = true %} +{% elif type == 'group' %} + {% set action_url = h.url_for('group_pages_edit', id=id, page='/' + page) %} + {% set cancel_url = h.url_for('group_pages', id=id, page='') %} + {% set slug_prefix = cancel_url ~ '/' %} + {% set slug_domain = h.url_for('group_pages', id=id, page='', qualified=true) %} + {% set hide_field_order = true %} +{% else %} + {% set action_url = h.url_for('pages_edit', page='/' + page) %} + {% set cancel_url = h.url_for('pages_show', page='') %} + {% set slug_prefix = cancel_url ~ '/' %} + {% set slug_domain = h.url_for('pages_show', page='', qualified=true) %} +{% endif %} + +{% set data = data or {} %} +{% set errors = errors or {} %} + +{% if not page %} +

    {{ _('Add page') }}

    +{% else %} +

    {{ _('Edit page') }}

    +{% endif %} + +
    + + {{ form.input('title', id='field-title', label=_('Title'), placeholder=_('eg. Page Title'), value=data.title, error=errors.title, classes=['control-full', 'control-large'], attrs={'data-module': 'slug-preview-target'}) }} + + {% set domain = slug_domain|replace("http://", "")|replace("https://", "") %} + {% set attrs = {'data-module': 'slug-preview-slug', 'data-module-prefix': domain~'/', 'data-module-placeholder': ''} %} + {{ form.prepend('name', id='field-name', label=_('URL'), prepend=slug_prefix, placeholder=_('eg. my-page'), value=data.name, error=errors.name, attrs=attrs) }} + + {#{{ form.input('name', id='field-name', label=_('Name'), placeholder=_('my-name'), value=data.name, error=errors.name, classes=['control-full']) }}#} + +
    + +
    + +
    +
    + + {% if not hide_field_order %} +
    + +
    + +
    +
    + + {% endif %} +{# data.content #} + + + + + {{ form.input('search', id='search', label=_('Search for Datasets'), placeholder=_('eg. ebola'), classes=['control-full', 'control-large']) }} + +
    + + {{ form.markdown('content', id='field-content', label=_('Content'), placeholder=_('My content'), value=data.content, error=errors.content) }} + +
    + {% if not page %} + {{ _('Cancel') }} + + {% else %} + + {% block delete_button %} + {% if h.check_access('ckanext_pages_delete', {'id': data.id}) %} + {% set locale = h.dump_json({'content': _('Are you sure you want to delete this Page?')}) %} + {% block delete_button_text %}{{ _('Delete') }}{% endblock %} + {% endif %} + {% endblock %} + + + {% endif %} +
    + + diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/confirm_delete.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/confirm_delete.html new file mode 100644 index 0000000000..6ab5f92814 --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/confirm_delete.html @@ -0,0 +1,22 @@ +{% extends "page.html" %} + +{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %} + +{% block maintag %}
    {% endblock %} + +{% block main_content %} +
    +
    + {% block form %} +

    {{ _('Are you sure you want to delete page - {name}?').format(name=c.page_dict.name) }}

    +

    + {% set action = form_action or h.url_for('organization_pages_delete', id=c.group_dict.name, page='/' + page) %} +

    + + +
    +

    + {% endblock %} +
    +
    +{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/edit_base.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/edit_base.html new file mode 100644 index 0000000000..c17a16c476 --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/edit_base.html @@ -0,0 +1,3 @@ +{% extends 'ckanext_pages/base.html' %} + +{% block subtitle %}{{ _('Pages') }}{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page.html new file mode 100644 index 0000000000..300178c48e --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page.html @@ -0,0 +1,13 @@ +{% extends 'group/read_base.html' %} + +{% block subtitle %}{{ _('Pages') }} - {{ c.group_dict.display_name }}{% endblock %} + +{% block primary_content_inner %} + {% link_for _('Edit page'), controller='ckanext.pages.controller:PagesController', action='group_edit', id=c.group_dict.name, page='/' + c.page.name, class_='btn btn-primary pull-right', icon='edit' %} +

    {{ c.page.title }}

    + {% if c.page.content %} + {{ h.render_markdown(c.page.content) }} + {% else %} +

    {{ _('This page currently has no content') }}

    + {% endif %} +{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page_edit.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page_edit.html new file mode 100644 index 0000000000..2bcc1790c8 --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page_edit.html @@ -0,0 +1,7 @@ +{% extends 'group/read_base.html' %} + +{% block subtitle %}{{ _('Pages') }} - {{ c.group_dict.display_name }}{% endblock %} + +{% block primary_content_inner %} + {% snippet 'ckanext_pages/base_form.html', type='group', id=c.group_dict.name, page=page, data=data, errors=errors %} +{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page_list.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page_list.html new file mode 100644 index 0000000000..bfc1b7ccc9 --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page_list.html @@ -0,0 +1,14 @@ +{% extends "group/read_base.html" %} + +{% block page_primary_action %} + {% if h.check_access('package_create', {'group_id': c.group_dict.id}) %} + {% link_for _('Add page'), controller='ckanext.pages.controller:PagesController', action='group_edit', id=c.group_dict.name, page='', class_='btn btn-primary', icon='plus-sign-alt' %} + {% endif %} +{% endblock %} + +{% block subtitle %}{{ _('Pages') }} - {{ c.group_dict.display_name }}{% endblock %} + +{% block primary_content_inner %} +

    {{ _('Pages') }}

    + {% snippet 'ckanext_pages/snippets/pages_list.html', pages=c.pages_dict, type='group', id=c.group_dict.name %} +{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page.html new file mode 100644 index 0000000000..b6976d7599 --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page.html @@ -0,0 +1,13 @@ +{% extends 'organization/read_base.html' %} + +{% block subtitle %}{{ _('Pages') }} - {{ c.group_dict.display_name }}{% endblock %} + +{% block primary_content_inner %} + {% link_for _('Edit page'), controller='ckanext.pages.controller:PagesController', action='org_edit', id=c.group_dict.name, page='/' + c.page.name, class_='btn btn-primary pull-right', icon='edit' %} +

    {{ c.page.title }}

    + {% if c.page.content %} + {{ h.render_markdown(c.page.content) }} + {% else %} +

    {{ _('This page currently has no content') }}

    + {% endif %} +{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_edit.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_edit.html new file mode 100644 index 0000000000..c2d9740aec --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_edit.html @@ -0,0 +1,7 @@ +{% extends 'organization/read_base.html' %} + +{% block subtitle %}{{ _('Pages') }} - {{ c.group_dict.display_name }}{% endblock %} + +{% block primary_content_inner %} + {% snippet 'ckanext_pages/base_form.html', type='org', id=c.group_dict.name, page=page, data=data, errors=errors %} +{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_list.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_list.html new file mode 100644 index 0000000000..7c0745f955 --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_list.html @@ -0,0 +1,14 @@ +{% extends 'organization/read_base.html' %} + +{% block page_primary_action %} + {% if h.check_access('package_create', {'group_id': c.group_dict.id}) %} + {% link_for _('Add page'), controller='ckanext.pages.controller:PagesController', action='org_edit', id=c.group_dict.name, page='', class_='btn btn-primary', icon='plus-sign-alt' %} + {% endif %} +{% endblock %} + +{% block subtitle %}{{ _('Pages') }} - {{ c.group_dict.display_name }}{% endblock %} + +{% block primary_content_inner %} +

    {{ _('Pages') }}

    + {% snippet 'ckanext_pages/snippets/pages_list.html', pages=c.pages_dict, type='org', id=c.group_dict.name %} +{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/page.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/page.html new file mode 100644 index 0000000000..c5d2a3a253 --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/page.html @@ -0,0 +1,19 @@ +{% extends 'page.html' %} + +{% block subtitle %}{{ c.page.title }}{% endblock %} + +{% block primary %} +
    + {% if h.check_access('ckanext_pages_update') %} + {% link_for _('Edit'), controller='ckanext.pages.controller:PagesController', action='pages_edit', page='/' + c.page.name, class_='btn btn-primary pull-right', icon='edit' %} + {% endif %} +

    {{ c.page.title }}

    + {% if c.page.content %} + {{ h.render_markdown(c.page.content) }} + {% else %} +

    {{ _('This page currently has no content') }}

    + {% endif %} +
    +{% endblock %} + +{% block secondary %}{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/pages_edit.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/pages_edit.html new file mode 100644 index 0000000000..85bac8c597 --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/pages_edit.html @@ -0,0 +1,7 @@ +{% extends 'ckanext_pages/edit_base.html' %} + +{% block subtitle %}{{ _('Edit Page')}} {% endblock %} + +{% block primary_content_inner %} + {% snippet 'ckanext_pages/base_form.html', page=page, data=data, errors=errors %} +{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/pages_list.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/pages_list.html new file mode 100644 index 0000000000..2423ed2c7a --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/pages_list.html @@ -0,0 +1,12 @@ +{% extends 'ckanext_pages/edit_base.html' %} + +{% block page_primary_action %} + {% if h.check_access('ckanext_pages_update', {}) %} + {% link_for _('Add page'), controller='ckanext.pages.controller:PagesController', action='pages_edit', page='', class_='btn btn-primary', icon='plus-sign-alt' %} + {% endif %} +{% endblock %} + +{% block primary_content_inner %} +

    {{ _('Pages') }}

    + {% snippet 'ckanext_pages/snippets/pages_list.html', pages=c.pages_dict %} +{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/snippets/pages_list.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/snippets/pages_list.html new file mode 100644 index 0000000000..54d1801da6 --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/snippets/pages_list.html @@ -0,0 +1,28 @@ +{% set pages_total = pages|length %} +{% set action = '{0}_show'.format(type) %} + +

    {{ _('1 page') if pages_total == 1 else _('{0} pages').format(pages_total) }}

    +
    +{% if pages %} +
      + {% for page in pages %} + {% if type %} + {% set url = h.url_for(controller='ckanext.pages.controller:PagesController', action=action, id=id, page='/' + page.name) %} + {% else %} + {% set url = h.url_for(controller='ckanext.pages.controller:PagesController', action='pages_show', page='/' + page.name) %} + {% endif %} +
    • +

      + {{ page.title }} +

      + {% if page.content %} + {{ h.markdown_extract(page.content) }} + {% else %} +

      {{ _('This page currently has no content') }}

      + {% endif %} +
      • + {% endfor %} +
    +{% else %} +

    {{ _('There are currently no pages here') }}

    +{% endif %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/header.html b/ckanext-pages/ckanext/pages/theme/templates_main/header.html new file mode 100644 index 0000000000..8d085eb770 --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_main/header.html @@ -0,0 +1,10 @@ +{% ckan_extends %} + +{% block header_account_logged %} +
  • + + + +
    • + {{ super() }} +{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_organization/organization/read_base.html b/ckanext-pages/ckanext/pages/theme/templates_organization/organization/read_base.html new file mode 100644 index 0000000000..aba18eda0e --- /dev/null +++ b/ckanext-pages/ckanext/pages/theme/templates_organization/organization/read_base.html @@ -0,0 +1,6 @@ +{% ckan_extends %} + +{% block content_primary_nav %} + {{ super() }} + {{ h.build_nav_icon('organization_pages', _('Pages'), id=c.group_dict.name, page='') }} +{% endblock %} diff --git a/ckanext-pages/setup.py b/ckanext-pages/setup.py new file mode 100644 index 0000000000..1b79a53451 --- /dev/null +++ b/ckanext-pages/setup.py @@ -0,0 +1,29 @@ +from setuptools import setup, find_packages + +version = '0.1' + +setup( + name='ckanext-pages', + version=version, + description='Basic CMS extension for ckan', + long_description='', + classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers + keywords='', + author='David Raznick', + author_email='david.raznick@gokfn.org', + url='', + license='', + packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), + namespace_packages=['ckanext', 'ckanext.pages'], + include_package_data=True, + zip_safe=False, + install_requires=[ + # -*- Extra requirements: -*- + ], + entry_points=\ + """ + [ckan.plugins] + pages=ckanext.pages.plugin:PagesPlugin + + """, +) diff --git a/ckanext-sitemap/ckanext/sitemap/controller.py b/ckanext-sitemap/ckanext/sitemap/controller.py index d012879785..52b1e4cc10 100644 --- a/ckanext-sitemap/ckanext/sitemap/controller.py +++ b/ckanext-sitemap/ckanext/sitemap/controller.py @@ -20,7 +20,7 @@ class SitemapController(BaseController): def _render_sitemap(self, page): root = etree.Element("urlset", nsmap={None: SITEMAP_NS}) #pkgs = Session.query(Package).all() - pkgs = Session.query(Package).filter(Package.private == 0).offset(int(page)*25).limit(25) + pkgs = Session.query(Package).filter(Package.private == False).offset(int(page)*25).limit(25) for pkg in pkgs: url = etree.SubElement(root, 'url') loc = etree.SubElement(url, 'loc') @@ -40,7 +40,7 @@ def _render_sitemap(self, page): def view(self): #Sitemap Index root = etree.Element("sitemapindex", nsmap={None: SITEMAP_NS}) - pkgs = Session.query(Package).count() + pkgs = Session.query(Package).filter(Package.private == False).count() count = pkgs/25 for i in range(1,count): sitemap = etree.SubElement(root, 'sitemap') From 608008532748d58f3522ba1e68288d39adc0fcae Mon Sep 17 00:00:00 2001 From: Alexandru Artimon Date: Mon, 3 Nov 2014 18:46:27 +0200 Subject: [PATCH 30/31] fixes #1665 - Change feedback button to link to http://docs.hdx.rwlabs.org/get-involved/ --- ckanext-hdx_theme/ckanext/hdx_theme/templates/header-new.html | 2 +- ckanext-hdx_theme/ckanext/hdx_theme/templates/header.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/header-new.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/header-new.html index a9440e4eb6..a85226effc 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/header-new.html +++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/header-new.html @@ -31,7 +31,7 @@

  • {{ _('About') }}
    • {% endblock %} - + Feedback

    diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/header.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/header.html index cfcb98daf4..8ec0579e91 100644 --- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/header.html +++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/header.html @@ -51,7 +51,7 @@

    #} {% endblock %} - + Feedback

    From 904f5d609a4973f6b74265465c8788b47ca0efe2 Mon Sep 17 00:00:00 2001 From: Marianne Bellotti Date: Tue, 4 Nov 2014 01:11:03 -0500 Subject: [PATCH 31/31] removing pages --- ckanext-pages/.gitignore | 10 - ckanext-pages/README.md | 33 --- ckanext-pages/ckanext/__init__.py | 8 - ckanext-pages/ckanext/pages/__init__.py | 7 - ckanext-pages/ckanext/pages/actions.py | 219 -------------- ckanext-pages/ckanext/pages/auth.py | 64 ---- ckanext-pages/ckanext/pages/controller.py | 279 ------------------ ckanext-pages/ckanext/pages/db.py | 123 -------- ckanext-pages/ckanext/pages/plugin.py | 147 --------- .../templates_group/group/read_base.html | 6 - .../templates_main/ckanext_pages/base.html | 17 -- .../ckanext_pages/base_form.html | 117 -------- .../ckanext_pages/confirm_delete.html | 22 -- .../ckanext_pages/edit_base.html | 3 - .../ckanext_pages/group_page.html | 13 - .../ckanext_pages/group_page_edit.html | 7 - .../ckanext_pages/group_page_list.html | 14 - .../ckanext_pages/organization_page.html | 13 - .../ckanext_pages/organization_page_edit.html | 7 - .../ckanext_pages/organization_page_list.html | 14 - .../templates_main/ckanext_pages/page.html | 19 -- .../ckanext_pages/pages_edit.html | 7 - .../ckanext_pages/pages_list.html | 12 - .../ckanext_pages/snippets/pages_list.html | 28 -- .../pages/theme/templates_main/header.html | 10 - .../organization/read_base.html | 6 - ckanext-pages/setup.py | 29 -- 27 files changed, 1234 deletions(-) delete mode 100644 ckanext-pages/.gitignore delete mode 100644 ckanext-pages/README.md delete mode 100644 ckanext-pages/ckanext/__init__.py delete mode 100644 ckanext-pages/ckanext/pages/__init__.py delete mode 100644 ckanext-pages/ckanext/pages/actions.py delete mode 100644 ckanext-pages/ckanext/pages/auth.py delete mode 100644 ckanext-pages/ckanext/pages/controller.py delete mode 100644 ckanext-pages/ckanext/pages/db.py delete mode 100644 ckanext-pages/ckanext/pages/plugin.py delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_group/group/read_base.html delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/base.html delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/base_form.html delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/confirm_delete.html delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/edit_base.html delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page.html delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page_edit.html delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page_list.html delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page.html delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_edit.html delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_list.html delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/page.html delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/pages_edit.html delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/pages_list.html delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/snippets/pages_list.html delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_main/header.html delete mode 100644 ckanext-pages/ckanext/pages/theme/templates_organization/organization/read_base.html delete mode 100644 ckanext-pages/setup.py diff --git a/ckanext-pages/.gitignore b/ckanext-pages/.gitignore deleted file mode 100644 index 595975452c..0000000000 --- a/ckanext-pages/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -*.egg-info -*.pyc -*.swp -*.swo -*~ -#* -.#* -build/ -dist/ -distribute-* \ No newline at end of file diff --git a/ckanext-pages/README.md b/ckanext-pages/README.md deleted file mode 100644 index 30cb98b272..0000000000 --- a/ckanext-pages/README.md +++ /dev/null @@ -1,33 +0,0 @@ -ckanext-pages -============= - -This extension gives you an easy way to add simple pages to CKAN. - -By default you can add pages to the main CKAN menu. - - - -Extra config options allow you to control the creation of extra pages against groups and organizations. - -To swich on this behaviour, to your config add: - -``` -ckanext.pages.organization = True -ckanext.pages.group = True -``` - -These options are False by default and this feature is experimental. - - -This module also gives you a quick way to remove default elements from the CKAN menu and you may need todo this -in order for you to have space for the new items you add. These options are: - -``` -ckanext.pages.about_menu = False -ckanext.pages.group_menu = False -ckanext.pages.organization_menu = False -``` - -By default these are all set to True, like on a default install. - - diff --git a/ckanext-pages/ckanext/__init__.py b/ckanext-pages/ckanext/__init__.py deleted file mode 100644 index bf99a9da02..0000000000 --- a/ckanext-pages/ckanext/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -# this is a namespace package -try: - import pkg_resources - pkg_resources.declare_namespace(__name__) -except ImportError: - import pkgutil - __path__ = pkgutil.extend_path(__path__, __name__) - diff --git a/ckanext-pages/ckanext/pages/__init__.py b/ckanext-pages/ckanext/pages/__init__.py deleted file mode 100644 index 2e2033b3c0..0000000000 --- a/ckanext-pages/ckanext/pages/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -# this is a namespace package -try: - import pkg_resources - pkg_resources.declare_namespace(__name__) -except ImportError: - import pkgutil - __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/ckanext-pages/ckanext/pages/actions.py b/ckanext-pages/ckanext/pages/actions.py deleted file mode 100644 index a52d37f264..0000000000 --- a/ckanext-pages/ckanext/pages/actions.py +++ /dev/null @@ -1,219 +0,0 @@ -import datetime - -import ckan.plugins as p -import ckan.lib.navl.dictization_functions as df -import ckan.new_authz as new_authz - -import db -def page_name_validator(key, data, errors, context): - session = context['session'] - page = context.get('page') - group_id = context.get('group_id') - if page and page == data[key]: - return - - query = session.query(db.Page.name).filter_by(name=data[key], group_id=group_id) - result = query.first() - if result: - errors[key].append( - p.toolkit._('Page name already exists in database')) - -schema = { - 'id': [p.toolkit.get_validator('ignore_empty'), unicode], - 'title': [p.toolkit.get_validator('not_empty'), unicode], - 'name': [p.toolkit.get_validator('not_empty'), unicode, - p.toolkit.get_validator('name_validator'), page_name_validator], - 'content': [p.toolkit.get_validator('ignore_missing'), unicode], - # 'lang': [p.toolkit.get_validator('not_empty'), unicode], - 'order': [p.toolkit.get_validator('ignore_missing'), - unicode], - 'private': [p.toolkit.get_validator('ignore_missing'), - p.toolkit.get_validator('boolean_validator')], - 'group_id': [p.toolkit.get_validator('ignore_missing'), unicode], - 'user_id': [p.toolkit.get_validator('ignore_missing'), unicode], - 'created': [p.toolkit.get_validator('ignore_missing'), - p.toolkit.get_validator('isodate')], -} - - -def _pages_show(context, data_dict): - if db.pages_table is None: - db.init_db(context['model']) - org_id = data_dict.get('org_id') - page = data_dict.get('page') - out = db.Page.get(group_id=org_id, name=page) - if out: - out = db.table_dictize(out, context) - return out - - -def _pages_list(context, data_dict): - search = {} - if db.pages_table is None: - db.init_db(context['model']) - org_id = data_dict.get('org_id') - ordered = data_dict.get('order') - private = data_dict.get('private', True) - if ordered: - search['order'] = True - if not org_id: - search['group_id'] = None - try: - p.toolkit.check_access('ckanext_pages_update', context, data_dict) - if not private: - search['private'] = False - except p.toolkit.NotAuthorized: - search['private'] = False - else: - group = context['model'].Group.get(org_id) - user = context['user'] - member = new_authz.has_user_permission_for_group_or_org( - group.id, user, 'read') - search['group_id'] = org_id - if not member: - search['private'] = False - out = db.Page.pages(**search) - return [{'title': pg.title, - 'content': pg.content, - 'name': pg.name, - 'group_id': pg.group_id, - } for pg in out] - - -def _pages_delete(context, data_dict): - if db.pages_table is None: - db.init_db(context['model']) - org_id = data_dict.get('org_id') - page = data_dict.get('page') - out = db.Page.get(group_id=org_id, name=page) - if out: - session = context['session'] - session.delete(out) - session.commit() - - -def _pages_update(context, data_dict): - if db.pages_table is None: - db.init_db(context['model']) - org_id = data_dict.get('org_id') - page = data_dict.get('page') - # we need the page in the context for name validation - context['page'] = page - context['group_id'] = org_id - - data, errors = df.validate(data_dict, schema, context) - - if errors: - raise p.toolkit.ValidationError(errors) - - out = db.Page.get(group_id=org_id, name=page) - if not out: - out = db.Page() - out.group_id = org_id - out.name = page - items = ['title', 'content', 'name', 'private', 'order'] - for item in items: - setattr(out, item, data.get(item)) - - out.modified = datetime.datetime.utcnow() - out.user_id = p.toolkit.c.userobj.id - out.save() - session = context['session'] - session.add(out) - session.commit() - - -def pages_show(context, data_dict): - try: - p.toolkit.check_access('ckanext_pages_show', context, data_dict) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) - return _pages_show(context, data_dict) - - -def pages_update(context, data_dict): - try: - p.toolkit.check_access('ckanext_pages_update', context, data_dict) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) - return _pages_update(context, data_dict) - - -def pages_delete(context, data_dict): - try: - p.toolkit.check_access('ckanext_pages_delete', context, data_dict) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) - return _pages_delete(context, data_dict) - - -def pages_list(context, data_dict): - try: - p.toolkit.check_access('ckanext_pages_list', context, data_dict) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) - return _pages_list(context, data_dict) - - -def org_pages_show(context, data_dict): - try: - p.toolkit.check_access('ckanext_org_pages_show', context, data_dict) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) - return _pages_show(context, data_dict) - - -def org_pages_update(context, data_dict): - try: - p.toolkit.check_access('ckanext_org_pages_update', context, data_dict) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) - return _pages_update(context, data_dict) - - -def org_pages_delete(context, data_dict): - try: - p.toolkit.check_access('ckanext_org_pages_delete', context, data_dict) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) - return _pages_delete(context, data_dict) - - -def org_pages_list(context, data_dict): - try: - p.toolkit.check_access('ckanext_org_pages_list', context, data_dict) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) - return _pages_list(context, data_dict) - - -def group_pages_show(context, data_dict): - try: - p.toolkit.check_access('ckanext_group_pages_show', context, data_dict) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) - return _pages_show(context, data_dict) - - -def group_pages_update(context, data_dict): - try: - p.toolkit.check_access('ckanext_group_pages_update', context, data_dict) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) - return _pages_update(context, data_dict) - - -def group_pages_delete(context, data_dict): - try: - p.toolkit.check_access('ckanext_group_pages_delete', context, data_dict) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) - return _pages_delete(context, data_dict) - - -def group_pages_list(context, data_dict): - try: - p.toolkit.check_access('ckanext_group_pages_list', context, data_dict) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, p.toolkit._('Not authorized to see this page')) - return _pages_list(context, data_dict) diff --git a/ckanext-pages/ckanext/pages/auth.py b/ckanext-pages/ckanext/pages/auth.py deleted file mode 100644 index 7449b78aa2..0000000000 --- a/ckanext-pages/ckanext/pages/auth.py +++ /dev/null @@ -1,64 +0,0 @@ -import ckan.plugins as p -import ckan.new_authz as new_authz - -import db - - -def sysadmin(context, data_dict): - return {'success': False} - -def anyone(context, data_dict): - return {'success': True} - -def group_admin(context, data_dict): - return p.toolkit.check_access('group_update', context, data_dict) - - -def org_admin(context, data_dict): - return p.toolkit.check_access('group_update', context, data_dict) - - -def page_privacy(context, data_dict): - if db.pages_table is None: - db.init_db(context['model']) - org_id = data_dict.get('org_id') - page = data_dict.get('page') - out = db.Page.get(group_id=org_id, name=page) - if out and out.private == False: - return {'success': True} - # no org_id means it's a universal page - if not org_id: - if out and out.private: - return {'success': False} - return {'success': True} - group = context['model'].Group.get(org_id) - user = context['user'] - authorized = new_authz.has_user_permission_for_group_or_org(group.id, - user, - 'read') - if not authorized: - return {'success': False, - 'msg': p.toolkit._( - 'User %s not authorized to read this page') % user} - else: - return {'success': True} - -# Starting from 2.2 you need to explicitly flag auth functions that allow -# anonymous access -if p.toolkit.check_ckan_version(min_version='2.2'): - anyone = p.toolkit.auth_allow_anonymous_access(anyone) - page_privacy = p.toolkit.auth_allow_anonymous_access(page_privacy) - - -pages_show = page_privacy -pages_update = sysadmin -pages_delete = sysadmin -pages_list = anyone -org_pages_show = page_privacy -org_pages_update = org_admin -org_pages_delete = org_admin -org_pages_list = anyone -group_pages_show = page_privacy -group_pages_update = group_admin -group_pages_delete = group_admin -group_pages_list = anyone diff --git a/ckanext-pages/ckanext/pages/controller.py b/ckanext-pages/ckanext/pages/controller.py deleted file mode 100644 index c832883f14..0000000000 --- a/ckanext-pages/ckanext/pages/controller.py +++ /dev/null @@ -1,279 +0,0 @@ -import ckan.plugins as p - -_ = p.toolkit._ - -class PagesController(p.toolkit.BaseController): - controller = 'ckanext.pages.controller:PagesController' - - def _get_group_dict(self, id): - ''' returns the result of group_show action or aborts if there is a - problem ''' - - def _template_setup_org(self, id): - if not id: - return - # we need the org for the rest of the page - context = {'for_view': True} - try: - p.toolkit.c.group_dict = p.toolkit.get_action('organization_show')(context, {'id': id}) - except p.toolkit.ObjectNotFound: - p.toolkit.abort(404, _('Organization not found')) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, _('Unauthorized to read organization %s') % id) - - def org_show(self, id, page=None): - if page: - page = page[1:] - self._template_setup_org(id) - if page is '': - return self._org_list_pages(id) - _page = p.toolkit.get_action('ckanext_pages_show')( - data_dict={'org_id': p.toolkit.c.group_dict['id'], - 'page': page,} - ) - if _page is None: - return self._org_list_pages(id) - p.toolkit.c.page = _page - return p.toolkit.render('ckanext_pages/organization_page.html') - - def _org_list_pages(self, id): - p.toolkit.c.pages_dict = p.toolkit.get_action('ckanext_pages_list')( - data_dict={'org_id': p.toolkit.c.group_dict['id']} - ) - return p.toolkit.render('ckanext_pages/organization_page_list.html') - - - def org_delete(self, id, page): - self._template_setup_org(id) - page = page[1:] - if 'cancel' in p.toolkit.request.params: - p.toolkit.redirect_to(controller=self.controller, action='org_edit', id=p.toolkit.c.group_dict['name'], page='/' + page) - - ## try: - ## self._check_access('group_delete', {}, {'id': id}) - ## except p.toolkit.NotAuthorized: - ## p.toolkit.abort(401, _('Unauthorized to delete page')) - - try: - if p.toolkit.request.method == 'POST': - p.toolkit.get_action('ckanext_pages_delete')({}, {'org_id': p.toolkit.c.group_dict['id'], 'page': page}) - p.toolkit.redirect_to(controller=self.controller, action='org_show', id=id, page='') - else: - p.toolkit.abort(404, _('Page Not Found')) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, _('Unauthorized to delete page')) - except p.toolkit.ObjectNotFound: - p.toolkit.abort(404, _('Group not found')) - return p.toolkit.render('ckanext_pages/confirm_delete.html', {'page': page}) - - - def org_edit(self, id, page=None, data=None, errors=None, error_summary=None): - self._template_setup_org(id) - if page: - page = page[1:] - _page = p.toolkit.get_action('ckanext_pages_show')( - data_dict={'org_id': p.toolkit.c.group_dict['id'], - 'page': page,} - ) - if _page is None: - _page = {} - - if p.toolkit.request.method == 'POST' and not data: - data = p.toolkit.request.POST - items = ['title', 'name', 'content', 'private'] - # update config from form - for item in items: - if item in data: - _page[item] = data[item] - _page['org_id'] = p.toolkit.c.group_dict['id'], - _page['page'] = page - try: - junk = p.toolkit.get_action('ckanext_pages_update')( - data_dict=_page - ) - except p.toolkit.ValidationError, e: - errors = e.error_dict - error_summary = e.error_summary - return self.org_edit(id, '/' + page, data, - errors, error_summary) - p.toolkit.redirect_to(p.toolkit.url_for('organization_pages', id=id, page='/' + _page['name'])) - - if not data: - data = _page - - errors = errors or {} - error_summary = error_summary or {} - - vars = {'data': data, 'errors': errors, - 'error_summary': error_summary, 'page': page} - - return p.toolkit.render('ckanext_pages/organization_page_edit.html', - extra_vars=vars) - - def _template_setup_group(self, id): - if not id: - return - # we need the org for the rest of the page - context = {'for_view': True} - try: - p.toolkit.c.group_dict = p.toolkit.get_action('group_show')(context, {'id': id}) - except p.toolkit.ObjectNotFound: - p.toolkit.abort(404, _('Group not found')) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, _('Unauthorized to read group %s') % id) - - - def group_show(self, id, page=None): - if page: - page = page[1:] - self._template_setup_group(id) - if page is '': - return self._group_list_pages(id) - _page = p.toolkit.get_action('ckanext_pages_show')( - data_dict={'org_id': p.toolkit.c.group_dict['id'], - 'page': page,} - ) - if _page is None: - return self._group_list_pages(id) - p.toolkit.c.page = _page - return p.toolkit.render('ckanext_pages/group_page.html') - - def _group_list_pages(self, id): - p.toolkit.c.pages_dict = p.toolkit.get_action('ckanext_pages_list')( - data_dict={'org_id': p.toolkit.c.group_dict['id']} - ) - return p.toolkit.render('ckanext_pages/group_page_list.html') - - def group_edit(self, id, page=None, data=None, errors=None, error_summary=None): - self._template_setup_group(id) - if page: - page = page[1:] - _page = p.toolkit.get_action('ckanext_pages_show')( - data_dict={'org_id': p.toolkit.c.group_dict['id'], - 'page': page,} - ) - if _page is None: - _page = {} - - if p.toolkit.request.method == 'POST' and not data: - data = p.toolkit.request.POST - items = ['title', 'name', 'content', 'private'] - # update config from form - for item in items: - if item in data: - _page[item] = data[item] - _page['org_id'] = p.toolkit.c.group_dict['id'] - _page['page'] = page - try: - junk = p.toolkit.get_action('ckanext_pages_update')( - data_dict=_page - ) - except p.toolkit.ValidationError, e: - errors = e.error_dict - error_summary = e.error_summary - return self.group_edit(id, '/' + page, data, - errors, error_summary) - p.toolkit.redirect_to(p.toolkit.url_for('group_pages', id=id, page='/' + _page['name'])) - - if not data: - data = _page - - errors = errors or {} - error_summary = error_summary or {} - - vars = {'data': data, 'errors': errors, - 'error_summary': error_summary, 'page': page} - - return p.toolkit.render('ckanext_pages/group_page_edit.html', - extra_vars=vars) - - - def pages_show(self, page=None): - if page: - page = page[1:] - if not page: - return self._pages_list_pages() - _page = p.toolkit.get_action('ckanext_pages_show')( - data_dict={'org_id': None, - 'page': page,} - ) - if _page is None: - return self._pages_list_pages() - p.toolkit.c.page = _page - return p.toolkit.render('ckanext_pages/page.html') - - def _pages_list_pages(self): - p.toolkit.c.pages_dict = p.toolkit.get_action('ckanext_pages_list')( - data_dict={'org_id': None} - ) - return p.toolkit.render('ckanext_pages/pages_list.html') - - def pages_delete(self, page): - page = page[1:] - if 'cancel' in p.toolkit.request.params: - p.toolkit.redirect_to(controller=self.controller, action='pages_edit', page='/' + page) - - - try: - if p.toolkit.request.method == 'POST': - p.toolkit.get_action('ckanext_pages_delete')({}, {'page': page}) - p.toolkit.redirect_to(controller=self.controller, action='pages_show', page='') - else: - p.toolkit.abort(404, _('Page Not Found')) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, _('Unauthorized to delete page')) - except p.toolkit.ObjectNotFound: - p.toolkit.abort(404, _('Group not found')) - return p.toolkit.render('ckanext_pages/confirm_delete.html', {'page': page}) - - - def pages_edit(self, page=None, data=None, errors=None, error_summary=None): - if page: - page = page[1:] - _page = p.toolkit.get_action('ckanext_pages_show')( - data_dict={'org_id': None, - 'page': page,} - ) - if _page is None: - _page = {} - - if p.toolkit.request.method == 'POST' and not data: - data = p.toolkit.request.POST - items = ['title', 'name', 'content', 'private', 'order'] - - # update config from form - for item in items: - if item in data: - _page[item] = data[item] - _page['org_id'] = None - _page['page'] = page - try: - junk = p.toolkit.get_action('ckanext_pages_update')( - data_dict=_page - ) - except p.toolkit.ValidationError, e: - errors = e.error_dict - error_summary = e.error_summary - return self.pages_edit('/' + page, data, - errors, error_summary) - p.toolkit.redirect_to(p.toolkit.url_for('pages_show', page='/' + _page['name'])) - - try: - p.toolkit.check_access('ckanext_pages_update', {'user': p.toolkit.c.user or p.toolkit.c.author}) - except p.toolkit.NotAuthorized: - p.toolkit.abort(401, _('Unauthorized to create or edit a page')) - - if not data: - data = _page - - errors = errors or {} - error_summary = error_summary or {} - - vars = {'data': data, 'errors': errors, - 'error_summary': error_summary, 'page': page} - - return p.toolkit.render('ckanext_pages/pages_edit.html', - extra_vars=vars) - - - diff --git a/ckanext-pages/ckanext/pages/db.py b/ckanext-pages/ckanext/pages/db.py deleted file mode 100644 index 0695c58d55..0000000000 --- a/ckanext-pages/ckanext/pages/db.py +++ /dev/null @@ -1,123 +0,0 @@ -import datetime -import uuid - -import sqlalchemy as sa -from sqlalchemy.orm import class_mapper - - -pages_table = None -Page = None - - -def make_uuid(): - return unicode(uuid.uuid4()) - - -def init_db(model): - class _Page(model.DomainObject): - - @classmethod - def get(cls, **kw): - '''Finds a single entity in the register.''' - query = model.Session.query(cls).autoflush(False) - return query.filter_by(**kw).first() - - @classmethod - def pages(cls, **kw): - '''Finds a single entity in the register.''' - order = kw.pop('order', False) - - query = model.Session.query(cls).autoflush(False) - query = query.filter_by(**kw) - if order: - query = query.order_by(cls.order).filter(cls.order != '') - return query.all() - - global Page - Page = _Page - # We will just try to create the table. If it already exists we get an - # error but we can just skip it and carry on. - sql = ''' - CREATE TABLE ckanext_pages ( - id text NOT NULL, - title text, - name text, - content text, - lang text, - "order" text, - private boolean, - group_id text, - user_id text NOT NULL, - created timestamp without time zone, - modified timestamp without time zone - ); - ''' - conn = model.Session.connection() - try: - conn.execute(sql) - except sa.exc.ProgrammingError: - pass - model.Session.commit() - - types = sa.types - global pages_table - pages_table = sa.Table('ckanext_pages', model.meta.metadata, - sa.Column('id', types.UnicodeText, primary_key=True, default=make_uuid), - sa.Column('title', types.UnicodeText, default=u''), - sa.Column('name', types.UnicodeText, default=u''), - sa.Column('content', types.UnicodeText, default=u''), - sa.Column('lang', types.UnicodeText, default=u''), - sa.Column('order', types.UnicodeText, default=u''), - sa.Column('private',types.Boolean,default=True), - sa.Column('group_id', types.UnicodeText, default=None), - sa.Column('user_id', types.UnicodeText, default=u''), - sa.Column('created', types.DateTime, default=datetime.datetime.utcnow), - sa.Column('modified', types.DateTime, default=datetime.datetime.utcnow), - ) - - model.meta.mapper( - Page, - pages_table, - ) - - -def table_dictize(obj, context, **kw): - '''Get any model object and represent it as a dict''' - result_dict = {} - - if isinstance(obj, sa.engine.base.RowProxy): - fields = obj.keys() - else: - ModelClass = obj.__class__ - table = class_mapper(ModelClass).mapped_table - fields = [field.name for field in table.c] - - for field in fields: - name = field - if name in ('current', 'expired_timestamp', 'expired_id'): - continue - if name == 'continuity_id': - continue - value = getattr(obj, name) - if value is None: - result_dict[name] = value - elif isinstance(value, dict): - result_dict[name] = value - elif isinstance(value, int): - result_dict[name] = value - elif isinstance(value, datetime.datetime): - result_dict[name] = value.isoformat() - elif isinstance(value, list): - result_dict[name] = value - else: - result_dict[name] = unicode(value) - - result_dict.update(kw) - - ##HACK For optimisation to get metadata_modified created faster. - - context['metadata_modified'] = max(result_dict.get('revision_timestamp', ''), - context.get('metadata_modified', '')) - - return result_dict - diff --git a/ckanext-pages/ckanext/pages/plugin.py b/ckanext-pages/ckanext/pages/plugin.py deleted file mode 100644 index 194b89d0cf..0000000000 --- a/ckanext-pages/ckanext/pages/plugin.py +++ /dev/null @@ -1,147 +0,0 @@ -import logging -from pylons import config - -import ckan.plugins as p -import ckan.lib.helpers as h - -import actions -import auth - -log = logging.getLogger(__name__) - -def build_pages_nav_main(*args): - - about_menu = p.toolkit.asbool(config.get('ckanext.pages.about_menu', True)) - group_menu = p.toolkit.asbool(config.get('ckanext.pages.group_menu', True)) - org_menu = p.toolkit.asbool(config.get('ckanext.pages.organization_menu', True)) - - new_args = [] - for arg in args: - if arg[0] == 'about' and not about_menu: - continue - if arg[0] == 'organizations_index' and not org_menu: - continue - if arg[0] == 'group_index' and not group_menu: - continue - new_args.append(arg) - - output = h.build_nav_main(*new_args) - - # do not display any private datasets in menu even for sysadmins - pages_list = p.toolkit.get_action('ckanext_pages_list')(None, {'order': True, 'private': False}) - - page_name = '' - - if (p.toolkit.c.action == 'pages_show' - and p.toolkit.c.controller == 'ckanext.pages.controller:PagesController'): - page_name = p.toolkit.c.environ['routes.url'].current().split('/')[-1] - - for page in pages_list: - link = h.link_to(page.get('title'), - h.url_for('/pages/' + str(page['name']))) - - if page['name'] == page_name: - li = h.literal('
  • ') + link + h.literal('
    • ') - else: - li = h.literal('
  • ') + link + h.literal('
    • ') - output = output + li - - return output - - - -class PagesPlugin(p.SingletonPlugin): - p.implements(p.IConfigurer, inherit=True) - p.implements(p.ITemplateHelpers, inherit=True) - p.implements(p.IConfigurable, inherit=True) - p.implements(p.IRoutes, inherit=True) - p.implements(p.IActions, inherit=True) - p.implements(p.IAuthFunctions, inherit=True) - - def update_config(self, config): - self.organization_pages = p.toolkit.asbool(config.get('ckanext.pages.organization', False)) - self.group_pages = p.toolkit.asbool(config.get('ckanext.pages.group', False)) - - p.toolkit.add_template_directory(config, 'theme/templates_main') - if self.group_pages: - p.toolkit.add_template_directory(config, 'theme/templates_group') - if self.organization_pages: - p.toolkit.add_template_directory(config, 'theme/templates_organization') - - - def configure(self, config): - return - - def get_helpers(self): - return { - 'build_nav_main': build_pages_nav_main - } - - def after_map(self, map): - controller = 'ckanext.pages.controller:PagesController' - - if self.organization_pages: - map.connect('organization_pages_delete', '/organization/pages_delete/{id}{page:/.*|}', - action='org_delete', ckan_icon='delete', controller=controller) - map.connect('organization_pages_edit', '/organization/pages_edit/{id}{page:/.*|}', - action='org_edit', ckan_icon='edit', controller=controller) - map.connect('organization_pages', '/organization/pages/{id}{page:/.*|}', - action='org_show', ckan_icon='file', controller=controller, highlight_actions='org_edit org_show') - - if self.group_pages: - map.connect('group_pages_delete', '/group/pages_delete/{id}{page:/.*|}', - action='group_delete', ckan_icon='delete', controller=controller) - map.connect('group_pages_edit', '/group/pages_edit/{id}{page:/.*|}', - action='group_edit', ckan_icon='edit', controller=controller) - map.connect('group_pages', '/group/pages/{id}{page:/.*|}', - action='group_show', ckan_icon='file', controller=controller, highlight_actions='group_edit group_show') - - - map.connect('pages_delete', '/pages_delete{page:/.*|}', - action='pages_delete', ckan_icon='delete', controller=controller) - map.connect('pages_edit', '/pages_edit{page:/.*|}', - action='pages_edit', ckan_icon='edit', controller=controller) - map.connect('pages_show', '/pages{page:/.*|}', - action='pages_show', ckan_icon='file', controller=controller, highlight_actions='pages_edit pages_show') - return map - - def get_actions(self): - actions_dict = { - 'ckanext_pages_show': actions.pages_show, - 'ckanext_pages_update': actions.pages_update, - 'ckanext_pages_delete': actions.pages_delete, - 'ckanext_pages_list': actions.pages_list, - } - if self.organization_pages: - org_actions={ - 'ckanext_org_pages_show': actions.org_pages_show, - 'ckanext_org_pages_update': actions.org_pages_update, - 'ckanext_org_pages_delete': actions.org_pages_delete, - 'ckanext_org_pages_list': actions.org_pages_list, - } - actions_dict.update(org_actions) - if self.group_pages: - group_actions={ - 'ckanext_group_pages_show': actions.group_pages_show, - 'ckanext_group_pages_update': actions.group_pages_update, - 'ckanext_group_pages_delete': actions.group_pages_delete, - 'ckanext_group_pages_list': actions.group_pages_list, - } - actions_dict.update(group_actions) - return actions_dict - - def get_auth_functions(self): - return { - 'ckanext_pages_show': auth.pages_show, - 'ckanext_pages_update': auth.pages_update, - 'ckanext_pages_delete': auth.pages_delete, - 'ckanext_pages_list': auth.pages_list, - 'ckanext_org_pages_show': auth.org_pages_show, - 'ckanext_org_pages_update': auth.org_pages_update, - 'ckanext_org_pages_delete': auth.org_pages_delete, - 'ckanext_org_pages_list': auth.org_pages_list, - 'ckanext_group_pages_show': auth.group_pages_show, - 'ckanext_group_pages_update': auth.group_pages_update, - 'ckanext_group_pages_delete': auth.group_pages_delete, - 'ckanext_group_pages_list': auth.group_pages_list, - } diff --git a/ckanext-pages/ckanext/pages/theme/templates_group/group/read_base.html b/ckanext-pages/ckanext/pages/theme/templates_group/group/read_base.html deleted file mode 100644 index 62c2bffa3d..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_group/group/read_base.html +++ /dev/null @@ -1,6 +0,0 @@ -{% ckan_extends %} - -{% block content_primary_nav %} - {{ super() }} - {{ h.build_nav_icon('group_pages', _('Pages'), id=c.group_dict.name, page='') }} -{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/base.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/base.html deleted file mode 100644 index a639da7682..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/base.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends 'page.html' %} - -{% block page_header %}{% endblock %} - -{% block secondary_content %} -
    -

    - - {{ _('What are Pages?') }} -

    -
    - {% trans %} -

    Pages are are simple way to add extra pages to your ckan instance. You can assign an order to them.

    - {% endtrans %} -
    -
    -{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/base_form.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/base_form.html deleted file mode 100644 index 8ebc0dc4ef..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/base_form.html +++ /dev/null @@ -1,117 +0,0 @@ -{% import 'macros/form.html' as form %} - -{% if type == 'org' %} - {% set action_url = h.url_for('organization_pages_edit', id=id, page='/' + page) %} - {% set cancel_url = h.url_for('organization_pages', id=id, page='') %} - {% set slug_prefix = cancel_url ~ '/' %} - {% set slug_domain = h.url_for('organization_pages', id=id, page='', qualified=true) %} - {% set hide_field_order = true %} -{% elif type == 'group' %} - {% set action_url = h.url_for('group_pages_edit', id=id, page='/' + page) %} - {% set cancel_url = h.url_for('group_pages', id=id, page='') %} - {% set slug_prefix = cancel_url ~ '/' %} - {% set slug_domain = h.url_for('group_pages', id=id, page='', qualified=true) %} - {% set hide_field_order = true %} -{% else %} - {% set action_url = h.url_for('pages_edit', page='/' + page) %} - {% set cancel_url = h.url_for('pages_show', page='') %} - {% set slug_prefix = cancel_url ~ '/' %} - {% set slug_domain = h.url_for('pages_show', page='', qualified=true) %} -{% endif %} - -{% set data = data or {} %} -{% set errors = errors or {} %} - -{% if not page %} -

    {{ _('Add page') }}

    -{% else %} -

    {{ _('Edit page') }}

    -{% endif %} - -
    - - {{ form.input('title', id='field-title', label=_('Title'), placeholder=_('eg. Page Title'), value=data.title, error=errors.title, classes=['control-full', 'control-large'], attrs={'data-module': 'slug-preview-target'}) }} - - {% set domain = slug_domain|replace("http://", "")|replace("https://", "") %} - {% set attrs = {'data-module': 'slug-preview-slug', 'data-module-prefix': domain~'/', 'data-module-placeholder': ''} %} - {{ form.prepend('name', id='field-name', label=_('URL'), prepend=slug_prefix, placeholder=_('eg. my-page'), value=data.name, error=errors.name, attrs=attrs) }} - - {#{{ form.input('name', id='field-name', label=_('Name'), placeholder=_('my-name'), value=data.name, error=errors.name, classes=['control-full']) }}#} - -
    - -
    - -
    -
    - - {% if not hide_field_order %} -
    - -
    - -
    -
    - - {% endif %} -{# data.content #} - - - - - {{ form.input('search', id='search', label=_('Search for Datasets'), placeholder=_('eg. ebola'), classes=['control-full', 'control-large']) }} - -
    - - {{ form.markdown('content', id='field-content', label=_('Content'), placeholder=_('My content'), value=data.content, error=errors.content) }} - -
    - {% if not page %} - {{ _('Cancel') }} - - {% else %} - - {% block delete_button %} - {% if h.check_access('ckanext_pages_delete', {'id': data.id}) %} - {% set locale = h.dump_json({'content': _('Are you sure you want to delete this Page?')}) %} - {% block delete_button_text %}{{ _('Delete') }}{% endblock %} - {% endif %} - {% endblock %} - - - {% endif %} -
    - - diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/confirm_delete.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/confirm_delete.html deleted file mode 100644 index 6ab5f92814..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/confirm_delete.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "page.html" %} - -{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %} - -{% block maintag %}
    {% endblock %} - -{% block main_content %} -
    -
    - {% block form %} -

    {{ _('Are you sure you want to delete page - {name}?').format(name=c.page_dict.name) }}

    -

    - {% set action = form_action or h.url_for('organization_pages_delete', id=c.group_dict.name, page='/' + page) %} -

    - - -
    -

    - {% endblock %} -
    -
    -{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/edit_base.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/edit_base.html deleted file mode 100644 index c17a16c476..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/edit_base.html +++ /dev/null @@ -1,3 +0,0 @@ -{% extends 'ckanext_pages/base.html' %} - -{% block subtitle %}{{ _('Pages') }}{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page.html deleted file mode 100644 index 300178c48e..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends 'group/read_base.html' %} - -{% block subtitle %}{{ _('Pages') }} - {{ c.group_dict.display_name }}{% endblock %} - -{% block primary_content_inner %} - {% link_for _('Edit page'), controller='ckanext.pages.controller:PagesController', action='group_edit', id=c.group_dict.name, page='/' + c.page.name, class_='btn btn-primary pull-right', icon='edit' %} -

    {{ c.page.title }}

    - {% if c.page.content %} - {{ h.render_markdown(c.page.content) }} - {% else %} -

    {{ _('This page currently has no content') }}

    - {% endif %} -{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page_edit.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page_edit.html deleted file mode 100644 index 2bcc1790c8..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page_edit.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends 'group/read_base.html' %} - -{% block subtitle %}{{ _('Pages') }} - {{ c.group_dict.display_name }}{% endblock %} - -{% block primary_content_inner %} - {% snippet 'ckanext_pages/base_form.html', type='group', id=c.group_dict.name, page=page, data=data, errors=errors %} -{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page_list.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page_list.html deleted file mode 100644 index bfc1b7ccc9..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/group_page_list.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "group/read_base.html" %} - -{% block page_primary_action %} - {% if h.check_access('package_create', {'group_id': c.group_dict.id}) %} - {% link_for _('Add page'), controller='ckanext.pages.controller:PagesController', action='group_edit', id=c.group_dict.name, page='', class_='btn btn-primary', icon='plus-sign-alt' %} - {% endif %} -{% endblock %} - -{% block subtitle %}{{ _('Pages') }} - {{ c.group_dict.display_name }}{% endblock %} - -{% block primary_content_inner %} -

    {{ _('Pages') }}

    - {% snippet 'ckanext_pages/snippets/pages_list.html', pages=c.pages_dict, type='group', id=c.group_dict.name %} -{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page.html deleted file mode 100644 index b6976d7599..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends 'organization/read_base.html' %} - -{% block subtitle %}{{ _('Pages') }} - {{ c.group_dict.display_name }}{% endblock %} - -{% block primary_content_inner %} - {% link_for _('Edit page'), controller='ckanext.pages.controller:PagesController', action='org_edit', id=c.group_dict.name, page='/' + c.page.name, class_='btn btn-primary pull-right', icon='edit' %} -

    {{ c.page.title }}

    - {% if c.page.content %} - {{ h.render_markdown(c.page.content) }} - {% else %} -

    {{ _('This page currently has no content') }}

    - {% endif %} -{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_edit.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_edit.html deleted file mode 100644 index c2d9740aec..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_edit.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends 'organization/read_base.html' %} - -{% block subtitle %}{{ _('Pages') }} - {{ c.group_dict.display_name }}{% endblock %} - -{% block primary_content_inner %} - {% snippet 'ckanext_pages/base_form.html', type='org', id=c.group_dict.name, page=page, data=data, errors=errors %} -{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_list.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_list.html deleted file mode 100644 index 7c0745f955..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/organization_page_list.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends 'organization/read_base.html' %} - -{% block page_primary_action %} - {% if h.check_access('package_create', {'group_id': c.group_dict.id}) %} - {% link_for _('Add page'), controller='ckanext.pages.controller:PagesController', action='org_edit', id=c.group_dict.name, page='', class_='btn btn-primary', icon='plus-sign-alt' %} - {% endif %} -{% endblock %} - -{% block subtitle %}{{ _('Pages') }} - {{ c.group_dict.display_name }}{% endblock %} - -{% block primary_content_inner %} -

    {{ _('Pages') }}

    - {% snippet 'ckanext_pages/snippets/pages_list.html', pages=c.pages_dict, type='org', id=c.group_dict.name %} -{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/page.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/page.html deleted file mode 100644 index c5d2a3a253..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/page.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends 'page.html' %} - -{% block subtitle %}{{ c.page.title }}{% endblock %} - -{% block primary %} -
    - {% if h.check_access('ckanext_pages_update') %} - {% link_for _('Edit'), controller='ckanext.pages.controller:PagesController', action='pages_edit', page='/' + c.page.name, class_='btn btn-primary pull-right', icon='edit' %} - {% endif %} -

    {{ c.page.title }}

    - {% if c.page.content %} - {{ h.render_markdown(c.page.content) }} - {% else %} -

    {{ _('This page currently has no content') }}

    - {% endif %} -
    -{% endblock %} - -{% block secondary %}{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/pages_edit.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/pages_edit.html deleted file mode 100644 index 85bac8c597..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/pages_edit.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends 'ckanext_pages/edit_base.html' %} - -{% block subtitle %}{{ _('Edit Page')}} {% endblock %} - -{% block primary_content_inner %} - {% snippet 'ckanext_pages/base_form.html', page=page, data=data, errors=errors %} -{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/pages_list.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/pages_list.html deleted file mode 100644 index 2423ed2c7a..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/pages_list.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends 'ckanext_pages/edit_base.html' %} - -{% block page_primary_action %} - {% if h.check_access('ckanext_pages_update', {}) %} - {% link_for _('Add page'), controller='ckanext.pages.controller:PagesController', action='pages_edit', page='', class_='btn btn-primary', icon='plus-sign-alt' %} - {% endif %} -{% endblock %} - -{% block primary_content_inner %} -

    {{ _('Pages') }}

    - {% snippet 'ckanext_pages/snippets/pages_list.html', pages=c.pages_dict %} -{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/snippets/pages_list.html b/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/snippets/pages_list.html deleted file mode 100644 index 54d1801da6..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_main/ckanext_pages/snippets/pages_list.html +++ /dev/null @@ -1,28 +0,0 @@ -{% set pages_total = pages|length %} -{% set action = '{0}_show'.format(type) %} - -

    {{ _('1 page') if pages_total == 1 else _('{0} pages').format(pages_total) }}

    -
    -{% if pages %} -
      - {% for page in pages %} - {% if type %} - {% set url = h.url_for(controller='ckanext.pages.controller:PagesController', action=action, id=id, page='/' + page.name) %} - {% else %} - {% set url = h.url_for(controller='ckanext.pages.controller:PagesController', action='pages_show', page='/' + page.name) %} - {% endif %} -
    • -

      - {{ page.title }} -

      - {% if page.content %} - {{ h.markdown_extract(page.content) }} - {% else %} -

      {{ _('This page currently has no content') }}

      - {% endif %} -
      • - {% endfor %} -
    -{% else %} -

    {{ _('There are currently no pages here') }}

    -{% endif %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_main/header.html b/ckanext-pages/ckanext/pages/theme/templates_main/header.html deleted file mode 100644 index 8d085eb770..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_main/header.html +++ /dev/null @@ -1,10 +0,0 @@ -{% ckan_extends %} - -{% block header_account_logged %} -
  • - - - -
    • - {{ super() }} -{% endblock %} diff --git a/ckanext-pages/ckanext/pages/theme/templates_organization/organization/read_base.html b/ckanext-pages/ckanext/pages/theme/templates_organization/organization/read_base.html deleted file mode 100644 index aba18eda0e..0000000000 --- a/ckanext-pages/ckanext/pages/theme/templates_organization/organization/read_base.html +++ /dev/null @@ -1,6 +0,0 @@ -{% ckan_extends %} - -{% block content_primary_nav %} - {{ super() }} - {{ h.build_nav_icon('organization_pages', _('Pages'), id=c.group_dict.name, page='') }} -{% endblock %} diff --git a/ckanext-pages/setup.py b/ckanext-pages/setup.py deleted file mode 100644 index 1b79a53451..0000000000 --- a/ckanext-pages/setup.py +++ /dev/null @@ -1,29 +0,0 @@ -from setuptools import setup, find_packages - -version = '0.1' - -setup( - name='ckanext-pages', - version=version, - description='Basic CMS extension for ckan', - long_description='', - classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers - keywords='', - author='David Raznick', - author_email='david.raznick@gokfn.org', - url='', - license='', - packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), - namespace_packages=['ckanext', 'ckanext.pages'], - include_package_data=True, - zip_safe=False, - install_requires=[ - # -*- Extra requirements: -*- - ], - entry_points=\ - """ - [ckan.plugins] - pages=ckanext.pages.plugin:PagesPlugin - - """, -)