+
+ {{ _("Additional information") }}
+
+
+
+ {% block indicator_additional_info %}
+
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/snippets/resources_list.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/snippets/resources_list.html
index da124da650..72bd872cd4 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/snippets/resources_list.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/snippets/resources_list.html
@@ -20,7 +20,7 @@
{{ h.snippet('widget/onboarding/data-use-survey.html', id="dataUseSurveyPopup", pkg=pkg) }}
{% set resource_item_snippet = resource_item_snippet or 'package/snippets/resource_item.html' %}
-
+ {% snippet "package/snippets/additional_info.html", pkg_dict=pkg %}
+
+ {% endblock %}
{% if not pkg.is_requestdata_type %}
-
-
-
+
{% endblock %}
{% block primary %}
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/hdx_resources_list.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/hdx_resources_list.html
index da19221849..0ad465bd67 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/hdx_resources_list.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/hdx_resources_list.html
@@ -1,33 +1,13 @@
-{% set tab_id_suffix = id_suffix or '-0' %}
-
- {{_('Downloads')}}
-
-
+
{% endif %}
+ {{ h.json_dumps(stats_downloads_last_weeks) }}
+
+ {{ _('Downloads') }}
+
+
-
+
-
{{_('Related Showcases')}}
+{{ _('Related Showcases') }}
{% snippet "package/snippets/related_list.html", pkg=pkg, user=c.userobj, showcases=showcase_list %}
-
+
{% snippet 'package/snippets/activity_stream.html', activity_stream=hdx_activities, id=pkg.id, object_type='package' %}
{% if h.follow_status('dataset', pkg.name) %} - See more in your dashboard + See more in your dashboard {% endif %}
{% if h.follow_status('dataset', pkg.name) %} - See more in your dashboard + See more in your dashboard {% endif %}
-
+
+
+
+
+ {% endblock %}
+
+
+
{% set metadata_url = h.url_for('hdx_dataset.package_metadata', id=pkg_dict.id) %}
-
+
+
+
+
+ {{ _("Data and Resources") }} [{{ pkg.num_resources }}]
+
-
-
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/snippets/additional_info.html b/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/snippets/additional_info.html
index 5ad8f90eeb..191d6f9f84 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/snippets/additional_info.html
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/templates/package/snippets/additional_info.html
@@ -1,205 +1,233 @@
-
- {% block package_resources %}
-
+ {% endblock %}
+
- {% snippet "package/snippets/resources_list.html", pkg=pkg, resources=pkg.resources, resource_item_snippet=resource_item_snippet %}
+ {% block package_resources %}
+
-
+ {% snippet "package/snippets/resources_list.html", pkg=pkg, resources=pkg.resources, resource_item_snippet=resource_item_snippet %}
-
- {% endblock %}
-
- {% block indicator_additional_info %}
- {% snippet "package/snippets/additional_info.html", pkg_dict=pkg %}
- {% endblock %}
-
+
+ {% block package_additional_info %}
+ {% set edit_mode = h.check_access('package_update', {'id':pkg_dict.id }) %}
-
-
-
-
-{% block package_additional_info %}
- {% set edit_mode = h.check_access('package_update', {'id':pkg_dict.id }) %}
-
+
+ | {{ _('Source') }} | -{{ pkg_dict.dataset_source }} | -
|---|---|
| {{ _('Contributor') }} | -- {% if pkg_dict.owner_org %} - {% set org_id = pkg_dict.owner_org or pkg_dict.organization.name %} - - {{ pkg_dict.organization.title }} - - {% endif %} - | -
| {{_('Time Period of the Dataset')}} [?] | -{{ h.render_date_from_concat_str(pkg_dict.dataset_date) }} ... {{ _('More') }} | -
| {{_('Modified')}} [?] | -- {{ h.render_datetime(modified_time) }} - | -
| {{_('Confirmed')}} [?] | -- {{ h.render_datetime(confirmed_time) }} - | -
| {{_('Dataset Added on HDX')}} [?] | -- {{ h.render_datetime(hdx_added_time) }} {{ _('Less') }} - | -
| {{ _('Expected Update Frequency') }} | -{{ h.hdx_get_frequency_by_value(pkg_dict.data_update_frequency) }} | -
| {{ _('Location') }} | -
+
+
+ {% set modified_time = pkg_dict.last_modified %}
+ {% set confirmed_time = pkg_dict.review_date %}
+ {% set hdx_added_time = pkg_dict.metadata_created %}
+ {{ _('Time Period of the Dataset') }} [?]
+ {{ h.render_date_from_concat_str(pkg_dict.dataset_date) }} ... {{ _('More') }}
+
+
+
+ {% if confirmed_time and confirmed_time > modified_time %}
+ {{ _('Modified') }} [?]
+
+ {{ h.render_datetime(modified_time) }}
+
+
+
+ {% endif %}
+ {{ _('Confirmed') }} [?]
+
+ {{ h.render_datetime(confirmed_time) }}
+
+
+
+ {{ _('Dataset Added on HDX') }} [?]
+
+ {{ h.render_datetime(hdx_added_time) }} {{ _('Less') }}
+
+
+
+ {{ _('Expected Update Frequency') }}
+ {{ h.hdx_get_frequency_by_value(pkg_dict.data_update_frequency) }}
+
+ {{ _('Location') }}
+ |
-
| {{ _('Visibility') }} | -
- {% if pkg_dict.private %}
- {{ _('Private') }} -
- {{ _('make it public') }}
- {% else %}
- {{ _('Public') }} -
- {{ _('make it private') }}
- {% endif %}
- |
-
| {{ _('Visibility') }} | -
- {% if pkg_dict.private %}
- {{ _('Private') }}
- {% else %}
- {{ _('Public') }}
- {% endif %}
- |
-
| {{ _('License') }} | -
- {% if pkg_dict.license_id %}
- {{ h.hdx_find_license_name(pkg_dict.license_id, pkg_dict.license_title) }}
- {% if pkg_dict.license_id == 'hdx-other' and pkg_dict.license_other %}
- :
- {% endif %}
-
- {# link and open-data logo will be removed according to https://github.com/OCHA-DAP/hdx-ckan/issues/294
- {% if 'license_url' in pkg_dict %}
- {{ pkg_dict.license_title }}
- {% else %}
- {{ pkg_dict.license_title }}
- {% endif %}
- {% if pkg_dict.isopen %}
-
- ![[Open Data]](https://assets.okfn.org/images/ok_buttons/od_80x15_blue.png)
-
- {% endif %}
- #}
+ {{ grp['title'] or grp['name'] }}
+ {% if not loop.last %}, {% endif %}
+ {% endfor %}
+ + + - {% endif %} - |
-
| {{ _('Field Names') }} | -{{ pkg_dict.field_names | replace(",", ", ") }} | -
| {{ _('File Types') }} | -{{ pkg_dict.file_types | replace(",", ", ") }} | -
| {{ _('Number of Rows') }} | -{{ pkg_dict.num_of_rows }} | -
| {{ _('Methodology') }} | - {% set methodology, methodology_other = h.methodology_bk_compat(pkg_dict.methodology, pkg_dict.methodology_other) %} -- |
| {{ _('Caveats / Comments') }} | -- |
| {{ _('Tags') }} | -
- {% for tag in pkg_dict.tags %}
-
- {% if tag.vocabulary_id %}
- {{ tag.display_name }}
- {% else %}
- {{ tag.display_name }}
+
+
+
+
+ {{ _('Source') }}
+ {{ pkg_dict.dataset_source }}
+
+
+
+ {{ _('Contributor') }}
+
- {% endfor %}
- |
-
| {{ _('File Format') }} | -
-
|
-
| {{ _(key) }} | -{{ value }} | -
+
+
+ {{ _('Methodology') }}
+ {% set methodology, methodology_other = h.methodology_bk_compat(pkg_dict.methodology, pkg_dict.methodology_other) %}
+
+
+
+
+
+
+ {% if not pkg_dict.is_requestdata_type %}
+ {{ _('Caveats / Comments') }}
+
+
+
+
+ {% endif %}
+ {% if pkg_dict.is_requestdata_type %}
+ {{ _('License') }}
+
+
+
+ {{ _('Field Names') }}
+ {{ pkg_dict.field_names | replace(",", ", ") }}
+
+
+ {{ _('File Types') }}
+ {{ pkg_dict.file_types | replace(",", ", ") }}
+
+
+ {% endif %}
+
+ {{ _('Number of Rows') }}
+ {{ pkg_dict.num_of_rows }}
+
+
+
+
+ {% if pkg_dict.resources %}
+ {{ _('Tags') }}
+
+ {% for tag in pkg_dict.tags %}
+
+
+ {% if tag.vocabulary_id %}
+ {{ tag.display_name }}
+ {% else %}
+ {{ tag.display_name }}
+ {% endif %}
+
+ {% endfor %}
+
+
+ {% endif %}
+
+ {# Metadata-only datasets are public, so this option is only for full datasets #}
+ {% if not pkg_dict.is_requestdata_type %}
+ {% if h.check_access('package_update', {'id':pkg_dict.id }) %}
+ {{ _('File Format') }}
+
+
+ -
+ {% for resource in h.dict_list_reduce(pkg_dict.resources, 'format') %}
+
- + {{ resource }} + + {% endfor %} +
+
+ {% else %}
+ {{ _('Visibility') }}
+
+ {% if pkg_dict.private %}
+
+ {{ _('Private') }} -
+ {{ _('make it public') }}
+ {% else %}
+ {{ _('Public') }} -
+ {{ _('make it private') }}
+ {% endif %}
+
+
+ {% endif %}
+ {% endif %}
+
+ {{ _('Visibility') }}
+
+ {% if pkg_dict.private %}
+
+ {{ _('Private') }}
+ {% else %}
+ {{ _('Public') }}
+ {% endif %}
+
+ {{ _('Less') }}
+
+