From 724f505a8f7e3fef417ea204cb39bc54d042cf50 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 4 Jan 2019 12:39:02 +0100
Subject: Sheet: refactor display of fields (more compact)

---
 .../ishtar/blocks/sheet_creation_section.html          | 18 ++++++++----------
 .../templates/ishtar/blocks/window_field_flex.html     |  6 +++---
 .../ishtar/blocks/window_field_flex_detail.html        |  6 +++---
 .../ishtar/blocks/window_field_flex_full.html          |  6 +++---
 .../blocks/window_field_flex_historized_multiple.html  |  6 +++---
 .../ishtar/blocks/window_field_flex_multiple.html      |  6 +++---
 .../ishtar/blocks/window_field_flex_multiple_full.html |  6 +++---
 .../templates/ishtar/blocks/window_field_flex_url.html |  6 +++---
 8 files changed, 29 insertions(+), 31 deletions(-)

(limited to 'ishtar_common')

diff --git a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html
index 78126a240..6247920cd 100644
--- a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html
+++ b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html
@@ -1,20 +1,18 @@
 {% load i18n link_to_window %}
 {% if item.history_creator.ishtaruser.person %}
-<div class="col-12 col-md-6 col-lg-4 d-flex flex-wrap row">
-    <dt class="col-5">{% trans "Creation" context "Sheet" %}</dt>
-    <dd class="col-7">
-        {{item.history_creator.ishtaruser.person}}
-        {{item.history_creator.ishtaruser.person|link_to_window}} <br/>
+<div class="col-12 col-md-6 col-lg-3 flex-wrap">
+    <dt>{% trans "Creation" context "Sheet" %}{{item.history_creator.ishtaruser.person|link_to_window}}</dt>
+    <dd>
+        {{item.history_creator.ishtaruser.person}}<br/>
         <small class="text-muted">{{item.history_creation_date|date:"DATETIME_FORMAT"}}</small>
     </dd>
 </div>
 {% endif %}
 {% if item.history_creation_date != item.last_edition_date %}
-<div class="col-12 col-md-6 col-lg-4 d-flex flex-wrap row">
-    <dt class="col-5">{% trans "Modification" context "Sheet" %}</dt>
-    <dd class='col-7'>
-        {{item.history_modifier.ishtaruser.person}}
-        {{item.history_modifier.ishtaruser.person|link_to_window}} <br/>
+<div class="col-12 col-md-6 col-lg-3 flex-wrap">
+    <dt>{% trans "Modification" context "Sheet" %}{{item.history_modifier.ishtaruser.person|link_to_window}}</dt>
+    <dd>
+        {{item.history_modifier.ishtaruser.person}}<br/>
         <small class="text-muted">{% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}</small>
     </dd>
 </div>
diff --git a/ishtar_common/templates/ishtar/blocks/window_field_flex.html b/ishtar_common/templates/ishtar/blocks/window_field_flex.html
index add2a5520..133750bee 100644
--- a/ishtar_common/templates/ishtar/blocks/window_field_flex.html
+++ b/ishtar_common/templates/ishtar/blocks/window_field_flex.html
@@ -1,6 +1,6 @@
 {% load i18n %}{% if data %}
-    <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">{{pre_data|safe}}{{data|linebreaksbr}}{{post_data|safe }}</dd>
+    <dl class="col-12 {% if size == 2 %}col-lg-6{% else %}col-md-6 col-lg-3{% endif %} flex-wrap">
+        <dt>{% trans caption %}</dt>
+        <dd>{{pre_data|safe}}{{data|linebreaksbr}}{{post_data|safe }}</dd>
     </dl>
 {% endif %}
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 6f5d80ba8..f7ca5ce8f 100644
--- a/ishtar_common/templates/ishtar/blocks/window_field_flex_detail.html
+++ b/ishtar_common/templates/ishtar/blocks/window_field_flex_detail.html
@@ -1,6 +1,6 @@
 {% load i18n %}{% if item %}
-<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 class="col-12 {% if size == 2 %}col-lg-6{% else %}col-md-6 col-lg-3{% endif %} flex-wrap">
+    <dt>{% trans caption %}{{link}}</dt>
+    <dd>{{item}}</dd>
 </dl>
 {% endif %}
