From f4eceb80557e2141e8535cc1b555c1a72e3e8ddd Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 25 Jun 2024 18:58:44 +0200
Subject: ✨ Notices - Town: add old town, new town reference on notices (refs
 #5380, #5732)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ishtar_common/templates/ishtar/sheet_town.html | 34 ++++++++++++++++++--------
 1 file changed, 24 insertions(+), 10 deletions(-)

(limited to 'ishtar_common/templates')

diff --git a/ishtar_common/templates/ishtar/sheet_town.html b/ishtar_common/templates/ishtar/sheet_town.html
index 7b86b9bf1..448ea6752 100644
--- a/ishtar_common/templates/ishtar/sheet_town.html
+++ b/ishtar_common/templates/ishtar/sheet_town.html
@@ -75,22 +75,36 @@
                 </dl>
                 {% endif %}
                 {% field_flex "Department" item.departement %}
+                {% with has_image=item.images.count %}
+                {% if not has_image %}
+            </div>
+        </div>
+        {% endif %}
+        {% if has_image %}
+    </div></div>
+    {% endif %}
+    {% endwith %}
+    <hr class="clearfix">
+        <div class="row">
                 {% if item.areas.count %}
-                <dl class="col-12 col-lg-6 flex-wrap">
+                <dl class="col-12 flex-wrap">
                     <dt>{% trans "Areas" %}</dt>
                     <dd>{% for area in item.areas.all %}{% if forloop.counter0 %}&nbsp;; {% endif %}{{area}}{{area|simple_link_to_window}}{% endfor %}</dd>
                 </dl>
                 {% endif %}
-                {% with has_image=item.images.count %}
-                {% if not has_image %}
-            </div>
+                {% if item.children.count %}
+                <dl class="col-12 flex-wrap">
+                    <dt>{% trans "Old town of" %}</dt>
+                    <dd>{% for town in item.children.all %}{% if forloop.counter0 %}&nbsp;; {% endif %}{{town}}{{town|simple_link_to_window}}{% endfor %}</dd>
+                </dl>
+                {% endif %}
+                {% if item.parents.count %}
+                <dl class="col-12 flex-wrap">
+                    <dt>{% trans "New town for" %}</dt>
+                    <dd>{% for town in item.parents.all %}{% if forloop.counter0 %}&nbsp;; {% endif %}{{town}}{{town|simple_link_to_window}}{% endfor %}</dd>
+                </dl>
+                {% endif %}
         </div>
-            {% endif %}
-            {% if has_image %}
-        </div></div>
-            {% endif %}
-            {% endwith %}
-            <hr class="clearfix">
         {% if PROFILE.mapping and item.main_geodata %}
         <h3>{% trans "Geographic localisation" %}</h3>
         <div class="row">
-- 
cgit v1.2.3