From c1c5b1b45749569cb9146bd6a0e9f73f5b4c5e5a 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

---
 ishtar_common/static/media/style.css                     | 16 ++++++++++++++++
 ishtar_common/static/media/style_basic.css               |  4 ++++
 .../templates/ishtar/blocks/window_field_detail.html     |  3 +++
 ishtar_common/templates/ishtar/sheet_toolbar.html        |  2 +-
 ishtar_common/templatetags/window_field.py               | 12 ++++++++++++
 5 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 ishtar_common/templates/ishtar/blocks/window_field_detail.html

(limited to 'ishtar_common')

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