From 8585f7b99bd43670a7be676b23d3ef37149982c9 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 6 Jun 2016 18:42:38 +0200
Subject: Improvement on find sheet

---
 .../templates/ishtar/sheet_find.html               | 62 +++++++++-------------
 ishtar_common/static/media/style.css               | 16 ++++++
 ishtar_common/static/media/style_basic.css         |  4 ++
 .../ishtar/blocks/window_field_detail.html         |  3 ++
 ishtar_common/templates/ishtar/sheet_toolbar.html  |  2 +-
 ishtar_common/templatetags/window_field.py         | 12 +++++
 6 files changed, 62 insertions(+), 37 deletions(-)
 create mode 100644 ishtar_common/templates/ishtar/blocks/window_field_detail.html

diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 370f4bb37..b37a9957c 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -10,7 +10,7 @@
 
 {% if previous or next %}
 <div class='tool'>
-{%if previous%}
+{% if previous %}
 <a href="#" onclick='load_window("{% url show-historized-find item.pk previous|date:"c"%}");$("#{{window_id}}").hide();return false;'>{%trans "Previous version"%} ({{previous}})</a>
 {% endif %}
 {% if previous and next %} - {% endif %}
@@ -68,16 +68,18 @@
     <th>{% trans "Type" %}</th>
     <th>{% trans "Related find" %}</th>
     <th>{% trans "Person" %}</th>
+    <th>{% trans "Container" %}</th>
     <th>{% trans "Start date" %}</th>
     <th>{% trans "End date" %}</th>
   </tr>
   {% for items, treatment in item.upstream_treatments %}
   <tr>
     <td class='string'>{{ treatment.treatment_type }}</td>
-    <td class='string'>{% for item in items %}{% if not forloop.first %} ; {% endif %} {{item}} {{ item|link_to_window}}{% endfor %}</td>
-    <td class='string'>{{ treatment.person|default_if_none:"" }}</td>
-    <td class='string'>{{ treatment.start_date|default_if_none:"" }}</td>
-    <td class='string'>{{ treatment.end_date|default_if_none:"" }}</td>
+    <td class='item-list'>{% for item in items %}<span>{{item}} {{ item|link_to_window}}</span>{% endfor %}</td>
+    <td class='string'>{{ treatment.person|default_if_none:"-" }}</td>
+    <td class='string'>{{ treatment.container|default_if_none:"-" }}</td>
+    <td class='string'>{{ treatment.start_date|default_if_none:"-" }}</td>
+    <td class='string'>{{ treatment.end_date|default_if_none:"-" }}</td>
   </tr>
   {% endfor %}
 </table>
@@ -96,7 +98,7 @@
   {% for items, treatment in item.downstream_treatments %}
   <tr>
     <td class='string'>{{ treatment.treatment_type }}</td>
-    <td class='string'>{% for item in items %}{% if not forloop.first %} ; {% endif %} {{item}} {{ item|link_to_window}}{% endfor %}</td>
+    <td class='item-list'>{% for item in items %}<span>{{item}} {{ item|link_to_window}}</span>{% endfor %}</td>
     <td class='string'>{{ treatment.person|default_if_none:"" }}</td>
     <td class='string'>{{ treatment.start_date|default_if_none:"" }}</td>
     <td class='string'>{{ treatment.end_date|default_if_none:"" }}</td>
@@ -108,44 +110,31 @@
 <h3>{% trans "Associated base finds"%}</h3>
 
 {% for base_find in item.base_finds.all %}
-<p><label>{%trans "Complete ID"%}{% trans ":"%}</label>
-<span class='value'>{{base_find.complete_id}}</span></p>
-
-{% field "Short ID" base_find.short_id %}
+<ul class='form-flex'>
+{% field_li "Complete ID" base_find.complete_id %}
+{% field_li "Short ID" base_find.short_id %}
 {% if base_find.IS_ISOLATED_DICT %}
-{% field "Batch/object" base_find.batch|from_dict:base_find.IS_ISOLATED_DICT %}
+{% field_li "Batch/object" base_find.batch|from_dict:base_find.IS_ISOLATED_DICT %}
 {% endif %}
 {% if base_find.history_object and base_find.history_object.IS_ISOLATED_DICT %}
-{% field "Batch/object" base_find.batch|from_dict:base_find.history_object.IS_ISOLATED_DICT %}
+{% field_li "Batch/object" base_find.batch|from_dict:base_find.history_object.IS_ISOLATED_DICT %}
 {% endif %}
 
-{% if base_find.discovery_date %}
-<p><label>{%trans "Discovery date"%}{% trans ":"%}</label>
-<span class='value'>{{base_find.discovery_date}}</span></p>
-{% endif%}
-{% if base_find.description %}
-<p><label>{%trans "Description"%}{% trans ":"%}</label>
-<span class='value'>{{base_find.description}}</span></p>
-{% endif%}
-{% field "Comment" base_find.comment "<pre>" "</pre>" %}
-{% if base_find.special_interest %}
-<p><label>{%trans "Special interest"%}{% trans ":"%}</label>
-<span class='value'>{{base_find.special_interest}}</span></p>
-{% endif%}
+{% field_li "Discovery date" base_find.discovery_date %}
+{% field_li "Special interest" base_find.special_interest %}
+{% field_li_detail "Context record" base_find.context_record %}
+{% if base_find.context_record %}{% field_li "Parcel" base_find.context_record.parcel %}
+{% field_li_detail "Operation" base_find.context_record.operation %}{% endif %}
+</ul>
 
