⚡ templates - context records: layout improvments

1 files changed, 19 insertions, 38 deletions

diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index bd766f9f6..1888aa49f 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -42,15 +42,6 @@
             {% trans "Identification / Description" %}
         </a>
     </li>
-    {% if display_interpretation %}
-    <li class="nav-item">
-        <a class="nav-link" id="{{window_id}}-intrepretation-tab"
-           data-toggle="tab" href="#{{window_id}}-interpretation" role="tab"
-           aria-controls="{{window_id}}-interpretation" aria-selected="false">
-            {% trans "Interpretation" %}
-        </a>
-    </li>
-    {% endif %}
     {% if display_datations or can_change %}
     <li class="nav-item">
         <a class="nav-link" id="{{window_id}}-datations-tab"
@@ -178,6 +169,15 @@
         </div>
         {% endif %}
 
+        {% if display_interpretation %}
+        <h3>{% trans _("Interpretation") %}</h3>
+        <div class='row'>
+            {% field_flex _("Activity") item.activity %}
+            {% field_flex_multiple_obj _("Identification") item 'identifications' %}
+            {% field_flex_full _("Interpretation") item.interpretation "<pre>" "</pre>" %}
+        </div>
+        {% endif %}
+
         {% if item.main_geodata or item.town or item.location %}
         <h3>{% trans "Geographic localisation" %}</h3>
         <div class='row'>
@@ -200,17 +200,6 @@
         {% endif %}
         {% endif %}
     </div>
-    {% if display_interpretation %}
-    <div class="tab-pane fade" id="{{window_id}}-interpretation"
-       role="tabpanel" aria-labelledby="{{window_id}}-interpretation-tab">
-        <h3>{% trans "Interpretation"%}</h3>
-        <div class='row'>
-            {% field_flex "Activity" item.activity %}
-            {% field_flex_multiple_obj "Identification" item 'identifications' %}
-            {% field_flex_full "Interpretation" item.interpretation "<pre>" "</pre>" %}
-        </div>
-    </div>
-    {% endif %}
 
     {% if display_datations or can_change %}
     <div class="tab-pane fade" id="{{window_id}}-datations"
@@ -239,28 +228,20 @@
 
         {% if item.operation %}
         <h3>{% trans "Operation summary"%}</h3>
-        {% if not item.operation.code_patriarche %}
-        <div class="alert alert-warning" role="alert">
-            {%trans "Patriarche OA code not yet recorded!"%}
-        </div>
-        {% endif %}
         <div class='row'>
-                {% field_flex_detail_full "Operation" item.operation %}
-            {% field_flex "Year" item.operation.year %}
-            {% trans "Numerical reference" as num_ref_label %}
-            {% field_flex num_ref_label item.operation.operation_code %}
-            {% field_flex "Patriarche OA code" item.operation.code_patriarche %}
-            {% field_flex_detail "Head scientist" item.operation.scientist %}
-
-            <dl class="col-12 col-md-6 col-lg-4 d-flex flex-wrap row">
-                <dt class="col-5">{% trans "State" %}</dt>
-                <dd class="col-7">{% if item.operation.is_active %}{% trans "Active file" %}{% else %}{%trans "Closed operation" %}{% endif %}</dd>
+            {% field_flex_detail_full _("Operation") item.operation %}
+            {% field_flex _("Year") item.operation.year %}
+            {% field_flex_detail _("Head scientist") item.operation.scientist %}
+
+            <dl class="col-12 col-md-6 col-lg-3 flex-wrap">
+                <dt>{% trans "State" %}</dt>
+                <dd>{% if item.operation.is_active %}{% trans "Active file" %}{% else %}{%trans "Closed operation" %}{% endif %}</dd>
             </dl>
 
             {% if not item.operation.is_active %}
-            <dl class="col-12 col-md-6 col-lg-4 d-flex flex-wrap row">
-                <dt class="col-5">{%trans "Closing date"%}</dt>
-                <dd class="col-7">
+            <dl class="col-12 col-md-6 col-lg-3 flex-wrap">
+                <dt>{%trans "Closing date"%}</dt>
+                <dd>
                     {{ item.operation.closing.date }} <strong>{%trans "by" %}</strong> {{ item.operation.closing.user }}
                 </dd>
             </dl>