diff --git a/assets/js/custom/core/mainLoop.js b/assets/js/custom/core/mainLoop.js index 46ec65e..9a68aed 100644 --- a/assets/js/custom/core/mainLoop.js +++ b/assets/js/custom/core/mainLoop.js @@ -1,14 +1,7 @@ 'use strict'; - - - let configure = () => undefined; - - - - export { configure } diff --git a/assets/scss/css/custom/nodes/schedule.scss b/assets/scss/css/custom/nodes/schedule.scss index da31348..bb3fd28 100644 --- a/assets/scss/css/custom/nodes/schedule.scss +++ b/assets/scss/css/custom/nodes/schedule.scss @@ -2,3 +2,35 @@ @import "../styles/_schedule"; @import "../styles/_clock"; + +footer { + position: absolute; + left: 65px; + top: 1020px; + width: 1790px; +} +.music-info { + font-family: lato; + font-weight: 400; + font-size: 22px; +} +.music-track { + padding-left: .5em; + padding-right: .5em; + font-style: italic; +} +.music-artist { + padding-left: .5em; + padding-right: 3em; + font-weight: 700; +} +.music-licence { + padding-left: .5em; + padding-right: 3em; +} +.music-link { + padding-left: .5em; + font-family: source code pro; + font-weight: 400; + font-size: 20px; +} diff --git a/content/schedule-vortragssaal/contents.lr b/content/schedule-vortragssaal/contents.lr index 1363fa0..1bca7a8 100644 --- a/content/schedule-vortragssaal/contents.lr +++ b/content/schedule-vortragssaal/contents.lr @@ -5,3 +5,13 @@ title: Vortragsraum Schedule Aalen Geekend 23 body: Der HTML5 InfoBeamer des Vortragsraum --- schedule: rendered_schedule-vortragsraum.js +--- +type: infobeamer-with-music +--- +music_artist: Daniel (C418) +--- +music_title: + + Minecraft - Volume Alpha +--- +music_url: https://c418.org/ diff --git a/models/html5infobeamer.ini b/models/html5infobeamer.ini index 1ed1183..d4be9a2 100644 --- a/models/html5infobeamer.ini +++ b/models/html5infobeamer.ini @@ -13,10 +13,30 @@ type = string [fields.type] label = Select Page Type type = select -choices = infobeamer, bauchbinde +choices = infobeamer, infobeamer-with-music, bauchbinde default = infobeamer [fields.schedule] label = Schedule Javascript Address type = string default = rendered_schedule.js + +[fields.music_title] +label = Music Title +type = string +width = 1/2 + +[fields.music_artist] +label = Music Artist +type = string +width = 1/2 + +[fields.music_licence] +label = Music License +type = string +width = 1/2 + +[fields.music_url] +label = Music Source +type = string +width = 1/2 diff --git a/templates/html5infobeamer.html b/templates/html5infobeamer.html index f95be29..651dcbf 100644 --- a/templates/html5infobeamer.html +++ b/templates/html5infobeamer.html @@ -14,7 +14,7 @@ -{% if this.type == 'infobeamer' %} +{% if this.type == 'infobeamer' or this.type == 'infobeamer-with-music' %} {% elif this.type == 'bauchbinde' %} @@ -22,13 +22,37 @@ -{% if this.type == 'infobeamer' %} +{% if this.type == 'infobeamer' or this.type == 'infobeamer-with-music' %} {% endif %}
+{% if this.type == 'infobeamer-with-music' %} + +{% endif %}