From 7db9d45bdeb412a6d4df2317d49638d1e1f07888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at> Date: Sun, 13 Aug 2017 16:15:55 +0200 Subject: [PATCH] commonBody: better layout --- commonBody.html | 52 ++++++++++++++++++++++++++----------------------- gastro.json | 2 +- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/commonBody.html b/commonBody.html index 52dc8c1..7044bc4 100644 --- a/commonBody.html +++ b/commonBody.html @@ -1,35 +1,39 @@ -<dl> - +<ul> {% set address = tagsPrefix(tags, 'addr:') %} {% if address %} -<dt> -<i class="fa fa-map-marker symbol" aria-hidden="true"></i> -{{ keyTrans('addr') }}: -</dt><dd> -{{ attribute(tags, 'addr:street') }} {{ attribute(tags, 'addr:housenumber') }}, {{ attribute(tags, 'addr:postcode') }} {{ attribute(tags, 'addr:city') }} -</dd> +<li> + <i class="fa fa-map-marker symbol" aria-hidden="true"></i> + <span class='key'>{{ keyTrans('addr') }}</span> + <span class='value'> + {{ attribute(tags, 'addr:street') }} + {{ attribute(tags, 'addr:housenumber') }}, + {{ attribute(tags, 'addr:postcode') }} + {{ attribute(tags, 'addr:city') }} + </span> +</li> {% endif %} {% if tags.phone %} -<dt> -<i class="fa fa-phone symbol" aria-hidden="true"></i> -{{ keyTrans('phone') }}: -</dt> -<dd> -<a href='tel:{{ tags.phone }}'>{{ tags.phone }}</a> -</dd> +<li> + <i class="fa fa-phone symbol" aria-hidden="true"></i> + <span class='key'>{{ keyTrans('phone') }}</span> + <span class='value'> + <a href='tel:{{ tags.phone }}'>{{ tags.phone }}</a> + </span> +</li> {% endif %} {% set payment = tagsPrefix(tags, 'payment:') %} {% if payment %} -<dt> -<i class="fa fa-money symbol" aria-hidden="true"></i> -{{ keyTrans('payment') }}: -</dt><dd> -{% for k, tag in payment %} -{% if tags[tag] == 'no' %}<s>{{ k }}</s> {% else %}{{ k }} {% endif %} -{% endfor %} -</dd> +<li> + <i class="fa fa-money symbol" aria-hidden="true"></i> + <span class='key'>{{ keyTrans('payment') }}</span> + <span class='value'> + {% for k, tag in payment %} + {% if tags[tag] == 'no' %}<s>{{ k }}</s> {% else %}{{ k }} {% endif %} + {% endfor %} + </span> +</li> {% endif %} -</dl> +</ul> diff --git a/gastro.json b/gastro.json index 41f87a2..88ac064 100644 --- a/gastro.json +++ b/gastro.json @@ -21,7 +21,7 @@ }, "feature": { "markerSign": "{% if tags.amenity=='bar' %}🍸{% elseif tags.amenity=='biergarten'%}🍻{% elseif tags.amenity=='cafe' %}☕{% elseif tags.amenity=='fast_food' %}🍔{% elseif tags.amenity=='ice_cream' %}🍨{% elseif tags.amenity=='pub' %}🍺{% else %}🍴{% endif %}", - "body": "{{ tagTrans('amenity', tags.amenity) }}<br/>{{ keyTrans('cuisine') }}: {{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}", + "body": "<span class='description'>\n{{ tagTrans('amenity', tags.amenity) }}\n</span>\n<ul>\n <li>\n <i class=\"fa fa-cutlery symbol\" aria-hidden=\"true\"></i>\n <span class='key'>{{ keyTrans('cuisine') }}</span>\n <span class='value'>{{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}</span>\n </li>\n</ul>", "description": "{{ tagTrans('amenity', tags.amenity) }}" } }