Nähere Details zu Rodelverleihs.

diff --git a/wrpylib/templates/sledrun_wikitext.txt b/wrpylib/templates/sledrun_wikitext.txt
index 29c9c5d6210eff75458464c9ebd666fb53e8d9b7..bceb8b4241831594cdeda5f9a2e72f05fd55c32d 100644 (file)
--- a/wrpylib/templates/sledrun_wikitext.txt
+++ b/wrpylib/templates/sledrun_wikitext.txt
@@ -5,6 +5,15 @@
 {%- macro wr_page(value) -%}
 [[{{ value.title }}{% if value.text %}|{{ value.text }}{% endif %}]]
 {%- endmacro -%}
 {%- macro wr_page(value) -%}
 [[{{ value.title }}{% if value.text %}|{{ value.text }}{% endif %}]]
 {%- endmacro -%}

+{%- macro address(value) -%}
+{% set space = joiner(" ") %}
+{%- if value.street %}{{ space() }}{{ value.street }}{% endif %}
+{%- if value.housenumber %}{{ space() }}{{ value.housenumber }}{% endif %}
+{%- if value.street or value.housenumber %};{% endif %}
+{%- if value.postcode %}{{ space() }}{{ value.postcode }}{% endif %}
+{%- if value.city %}{{ space() }}{{ value.city }}{% endif %}
+{%- if value.country %}{{ space() }}{{ value.country }}{% endif %}
+{%- endmacro -%}

 {% if sledrun_json.entry_under_construction %}{% raw %}{{In Arbeit|Rodelbahn}}{% endraw %}
 
 {% endif -%}
 {% if sledrun_json.entry_under_construction %}{% raw %}{{In Arbeit|Rodelbahn}}{% endraw %}
 
 {% endif -%}


@@ -58,7 +67,7 @@
 {%- endif %}
 {%- endif -%}
 {% for rental in sled_rental %}
 {%- endif %}
 {%- endif -%}
 {% for rental in sled_rental %}

-** {% set space = joiner(" ") %}
+** {% set space = joiner("; ") %}

    {%- if rental.name %}{{ space() }}
    {%- if rental.weblink and not rental.weblink.text %}{{ weblink({"url": rental.weblink.url, "text": rental.name}) }}
    {%- else %}{{ rental.name }}
    {%- if rental.name %}{{ space() }}
    {%- if rental.weblink and not rental.weblink.text %}{{ weblink({"url": rental.weblink.url, "text": rental.name}) }}
    {%- else %}{{ rental.name }}


@@ -67,7 +76,11 @@
    {%- if rental.wr_page %}{{ space() }}{{ wr_page(rental.wr_page) }}{% endif %}
    {%- if rental.weblink and not (rental.name and not rental.weblink.text) %}
    {{- space() }}{{ weblink(rental.weblink) }}{% endif %}
    {%- if rental.wr_page %}{{ space() }}{{ wr_page(rental.wr_page) }}{% endif %}
    {%- if rental.weblink and not (rental.name and not rental.weblink.text) %}
    {{- space() }}{{ weblink(rental.weblink) }}{% endif %}

-   {%- if rental.note %}{{ space() }}({{ rental.note }}){% endif %}
+   {%- if rental.phone %}{{ space() }}Tel. {{ rental.phone }}{% endif %}
+   {%- if rental.address %}{{ space() }}{{ address(rental.address) }}{% endif %}
+   {%- if rental.location %}{{ space() }}{{ rental.location }}{% endif %}
+   {%- if rental.opening_hours %}{{ space() }}{{ rental.opening_hours }}{% endif %}
+   {%- if rental.note %}{{ space() }}{{ rental.note }}{% endif %}

 {%- endfor %}
 * '''Schneelage - Auskunft''':
 {%- for info in info_phone %}
 {%- endfor %}
 * '''Schneelage - Auskunft''':
 {%- for info in info_phone %}