From 25d8f4dc8ab65a28658d75fbceaad4657670b837 Mon Sep 17 00:00:00 2001
From: etj <etj@geo-solutions.it>
Date: Thu, 12 Oct 2023 16:41:53 +0200
Subject: [PATCH] [Fixes #11585] Move linked resources widget to the "optional
 metadata" tab

---
 .../templates/layouts/doc_panels.html         |  12 ++++++------
 .../geoapps/templates/layouts/app_panels.html |  14 +++++++-------
 geonode/layers/templates/layouts/panels.html  |  12 ++++++------
 geonode/locale/it/LC_MESSAGES/django.mo       | Bin 161218 -> 161218 bytes
 geonode/locale/it/LC_MESSAGES/django.po       |   3 ++-
 .../maps/templates/layouts/map_panels.html    |  13 +++++++------
 6 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/geonode/documents/templates/layouts/doc_panels.html b/geonode/documents/templates/layouts/doc_panels.html
index 0c7c10667ba..e2dffb26eea 100644
--- a/geonode/documents/templates/layouts/doc_panels.html
+++ b/geonode/documents/templates/layouts/doc_panels.html
@@ -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>
@@ -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">
diff --git a/geonode/geoapps/templates/layouts/app_panels.html b/geonode/geoapps/templates/layouts/app_panels.html
index 855c10b1429..ddedc0eb6bf 100644
--- a/geonode/geoapps/templates/layouts/app_panels.html
+++ b/geonode/geoapps/templates/layouts/app_panels.html
@@ -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>-->
@@ -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>
diff --git a/geonode/layers/templates/layouts/panels.html b/geonode/layers/templates/layouts/panels.html
index dfd9d14e40a..4ee805635e8 100644
--- a/geonode/layers/templates/layouts/panels.html
+++ b/geonode/layers/templates/layouts/panels.html
@@ -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>
@@ -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">
diff --git a/geonode/locale/it/LC_MESSAGES/django.mo b/geonode/locale/it/LC_MESSAGES/django.mo
index 1b322e2d5ac2449ce20b34988a68104c7eb05a20..431f7fffb9b3ea4379b6793efad59a8fcaffacb6 100644
GIT binary patch
delta 24
gcmX@~n)A?W&W0AoEljrsS#okx)3@IjWO|$o0F1;6s{jB1

delta 24
gcmX@~n)A?W&W0AoEljrsS&E8MbGF|XWO|$o0F7A+yZ`_I

diff --git a/geonode/locale/it/LC_MESSAGES/django.po b/geonode/locale/it/LC_MESSAGES/django.po
index 7b4f071266c..6826098fc12 100644
--- a/geonode/locale/it/LC_MESSAGES/django.po
+++ b/geonode/locale/it/LC_MESSAGES/django.po
@@ -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"
diff --git a/geonode/maps/templates/layouts/map_panels.html b/geonode/maps/templates/layouts/map_panels.html
index 1dc3deb8ff6..eb163abdf2d 100644
--- a/geonode/maps/templates/layouts/map_panels.html
+++ b/geonode/maps/templates/layouts/map_panels.html
@@ -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>
@@ -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>