From b3d1aa5f7f0edcbf5f52d88a7a13e944b0f36822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at> Date: Thu, 5 Sep 2024 10:11:07 +0200 Subject: [PATCH] Support multi-values for email, website, phone (and contact:...) --- detailsBody.html | 35 +++++++++++++++++++++++++---------- popupBody.html | 30 ++++++++++++++++++++++++------ 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/detailsBody.html b/detailsBody.html index 56daf12..9c43f94 100644 --- a/detailsBody.html +++ b/detailsBody.html @@ -48,7 +48,10 @@ <i class="fa fa-globe" aria-hidden="true"></i> <span class='key'>{{ keyTrans('website') }}:</span> <span class='value'> - <a target='_blank' href='{{ tags.website|websiteUrl }}'>{{ tags.website }}</a> + {% for i, v in tags.website|split(';') -%} + {%- if i > 0 %}, {% endif %} + <a target='_blank' href='{{ v|websiteUrl }}'>{{ v }}</a> + {%- endfor %} </span> </li> {% endif %} @@ -58,7 +61,10 @@ <i class="fa fa-globe" aria-hidden="true"></i> <span class='key'>{{ keyTrans('website') }}:</span> <span class='value'> - <a target='_blank' href='{{ attribute(tags, 'contact:website')|websiteUrl }}'>{{ attribute(tags, 'contact:website') }}</a> + {% for i, v in attribute(tags, 'contact:website')|split(';') -%} + {%- if i > 0 %}, {% endif %} + <a target='_blank' href='{{ v|websiteUrl }}'>{{ v }}</a> + {%- endfor %} </span> </li> {% endif %} @@ -68,7 +74,10 @@ <i class="fa fa-phone" aria-hidden="true"></i> <span class='key'>{{ keyTrans('phone') }}:</span> <span class='value'> - <a target='_blank' href='tel:{{ tags.phone }}'>{{ tags.phone }}</a> + {% for i, v in tags.phone|split(';') -%} + {%- if i > 0 %}, {% endif %} + <a target='_blank' href='tel:{{ v }}'>{{ v }}</a> + {%- endfor %} </span> </li> {% endif %} @@ -78,19 +87,24 @@ <i class="fa fa-phone" aria-hidden="true"></i> <span class='key'>{{ keyTrans('phone') }}:</span> <span class='value'> - <a target='_blank' href='tel:{{ attribute(tags, 'contact:phone') }}'>{{ attribute(tags, 'contact:phone') }}</a> + {% for i, v in attribute(tags, 'contact:phone')|split(';') -%} + {%- if i > 0 %}, {% endif %} + <a target='_blank' href='tel:{{ v }}'>{{ v }}</a> + {%- endfor %} </span> </li> {% endif %} + {% if attribute(tags, 'contact:email') %} <li class='hasSymbol'> <i class="fa fa-envelope" aria-hidden="true"></i> <span class='key'>{{ keyTrans('email') }}:</span> <span class='value'> - <a target='_blank' href='mailto:{{ attribute(tags, 'contact:email') }}'> - {{ attribute(tags, 'contact:email') }} - </a> + {% for i, v in attribute(tags, 'contact:email')|split(';') -%} + {%- if i > 0 %}, {% endif %} + <a target='_blank' href='mailto:{{ v }}'>{{ v }}</a> + {%- endfor %} </span> </li> {% endif %} @@ -100,9 +114,10 @@ <i class="fa fa-envelope" aria-hidden="true"></i> <span class='key'>{{ keyTrans('email') }}:</span> <span class='value'> - <a target='_blank' href='mailto:{{ attribute(tags, 'email') }}'> - {{ attribute(tags, 'email') }} - </a> + {% for i, v in tags.email|split(';') -%} + {%- if i > 0 %}, {% endif %} + <a target='_blank' href='mailto:{{ v }}'>{{ v }}</a> + {%- endfor %} </span> </li> {% endif %} diff --git a/popupBody.html b/popupBody.html index 9ec1368..1aa1344 100644 --- a/popupBody.html +++ b/popupBody.html @@ -48,7 +48,10 @@ <i class="fa fa-globe" aria-hidden="true"></i> <span class='key'>{{ keyTrans('website') }}:</span> <span class='value'> - <a target='_blank' href='{{ tags.website|websiteUrl }}'>{{ tags.website }}</a> + {% for i, v in tags.website|split(';') -%} + {%- if i > 0 %}, {% endif %} + <a target='_blank' href='{{ v|websiteUrl }}'>{{ v }}</a> + {%- endfor %} </span> </li> {% endif %} @@ -58,7 +61,10 @@ <i class="fa fa-globe" aria-hidden="true"></i> <span class='key'>{{ keyTrans('website') }}:</span> <span class='value'> - <a target='_blank' href='{{ attribute(tags, 'contact:website')|websiteUrl }}'>{{ attribute(tags, 'contact:website') }}</a> + {% for i, v in attribute(tags, 'contact:website')|split(';') -%} + {%- if i > 0 %}, {% endif %} + <a target='_blank' href='{{ v|websiteUrl }}'>{{ v }}</a> + {%- endfor %} </span> </li> {% endif %} @@ -68,7 +74,10 @@ <i class="fa fa-phone" aria-hidden="true"></i> <span class='key'>{{ keyTrans('phone') }}:</span> <span class='value'> - <a target='_blank' href='tel:{{ tags.phone }}'>{{ tags.phone }}</a> + {% for i, v in tags.phone|split(';') -%} + {%- if i > 0 %}, {% endif %} + <a target='_blank' href='tel:{{ v }}'>{{ v }}</a> + {%- endfor %} </span> </li> {% endif %} @@ -78,7 +87,10 @@ <i class="fa fa-phone" aria-hidden="true"></i> <span class='key'>{{ keyTrans('phone') }}:</span> <span class='value'> - <a target='_blank' href='tel:{{ attribute(tags, 'contact:phone') }}'>{{ attribute(tags, 'contact:phone') }}</a> + {% for i, v in attribute(tags, 'contact:phone')|split(';') -%} + {%- if i > 0 %}, {% endif %} + <a target='_blank' href='tel:{{ v }}'>{{ v }}</a> + {%- endfor %} </span> </li> {% endif %} @@ -90,15 +102,21 @@ <span class='value'> {% if attribute(tags, 'contact:email') %} - <a target='_blank' href='mailto:{{ attribute(tags, 'contact:email') }}'> + {% for i, v in attribute(tags, 'contact:email')|split(';') -%} + {%- if i > 0 %}, {% endif %} + <a target='_blank' href='mailto:{{ v }}'> <i class="fa fa-envelope" aria-hidden="true"></i> </a> + {%- endfor %} {% endif %} {% if attribute(tags, 'email') %} - <a target='_blank' href='mailto:{{ attribute(tags, 'email') }}'> + {% for i, v in tags.email|split(';') -%} + {%- if i > 0 %}, {% endif %} + <a target='_blank' href='mailto:{{ v }}'> <i class="fa fa-envelope" aria-hidden="true"></i> </a> + {%- endfor %} {% endif %} </span>