-<p><label>{%trans "Related context record"%}{% trans ":"%}</label>
-<span class='value'><a href="#" onclick='load_window("{% url show-contextrecord base_find.context_record.pk ''%}");'>{{ base_find.context_record }}</a></span></p>
-<p><label>{%trans "Related parcel"%}{% trans ":"%}</label>
-<span class='value'>{{base_find.context_record.parcel}}</span></p>
-<p><label>{%trans "Related operation"%}{% trans ":"%}</label>
-<span class='value'><a href="#" onclick='load_window("{% url show-operation base_find.context_record.operation.pk ''%}");'>{{ base_find.context_record.operation }}</a></span></p>
+{% field "Description" base_find.description "<pre>" "</pre>" %}
+{% field "Comment" base_find.comment "<pre>" "</pre>" %}
 {% if forloop.counter0 %}<hr/>{% endif %}
 {% endfor %}
 
-{% if not item.source.count %}
-  <em>{% trans "No document associated to this find" %}</em>
-{% else %}
-<table class='simple' id='{{window_id}}-docs'>
+{% if item.source.count %}
+<h3>{% trans "Documents"%}</h3>
+<table id='{{window_id}}-docs'>
   <caption>{%trans "Documents"%}</caption>
   <tr>
     <th>{% trans "Title" %}</th>
@@ -165,7 +154,8 @@
 </table>
 
 <script type='text/javascript'>
-tableToGrid('#{{window_id}}-docs', {});
+tableToGrid('#{{window_id}}-docs', {
+    width: null, shrinkToFit: false});
 </script>
 {% endif %}
 
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 7ea698edd..b42f2fbd9 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -905,6 +905,22 @@ a.photo{
     font-style:italic;
 }
 
+#window table.simple td.item-list{
+    text-align:left;
+}
+
+table td.item-list span{
+    padding: 4px 4px;
+    background-color: #eee;
+    margin: 0.2em;
+    line-height: 26px;
+    border-radius: 4px;
+}
+
+#window table.simple td.item-list .display_details{
+    vertical-align: middle;
+}
+
 #window .head{
     text-align:center;
     background-color:#f1f2f6;
diff --git a/ishtar_common/static/media/style_basic.css b/ishtar_common/static/media/style_basic.css
index d624ae09c..1d92928dc 100644
--- a/ishtar_common/static/media/style_basic.css
+++ b/ishtar_common/static/media/style_basic.css
@@ -85,3 +85,7 @@ p{
     width:100%;
     border-bottom:1px solid #922;
 }
+
+.display_details, .display_details_inline{
+    display: none;
+}
diff --git a/ishtar_common/templates/ishtar/blocks/window_field_detail.html b/ishtar_common/templates/ishtar/blocks/window_field_detail.html
new file mode 100644
index 000000000..2be9c5ec4
--- /dev/null
+++ b/ishtar_common/templates/ishtar/blocks/window_field_detail.html
@@ -0,0 +1,3 @@
+{% load i18n %}{% if item %}{% if li %}<li>{% else %}<p>{% endif %}<label>{% trans caption %}{% trans ":"%}</label>
+<span class='value'>{{item}}{{link}}</span>{% if li %}</li>{% else %}</p>{% endif %}
+{% endif %}
diff --git a/ishtar_common/templates/ishtar/sheet_toolbar.html b/ishtar_common/templates/ishtar/sheet_toolbar.html
index 7e2c1659a..a6736b6cc 100644
--- a/ishtar_common/templates/ishtar/sheet_toolbar.html
+++ b/ishtar_common/templates/ishtar/sheet_toolbar.html
@@ -1,2 +1,2 @@
-{% load i18n link_to_window %}<div class='tool'>{%trans "Export as:"%} <a href='{{item|link_to_odt}}'>{%trans "OpenOffice.org file"%}</a>, <a href='{{item|link_to_pdf}}'>{%trans "PDF file"%}</a></div>
+{% load i18n link_to_window %}<div class='tool'>{% trans "Export as:" %} <a href='{{item|link_to_odt}}'>{%trans "OpenOffice.org file"%}</a>, <a href='{{item|link_to_pdf}}'>{%trans "PDF file"%}</a></div>
 {% modify_toolbar item "person_modification" %}
diff --git a/ishtar_common/templatetags/window_field.py b/ishtar_common/templatetags/window_field.py
index 269686a91..9ce2cf6b6 100644
--- a/ishtar_common/templatetags/window_field.py
+++ b/ishtar_common/templatetags/window_field.py
@@ -1,5 +1,6 @@
 from django import template
 from django.utils.translation import ugettext_lazy as _
+from ishtar_common.templatetags.link_to_window import link_to_window
 
 register = template.Library()
 
@@ -39,3 +40,14 @@ def field_multiple(caption, data, li=False):
 @register.inclusion_tag('ishtar/blocks/window_field_multiple.html')
 def field_li_multiple(caption, data):
     return field_multiple(caption, data, li=True)
+
+
+@register.inclusion_tag('ishtar/blocks/window_field_detail.html')
+def field_detail(caption, item, li=False):
+    return {'caption': caption, 'item': item, 'link': link_to_window(item),
+            'li': li}
+
+
+@register.inclusion_tag('ishtar/blocks/window_field_detail.html')
+def field_li_detail(caption, item):
+    return field_detail(caption, item, li=True)
-- 
cgit v1.2.3