From 55ac7e27973da030b369f823cd6579e209c60526 Mon Sep 17 00:00:00 2001 From: Benjamin Kiessling Date: Sun, 29 Jan 2012 17:49:05 +0100 Subject: Update to use new template system --- slideshows/advanced/template.html | 22 ++++++++++++++++++++-- slideshows/dark/desc.js | 7 +++++-- slideshows/dark/template.html | 26 ++++++++++++++++++++++---- slideshows/default/template/styles.css | 4 ---- 4 files changed, 47 insertions(+), 12 deletions(-) diff --git a/slideshows/advanced/template.html b/slideshows/advanced/template.html index e7e9b3f..9cc43f9 100644 --- a/slideshows/advanced/template.html +++ b/slideshows/advanced/template.html @@ -12,11 +12,29 @@
    - $IMAGES + {% for slide in slides %} +
  • + {% if slide.image %}{% endif %} + {% if slide.description %}
    {{slide.description}}
    {% if slide.text %}
    {{slide.text}}
    {% endif %}
    {% endif %} + {% if slide.image %}{% endif %} +
    • + {% endfor %}
- $EVENTS + {% for date in events %} +
{{date.date}}
+ {% if date.events %}
    {% endif %} + {% for event in date.events %} +
  • + {% if event.start %}
    {{event.start}}
    {% endif %} + {% if event.summary %}
    {{event.summary}}
    {% endif %} + {% if event.description %}
    {{event.description}}
    {% endif %} +
    • + {% endfor %} +
+
+ {% endfor %}
diff --git a/slideshows/dark/desc.js b/slideshows/dark/desc.js index dcc120e..2d87d48 100644 --- a/slideshows/dark/desc.js +++ b/slideshows/dark/desc.js @@ -1,4 +1,7 @@ [ + { + "file": "IMGP4596.jpg", + "head": "Kicker", + "text": "unser toller Profikicker" + } ] - - diff --git a/slideshows/dark/template.html b/slideshows/dark/template.html index 9543d73..c2c5415 100644 --- a/slideshows/dark/template.html +++ b/slideshows/dark/template.html @@ -11,12 +11,30 @@
-
    - $IMAGES -
+
    + {% for slide in slides %} +
  • + {% if slide.image %}{% endif %} + {% if slide.description %}
    {{slide.description}}
    {% if slide.text %}
    {{slide.text}}
    {% endif %}
    {% endif %} + {% if slide.image %}{% endif %} +
    • + {% endfor %} +
- $EVENTS + {% for date in events %} +
{{date.date}}
+ {% if date.events %}
    {% endif %} + {% for event in date.events %} +
  • + {% if event.start %}
    {{event.start}}
    {% endif %} + {% if event.summary %}
    {{event.summary}}
    {% endif %} + {% if event.description %}
    {{event.description}}
    {% endif %} +
    • + {% endfor %} +
+
+ {% endfor %}
diff --git a/slideshows/default/template/styles.css b/slideshows/default/template/styles.css index 32dd4f2..b0f6084 100644 --- a/slideshows/default/template/styles.css +++ b/slideshows/default/template/styles.css @@ -88,10 +88,6 @@ ul.eventList { border-radius:4px; } -div.eventField { - display: none; -} - .eventDate{ font-size:1.5em; margin-left: 5px; -- cgit v1.2.1