common/detailsBody: unify contact information

commonBody.html

@@ -75,16 +75,6 @@
 </li>
 {% endif %}
 
-{% if attribute(tags, 'contact:website') %}
-<li class='hasSymbol'>
-  <i class="fa fa-globe" aria-hidden="true"></i>
-  <span class='key'>{{ keyTrans('website') }}:</span>
-  <span class='value'>
-    <a href='{{ attribute(tags, 'contact:website') }}'>{{ attribute(tags, 'contact:website') }}</a>
-  </span>
-</li>
-{% endif %}
-
 {% if tags.opening_hours %}
 {% set oh_state = openingHoursState(tags.opening_hours) %}
 {% set oh_css = { "open": "yes", "closed": "no", "unknown": "unknown" } %}

detailsBody.html

@@ -13,6 +13,26 @@
 </li>
 {% endif %}
 
+{% if tags.website %}
+<li class='hasSymbol'>
+  <i class="fa fa-globe" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('website') }}:</span>
+  <span class='value'>
+    <a href='{{ tags.website }}'>{{ tags.website }}</a>
+  </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'contact:website') %}
+<li class='hasSymbol'>
+  <i class="fa fa-globe" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('website') }}:</span>
+  <span class='value'>
+    <a href='{{ attribute(tags, 'contact:website') }}'>{{ attribute(tags, 'contact:website') }}</a>
+  </span>
+</li>
+{% endif %}
+
 {% if tags.phone %}
 <li class='hasSymbol'>
   <i class="fa fa-phone" aria-hidden="true"></i>
@@ -33,6 +53,16 @@
 </li>
 {% endif %}
 
+{% if tags.phone %}
+<li class='hasSymbol'>
+  <i class="fa fa-phone" aria-hidden="true"></i>
+  <span class='key'>{{ keyTrans('phone') }}:</span>
+  <span class='value'>
+    <a href='tel:{{ tags.phone }}'>{{ tags.phone }}</a>
+  </span>
+</li>
+{% endif %}
+
 {% if attribute(tags, 'contact:email') %}
 <li class='hasSymbol'>
   <i class="fa fa-envelope" aria-hidden="true"></i>