Improve sledrun_wiki template.

diff --git a/wrpylib/templates/sledrun_wiki.txt b/wrpylib/templates/sledrun_wiki.txt
index 67b39c41a6234aced9cda858ad489f3918763bdb..adc71be1e409081f7aecacbf9ff752aa355b5c55 100644 (file)
--- a/wrpylib/templates/sledrun_wiki.txt
+++ b/wrpylib/templates/sledrun_wiki.txt
@@ -3,7 +3,7 @@
 {% if value.text %}[{{ value.url }} {{ value.text }}]{% else %}{{ value.url }}{% endif %}
 {%- endmacro %}
 {%- macro wr_page(value) -%}
-[[{{ value.title }}{% if value.name %}|{{ value.name }}{% endif %}]]
+[[{{ value.title }}{% if value.text %}|{{ value.text }}{% endif %}]]
 {%- endmacro -%}
 == Allgemeines ==
 {{ rodelbahnbox }}
@@ -28,23 +28,25 @@
 * '''Hütten''':
 {%- for info in gastronomy %}
 ** {% if info.wr_page %}{{ wr_page(info.wr_page) }}{% endif %}
+   {%- if info.weblink %}{{ weblink(info.weblink) }}{% endif %}
+   {%- if info.note %} ({{ info.note }}){% endif %}
 {%- endfor %}
 * '''Andere Rodelbahnen''':
-{%- for info in sledrun_list %}
+{% for info in sledrun_list %}
 ** {{ wr_page(info) }}
 {% endfor -%}
 * '''Siehe auch''':
-{%- for info in see_also %}
+{% for info in see_also %}
 ** {{ weblink(info) }}
 {%- endfor %}
 
 {% raw %}{{Buttonleiste{% endraw -%}
 |Bericht={{ allow_reports | default(true) | german_bool }}
-{%- if forum_id %}|ForumId={{ forum_id }}{% endif %}
+{%- if forum_id %}|ForumId={{ forum_id }}{% endif -%}
+{% if impressions_title %}|Impressionen={{ impressions_title }}{% endif -%}
 {%- if position %}|Wetter=Ja{% endif -%}
-{%- if videos %}|Video={{ videos[0].url }} {% endif -%}
+{%- if videos %}|Video={{ videos[0].url }}{% endif -%}
 |Korrektur=Seite{% if correction_email %}|Korrektur_To={{ correction_email }}{% endif -%}
-{% if impressions_title %}|Impressionen={{ impressions_title }}{% endif -%}
 {% if freizeitticket_tyrol %}|Freizeitticket=Ja{% endif -%}
 {% if regio_card_tyrol %}|Regiocard=Ja{% endif -%}}}
 {% raw %}{{Clear}}{% endraw %}