From 92ca447db50c281379168014536ae2562c610599 Mon Sep 17 00:00:00 2001 From: John Martin Date: Thu, 6 Jun 2013 11:50:28 +0100 Subject: [PATCH 1/8] [#890] Adds primary_content_inner to base template and makes use of it --- ckan/public/base/less/layout.less | 3 + ckan/public/base/less/toolbar.less | 14 +-- ckan/templates/admin/base.html | 20 +--- ckan/templates/group/about.html | 24 +++-- ckan/templates/group/activity_stream.html | 10 +- ckan/templates/group/read.html | 10 +- ckan/templates/group/read_base.html | 32 +++---- ckan/templates/organization/about.html | 2 - .../organization/activity_stream.html | 2 - .../organization/base_form_page.html | 2 - ckan/templates/organization/edit_base.html | 26 ++---- ckan/templates/organization/member_new.html | 92 +++++++++---------- ckan/templates/organization/members.html | 68 +++++++------- ckan/templates/organization/read.html | 8 +- ckan/templates/organization/read_base.html | 32 +++---- ckan/templates/package/activity.html | 2 - ckan/templates/package/activity_stream.html | 2 - ckan/templates/package/edit.html | 4 +- ckan/templates/package/followers.html | 2 - ckan/templates/package/history.html | 2 - ckan/templates/package/read.html | 46 +++++----- ckan/templates/package/read_base.html | 47 +++++----- ckan/templates/package/related_list.html | 2 - ckan/templates/package/resource_edit.html | 4 +- ckan/templates/package/search.html | 2 +- .../package/snippets/additional_info.html | 2 +- .../package/snippets/resources_list.html | 2 +- ckan/templates/package/snippets/tags.html | 2 +- ckan/templates/page.html | 37 ++++++-- ckan/templates/snippets/organization.html | 3 + ckan/templates/user/dashboard.html | 4 +- 31 files changed, 234 insertions(+), 274 deletions(-) diff --git a/ckan/public/base/less/layout.less b/ckan/public/base/less/layout.less index 2ff142b485a..ec8b3e9ed8c 100644 --- a/ckan/public/base/less/layout.less +++ b/ckan/public/base/less/layout.less @@ -153,6 +153,9 @@ } } } + .follow_button { + margin-top: 15px; + } &.editing { .module-heading { diff --git a/ckan/public/base/less/toolbar.less b/ckan/public/base/less/toolbar.less index 7f43f085d8e..6d84e4ddfd8 100644 --- a/ckan/public/base/less/toolbar.less +++ b/ckan/public/base/less/toolbar.less @@ -78,19 +78,21 @@ } .page-header { - position: relative; + .clearfix; border-bottom: 1px solid @moduleHeadingBorderColor; background-color: @moduleHeadingBackgroundColor; - height: 30px; .border-radius(0 3px 0 0); .nav-tabs { - position: absolute; - left: 20px; - bottom: -1px; - margin-bottom: 0; + float: left; + margin-bottom: -1px; li.active a, a:hover { background-color: @moduleBackgroundColor; } } + .edit_action { + float: right; + margin-top: -5px; + margin-right: -7px; + } } diff --git a/ckan/templates/admin/base.html b/ckan/templates/admin/base.html index 83427133f4d..a08ab2c93b6 100644 --- a/ckan/templates/admin/base.html +++ b/ckan/templates/admin/base.html @@ -5,21 +5,7 @@ {% block breadcrumb_content %} {% endblock %} -{% block primary_content %} -
- {% block page_header %} -
-
    - {% block page_header_tabs %} - {{ h.build_nav_icon('ckanadmin_index', _('Sysadmins')) }} - {{ h.build_nav_icon('ckanadmin_config', _('Config')) }} - {% endblock %} -
-
- {% endblock %} -
- {% block primary_content_inner %} - {% endblock %} -
-
+{% block page_header_tabs %} + {{ h.build_nav_icon('ckanadmin_index', _('Sysadmins')) }} + {{ h.build_nav_icon('ckanadmin_config', _('Config')) }} {% endblock %} diff --git a/ckan/templates/group/about.html b/ckan/templates/group/about.html index ecacd804264..cdf708b3085 100644 --- a/ckan/templates/group/about.html +++ b/ckan/templates/group/about.html @@ -3,18 +3,16 @@ {% block subtitle %}{{ _('About') }} - {{ c.group_dict.display_name }}{% endblock %} {% block primary_content_inner %} -
-

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

- {% block group_description %} - {% if c.group_dict.description %} - {{ h.render_markdown(c.group_dict.description) }} - {% else %} -

{{ _('There is no description for this group') }}

- {% endif %} - {% endblock %} +

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

+ {% block group_description %} + {% if c.group_dict.description %} + {{ h.render_markdown(c.group_dict.description) }} + {% else %} +

{{ _('There is no description for this group') }}

+ {% endif %} + {% endblock %} - {% block group_extras %} - {% snippet 'snippets/additional_info.html', extras = h.sorted_extras(c.group_dict.extras) %} - {% endblock %} -
+ {% block group_extras %} + {% snippet 'snippets/additional_info.html', extras = h.sorted_extras(c.group_dict.extras) %} + {% endblock %} {% endblock %} diff --git a/ckan/templates/group/activity_stream.html b/ckan/templates/group/activity_stream.html index dc84175cd7e..afb8d973e57 100644 --- a/ckan/templates/group/activity_stream.html +++ b/ckan/templates/group/activity_stream.html @@ -3,10 +3,8 @@ {% block subtitle %}{{ _('Activity Stream') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %} {% block primary_content_inner %} -
-

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

- {% block activity_stream %} - {{ c.group_activity_stream | safe }} - {% endblock %} -
+

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

+ {% block activity_stream %} + {{ c.group_activity_stream | safe }} + {% endblock %} {% endblock %} diff --git a/ckan/templates/group/read.html b/ckan/templates/group/read.html index f56359b37d9..94106a29b74 100644 --- a/ckan/templates/group/read.html +++ b/ckan/templates/group/read.html @@ -3,19 +3,17 @@ {% block subtitle %}{{ c.group_dict.display_name }}{% endblock %} {% block primary_content_inner %} -
- {% block packages_list %} + {% block packages_list %} {% include "package/snippets/search_form.html" %} - {% endblock %} -
+ {% endblock %} {% block page_pagination %} - {{ c.page.pager(q=c.q) }} + {{ c.page.pager(q=c.q) }} {% endblock %} {% endblock %} {% block secondary_content %} {{ super() }} {% for facet in c.facet_titles %} - {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet, extras={'id':c.group_dict.id}) }} + {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet, extras={'id':c.group_dict.id}) }} {% endfor %} {% endblock %} diff --git a/ckan/templates/group/read_base.html b/ckan/templates/group/read_base.html index 949c43478f6..a3d7ef42855 100644 --- a/ckan/templates/group/read_base.html +++ b/ckan/templates/group/read_base.html @@ -7,29 +7,20 @@
  • {% link_for c.group_dict.display_name|truncate(35), controller='group', action='read', id=c.group_dict.name %}
    • {% endblock %} -{% block actions_content %} +{% block add_action %} + {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %} +{% endblock %} + +{% block edit_action %} {% if h.check_access('group_update', {'id': c.group_dict.id}) %} -
  • {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn', icon='plus-sign-alt' %}
    • -
  • {% link_for _('Edit'), controller='group', action='edit', id=c.group_dict.name, class_='btn btn-primary', icon='wrench' %}
    • + {% link_for _('Edit'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %} {% endif %} -
  • {{ h.follow_button('group', c.group_dict.id) }}
    • {% endblock %} -{% block primary_content %} -
    - {% block page_header %} -
    -
      - {% block page_header_tabs %} - {{ h.build_nav_icon('group_read', _('Datasets'), id=c.group_dict.name) }} - {{ h.build_nav_icon('group_activity', _('Activity Stream'), id=c.group_dict.name, offset=0) }} - {{ h.build_nav_icon('group_about', _('About'), id=c.group_dict.name) }} - {% endblock %} -
    -
    - {% endblock %} - {% block primary_content_inner %}{% endblock %} -
    +{% block page_header_tabs %} + {{ h.build_nav_icon('group_read', _('Datasets'), id=c.group_dict.name) }} + {{ h.build_nav_icon('group_activity', _('Activity Stream'), id=c.group_dict.name, offset=0) }} + {{ h.build_nav_icon('group_about', _('About'), id=c.group_dict.name) }} {% endblock %} {% block secondary_content %} @@ -59,6 +50,9 @@

    {{ c.group_dict.display_name }}

    {{ h.SI_number_span(c.group_dict.packages|length) }}
    +
    + {{ h.follow_button('group', c.group_dict.id) }} +
    {% endblock %} diff --git a/ckan/templates/organization/about.html b/ckan/templates/organization/about.html index 22054f45d0d..47b56d5ebdd 100644 --- a/ckan/templates/organization/about.html +++ b/ckan/templates/organization/about.html @@ -3,7 +3,6 @@ {% block subtitle %}{{ _('About') }} - {{ c.group_dict.display_name }}{% endblock %} {% block primary_content_inner %} -

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

    {% block organization_description %} {% if c.group_dict.description %} @@ -16,5 +15,4 @@

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

    {% block organization_extras %} {% snippet 'snippets/additional_info.html', extras = h.sorted_extras(c.group_dict.extras) %} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/organization/activity_stream.html b/ckan/templates/organization/activity_stream.html index 30fc375d697..0320bb76c16 100644 --- a/ckan/templates/organization/activity_stream.html +++ b/ckan/templates/organization/activity_stream.html @@ -3,10 +3,8 @@ {% block subtitle %}{{ _('Activity Stream') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %} {% block primary_content_inner %} -

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

    {% block activity_stream %} {{ c.group_activity_stream | safe }} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/organization/base_form_page.html b/ckan/templates/organization/base_form_page.html index 1bff311bc99..4eb308287e1 100644 --- a/ckan/templates/organization/base_form_page.html +++ b/ckan/templates/organization/base_form_page.html @@ -1,12 +1,10 @@ {% extends "organization/edit_base.html" %} {% block primary_content_inner %} -

    {% block page_heading %}{{ _('Organization Form') }}{% endblock %}

    {% block form %} {{ c.form | safe }} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/organization/edit_base.html b/ckan/templates/organization/edit_base.html index d5006bde46d..68bdd5abbe3 100644 --- a/ckan/templates/organization/edit_base.html +++ b/ckan/templates/organization/edit_base.html @@ -1,4 +1,4 @@ -{% extends "organization/index.html" %} +{% extends "page.html" %} {% set organization = c.group_dict %} @@ -14,29 +14,17 @@ {% endblock %} {% endblock %} -{% block actions_content %} +{% block edit_action %} {% if organization and h.check_access('organization_update', {'id': organization.id}) %} -
  • {% link_for _('View organization'), controller='organization', action='read', id=organization.name, class_='btn', icon='eye-open' %}
    • + {% link_for _('View organization'), controller='organization', action='read', id=organization.name, class_='btn', icon='eye-open' %} {% endif %} {#
  • {% link_for _('History'), controller='organization', action='history', id=organization.name, class_='btn', icon='undo' %}
    • #} {% endblock %} -{% block primary_content %} -
    - {% block page_header %} -
    -
      - {% block page_header_tabs %} - {{ h.build_nav_icon('organization_edit', _('Edit'), id=c.group_dict.name) }} - {{ h.build_nav_icon('organization_bulk_process', _('Datasets'), id=c.group_dict.name) }} - {{ h.build_nav_icon('organization_members', _('Members'), id=c.group_dict.name) }} - {% endblock %} -
    -
    - {% endblock %} - {% block primary_content_inner %} - {% endblock %} -
    +{% block page_header_tabs %} + {{ h.build_nav_icon('organization_edit', _('Edit'), id=c.group_dict.name) }} + {{ h.build_nav_icon('organization_bulk_process', _('Datasets'), id=c.group_dict.name) }} + {{ h.build_nav_icon('organization_members', _('Members'), id=c.group_dict.name) }} {% endblock %} {% block secondary_content %} diff --git a/ckan/templates/organization/member_new.html b/ckan/templates/organization/member_new.html index 355d5560b38..dd2c4e50bfa 100644 --- a/ckan/templates/organization/member_new.html +++ b/ckan/templates/organization/member_new.html @@ -7,57 +7,55 @@ {% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }}{% endblock %} {% block primary_content_inner %} -
    - {% link_for _('Back to all members'), controller='organization', action='members', id=organization.name, class_='btn pull-right', icon='arrow-left' %} -

    - {% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %} -

    - {% block form %} -
    + {% link_for _('Back to all members'), controller='organization', action='members', id=organization.name, class_='btn pull-right', icon='arrow-left' %} +

    + {% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %} +

    + {% block form %} + + {% if user %} + + {% set format_attrs = {'disabled': true} %} + {{ form.input('username', label=_('User'), value=user.name, classes=['control-medium'], attrs=format_attrs) }} + {% else %} + {% set format_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/user/autocomplete?q=?'} %} + {{ form.input('username', id='field-username', label=_('User'), placeholder=_('Username'), value='', error='', classes=['control-medium'], attrs=format_attrs) }} + {% endif %} + {% set format_attrs = {'data-module': 'autocomplete'} %} + {{ form.select('role', label=_('Role'), options=c.roles, selected=c.user_role, error='', attrs=format_attrs) }} +
    {% if user %} - - {% set format_attrs = {'disabled': true} %} - {{ form.input('username', label=_('User'), value=user.name, classes=['control-medium'], attrs=format_attrs) }} + {% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %} + {{ _('Delete') }} + {% else %} - {% set format_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/user/autocomplete?q=?'} %} - {{ form.input('username', id='field-username', label=_('User'), placeholder=_('Username'), value='', error='', classes=['control-medium'], attrs=format_attrs) }} - {% endif %} - {% set format_attrs = {'data-module': 'autocomplete'} %} - {{ form.select('role', label=_('Role'), options=c.roles, selected=c.user_role, error='', attrs=format_attrs) }} -
    - {% if user %} - {% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %} - {{ _('Delete') }} - - {% else %} - - {% endif %} -
    - - {% endblock %} -
    + + {% endif %} +
    + + {% endblock %} + {% endblock %} {% block secondary_content %} - {{ super() }} -
    -

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

    -
    - {% trans %} -

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

    -

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

    -

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

    - {% endtrans %} -
    +{{ super() }} +
    +

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

    +
    + {% trans %} +

    Admin: Can add/edit and delete datasets, as well as + manage organization members.

    +

    Editor: Can add and edit datasets, but not manage + organization members.

    +

    Member: Can view the organization's private + datasets, but not add new datasets.

    + {% endtrans %}
    {% endblock %} diff --git a/ckan/templates/organization/members.html b/ckan/templates/organization/members.html index 7bb5b648349..28717e1e69a 100644 --- a/ckan/templates/organization/members.html +++ b/ckan/templates/organization/members.html @@ -3,39 +3,37 @@ {% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }}{% endblock %} {% block primary_content_inner %} -
    - {% link_for _('Add Member'), controller='organization', action='member_new', id=c.group_dict.id, class_='btn pull-right', icon='plus-sign-alt' %} -

    {{ _('{0} members'.format(c.members|length)) }}

    - - - - - - - - - - - - - {% for user_id, user, role in c.members %} - - - - - - {% endfor %} - -
    {{ _('User') }}{{ _('Role') }}
    - {{ h.linked_user(user_id, maxlength=20) }} - {{ role }} - {% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %} -
    - - - - {% block delete_button_text %}{% endblock %} -
    -
    -
    + {% link_for _('Add Member'), controller='organization', action='member_new', id=c.group_dict.id, class_='btn pull-right', icon='plus-sign-alt' %} +

    {{ _('{0} members'.format(c.members|length)) }}

    + + + + + + + + + + + + + {% for user_id, user, role in c.members %} + + + + + + {% endfor %} + +
    {{ _('User') }}{{ _('Role') }}
    + {{ h.linked_user(user_id, maxlength=20) }} + {{ role }} + {% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %} +
    + + + + {% block delete_button_text %}{% endblock %} +
    +
    {% endblock %} diff --git a/ckan/templates/organization/read.html b/ckan/templates/organization/read.html index 02e2e5e1596..dfc46730b8c 100644 --- a/ckan/templates/organization/read.html +++ b/ckan/templates/organization/read.html @@ -1,13 +1,11 @@ {% extends "organization/read_base.html" %} {% block primary_content_inner %} -
    - {% block packages_list %} + {% block packages_list %} {% include "package/snippets/search_form.html" %} - {% endblock %} -
    + {% endblock %} {% block page_pagination %} - {{ c.page.pager(q=c.q) }} + {{ c.page.pager(q=c.q) }} {% endblock %} {% endblock %} diff --git a/ckan/templates/organization/read_base.html b/ckan/templates/organization/read_base.html index 959d078d7e2..8f6aa92894f 100644 --- a/ckan/templates/organization/read_base.html +++ b/ckan/templates/organization/read_base.html @@ -7,30 +7,22 @@
  • {% link_for c.group_dict.display_name|truncate(35), controller='organization', action='read', id=c.group_dict.name %}
    • {% endblock %} -{% block actions_content %} +{% block add_action %} {% if h.check_access('organization_update', {'id': c.group_dict.id}) %} -
  • {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn', icon='plus-sign-alt' %}
    • -
  • {% link_for _('Admin'), controller='organization', action='edit', id=c.group_dict.name, class_='btn btn-primary', icon='wrench' %}
    • + {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %} {% endif %} -
  • {{ h.follow_button('group', c.group_dict.id) }}
    • - {#
  • {% link_for _('History'), controller='organization', action='history', id=c.group_dict.name, class_='btn', icon='undo' %}
    • #} {% endblock %} -{% block primary_content %} -
    - {% block page_header %} -
    -
      - {% block page_header_tabs %} - {{ h.build_nav_icon('organization_read', _('Datasets'), id=c.group_dict.name) }} - {{ h.build_nav_icon('organization_activity', _('Activity Stream'), id=c.group_dict.name) }} - {{ h.build_nav_icon('organization_about', _('About'), id=c.group_dict.name) }} - {% endblock %} -
    -
    - {% endblock %} - {% block primary_content_inner %}{% endblock %} -
    +{% block edit_action %} + {% if h.check_access('organization_update', {'id': c.group_dict.id}) %} + {% link_for _('Admin'), controller='organization', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %} + {% endif %} +{% endblock %} + +{% block page_header_tabs %} + {{ h.build_nav_icon('organization_read', _('Datasets'), id=c.group_dict.name) }} + {{ h.build_nav_icon('organization_activity', _('Activity Stream'), id=c.group_dict.name) }} + {{ h.build_nav_icon('organization_about', _('About'), id=c.group_dict.name) }} {% endblock %} {% block secondary_content %} diff --git a/ckan/templates/package/activity.html b/ckan/templates/package/activity.html index 603fc6a8565..14600d5211a 100644 --- a/ckan/templates/package/activity.html +++ b/ckan/templates/package/activity.html @@ -3,10 +3,8 @@ {% block subtitle %}{{ _('Activity Stream') }} - {{ c.pkg_dict.title or c.pkg_dict.name }}{% endblock %} {% block primary_content_inner %} -

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

    {% block activity_stream %} {{ c.package_activity_stream | safe }} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/package/activity_stream.html b/ckan/templates/package/activity_stream.html index dd1d2a5268e..233c3b58c43 100644 --- a/ckan/templates/package/activity_stream.html +++ b/ckan/templates/package/activity_stream.html @@ -3,10 +3,8 @@ {% block subtitle %}{{ _('Activity Stream') }}{% endblock %} {% block package_content %} -

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

    {% block activity_stream %} {{ c.package_activity_stream | safe }} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/package/edit.html b/ckan/templates/package/edit.html index 668a00cc3e3..971ac9b094a 100644 --- a/ckan/templates/package/edit.html +++ b/ckan/templates/package/edit.html @@ -13,8 +13,8 @@ {% snippet 'package/snippets/resources.html', pkg=pkg, action='resource_edit' %} {% endblock %} -{% block actions_content %} -
  • {% link_for _('View dataset'), controller='package', action='read', id=pkg.name, class_='btn', icon='eye-open' %}
    • +{% block edit_action %} + {% link_for _('View dataset'), controller='package', action='read', id=pkg.name, class_='btn', icon='eye-open' %} {% endblock %} {% block secondary_content %} diff --git a/ckan/templates/package/followers.html b/ckan/templates/package/followers.html index 91a650c49fc..04211893fde 100644 --- a/ckan/templates/package/followers.html +++ b/ckan/templates/package/followers.html @@ -3,10 +3,8 @@ {% block subtitle %}{{ _('Followers') }} - {{ c.pkg_dict.title or c.pkg_dict.name }}{% endblock %} {% block primary_content_inner %} -

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

    {% block followers_list %} {% snippet "user/snippets/followers.html", followers=c.followers %} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/package/history.html b/ckan/templates/package/history.html index 0f09674214a..f4e3516cc96 100644 --- a/ckan/templates/package/history.html +++ b/ckan/templates/package/history.html @@ -3,10 +3,8 @@ {% block subtitle %}{{ _('History') }} - {{ c.pkg_dict.title or c.pkg_dict.name }}{% endblock %} {% block primary_content_inner %} -

    {{ _('History') }}

    {% block package_history_revisions %} {% snippet "package/snippets/history_revisions.html", pkg_dict=pkg, pkg_revisions=c.pkg_revisions %} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html index 46405de1249..a805b4a5763 100644 --- a/ckan/templates/package/read.html +++ b/ckan/templates/package/read.html @@ -5,33 +5,31 @@ {% block subtitle %}{{ pkg.title or pkg.name }}{% endblock %} {% block primary_content_inner %} - + {{ super() }} {% block package_description %} -
    - {% if pkg.private %} - - - {{ _('Private') }} - - {% endif %} -

    - {% block page_heading %} - {{ pkg.title or pkg.name }} - {% if pkg.state.startswith('draft') %} - [{{ _('Draft') }}] - {% endif %} - {% endblock %} -

    - {% block package_notes %} - {% if c.pkg_notes_formatted %} -
    - {{ c.pkg_notes_formatted }} -
    + {% if pkg.private %} + + + {{ _('Private') }} + + {% endif %} +

    + {% block page_heading %} + {{ pkg.title or pkg.name }} + {% if pkg.state.startswith('draft') %} + [{{ _('Draft') }}] {% endif %} {% endblock %} - {# FIXME why is this here? seems wrong #} - -

    + + {% block package_notes %} + {% if c.pkg_notes_formatted %} +
    + {{ c.pkg_notes_formatted }} +
    + {% endif %} + {% endblock %} + {# FIXME why is this here? seems wrong #} + {% endblock %} {% block package_resources %} diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html index e3845a35202..946ac19c339 100644 --- a/ckan/templates/package/read_base.html +++ b/ckan/templates/package/read_base.html @@ -7,29 +7,19 @@ {% endblock -%} -{% block actions_content %} - {# NOTE: Not implemented in stage 1 #} - {#
  • {% link_for _('History'), controller='package', action='history', id=pkg.name, class_='btn', icon='undo' %}
    • #} +{% block edit_action %} {% if h.check_access('package_update', {'id':pkg.id }) %} -
  • {% link_for _('Edit'), controller='package', action='edit', id=pkg.name, class_='btn btn-primary', icon='wrench' %}
    • + {% link_for _('Edit'), controller='package', action='edit', id=pkg.name, class_='btn', icon='wrench' %} {% endif %} -
  • {{ h.follow_button('dataset', pkg.id) }}
    • {% endblock %} -{% block primary_content %} -
    - {% block page_header %} -
    -
      - {% block page_header_tabs %} - {{ h.build_nav_icon('dataset_read', _('Dataset'), id=pkg.name) }} - {{ h.build_nav_icon('dataset_activity', _('Activity Stream'), id=pkg.name) }} - {{ h.build_nav_icon('related_list', _('Related'), id=pkg.name) }} - {% endblock %} -
    -
    - {% endblock %} +{% block page_header_tabs %} + {{ h.build_nav_icon('dataset_read', _('Dataset'), id=pkg.name) }} + {{ h.build_nav_icon('dataset_activity', _('Activity Stream'), id=pkg.name) }} + {{ h.build_nav_icon('related_list', _('Related'), id=pkg.name) }} +{% endblock %} +{% block primary_content_inner %} {% block package_revision_info %} {% if c.pkg_revision_id %}
    @@ -46,15 +36,30 @@
    {% endif %} {% endblock %} - - {% block primary_content_inner %}{% endblock %} -
    {% endblock %} {% block secondary_content %} {% block secondary_help_content %}{% endblock %} + {% block package_info %} +
    +
    +

    {{ pkg.title or pkg.name }}

    +
    +
    +
    {{ _('Followers') }}
    + {# todo get pkg.num_followers to work #} +
    {{ h.SI_number_span(0) }}
    +
    +
    + +
    +
    + {% endblock %} + {% block package_organization %} {% if pkg.organization %} {% snippet "snippets/organization.html", organization=pkg.organization %} diff --git a/ckan/templates/package/related_list.html b/ckan/templates/package/related_list.html index 1b7dfd5b806..d9aa5ac34f9 100644 --- a/ckan/templates/package/related_list.html +++ b/ckan/templates/package/related_list.html @@ -3,7 +3,6 @@ {% set pkg = c.pkg %} {% block primary_content_inner %} -

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

    {% block related_list %} {% if c.pkg.related %} @@ -17,5 +16,4 @@

    {% block page_heading %}{{ _('Related Media for {datase {% link_for _('Add Related Item'), controller='related', action='new', id=pkg.name, class_='btn btn-primary' %}

    {% endblock %} - {% endblock %} diff --git a/ckan/templates/package/resource_edit.html b/ckan/templates/package/resource_edit.html index 8f4c64fa768..fd898a703d8 100644 --- a/ckan/templates/package/resource_edit.html +++ b/ckan/templates/package/resource_edit.html @@ -12,8 +12,8 @@
  • {{ _('Edit') }}
    • {% endblock %} -{% block actions_content %} -
  • {% link_for _('View resource'), controller='package', action='resource_read', id=pkg_dict.name, resource_id=res.id, class_='btn', icon='eye-open' %}
    • +{% block edit_action %} + {% link_for _('View resource'), controller='package', action='resource_read', id=pkg_dict.name, resource_id=res.id, class_='btn', icon='eye-open' %} {% endblock %} {# logged_in is defined in new_resource.html #} diff --git a/ckan/templates/package/search.html b/ckan/templates/package/search.html index 09c5d24c9e3..2b3f98c72c6 100644 --- a/ckan/templates/package/search.html +++ b/ckan/templates/package/search.html @@ -3,7 +3,7 @@ {% block subtitle %}{{ _("Search for a Dataset") }}{% endblock %} -{% block add_action_content %} +{% block add_action %} {% if h.check_access('package_create') %} {% link_for _('Add Dataset'), controller='package', action='new', class_='btn btn-primary', icon='plus-sign-alt' %} {% endif %} diff --git a/ckan/templates/package/snippets/additional_info.html b/ckan/templates/package/snippets/additional_info.html index f5e864c7674..2fa73a36ec2 100644 --- a/ckan/templates/package/snippets/additional_info.html +++ b/ckan/templates/package/snippets/additional_info.html @@ -1,4 +1,4 @@ -
    +

    {{ _('Additional Info') }}

    diff --git a/ckan/templates/package/snippets/resources_list.html b/ckan/templates/package/snippets/resources_list.html index f2327a5a915..7cd33a1c59b 100644 --- a/ckan/templates/package/snippets/resources_list.html +++ b/ckan/templates/package/snippets/resources_list.html @@ -9,7 +9,7 @@ {% snippet "package/snippets/resources_list.html", pkg=pkg, resources=pkg.resources %} #} -
    +

    {{ _('Data and Resources') }}

    {% block resource_list %} {% if resources %} diff --git a/ckan/templates/package/snippets/tags.html b/ckan/templates/package/snippets/tags.html index ab95b97bdc7..8d296d62ea2 100644 --- a/ckan/templates/package/snippets/tags.html +++ b/ckan/templates/package/snippets/tags.html @@ -1,5 +1,5 @@ {% if tags %} -
    +
    {% snippet 'snippets/tag_list.html', tags=tags, _class='tag-list well' %}
    {% endif %} diff --git a/ckan/templates/page.html b/ckan/templates/page.html index 01f50bfd1f7..f885a314256 100644 --- a/ckan/templates/page.html +++ b/ckan/templates/page.html @@ -29,13 +29,11 @@ {% block toolbar %}
    - {% block add_action %} - {% if self.add_action_content() | trim %} -
    - {% block add_action_content %}{% endblock %} -
    - {% endif %} - {% endblock %} + {% if self.add_action() | trim %} +
    + {% block add_action %}{% endblock %} +
    + {% endif %} {% block breadcrumb %} {% if self.breadcrumb_content() | trim %}
      @@ -49,11 +47,11 @@
      - {% block actions %} + {#{% block actions %}
      {% block actions_content %}{% endblock %}
      - {% endblock %} + {% endblock %}#} {# The pre_primary block can be used to add content to before the @@ -75,7 +73,26 @@

      My page content

      Some content for the page

      {% endblock %} #} - {% block primary_content %}{% endblock %} + {% block primary_content %} +
      + {% block page_header %} +
      + {% if self.edit_action() | trim %} +
      + {% block edit_action %}{% endblock %} +
      + {% endif %} +
        + {% block page_header_tabs %}{% endblock %} +
      +
      + {% endblock %} +
      + {% block primary_content_inner %} + {% endblock %} +
      +
      + {% endblock %}
      {% endblock %} diff --git a/ckan/templates/snippets/organization.html b/ckan/templates/snippets/organization.html index aefcb6ff81f..09e1cf63710 100644 --- a/ckan/templates/snippets/organization.html +++ b/ckan/templates/snippets/organization.html @@ -43,6 +43,9 @@

      {{ organization.title or organization.name }}

      {{ h.SI_number_span(organization.package_count) }}
    + {% endif %}
    diff --git a/ckan/templates/user/dashboard.html b/ckan/templates/user/dashboard.html index 5ee3e1edffd..3e8daa2bc4b 100644 --- a/ckan/templates/user/dashboard.html +++ b/ckan/templates/user/dashboard.html @@ -1,8 +1,8 @@ {% extends "user/edit_base.html" %} -{% block add_action_content %} +{% block add_action %} {% if h.check_access('package_create') %} -
  • {% link_for _('Add Dataset'), controller='package', action='new', class_="btn btn-primary", icon="plus-sign-alt" %}
    • + {% link_for _('Add Dataset'), controller='package', action='new', class_="btn btn-primary", icon="plus-sign-alt" %} {% endif %} {% endblock %} From 75da354905964f2baa2ec002b1b0fd51f1046780 Mon Sep 17 00:00:00 2001 From: John Martin Date: Tue, 11 Jun 2013 15:22:45 +0100 Subject: [PATCH 2/8] [#890] Adds num_followers to package_show --- ckan/logic/action/get.py | 4 ++++ ckan/templates/package/read_base.html | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py index 4d296733312..94640e3e56d 100644 --- a/ckan/logic/action/get.py +++ b/ckan/logic/action/get.py @@ -744,6 +744,10 @@ def package_show(context, data_dict): for item in plugins.PluginImplementations(plugins.IPackageController): item.after_show(context, package_dict) + package_dict['num_followers'] = logic.get_action('dataset_follower_count')( + {'model': model, 'session': model.Session}, + {'id': package_dict['id']}) + return package_dict def resource_show(context, data_dict): diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html index 946ac19c339..34a84c27c72 100644 --- a/ckan/templates/package/read_base.html +++ b/ckan/templates/package/read_base.html @@ -49,8 +49,7 @@

    {{ pkg.title or pkg.name }}

    {{ _('Followers') }}
    - {# todo get pkg.num_followers to work #} -
    {{ h.SI_number_span(0) }}
    +
    {{ h.SI_number_span(pkg.num_followers) }}
    diff --git a/ckan/templates/organization/read.html b/ckan/templates/organization/read.html index d4ef362d77a..f7953fe7e78 100644 --- a/ckan/templates/organization/read.html +++ b/ckan/templates/organization/read.html @@ -1,6 +1,6 @@ {% extends "organization/read_base.html" %} -{% block add_action %} +{% block page_primary_action %} {% if h.check_access('organization_update', {'id': c.group_dict.id}) %} {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %} {% endif %} diff --git a/ckan/templates/organization/read_base.html b/ckan/templates/organization/read_base.html index db26c0cf814..a9ff1bf6302 100644 --- a/ckan/templates/organization/read_base.html +++ b/ckan/templates/organization/read_base.html @@ -7,13 +7,13 @@
  • {% link_for c.group_dict.display_name|truncate(35), controller='organization', action='read', id=c.group_dict.name %}
    • {% endblock %} -{% block edit_action %} +{% block content_action %} {% if h.check_access('organization_update', {'id': c.group_dict.id}) %} {% link_for _('Admin'), controller='organization', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %} {% endif %} {% endblock %} -{% block page_header_tabs %} +{% block content_primary_nav %} {{ h.build_nav_icon('organization_read', _('Datasets'), id=c.group_dict.name) }} {{ h.build_nav_icon('organization_activity', _('Activity Stream'), id=c.group_dict.name) }} {{ h.build_nav_icon('organization_about', _('About'), id=c.group_dict.name) }} diff --git a/ckan/templates/package/edit.html b/ckan/templates/package/edit.html index 971ac9b094a..4f15985d033 100644 --- a/ckan/templates/package/edit.html +++ b/ckan/templates/package/edit.html @@ -13,7 +13,7 @@ {% snippet 'package/snippets/resources.html', pkg=pkg, action='resource_edit' %} {% endblock %} -{% block edit_action %} +{% block content_action %} {% link_for _('View dataset'), controller='package', action='read', id=pkg.name, class_='btn', icon='eye-open' %} {% endblock %} diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html index 6208da4a53f..d9eb8938a41 100644 --- a/ckan/templates/package/read_base.html +++ b/ckan/templates/package/read_base.html @@ -14,13 +14,13 @@ {% endblock -%} -{% block edit_action %} +{% block content_action %} {% if h.check_access('package_update', {'id':pkg.id }) %} {% link_for _('Edit'), controller='package', action='edit', id=pkg.name, class_='btn', icon='wrench' %} {% endif %} {% endblock %} -{% block page_header_tabs %} +{% block content_primary_nav %} {{ h.build_nav_icon('dataset_read', _('Dataset'), id=pkg.name) }} {{ h.build_nav_icon('dataset_activity', _('Activity Stream'), id=pkg.name) }} {{ h.build_nav_icon('related_list', _('Related'), id=pkg.name) }} diff --git a/ckan/templates/package/resource_edit.html b/ckan/templates/package/resource_edit.html index 48482f8de49..52ac2ab4722 100644 --- a/ckan/templates/package/resource_edit.html +++ b/ckan/templates/package/resource_edit.html @@ -12,7 +12,7 @@
  • {{ _('Edit') }}
    • {% endblock %} -{% block edit_action %} +{% block content_action %} {% link_for _('View resource'), controller='package', action='resource_read', id=pkg_dict.name, resource_id=res.id, class_='btn', icon='eye-open' %} {% endblock %} diff --git a/ckan/templates/package/search.html b/ckan/templates/package/search.html index 7fb24bf2b15..41c59dc3863 100644 --- a/ckan/templates/package/search.html +++ b/ckan/templates/package/search.html @@ -10,9 +10,9 @@ {% block primary_content %}
    - {% block add_action %} + {% block page_primary_action %} {% if h.check_access('package_create') %} -
    +
    {% link_for _('Add Dataset'), controller='package', action='new', class_='btn btn-primary', icon='plus-sign-alt' %}
    {% endif %} diff --git a/ckan/templates/page.html b/ckan/templates/page.html index 669d46da4a2..3b84e703e9a 100644 --- a/ckan/templates/page.html +++ b/ckan/templates/page.html @@ -72,20 +72,20 @@

    My page content

    {% block page_header %}
    - {% if self.edit_action() | trim %} -
    - {% block edit_action %}{% endblock %} + {% if self.content_action() | trim %} +
    + {% block content_action %}{% endblock %}
    {% endif %}
      - {% block page_header_tabs %}{% endblock %} + {% block content_primary_nav %}{% endblock %}
    {% endblock %}
    - {% if self.add_action() | trim %} -
    - {% block add_action %}{% endblock %} + {% if self.page_primary_action() | trim %} +
    + {% block page_primary_action %}{% endblock %}
    {% endif %} {% block primary_content_inner %} diff --git a/ckan/templates/user/dashboard.html b/ckan/templates/user/dashboard.html index 3e8daa2bc4b..d9458910c47 100644 --- a/ckan/templates/user/dashboard.html +++ b/ckan/templates/user/dashboard.html @@ -1,6 +1,6 @@ {% extends "user/edit_base.html" %} -{% block add_action %} +{% block page_primary_action %} {% if h.check_access('package_create') %} {% link_for _('Add Dataset'), controller='package', action='new', class_="btn btn-primary", icon="plus-sign-alt" %} {% endif %} diff --git a/ckan/templates/user/edit_base.html b/ckan/templates/user/edit_base.html index 4826aada4da..f10048b5cd4 100644 --- a/ckan/templates/user/edit_base.html +++ b/ckan/templates/user/edit_base.html @@ -13,7 +13,7 @@ {% block page_header %}
      - {% block page_header_tabs %} + {% block content_primary_nav %} {{ h.build_nav_icon('user_dashboard', _('News feed')) }} {{ h.build_nav_icon('user_edit', _('Settings'), id=user.name) }} {% endblock %} diff --git a/ckan/templates/user/read_base.html b/ckan/templates/user/read_base.html index b0a97403d43..fc09cc773ec 100644 --- a/ckan/templates/user/read_base.html +++ b/ckan/templates/user/read_base.html @@ -23,7 +23,7 @@ {% block page_header %}
        - {% block page_header_tabs %} + {% block content_primary_nav %} {{ h.build_nav_icon('user_datasets', _('Datasets'), id=user.name) }} {{ h.build_nav_icon('user_activity_stream', _('Activity Stream'), id=user.name) }} {% endblock %} From 25cdea387018486791b66fad9bce282b2dd2a65f Mon Sep 17 00:00:00 2001 From: John Martin Date: Tue, 25 Jun 2013 10:36:26 +0100 Subject: [PATCH 7/8] [#890] Removed old template block that isn't needed anymore --- ckan/templates/page.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ckan/templates/page.html b/ckan/templates/page.html index 3b84e703e9a..0f2b3a57885 100644 --- a/ckan/templates/page.html +++ b/ckan/templates/page.html @@ -42,12 +42,6 @@
        - {#{% block actions %} -
        - {% block actions_content %}{% endblock %} -
        - {% endblock %}#} - {# The pre_primary block can be used to add content to before the rendering of the main content columns of the page. From 135468323271b12bb2562795094bfbe29a26e32b Mon Sep 17 00:00:00 2001 From: tobes Date: Tue, 25 Jun 2013 11:07:37 +0100 Subject: [PATCH 8/8] [#890] New get_action helper and remove package_show extra work --- ckan/lib/helpers.py | 8 ++++++++ ckan/logic/action/get.py | 5 +---- ckan/templates/package/read_base.html | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py index 891660f3b7e..047f3a1ce0c 100644 --- a/ckan/lib/helpers.py +++ b/ckan/lib/helpers.py @@ -611,6 +611,13 @@ def check_access(action, data_dict=None): return authorized +def get_action(action_name, data_dict=None): + '''Calls an action function from a template.''' + if data_dict is None: + data_dict = {} + return logic.get_action(action_name)({}, data_dict) + + def linked_user(user, maxlength=0, avatar=20): if user in [model.PSEUDO_USER__LOGGED_IN, model.PSEUDO_USER__VISITOR]: return user @@ -1582,6 +1589,7 @@ def SI_number_span(number): 'subnav_named_route', 'default_group_type', 'check_access', + 'get_action', 'linked_user', 'group_name_to_title', 'markdown_extract', diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py index 089440b9e9d..49901ce2484 100644 --- a/ckan/logic/action/get.py +++ b/ckan/logic/action/get.py @@ -754,12 +754,9 @@ def package_show(context, data_dict): for item in plugins.PluginImplementations(plugins.IPackageController): item.after_show(context, package_dict) - package_dict['num_followers'] = logic.get_action('dataset_follower_count')( - {'model': model, 'session': model.Session}, - {'id': package_dict['id']}) - return package_dict + def resource_show(context, data_dict): '''Return the metadata of a resource. diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html index d9eb8938a41..bc5b0d25e3d 100644 --- a/ckan/templates/package/read_base.html +++ b/ckan/templates/package/read_base.html @@ -56,7 +56,7 @@

        {{ pkg.title or pkg.name }}

        {{ _('Followers') }}
        -
        {{ h.SI_number_span(pkg.num_followers) }}
        +
        {{ h.SI_number_span(h.get_action('dataset_follower_count', {'id': pkg.id})) }}