diff --git a/ishtar_common/templates/ishtar/blocks/window_field_flex_full.html b/ishtar_common/templates/ishtar/blocks/window_field_flex_full.html
index f44cdc6fd..ec337a5f8 100644
--- a/ishtar_common/templates/ishtar/blocks/window_field_flex_full.html
+++ b/ishtar_common/templates/ishtar/blocks/window_field_flex_full.html
@@ -1,6 +1,6 @@
 {% load i18n %}{% if data %}
-    <dl class="col-12 row">
-        <dt class="col-12">{% trans caption %}</dt>
-        <dd class="col-12">{{pre_data|safe}}{{data|linebreaksbr}}{{post_data|safe }}</dd>
+    <dl class="col-12">
+        <dt>{% trans caption %}</dt>
+        <dd>{{pre_data|safe}}{{data|linebreaksbr}}{{post_data|safe }}</dd>
     </dl>
 {% endif %}
diff --git a/ishtar_common/templates/ishtar/blocks/window_field_flex_historized_multiple.html b/ishtar_common/templates/ishtar/blocks/window_field_flex_historized_multiple.html
index a68bd0cb4..493585a60 100644
--- a/ishtar_common/templates/ishtar/blocks/window_field_flex_historized_multiple.html
+++ b/ishtar_common/templates/ishtar/blocks/window_field_flex_historized_multiple.html
@@ -1,7 +1,7 @@
 {% load i18n %}{% if data %}
-<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 %}
+<dl class="col-12 {% if size == 2 %}col-lg-6{% else %}col-md-6 col-lg-3{% endif %} flex-wrap">
+    <dt>{% trans caption %}</dt>
+    <dd>{% for d in data %}
         {% if forloop.counter0 %} ; {% endif %}{{ d }}
     {% endfor %}</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 010200837..abf03ead1 100644
--- a/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple.html
+++ b/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple.html
@@ -1,7 +1,7 @@
 {% load i18n %}{% if data.count %}
-<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 %}
+<dl class="col-12 {% if size == 2 %}col-lg-6{% else %}col-md-6 col-lg-3{% endif %} flex-wrap">
+    <dt>{% trans caption %}</dt>
+    <dd>{% for d in data.all %}
         {% if forloop.counter0 %} ; {% endif %}{{ d }}
     {% endfor %}</dd>
 </dl>
diff --git a/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple_full.html b/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple_full.html
index b70c1d2fc..14cab4722 100644
--- a/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple_full.html
+++ b/ishtar_common/templates/ishtar/blocks/window_field_flex_multiple_full.html
@@ -1,7 +1,7 @@
 {% load i18n %}{% if data.count %}
-    <dl class="col-12 row">
-        <dt class="col-12">{% trans caption %}</dt>
-        <dd class="col-12">{% for d in data.distinct.all %}
+    <dl class="col-12">
+        <dt>{% trans caption %}</dt>
+        <dd>{% for d in data.distinct.all %}
             {% if forloop.counter0 %} ; {% endif %}{{ d }}
         {% endfor %}</dd>
     </dl>
diff --git a/ishtar_common/templates/ishtar/blocks/window_field_flex_url.html b/ishtar_common/templates/ishtar/blocks/window_field_flex_url.html
index b3a801636..4f23ff74b 100644
--- a/ishtar_common/templates/ishtar/blocks/window_field_flex_url.html
+++ b/ishtar_common/templates/ishtar/blocks/window_field_flex_url.html
@@ -1,7 +1,7 @@
 {% load i18n %}{% if link %}
-<dl class="col-12 col-md-6 col-lg-4 d-flex flex-wrap row">
-    <dt class="col-5">{% trans caption %}</dt>
-    <dd class="col-7">
+<dl class="col-12 col-md-6 col-lg-3 flex-wrap">
+    <dt>{% trans caption %}</dt>
+    <dd>
         <a target="_blank" href='{{link|safe}}'>{% if link_name %}{{link_name}}{% else %}{{link}}{% endif %}</a>
     </dd>
 </dl>
-- 
cgit v1.2.3