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.

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

[Fixes #11585] Move linked resources to the "optional metadata" tab #11586

Merged
merged 1 commit into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions geonode/documents/templates/layouts/doc_panels.html
Original file line number Diff line number Diff line change
Expand Up @@ -313,12 +313,6 @@
{{ document_form.title }}
</div>
{% endblock doc_title %}
{% block doc_linked_resources %}
<div id="req_item">
<span><label for="{{ document_form.linked_resources|id }}">{% trans "Related resources" %}</label></span>
{{ document_form.linked_resources }}
</div>
{% endblock doc_linked_resources %}
{% block doc_abstract %}
<div id="req_item">
<span><label for="{{ document_form.abstract|id }}">{{ document_form.abstract.label }}</label></span>
Expand Down Expand Up @@ -555,6 +549,12 @@
{{ document_form.extra_metadata }}
</div>
{% endblock doc_extra_metadata %}
{% block doc_linked_resources %}
<div id="linked_resources">
<span><label for="{{ document_form.linked_resources|id }}">{% trans "Related resources" %}</label></span>
{{ document_form.linked_resources }}
</div>
{% endblock doc_linked_resources %}
</div>
</div>
<div class="col-xs-12 col-lg-3">
Expand Down
14 changes: 7 additions & 7 deletions geonode/geoapps/templates/layouts/app_panels.html
Original file line number Diff line number Diff line change
Expand Up @@ -297,13 +297,6 @@
<!--<p class="xxs-font-size">(Name by which the cited resource is known)</p>-->
{{ geoapp_form.title }}
{% endblock %}
{% block geoapp_linked_resources %}
<div id="req_item">
<span><label for="{{ geoapp_form.linked_resources|id }}">{% trans "Related resources" %}</label></span>
{{ geoapp_form.linked_resources }}
</div>
{% endblock geoapp_linked_resources %}

<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 Down Expand Up @@ -501,6 +494,13 @@
{{ geoapp_form.extra_metadata }}
</div>
{% endblock geoapp_extra_metadata %}
{% block geoapp_linked_resources %}
<div id="linked_resources">
<span><label for="{{ geoapp_form.linked_resources|id }}">{% trans "Related resources" %}</label></span>
{{ geoapp_form.linked_resources }}
</div>
{% endblock geoapp_linked_resources %}

</div>
{% endblock maintenance_block %}
</div>
Expand Down
12 changes: 6 additions & 6 deletions geonode/layers/templates/layouts/panels.html
Original file line number Diff line number Diff line change
Expand Up @@ -331,12 +331,6 @@
{{ dataset_form.title }}
</div>
{% endblock dataset_title %}
{% block dataset_linked_resources %}
<div id="req_item">
<span><label for="{{ dataset_form.linked_resources|id }}">{% trans "Related resources" %}</label></span>
{{ dataset_form.linked_resources }}
</div>
{% endblock dataset_linked_resources %}
{% block dataset_abstract %}
<div id="req_item">
<span><label for="{{ dataset_form.abstract|id }}">{{ dataset_form.abstract.label }}</label></span>
Expand Down Expand Up @@ -563,6 +557,12 @@
{{ dataset_form.extra_metadata }}
</div>
{% endblock layer_extra_metadata %}
{% block dataset_linked_resources %}
<div id="linked_resources">
<span><label for="{{ dataset_form.linked_resources|id }}">{% trans "Related resources" %}</label></span>
{{ dataset_form.linked_resources }}
</div>
{% endblock dataset_linked_resources %}
</div>
</div>
<div class="col-xs-12 col-lg-3">
Expand Down
Binary file modified geonode/locale/it/LC_MESSAGES/django.mo
Binary file not shown.
3 changes: 2 additions & 1 deletion geonode/locale/it/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,8 @@ msgid "Link to"
msgstr "Collegamento a"

msgid "Related resources"
msgstr "Risorse correlate"
msgstr "Risorse collegate"
#msgstr "Risorse correlate"

msgid "File"
msgstr "File"
Expand Down
13 changes: 7 additions & 6 deletions geonode/maps/templates/layouts/map_panels.html
Original file line number Diff line number Diff line change
Expand Up @@ -317,12 +317,6 @@
{{ map_form.title }}
</div>
{% endblock map_title %}
{% block map_linked_resources %}
<div id="req_item">
<span><label for="{{ map_form.linked_resources|id }}">{% trans "Related resources" %}</label></span>
{{ map_form.linked_resources }}
</div>
{% endblock map_linked_resources %}
{% block map_abstract %}
<div id="req_item">
<span><label for="{{ map_form.abstract|id }}">{{ map_form.abstract.label }}</label></span>
Expand Down Expand Up @@ -550,6 +544,13 @@
{{ map_form.extra_metadata }}
</div>
{% endblock map_extra_metadata %}
{% block map_linked_resources %}
<div id="linked_resources">
<span><label for="{{ map_form.linked_resources|id }}">{% trans "Related resources" %}</label></span>
{{ map_form.linked_resources }}
</div>
{% endblock map_linked_resources %}

</div>
{% endblock maintenance_block %}
</div>
Expand Down