From 7beb073b8fb06505b3be5da8f93e4183e0eb4da9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sun, 26 Jan 2020 17:21:55 +0100
Subject: [PATCH] details/popup: include year_of_construction and end_date (if
set)
---
detailsBody.html | 20 ++++++++++++++++----
popupBody.html | 20 ++++++++++++++++----
2 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/detailsBody.html b/detailsBody.html
index 5e0da29..9bb0959 100644
--- a/detailsBody.html
+++ b/detailsBody.html
@@ -149,19 +149,31 @@
</li>
{% endif %}
-{% if tags.start_date %}
+{% if tags.year_of_construction or tags.start_date or tags.opening_date or tags.end_date %}
<li class='hasSymbol'>
<i class="fa fa-clock-o" aria-hidden="true"></i>
+
+{% if tags.year_of_construction %}
+ <span class='key'>{{ keyTrans('year_of_construction') }}:</span>
+ <span class='value'>{{ tags.year_of_construction|osmFormatDate }}</span>
+ <br/>
+{% endif %}
+
+{% if tags.start_date %}
<span class='key'>{{ keyTrans('start_date') }}:</span>
<span class='value'>{{ tags.start_date|osmFormatDate }}</span>
- </li>
+ <br/>
{% endif %}
{% if tags.opening_date %}
- <li class='hasSymbol'>
- <i class="fa fa-clock-o" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('opening_date') }}:</span>
<span class='value'>{{ tags.opening_date|osmFormatDate }}</span>
+{% endif %}
+
+{% if tags.end_date %}
+ <span class='key'>{{ keyTrans('end_date') }}:</span>
+ <span class='value'>{{ tags.end_date|osmFormatDate }}</span>
+{% endif %}
</li>
{% endif %}
diff --git a/popupBody.html b/popupBody.html
index 8952dec..96c2d52 100644
--- a/popupBody.html
+++ b/popupBody.html
@@ -155,19 +155,31 @@
<span class='value'><a href="https://{{ wikipedia[1] }}.wikipedia.org/wiki/{{ wikipedia[2]|replace({ ' ': '_' }) }}">{{ wikipedia[2] }}</a></span>
{% endif %}
-{% if tags.start_date %}
+{% if tags.year_of_construction or tags.start_date or tags.opening_date or tags.end_date %}
<li class='hasSymbol'>
<i class="fa fa-clock-o" aria-hidden="true"></i>
+
+{% if tags.year_of_construction %}
+ <span class='key'>{{ keyTrans('year_of_construction') }}:</span>
+ <span class='value'>{{ tags.year_of_construction|osmFormatDate }}</span>
+ <br/>
+{% endif %}
+
+{% if tags.start_date %}
<span class='key'>{{ keyTrans('start_date') }}:</span>
<span class='value'>{{ tags.start_date|osmFormatDate }}</span>
- </li>
+ <br/>
{% endif %}
{% if tags.opening_date %}
- <li class='hasSymbol'>
- <i class="fa fa-clock-o" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('opening_date') }}:</span>
<span class='value'>{{ tags.opening_date|osmFormatDate }}</span>
+{% endif %}
+
+{% if tags.end_date %}
+ <span class='key'>{{ keyTrans('end_date') }}:</span>
+ <span class='value'>{{ tags.end_date|osmFormatDate }}</span>
+{% endif %}
</li>
{% endif %}