Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport 4.1.x] [Fixes #11430] Improve metadata template #11485

Merged
merged 2 commits into from
Sep 14, 2023
Merged

[Backport 4.1.x] [Fixes #11430] Improve metadata template #11485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d2acf3
[Fixes #11430] Improve metadata template (#11431)
mattiagiupponi Sep 13, 2023
5e286ee
Merge branch '4.1.x' into backport-11431-to-4.1.x
giohappy Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions geonode/documents/templates/layouts/doc_panels.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,13 +556,16 @@
</div>
</div>
<div class="col-xs-12 col-lg-3">
{% block document_poc %}
<div class="panel panel-default" style="margin-top: 5px">
<div class="panel-heading">{% trans "Responsible Parties" %}</div>
<div class="panel-body">
<span><label for="{{ document_form.poc|id }}">{{ document_form.poc.label }}</label></span>
{{ document_form.poc }}
</div>
</div>
{% endblock %}

<div class="panel panel-default">
<div class="panel-heading">{% trans "Responsible and Permissions" %}</div>
<div class="panel-body">
Expand Down
12 changes: 12 additions & 0 deletions geonode/geoapps/templates/layouts/app_panels.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,11 @@
</script>
</div>
<div class="col-lg-4">
{% block geoapp_title %}
<span><label for="{{ geoapp_form.title|id }}">{{ geoapp_form.title.label }}</label></span>
<!--<p class="xxs-font-size">(Name by which the cited resource is known)</p>-->
{{ geoapp_form.title }}
{% endblock %}
<div>
<span><label for="{{ geoapp_form.abstract|id }}">{{ geoapp_form.abstract.label }}</label></span>
<!--<p class="xxs-font-size">(Brief narrative summary of the content of the resource/s)</p>-->
Expand All @@ -312,6 +314,7 @@
<!--<p class="xxs-font-size">(When a given event occurred on the resource)</p>-->
{{ geoapp_form.date }}
</div>
{% block geoapp_category %}
<div id="basicCategoryInfo" class="col-lg-12">
<span><label for="{{ category_form.category_choice_field|id }}" class="control-label required-field">{% trans "Category" %}</label></span>
<select
Expand All @@ -331,6 +334,7 @@
{% endfor %}
</select>
</div>
{% endblock geoapp_category %}
<div id="basicGroupInfo" class="col-lg-12">
<span><label for="id_resource-group" class="control-label required-field">{% trans "Group" %}</label></span>
<select
Expand Down Expand Up @@ -377,6 +381,7 @@
<div class="panel-body">
<div class="" id="mdinfo">
<div class="">
{% block geoapp_attributes %}
<div class="col-lg-4">
<div>
<span><label for="{{ geoapp_form.language|id }}">{{ geoapp_form.language.label }}</label></span>
Expand All @@ -393,6 +398,7 @@
{{ geoapp_form.attribution }}
</div>
</div>
{% endblock geoapp_attributes %}
<div class="col-lg-4">
<div id="regions_multiselect_container">
<span><label for="{{ geoapp_form.regions|id }}">{{ geoapp_form.regions.label }}</label></span>
Expand Down Expand Up @@ -452,20 +458,25 @@
</div>
</div>
<div class="col-xs-12 col-lg-5">
{% block geoapp_temporal_extent_start %}
<div class="col-xs-12 col-lg-6">
<div class="input-group date">
<span><label for="{{ geoapp_form.temporal_extent_start|id }}">{{ geoapp_form.temporal_extent_start.label }}</label></span>
<!--<p class="xxs-font-size">(When a given event occurred on the resource)</p>-->
{{ geoapp_form.temporal_extent_start }}
</div>
</div>
{% endblock geoapp_temporal_extent_start %}
{% block geoapp_temporal_extent_end %}
<div class="col-xs-12 col-lg-6" id="req_date">
<div class="input-group date">
<span><label for="{{ geoapp_form.temporal_extent_end|id }}">{{ geoapp_form.temporal_extent_end.label }}</label></span>
<!--<p class="xxs-font-size">(Identification of when a given event occurred)</p>-->
{{ geoapp_form.temporal_extent_end }}
</div>
</div>
{% endblock geoapp_temporal_extent_end %}
{% block maintenance_block %}
<div class="col-xs-12">
<div style="margin-top: 5px">
<span><label for="{{ geoapp_form.maintenance_frequency|id }}">{{ geoapp_form.maintenance_frequency.label }}</label></span>
Expand All @@ -484,6 +495,7 @@
</div>
{% endblock geoapp_extra_metadata %}
</div>
{% endblock maintenance_block %}
</div>
<div class="col-xs-12 col-lg-3">
<div class="panel panel-default" style="margin-top: 5px">
Expand Down
4 changes: 2 additions & 2 deletions geonode/layers/templates/layouts/panels.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,15 +560,15 @@
</div>
</div>
<div class="col-xs-12 col-lg-3">
{% block dataset_poc %}
<div class="panel panel-default" style="margin-top: 5px">
<div class="panel-heading">{% trans "Responsible Parties" %}</div>
{% block dataset_poc %}
<div class="panel-body check-select">
<span><label for="{{ dataset_form.poc|id }}">{{ dataset_form.poc.label }}</label></span>
{{ dataset_form.poc }}
</div>
{% endblock dataset_poc %}
</div>
{% endblock dataset_poc %}
<div class="panel panel-default">
<div class="panel-heading">{% trans "Responsible and Permissions" %}</div>
<div class="panel-body">
Expand Down
8 changes: 7 additions & 1 deletion geonode/maps/templates/layouts/map_panels.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,13 +508,15 @@
{% endblock map_supplemental_information %}
</div>
<div class="col-xs-12 col-lg-5">
{% block map_temporal_extent_start %}
<div class="col-xs-12 col-lg-6">
<div class="input-group date">
<span><label for="{{ map_form.temporal_extent_start|id }}">{{ map_form.temporal_extent_start.label }}</label></span>
<!--<p class="xxs-font-size">(When a given event occurred on the resource)</p>-->
{{ map_form.temporal_extent_start }}
</div>
</div>
</div>
{% endblock %}
<div class="col-xs-12 col-lg-6">
{% block map_temporal_extent_end %}
<div class="input-group date">
Expand All @@ -524,6 +526,7 @@
</div>
{% endblock map_temporal_extent_end %}
</div>
{% block maintenance_block %}
<div class="col-xs-12">
<div style="margin-top: 5px">
<span><label for="{{ map_form.maintenance_frequency|id }}">{{ map_form.maintenance_frequency.label }}</label></span>
Expand All @@ -542,15 +545,18 @@
</div>
{% endblock map_extra_metadata %}
</div>
{% endblock maintenance_block %}
</div>
<div class="col-xs-12 col-lg-3">
{% block map_poc %}
<div class="panel panel-default" style="margin-top: 5px">
<div class="panel-heading">{% trans "Responsible Parties" %}</div>
<div class="panel-body">
<span><label for="{{ map_form.poc|id }}">{{ map_form.poc.label }}</label></span>
{{ map_form.poc }}
</div>
</div>
{% endblock %}
<div class="panel panel-default">
<div class="panel-heading">{% trans "Responsible and Permissions" %}</div>
<div class="panel-body">
Expand Down
Loading