From a8f8749b16f302a6e8f42ce7580f63e1289c7058 Mon Sep 17 00:00:00 2001 From: Andreyka Date: Tue, 23 Jun 2020 16:06:21 +0200 Subject: [PATCH] Changed order of fields in dataset and resource --- .../snippets/package_basic_fields.html | 90 +++++++++---------- .../package/snippets/resource_form.html | 34 +++---- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/ckanext/knowledgehub/templates/package/snippets/package_basic_fields.html b/ckanext/knowledgehub/templates/package/snippets/package_basic_fields.html index c78391a7..1bf03eb9 100644 --- a/ckanext/knowledgehub/templates/package/snippets/package_basic_fields.html +++ b/ckanext/knowledgehub/templates/package/snippets/package_basic_fields.html @@ -15,19 +15,18 @@ {% set show_organizations_selector = organizations_available %} {% set show_visibility_selector = dataset_has_organization or (organizations_available and (user_is_sysadmin or dataset_is_draft)) %} - - {{ form.input('short_title', id='field-short-title', label=_('Short Title'), placeholder=_('eg. A short title'), value=data.short_title, error=errors.short_title) }} - {% block package_basic_fields_sensitivity %} - {{ form.input('data_sensitivity', id='field-data-sensitivity', label=_('Data Sensitivity'), placeholder=_('eg. Yes'), value=data.data_sensitivity, error=errors.data_sensitivity) }} + {% block package_basic_fields_unit_measurement %} + {{ form.input('unit_of_measurement', id='field-unit-of-measurement', label=_('Unit of Measurement'), placeholder=_('Unit of measurement / observation for the dataset'), + value=data.unit_of_measurement, error=errors.unit_of_measurement, is_required=true) }} {% endblock %} - + {{ form.input('data_collector', id='field-data-collector', label=_('Data Collector'), placeholder=_('Which organization owns/collected the data'), value=data.data_collector, error=errors.data_collector, classes=['control-full'], is_required=true) }} {% block basic_fields_external_access %} {% set options = ['Not Available', 'Direct Access', 'Public Use', 'Licensed Use', 'Data Enclave', 'Open Access'] %}
- +
+ {% for opt in options %} + + {% endfor %} + +
+
+ {% endblock %} + + {% block basic_fields_archived %} + {% set options = ['No', 'Yes'] %} +
+ +
+ +
+
+ {% endblock %} + + + {{ form.input('short_title', id='field-short-title', label=_('Short Title'), placeholder=_('eg. A short title'), value=data.short_title, error=errors.short_title) }} + + {% block package_basic_fields_sensitivity %} + {{ form.input('data_sensitivity', id='field-data-sensitivity', label=_('Data Sensitivity'), placeholder=_('eg. Yes'), value=data.data_sensitivity, error=errors.data_sensitivity) }} + {% endblock %} + {% block package_basic_fields_original_id %} {{ form.input('original_id', id='field-data-original-id', label=_('Original ID'), placeholder=_('If the dataset already has an ID '), value=data.original_id, error=errors.original_id) }} {% endblock %} @@ -47,11 +86,6 @@ {{ form.input('date_range_end', id='field-date-range-end', label=_('Date Range End'), placeholder=_('Date collection last date '), value=data.date_range_end, error=errors.date_range_end) }} {% endblock %} - {% block package_basic_fields_unit_measurement %} - {{ form.input('unit_of_measurement', id='field-unit-of-measurement', label=_('Unit of Measurement'), placeholder=_('Unit of measurement / observation for the dataset'), - value=data.unit_of_measurement, error=errors.unit_of_measurement, is_required=true) }} - {% endblock %} - {% block package_basic_hxl_ated %} {{ form.input('hxl_ated', id='field-hxl-ated', label=_("HXL-ated"), placeholder=_('Indicates if the dataset has HXL hashtags'), value=data.hxl_ated, error=errors.hxl_ated) }} {% endblock %} @@ -64,7 +98,6 @@ {{ form.input('linked_datasets', id='field-linked-datasets', label=_("Linked Datasets"), placeholder=_('Links to other RIDL datasets.'), value=data.linked_datasets, error=errors.linked_datasets) }} {% endblock %} - {{ form.input('data_collector', id='field-data-collector', label=_('Data Collector'), placeholder=_('Which organization owns/collected the data'), value=data.data_collector, error=errors.data_collector, classes=['control-full'], is_required=true) }} {% block basic_fields_process_status %} @@ -96,26 +129,6 @@ {% endblock %} - {% block basic_fields_data_collection_technique %} - {% set options = ['Not specified', 'Face-to-face interview', 'Face-to-face interview: Computerised', 'Face-to-face interview: Mobile', - 'Face-to-face interview: Paper-and-pencil', 'Telephone interview', 'E-mail interview', 'Self-administered questionnaire: E-mail', - 'Self-administered questionnaire: Paper', 'Self-administered questionnaire: SMS/MMS', - 'Web-based interview: audio-visual technology enabling the interviewer(s) and interviewee(s) to communicate in real time', - 'Self-administered questionnaire: Computer-assisted', 'Self-administered questionnaire: Web-based', 'Face-to-face focus group', - 'Telephone focus group', 'Observation', 'Other'] %} -
- -
- -
-
- {% endblock %} - - {% block basic_fields_sampling_procedure %} {% set options = ['Probability: Simple random', 'Probability: Systematic random', 'Probability: Stratified', 'Probability: Stratified: Proportional', 'Probability: Stratified: Disproportional', 'Probability: Cluster', 'Probability: Cluster: Simple random', 'Probability: Cluster: Stratified random', 'Probability: Multistage', 'Non-probability', 'Non-probability: Availability', @@ -147,19 +160,6 @@ {% endblock %} - {% block basic_fields_archived %} - {% set options = ['No', 'Yes'] %} -
- -
- -
-
- {% endblock %} {% if show_organizations_selector and show_visibility_selector %}
diff --git a/ckanext/knowledgehub/templates/package/snippets/resource_form.html b/ckanext/knowledgehub/templates/package/snippets/resource_form.html index 8030fc2a..39c1df2f 100644 --- a/ckanext/knowledgehub/templates/package/snippets/resource_form.html +++ b/ckanext/knowledgehub/templates/package/snippets/resource_form.html @@ -60,11 +60,24 @@ - {{ form.select('admin', id='field-resource-validation-admin', label=_('Request Resource Validation'), options=h.get_resource_validation_options(pkg_name), selected=data.admin, error=errors.resource_validation, classes=["control-medium"]) }} - {{ form.input('date_range_start', id='field-date-range-start', label=_('Date Range Start'), placeholder=_('Date collection first date '), value=data.date_range_start, error=errors.date_range_start, is_required=true) }} {{ form.input('date_range_end', id='field-date-range-end', label=_('Date Range End'), placeholder=_('Date collection last date '), value=data.date_range_end, error=errors.date_range_end, is_required=true) }} + {% block basic_fields_file_type %} + {% set options = ['Microdata', 'Questionnaire', 'Report', 'Sampling strategy & methodology Description', 'Infographics & Dashboard', + 'Other'] %} +
+ +
+ +
+
+ {% endblock %} + {% block resource_fields_process_status %} {% set options = ['Raw-Uncleaned', 'Cleaned Only', 'Cleaned & Anonymized'] %}
@@ -93,7 +106,7 @@
{% endblock %} - + {% block package_basic_hxl_ated %} {% set options = ['No', 'Yes'] %}
@@ -108,21 +121,8 @@
{% endblock %} + {{ form.select('admin', id='field-resource-validation-admin', label=_('Request Resource Validation'), options=h.get_resource_validation_options(pkg_name), selected=data.admin, error=errors.resource_validation, classes=["control-medium"]) }} - {% block basic_fields_file_type %} - {% set options = ['Microdata', 'Questionnaire', 'Report', 'Sampling strategy & methodology Description', 'Infographics & Dashboard', - 'Other'] %} -
- -
- -
-
- {% endblock %} {% endblock basic_fields %}