diff --git a/ckanext/odsh/collection/helpers.py b/ckanext/odsh/collection/helpers.py index 9c3024337c10aabcf5723f4bea75abd4adc0de08..282fe5e0c1a0be68034caa18ba201181970f5291 100644 --- a/ckanext/odsh/collection/helpers.py +++ b/ckanext/odsh/collection/helpers.py @@ -75,6 +75,8 @@ def gather_collection_info(collection_dict, datasets_in_collection, dataset_dict name_collection = collection_dict.get('name') persistent_link_last_member = url_last_member(name_collection) + url_collection = url_from_id(collection_dict.get('id')) + if dataset_dict: name_current_dataset = dataset_dict.get('name') dataset_names = [d.get('name') for d in datasets_in_collection] @@ -107,6 +109,7 @@ def gather_collection_info(collection_dict, datasets_in_collection, dataset_dict return { 'title': collection_dict.get('title'), + 'url': url_collection, 'members': datasets_in_collection, 'first_member': { 'name': name_first_dataset, diff --git a/ckanext/odsh/public/odsh.css b/ckanext/odsh/public/odsh.css index ddc13115e51f999a1f0ffdf7c128947a705ad147..3bfd2f36dd4ace2549d081957d14f0e580472929 100644 --- a/ckanext/odsh/public/odsh.css +++ b/ckanext/odsh/public/odsh.css @@ -140,6 +140,11 @@ h3{ } @media (min-width: 1024px){ + .site-collection-summary .odsh-dataset-heading { + margin-left: 0px; + margin-right: 0px; + } + .search-form, .odsh-dataset-heading { border-bottom: none; margin-bottom: 0px; @@ -402,6 +407,11 @@ input[type=radio], input[type=checkbox] { max-width: 300px; padding: 40.66px 16px 0px; } + +.site-collection-summary .secondary.span3 { + display: none; +} + .secondary .module-narrow .module-content{ padding-left: 0px; padding-right: 0px; @@ -411,6 +421,10 @@ input[type=radio], input[type=checkbox] { padding-left: 31px; } +.site-collection-summary .primary { + padding-left: 0; +} + .primary.organization { padding-left: 0px; } diff --git a/ckanext/odsh/public/odsh_header.css b/ckanext/odsh/public/odsh_header.css index f32a5f642ec764496f478f8f70d69e73ef82b161..b0662f50770cbd29d4dd9d3916155c4dfb36d9e9 100644 --- a/ckanext/odsh/public/odsh_header.css +++ b/ckanext/odsh/public/odsh_header.css @@ -242,7 +242,7 @@ } @media (min-width: 768px) { - .navbar.masthead .navigation .nav-pills li:not(:first-child) { + .navbar.masthead .navigation .nav-pills li:not(:nth-child(2)) { margin-left: 22px; } } diff --git a/ckanext/odsh/templates/package/collection_read.html b/ckanext/odsh/templates/package/collection_read.html index 7f1ef070954d4df8b125becfd81a30213ef81134..c76cb3be210518bb7c05cf6eb9df3aaf4f9edcd8 100644 --- a/ckanext/odsh/templates/package/collection_read.html +++ b/ckanext/odsh/templates/package/collection_read.html @@ -1,9 +1,12 @@ {% extends "package/read.html" %} +{% block bodytag %} {{ super() }} class="site-collection-summary" {% endblock %} {% block package_resources %} {% endblock package_resources %} +{% block secondary_content %} +{% endblock secondary_content %} {% block collection %} diff --git a/ckanext/odsh/templates/package/read.html b/ckanext/odsh/templates/package/read.html index fd94229c593a5ceb09e219f32f13b9babeff6458..34da5ee1fa035c942a6b95f81a29d9755bc01a4a 100644 --- a/ckanext/odsh/templates/package/read.html +++ b/ckanext/odsh/templates/package/read.html @@ -3,6 +3,7 @@ {% set pkg = c.pkg_dict %} {% set collection = h.get_collection(pkg) %} {% set collection_title = collection['title'] if collection else None %} +{% set collection_url = collection['url'] if collection else None %} {% set successor_url = collection['successor']['url'] if collection else None %} {% set predecessor_url = collection['predecessor']['url'] if collection else None %} {% set latest_collection_member = collection['persistent_link_last_member'] if collection else None %} @@ -101,7 +102,7 @@ <section id="dataset-collection"> {% if collection_title %} <p> - Dieses Dokument ist Bestandteil der Dokumentengruppe "{{ collection_title }}". + Dieses Dokument ist Bestandteil der <a href={{ collection_url }}>Dokumentengruppe "{{ collection_title }}"</a>. Sie können zu älteren und neueren Dokumenten blättern. </p> {% endif %} {# collection_title #}