Sheet refactoring with images

3 files changed, 26 insertions, 14 deletions

diff --git a/ishtar_common/templates/ishtar/blocks/window_field_flex_detail.html b/ishtar_common/templates/ishtar/blocks/window_field_flex_detail.html
index 5968f9afa..6f5d80ba8 100644
--- a/ishtar_common/templates/ishtar/blocks/window_field_flex_detail.html
+++ b/ishtar_common/templates/ishtar/blocks/window_field_flex_detail.html
@@ -1,5 +1,5 @@
 {% load i18n %}{% if item %}
-<dl class="col-12 col-md-6 col-lg-4 d-flex flex-wrap row">
+<dl class="col-12 {% if size == 2 %}col-lg-6{% else %}col-md-6 col-lg-4{% endif %} d-flex flex-wrap row">
     <dt class="col-5">{% trans caption %}</dt>
     <dd class="col-7">{{item}}{{link}}</dd>
 </dl>
diff --git a/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple.html b/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple.html
index 60f6361b7..010200837 100644
--- a/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple.html
+++ b/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple.html
@@ -1,5 +1,5 @@
 {% load i18n %}{% if data.count %}
-<dl class="col-12 col-md-6 col-lg-4 d-flex flex-wrap row">
+<dl class="col-12 {% if size == 2 %}col-lg-6{% else %}col-md-6 col-lg-4{% endif %} d-flex flex-wrap row">
     <dt class="col-5">{% trans caption %}</dt>
     <dd class="col-7">{% for d in data.all %}
         {% if forloop.counter0 %} ; {% endif %}{{ d }}
diff --git a/ishtar_common/templatetags/window_field.py b/ishtar_common/templatetags/window_field.py
index f1db8cf48..46329a3fa 100644
--- a/ishtar_common/templatetags/window_field.py
+++ b/ishtar_common/templatetags/window_field.py
@@ -34,8 +34,11 @@ def field_li(caption, data, pre_data='', post_data=''):
 
 
 @register.inclusion_tag('ishtar/blocks/window_field_flex.html')
-def field_flex(caption, data, pre_data='', post_data=''):
-    return field(caption, data, pre_data, post_data)
+def field_flex(caption, data, pre_data='', post_data='', small=False):
+    size = None
+    if small:
+        size = 2
+    return field(caption, data, pre_data, post_data, size=size)
 
 
 @register.inclusion_tag('ishtar/blocks/window_field_flex.html')
@@ -44,8 +47,11 @@ def field_flex_2(caption, data, pre_data='', post_data=''):
 
 
 @register.inclusion_tag('ishtar/blocks/window_field_flex_full.html')
-def field_flex_full(caption, data, pre_data='', post_data=''):
-    return field(caption, data, pre_data, post_data)
+def field_flex_full(caption, data, pre_data='', post_data='', small=False):
+    size = None
+    if small:
+        size = 2
+    return field(caption, data, pre_data, post_data, size=size)
 
 
 @register.inclusion_tag('ishtar/blocks/window_field_url.html')
@@ -85,8 +91,8 @@ def field_flex_file(context, caption, link):
 
 
 @register.inclusion_tag('ishtar/blocks/window_field_multiple.html')
-def field_multiple(caption, data, li=False):
-    return {'caption': caption, 'data': data, 'li': li}
+def field_multiple(caption, data, li=False, size=None):
+    return {'caption': caption, 'data': data, 'li': li, "size": size}
 
 
 @register.inclusion_tag('ishtar/blocks/window_field_multiple.html')
@@ -95,14 +101,17 @@ def field_li_multiple(caption, data):
 
 
 @register.inclusion_tag('ishtar/blocks/window_field_flex_multiple.html')
-def field_flex_multiple(caption, data):
-    return field_multiple(caption, data)
+def field_flex_multiple(caption, data, small=False):
+    size = None
+    if small:
+        size = 2
+    return field_multiple(caption, data, size=size)
 
 
 @register.inclusion_tag('ishtar/blocks/window_field_detail.html')
-def field_detail(caption, item, li=False):
+def field_detail(caption, item, li=False, size=None):
     return {'caption': caption, 'item': item, 'link': link_to_window(item),
-            'li': li}
+            'li': li, 'size': size}
 
 
 @register.inclusion_tag('ishtar/blocks/window_field_detail.html')
@@ -111,5 +120,8 @@ def field_li_detail(caption, item):
 
 
 @register.inclusion_tag('ishtar/blocks/window_field_flex_detail.html')
-def field_flex_detail(caption, item):
-    return field_detail(caption, item)
+def field_flex_detail(caption, item, small=False):
+    size = None
+    if small:
+        size = 2
+    return field_detail(caption, item, size=size)