Sheet refactoring with images

1 files changed, 49 insertions, 35 deletions

diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index c605addb9..2ad74b7d2 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -9,49 +9,56 @@
 
 {% block content %}
 
-<div class="row">
-    <div class="offset-lg-4 col-lg-4 offset-md-3 col-md-6 offset-sm-1 col-sm-10 col-12">
-        <div class="card">
-            {% include "ishtar/blocks/window_image.html" %}
-            <div class="card-body">
-                <p class="card-text">
-                <p class='window-refs'>{{ item.parcel.short_label }}</p>
-                <p class="window-refs">{{ item.label|default:"" }}</p>
-                {% include "ishtar/blocks/sheet_external_id.html" %}
-                </p>
-            </div>
+<div class="clearfix">
+    <div class="card float-left col-12 col-md-6 col-lg-4">
+        {% include "ishtar/blocks/window_image.html" %}
+        <div class="card-body">
+            <p class="card-text">
+            <p class='window-refs'>{{ item.parcel.short_label }}</p>
+            <p class="window-refs">{{ item.label|default:"" }}</p>
+            {% include "ishtar/blocks/sheet_external_id.html" %}
+            </p>
         </div>
     </div>
-</div>
 
-<div class='row'>
-    {% field_flex "Complete ID" item.full_label %}
-    {% include "ishtar/blocks/sheet_creation_section.html" %}
-    {% field_flex "Type" item.unit %}
-    {% field_flex "Excavation technic" item.excavation_technic %}
-    {% field_flex_multiple "Chronology" item.datings %}
-    {% field_flex "Town" item.town.label_with_areas %}
-    {% field_flex_multiple "Documentation" item.documentations %}
-    {% field_flex "Opening date" item.opening_date %}
-    {% field_flex "Closing date" item.closing_date %}
-    {% field_flex_full "Comment on datings" item.datings_comment "<pre>" "</pre>" %}
+    <div class='row'>
+        {% field_flex_2 "Complete ID" item.full_label %}
+        {% field_flex_2 "Type" item.unit %}
+        {% with has_image=item.images.count %}
+
+        {% if not has_image %}
+    </div>
 </div>
+<div class="row">
+        {% endif %}
 
-{% include "ishtar/blocks/sheet_json.html" %}
+        {% field_flex "Excavation technic" item.excavation_technic '' '' has_image %}
+        {% field_flex_multiple "Chronology" item.datings has_image %}
+        {% field_flex "Town" item.town.label_with_areas '' '' has_image %}
+        {% field_flex_multiple "Documentation" item.documentations has_image %}
+        {% field_flex "Opening date" item.opening_date '' '' has_image %}
+        {% field_flex "Closing date" item.closing_date '' '' has_image %}
+        {% field_flex_full "Comment on datings" item.datings_comment "<pre>" "</pre>" has_image %}
+    </div>
 
-{% if item.diameter or item.depth_of_appearance or item.documentations.count or item.description or item.lenght or item.width or item.depth or item.thickness or item.comment %}
-<h3>{% trans "Description"%}</h3>
-<div class='row'>
-    {% field_flex_full "Description" item.description "<pre>" "</pre>" %}
-    {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %}
-    {% field_flex "Length (m)" item.lenght %}
-    {% field_flex "Width (m)" item.width %}
-    {% field_flex "Diameter (m)" item.diameter %}
-    {% field_flex "Depth (m)" item.depth %}
-    {% field_flex "Thickness (m)" item.thickness %}
-    {% field_flex "Depth of appearance (m)" item.depth_of_appearance %}
+    {% if item.diameter or item.depth_of_appearance or item.documentations.count or item.description or item.lenght or item.width or item.depth or item.thickness or item.comment %}
+    <h3>{% trans "Description"%}</h3>
+    <div class='row'>
+        {% field_flex_full "Description" item.description "<pre>" "</pre>" has_image %}
+        {% field_flex_full "Comment" item.comment "<pre>" "</pre>" has_image %}
+        {% field_flex "Length (m)" item.lenght '' '' has_image %}
+        {% field_flex "Width (m)" item.width '' '' has_image %}
+        {% field_flex "Diameter (m)" item.diameter '' '' has_image %}
+        {% field_flex "Depth (m)" item.depth '' '' has_image %}
+        {% field_flex "Thickness (m)" item.thickness '' '' has_image %}
+        {% field_flex "Depth of appearance (m)" item.depth_of_appearance '' '' has_image %}
+    </div>
+    {% endif %}
+
+{% if has_image %}
 </div>
 {% endif %}
+{% endwith %}
 
 {% if item.activity or item.identification or item.interpretation %}
 <h3>{% trans "Interpretation"%}</h3>
@@ -74,6 +81,13 @@
 </div>
 {% endif %}
 
+<h3>{% trans "Sheet"%}</h3>
+<div class="row">
+    {% include "ishtar/blocks/sheet_creation_section.html" %}
+</div>
+
+{% include "ishtar/blocks/sheet_json.html" %}
+
 {% trans "Context record relations" as cr_rels %}
 {% if item.right_relations.count %}
 {% dynamic_table_document cr_rels 'context_records_relations' 'left_record_id' item.pk '' output %}