From 1404400c13b95ba7b5c4e282bd0885a49744c70a Mon Sep 17 00:00:00 2001
From: mattiagiupponi <51856725+mattiagiupponi@users.noreply.github.com>
Date: Wed, 13 Sep 2023 18:10:08 +0200
Subject: [PATCH] [Fixes #11430] Improve metadata template (#11431)

* Fixup dataset template

* Fixup document template

* Fixup geoapp and maps template

* [Fixes #11430] Fix template typo
---
 geonode/documents/templates/layouts/doc_panels.html |  3 +++
 geonode/geoapps/templates/layouts/app_panels.html   | 12 ++++++++++++
 geonode/layers/templates/layouts/panels.html        |  4 ++--
 geonode/maps/templates/layouts/map_panels.html      |  8 +++++++-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/geonode/documents/templates/layouts/doc_panels.html b/geonode/documents/templates/layouts/doc_panels.html
index bbde7b2e7d5..d02d01085fc 100644
--- a/geonode/documents/templates/layouts/doc_panels.html
+++ b/geonode/documents/templates/layouts/doc_panels.html
@@ -556,6 +556,7 @@
                 </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">
@@ -563,6 +564,8 @@
                   {{ document_form.poc }}
                 </div>
               </div>
+              {% endblock %}
+
               <div class="panel panel-default">
                 <div class="panel-heading">{% trans "Responsible and Permissions" %}</div>
                 <div class="panel-body">
diff --git a/geonode/geoapps/templates/layouts/app_panels.html b/geonode/geoapps/templates/layouts/app_panels.html
index d46741d8c2e..cb8aa41f766 100644
--- a/geonode/geoapps/templates/layouts/app_panels.html
+++ b/geonode/geoapps/templates/layouts/app_panels.html
@@ -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>-->
@@ -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
@@ -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
@@ -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>
@@ -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>
@@ -452,6 +458,7 @@
                 </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>
@@ -459,6 +466,8 @@
                     {{ 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>
@@ -466,6 +475,8 @@
                     {{ 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>
@@ -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">
diff --git a/geonode/layers/templates/layouts/panels.html b/geonode/layers/templates/layouts/panels.html
index c10634646f3..579b5f46ea6 100644
--- a/geonode/layers/templates/layouts/panels.html
+++ b/geonode/layers/templates/layouts/panels.html
@@ -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">
diff --git a/geonode/maps/templates/layouts/map_panels.html b/geonode/maps/templates/layouts/map_panels.html
index 307549913da..dce48088967 100644
--- a/geonode/maps/templates/layouts/map_panels.html
+++ b/geonode/maps/templates/layouts/map_panels.html
@@ -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">
@@ -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>
@@ -542,8 +545,10 @@
                     </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">
@@ -551,6 +556,7 @@
                       {{ map_form.poc }}
                   </div>
               </div>
+              {% endblock %}
               <div class="panel panel-default">
                   <div class="panel-heading">{% trans "Responsible and Permissions" %}</div>
                   <div class="panel-body">