From 1907713911050d83fa63a44cf293ab2f60969cca Mon Sep 17 00:00:00 2001 From: Abdulhakeem Shaibu Date: Wed, 13 Jan 2021 18:45:59 +0100 Subject: [PATCH 1/2] fix: restore dataset form --- .../templates/package/base_form_page.html | 36 ++++++++----------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/ckanext/biskit/templates/package/base_form_page.html b/ckanext/biskit/templates/package/base_form_page.html index 0dba9e8..c265e09 100644 --- a/ckanext/biskit/templates/package/base_form_page.html +++ b/ckanext/biskit/templates/package/base_form_page.html @@ -1,24 +1,16 @@ -{% extends "package/edit_base.html" %} +{% ckan_extends %} - -{% block secondary_content %} - {% block info_module %} -
-

{{ _('What are datasets?') }}

-
-

- {% trans %} - A Dataset is a collection of data resources (such as files), - together with a description and other information, at a fixed URL. - Datasets are what users see when searching for data. - {% endtrans %} -

-
-
- {% endblock %} - - {% block resources_module %} - {# TODO: Pass in a list of previously created resources and the current package dict #} - {% snippet "package/snippets/resources.html", pkg={}, action='new_resource' %} - {% endblock %} +{% block info_module %} +
+

{{ _('What are datasets?') }}

+
+

+ {% trans %} + A Dataset is a collection of data resources (such as files), + together with a description and other information, at a fixed URL. + Datasets are what users see when searching for data. + {% endtrans %} +

+
+
{% endblock %} From 2711669ddc385f2749ab291e999fb9c3877cc0fe Mon Sep 17 00:00:00 2001 From: Abdulhakeem Shaibu Date: Thu, 14 Jan 2021 11:31:07 +0100 Subject: [PATCH 2/2] chore: drop placeholder tags on home page about header text --- ckanext/biskit/templates/home/about.html | 4 ++-- ckanext/biskit/templates/home/snippets/search.html | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ckanext/biskit/templates/home/about.html b/ckanext/biskit/templates/home/about.html index 4b14614..5714999 100644 --- a/ckanext/biskit/templates/home/about.html +++ b/ckanext/biskit/templates/home/about.html @@ -6,7 +6,7 @@
-

Blood Information System for Krisis Intervention and Management.

+

Blood Information System for Crisis Intervention and Management.

{% block primary %} @@ -27,4 +27,4 @@

Blood Information System for Krisis Intervention and Management.

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/ckanext/biskit/templates/home/snippets/search.html b/ckanext/biskit/templates/home/snippets/search.html index c270f5c..342dc1b 100644 --- a/ckanext/biskit/templates/home/snippets/search.html +++ b/ckanext/biskit/templates/home/snippets/search.html @@ -13,9 +13,8 @@
{{ _('Popular tags :') }} - HospitalSupplier {% for tag in tags %} {{ h.truncate(tag.display_name, 22) }} {% endfor %}
- \ No newline at end of file +