Adapt container and warehous sheets - container forms

1 files changed, 30 insertions, 18 deletions

diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html
index 7c9f84a32..b1e74fb88 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_container.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_container.html
@@ -1,29 +1,41 @@
 {% extends "ishtar/sheet.html" %}
 {% load i18n window_header window_field window_tables %}
 
-{% block head_title %}{% trans "Container" %}{% endblock %}
+{% block head_title %}<strong>{% trans "Container" %}</strong> - {{ item.reference|default:"" }} ({{ item.container_type|default:"" }}){% endblock %}
 
-{% block content %}
+{% block toolbar %}
 {% window_nav item window_id 'show-container' 'container_modify' '' '' previous next 1 %}
+{% endblock %}
 
-{% if item.image %}
-<a href='{{item.image.url}}' rel="prettyPhoto" title="{{item.label}}" class='photo'><img src='{{item.thumbnail.url}}'/></a>
-{% endif%}
-
-<p class="window-refs">{{ item.reference|default:"" }}</p>
-<p class="window-refs">{{ item.container_type|default:"" }}</p>
-<p class="window-refs">{{ item.responsible.name }} - {{ item.index }}</p>
-{% include "ishtar/blocks/sheet_external_id.html" %}
-
-<ul class='form-flex'>
-    {% field_li_detail "Responsible warehouse" item.responsible %}
-    {% field_li_detail "Location (warehouse)" item.location %}
+{% 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">
+            {% if item.image %}
+            <img class='card-img-top' src="{{item.thumbnail.url}}">
+            {% endif%}
+            <div class="card-body">
+                <p class="card-text">
+                    <p class="window-refs">{{ item.reference|default:"" }}</p>
+                    <p class="window-refs">{{ item.container_type|default:"" }}</p>
+                    <p class="window-refs">{{ item.responsible.name }} - {{ item.index }}</p>
+                    {% include "ishtar/blocks/sheet_external_id.html" %}
+                </p>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<div class="row">
+    {% field_flex_detail "Responsible warehouse" item.responsible %}
+    {% field_flex_detail "Location (warehouse)" item.location %}
     {% include "ishtar/blocks/sheet_creation_section.html" %}
-</ul>
-{% field "Location" item.precise_location %}
-{% field "Comment" item.comment "<pre>" "</pre>" %}
+    {% field_flex "Location" item.precise_location %}
+    {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %}
+    {% include "ishtar/blocks/sheet_json.html" %}
+</div>
 
-{% include "ishtar/blocks/sheet_json.html" %}
 
 {% if item.finds.count %}
 <h4>{% trans "Content" %}</h4>