diff options
Diffstat (limited to 'slideshows')
| -rw-r--r-- | slideshows/advanced/template.html | 22 | ||||
| -rw-r--r-- | slideshows/dark/desc.js | 7 | ||||
| -rw-r--r-- | slideshows/dark/template.html | 26 | ||||
| -rw-r--r-- | 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 @@  <div class="frame">  	<div class="content">  	<ul class="rui-billboard" data-billboard='{fxName: null, autostart: true, showButtons: false, delay: 10000}'> -		$IMAGES +		{% for slide in slides %} +			<li> +			{% if slide.image %}<img src={{slide.image}}>{% endif %} +			{% if slide.description %}<div class="slideDesc"><div class="slideHead">{{slide.description}}</div>{% if slide.text %}<div class="slideText">{{slide.text}}</div>{% endif %}</div>{% endif %} +			{% if slide.image %}</img>{% endif %} +			</li> +		{% endfor %}  	</ul>  	</div>  	<div class="events"> -		$EVENTS +		{% for date in events %} +		<div class="event"><div class="eventDate">{{date.date}}</div> +			{% if date.events %}<ul class="eventList">{% endif %} +				{% for event in date.events %} +					<li class="eventEl"> +					{% if event.start %}<div class="eventfield start">{{event.start}}</div>{% endif %} +					{% if event.summary %}<div class="eventField summary">{{event.summary}}</div>{% endif %} +					{% if event.description %}<div class="eventField description">{{event.description}}</div>{% endif %} +					</li> +				{% endfor %} +			</ul> +		</div> +		{% endfor %}  	</div>  </div>  </body> 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 @@  <body>  <div class="frame">  	<div class="content"> -		<ul class="rui-billboard" data-billboard='{fxName: null, autostart: true, showButtons: false, delay: 10000}'>	 -			$IMAGES -		</ul> +	<ul class="rui-billboard" data-billboard='{fxName: null, autostart: true, showButtons: false, delay: 10000}'> +		{% for slide in slides %} +			<li> +			{% if slide.image %}<img src={{slide.image}}>{% endif %} +			{% if slide.description %}<div class="slideDesc"><div class="slideHead">{{slide.description}}</div>{% if slide.text %}<div class="slideText">{{slide.text}}</div>{% endif %}</div>{% endif %} +			{% if slide.image %}</img>{% endif %} +			</li> +		{% endfor %} +	</ul>  	</div>  	<div class="events"> -		$EVENTS +		{% for date in events %} +		<div class="event"><div class="eventDate">{{date.date}}</div> +			{% if date.events %}<ul class="eventList">{% endif %} +				{% for event in date.events %} +					<li class="eventEl"> +					{% if event.start %}<div class="eventfield start">{{event.start}}</div>{% endif %} +					{% if event.summary %}<div class="eventField summary">{{event.summary}}</div>{% endif %} +					{% if event.description %}<div class="eventField description">{{event.description}}</div>{% endif %} +					</li> +				{% endfor %} +			</ul> +		</div> +		{% endfor %}  	</div>  </div>  </body> 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;
  | 
