From a859b91583f53eae8f34f67f554acff9abd893a2 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 12 Jun 2024 10:49:18 +0200
Subject: 🩹 minor fix on sheets (refs #5865, #4808, #5867)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/ishtar/sheet_file.html               | 26 +++++++++++-----------
 .../ishtar/blocks/window_tables/parcels.html       |  2 +-
 .../templates/ishtar/sheet_administrativeact.html  |  6 ++---
 ishtar_common/templates/ishtar/sheet_document.html |  1 -
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index e0f6c9d2d..7e98234c5 100644
--- a/archaeological_files/templates/ishtar/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -94,9 +94,9 @@
             {% field_flex "Complement" item.address_complement %}
             {% field_flex "Postal code" item.postal_code %}
             {% if item.total_surface %}
-            <div class="col-12 col-md-6 col-lg-4 d-flex flex-wrap row">
-                <dt class="col-5">{%trans "Surface"%}</dt>
-                <dd class='col-7'>
+            <div class="col-12 col-md-6 col-lg-3 flex-wrap">
+                <dt>{% trans "Surface" %}</dt>
+                <dd>
                     {{ item.total_surface }} m<sup>2</sup> ({{ item.total_surface_ha }} ha)
                 </dd>
             </div>
@@ -109,10 +109,10 @@
         <div class="row">
 
             {% if item.total_developed_surface %}
-            <div class="col-12 col-md-6 col-lg-4 d-flex flex-wrap row">
-                <dt class="col-5">{%trans "Developed surface"%}</dt>
-                <dd class='col-7'>
-                {{ item.total_developed_surface }} m<sup>2</sup> ({{ item.total_developed_surface_ha }} ha)</span></li>
+            <div class="col-12 col-md-6 col-lg-3 flex-wrap">
+                <dt>{%trans "Developed surface"%}</dt>
+                <dd>
+                {{ item.total_developed_surface }} m<sup>2</sup> ({{ item.total_developed_surface_ha }} ha)
                 </dd>
             </div>
             {% endif %}
@@ -258,20 +258,20 @@
         </div>
         <div class="row">
             {% if item.total_developed_surface %}
-            <dl class="col-12 col-lg-6 flex-wrap">
-                <dt>{%trans "Total developed surface"%}</dt>
+            <div class="col-12 col-md-6 col-lg-3 flex-wrap">
+                <dt>{% trans "Total developed surface"%}</dt>
                 <dd>
                     {{ item.total_developed_surface }} m<sup>2</sup> ({{ item.total_developed_surface_ha }} ha)
                 </dd>
-            </dl>
+            </div>
             {% endif %}
             {% if item.total_surface %}
-            <dl class="col-12 col-lg-6 flex-wrap">
-                <dt>{% trans "Surface" %}</dt>
+            <div class="col-12 col-md-6 col-lg-3 flex-wrap">
+                <dt>{% trans "Surface"%}</dt>
                 <dd>
                     {{ item.total_surface }} m<sup>2</sup> ({{ item.total_surface_ha }} ha)
                 </dd>
-            </dl>
+            </div>
             {% endif %}
         </div>
         <h3>{% trans "Human and technical requirements" %}</h3>
diff --git a/archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html b/archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html
index 68627d57a..1d06a2e33 100644
--- a/archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html
+++ b/archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html
@@ -22,7 +22,7 @@
     {#<td class='string'>{{operation.parcel.owner}}</td>#}
   </tr>
   {% empty %}
-  <tr><td colspan="4" class='no_items'>{% trans "No parcel" %}</td></tr>
+  <tr><td colspan="5" class='no_items'>{% trans "No parcel" %}</td></tr>
   {% endfor %}
   </tbody>
 </table>
diff --git a/archaeological_operations/templates/ishtar/sheet_administrativeact.html b/archaeological_operations/templates/ishtar/sheet_administrativeact.html
index 61cc4a256..2c52ffae7 100644
--- a/archaeological_operations/templates/ishtar/sheet_administrativeact.html
+++ b/archaeological_operations/templates/ishtar/sheet_administrativeact.html
@@ -54,9 +54,9 @@
         {% field_flex_detail "Treatment request" item.treatment_file %}
 
         {% if item.operation and item.operation.surface %}
-        <div class="col-12 col-md-6 col-lg-4 d-flex flex-wrap row">
-            <dt class="col-5">{% trans "Surface"%}</dt>
-            <dd class='col-7'>
+        <div class="col-12 col-md-6 col-lg-3 flex-wrap">
+            <dt>{% trans "Surface"%}</dt>
+            <dd>
                 {{ item.operation.surface }} m<sup>2</sup> ({{ item.operation.surface_ha }} ha)
             </dd>
         </div>
diff --git a/ishtar_common/templates/ishtar/sheet_document.html b/ishtar_common/templates/ishtar/sheet_document.html
index f3c8be108..02c32638b 100644
--- a/ishtar_common/templates/ishtar/sheet_document.html
+++ b/ishtar_common/templates/ishtar/sheet_document.html
@@ -43,7 +43,6 @@
         </div>
         {% field_flex "Title" item.title %}
         {% field_flex "Type" item.source_type_html "" "" 1 %}
-        {% include "ishtar/blocks/sheet_creation_section.html" %}
 
         {% if item.format_type or item.support_type or item.scale or item.shooting_angle or item.duplicate != None or item.item_number != 1 %}
         <h4 class="col-12">{% trans "Format" %}</h4>
-- 
cgit v1.2.3