From 3407da6fa9018938b3e58f2810620029644efde4 Mon Sep 17 00:00:00 2001
From: Luca <Luca@hackerspace-bamberg.de>
Date: Sun, 27 Dec 2020 13:32:40 +0100
Subject: [PATCH 1/7] update 'bauchbinde'

---
 static/bauchbinde/assets/script.js | 81 ++++++++++++++++++++----------
 1 file changed, 55 insertions(+), 26 deletions(-)

diff --git a/static/bauchbinde/assets/script.js b/static/bauchbinde/assets/script.js
index 2f7ec7c..b814def 100644
--- a/static/bauchbinde/assets/script.js
+++ b/static/bauchbinde/assets/script.js
@@ -1,23 +1,31 @@
 (() => {
     const scheduleUrl = 'https://schedule2.broken.equipment/everything.schedule.json';
 
+    let data = null;
     let textEl;
-    let headline = '¯\\_(ツ)_/¯';
-    let speaker = '';
+    let headline = null;
+    let speaker = null;
     let isIntro = false;
     let holdDuration = 4000;
     let room = null;
     let time = null;
     let startDelay = 1000;
+    let gracePeriod = 5;
 
-    async function getCurrentTalkByRoomName(roomName) {
-        let now = Date.now();
+    async function getCurrentTalkByRoomName(roomName, offset) {
+        if (!offset) {
+            offset = 0;
+        }
+        let now = Date.now() + offset;
         if (time) {
-            now = Date.parse(time)
+            now = Date.parse(time) + offset;
+        }
+
+        if (!data) {
+            const response = await fetch(scheduleUrl);
+            data = await response.json();
         }
 
-        const response = await fetch(scheduleUrl);
-        const data = await response.json();
         const days = data.schedule.conference.days;
         const today = days.find(day => {
             const start = Date.parse(day.day_start);
@@ -85,14 +93,24 @@
                 if (key === 'width') {
                     root.style.setProperty('--width', value);
                 }
+                if (key === 'gracePeriod') {
+                    gracePeriod = parseInt(value, 10)
+                }
             }
         }
 
         if (room) {
-            const talk = await getCurrentTalkByRoomName(room);
+            let offset = gracePeriod * 60 * 1000;
+            let talk = await getCurrentTalkByRoomName(room);
             if (!talk) {
-                headline = '¯\\_(ツ)_/¯';
-                speaker = '';
+                talk = await getCurrentTalkByRoomName(room, -offset);
+            }
+            if (!talk) {
+                talk = await getCurrentTalkByRoomName(room, offset);
+            }
+            if (!talk) {
+                headline = null;
+                speaker = null;
             } else {
                 headline = talk.title;
                 if (talk.persons) {
@@ -101,7 +119,11 @@
             }
         }
 
-        if (speaker) {
+        if (!headline) {
+            return false;
+        }
+
+        if (speaker && headline) {
             headline += ',';
         }
 
@@ -110,18 +132,22 @@
         const speakerEl = document.createElement('span');
         speakerEl.classList.add('speaker');
 
-        Array.from(headline).forEach(letter => {
-            const letterEl = document.createElement('span');
-            letterEl.classList.add('letter');
-            letterEl.innerText = letter;
-            headlineEl.appendChild(letterEl);
-        })
-        Array.from(speaker).forEach(letter => {
-            const letterEl = document.createElement('span');
-            letterEl.classList.add('letter');
-            letterEl.innerText = letter;
-            speakerEl.appendChild(letterEl);
-        })
+        if (headline) {
+            Array.from(headline).forEach(letter => {
+                const letterEl = document.createElement('span');
+                letterEl.classList.add('letter');
+                letterEl.innerText = letter;
+                headlineEl.appendChild(letterEl);
+            })
+        }
+        if (speaker) {
+            Array.from(speaker).forEach(letter => {
+                const letterEl = document.createElement('span');
+                letterEl.classList.add('letter');
+                letterEl.innerText = letter;
+                speakerEl.appendChild(letterEl);
+            })
+        }
 
         textEl.appendChild(headlineEl);
         textEl.appendChild(document.createTextNode(' '));
@@ -149,6 +175,8 @@
             }
             secondaryTilesEl.appendChild(tile);
         }
+
+        return true;
     }
 
     async function animate() {
@@ -256,8 +284,9 @@
     }
 
     window.addEventListener('load', async () => {
-        await init();
-        await new Promise(r => setTimeout(r, startDelay));
-        await animate();
+        if (await init()) {
+            await new Promise(r => setTimeout(r, startDelay));
+            await animate();
+        }
     });
 })();

From e38e4a692628cb5105d3ba8110316d512750cb55 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan@f2o.io>
Date: Sun, 27 Dec 2020 13:58:31 +0100
Subject: [PATCH 2/7] add rc3 stage

---
 content/rc3stage.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 content/rc3stage.md

diff --git a/content/rc3stage.md b/content/rc3stage.md
new file mode 100644
index 0000000..4046b54
--- /dev/null
+++ b/content/rc3stage.md
@@ -0,0 +1,11 @@
+---
+title: rC3 Stage
+menu:
+  main:
+    weight: 3
+---
+
+Go to {{<external href="https://streaming.media.ccc.de/rc3/franconiannet">}}streaming.media.ccc.de{{</external>}} or watch here.
+
+{{<iframe src="https://streaming.media.ccc.de/rc3/embed/franconiannet/dash/native" width="1024" height="576" frameborder="none" allowfullscreen="allowfullscreen" seamless="seamless" scrolling="no">}}
+

From 21c93bd4b17a2f170877d9b5811d3214e6f76268 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan@f2o.io>
Date: Sun, 27 Dec 2020 14:25:36 +0100
Subject: [PATCH 3/7] add main stream

---
 content/_index.de.md   |  6 ++++--
 content/_index.md      |  6 ++++--
 content/catcontent.md  |  8 ++++++++
 content/rc3stage.de.md | 11 +++++++++++
 4 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 content/catcontent.md
 create mode 100644 content/rc3stage.de.md

diff --git a/content/_index.de.md b/content/_index.de.md
index 13c9c40..0a1bdb3 100644
--- a/content/_index.de.md
+++ b/content/_index.de.md
@@ -7,6 +7,8 @@ menu:
 
 {{<video mp4=`/franconia_animated.mp4` webm=`/franconia_animated.webm` alt=`Ein Router in Form des Frankenrechens mit der Aufschrift "franconian.net" und einem "Fenster" in die Welt des rC3. Daran angeschlossen sind die Hackspaces backspace, Hackzogtum und Nerd2Nerd.`>}}
 
-## cat content/*
+Unsere Streams:
 
-{{<image src="https://thiscatdoesnotexist.com/" alt="Diese Katze gibt es nicht wirklich. Das Bild wurde maschinell erzeugt und ist ohne Unterschrift gültig.">}}
+* [rC3 Stage]({{<ref "rc3stage">}}) (offizielle franconian.net Media CCC Stage)
+
+* [franconian.net Lounge]({{<ref "lounge">}}) (Sub-Stream fuer das Musik Programm)
diff --git a/content/_index.md b/content/_index.md
index cfb720b..f3657a0 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -7,6 +7,8 @@ menu:
 
 {{<video mp4=`/franconia_animated.mp4` webm=`/franconia_animated.webm` alt=`A router labelled "franconian.net" with a "window" to the world of rC3 and the hackspaces backspace, Hackzogtum, and Nerd2Nerd connected to it.`>}}
 
-## cat content/*
+Watch our stages here:
 
-{{<image src="https://thiscatdoesnotexist.com/" alt="This cat does not actually exist. The picture was created by an android who dreams of electric cats.">}}
+* [rC3 Stage]({{<ref "rc3stage">}}) (official franconian Media CCC stage)
+
+* [franconian.net Lounge]({{<ref "lounge">}}) (our special sub-stream for music acts)
diff --git a/content/catcontent.md b/content/catcontent.md
new file mode 100644
index 0000000..f83df27
--- /dev/null
+++ b/content/catcontent.md
@@ -0,0 +1,8 @@
+---
+title: Cat Content
+menu:
+  main:
+    weight: 5
+---
+
+{{<image src="https://thiscatdoesnotexist.com/" alt="This cat does not actually exist. The picture was created by an android who dreams of electric cats.">}}
diff --git a/content/rc3stage.de.md b/content/rc3stage.de.md
new file mode 100644
index 0000000..3848ba3
--- /dev/null
+++ b/content/rc3stage.de.md
@@ -0,0 +1,11 @@
+---
+title: rC3 Stage
+menu:
+  main:
+    weight: 3
+---
+
+Du kannst entweder per {{<external href="https://streaming.media.ccc.de/rc3/franconiannet">}}streaming.media.ccc.de{{</external>}} streamen oder hier:
+
+{{<iframe src="https://streaming.media.ccc.de/rc3/embed/franconiannet/dash/native" width="1024" height="576" frameborder="none" allowfullscreen="allowfullscreen" seamless="seamless" scrolling="no">}}
+

From d13d7fc15e6181fe902e4caa3da37ac6b802dbc3 Mon Sep 17 00:00:00 2001
From: Luca <Luca@hackerspace-bamberg.de>
Date: Sun, 27 Dec 2020 14:34:29 +0100
Subject: [PATCH 4/7] Fix cat content

---
 content/catcontent.de.md | 5 +++++
 content/catcontent.md    | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 content/catcontent.de.md

diff --git a/content/catcontent.de.md b/content/catcontent.de.md
new file mode 100644
index 0000000..f0647dd
--- /dev/null
+++ b/content/catcontent.de.md
@@ -0,0 +1,5 @@
+---
+title: cat content/*
+---
+
+{{<image src="https://thiscatdoesnotexist.com/" alt="Diese Katze gibt es nicht wirklich. Das Bild wurde maschinell erzeugt und ist ohne Unterschrift gültig.">}}
diff --git a/content/catcontent.md b/content/catcontent.md
index f83df27..531f080 100644
--- a/content/catcontent.md
+++ b/content/catcontent.md
@@ -1,8 +1,5 @@
 ---
-title: Cat Content
-menu:
-  main:
-    weight: 5
+title: cat content/*
 ---
 
 {{<image src="https://thiscatdoesnotexist.com/" alt="This cat does not actually exist. The picture was created by an android who dreams of electric cats.">}}

From 43d07b001befe2ed40e5b00741b481bfaf79999f Mon Sep 17 00:00:00 2001
From: Florian Sorg <florian@sorg.tech>
Date: Sun, 27 Dec 2020 14:50:59 +0100
Subject: [PATCH 5/7] tweak table styles

---
 assets/style.scss | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/assets/style.scss b/assets/style.scss
index e8939bb..a45fb75 100644
--- a/assets/style.scss
+++ b/assets/style.scss
@@ -132,16 +132,20 @@ table {
 	thead th {
 		@include heading;
 		font-weight: bold;
+		white-space: nowrap;
 	}
 
-	thead tr, tr:not(:last-child) {
-		@include hline(10em, 1px, $primary-1, $primary-2, $primary-3)
+	thead tr, {
+		@include hline(10em, 2px, $primary-1, $primary-2, $primary-3)
+	}
+
+	tr:not(:last-child) {
+		border-bottom: 1px solid $primary-3;
 	}
 
 	td, th {
 		padding: 0.2em 0.5em;
 		text-align: left;
-		white-space: nowrap;
 	}
 }
 

From f31363d2699263524ee48f410301536cc9e11a04 Mon Sep 17 00:00:00 2001
From: Luca <Luca@hackerspace-bamberg.de>
Date: Sun, 27 Dec 2020 14:52:18 +0100
Subject: [PATCH 6/7] Fix home page

---
 content/_index.de.md | 7 +++----
 content/_index.md    | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/content/_index.de.md b/content/_index.de.md
index 0a1bdb3..18fc7d3 100644
--- a/content/_index.de.md
+++ b/content/_index.de.md
@@ -7,8 +7,7 @@ menu:
 
 {{<video mp4=`/franconia_animated.mp4` webm=`/franconia_animated.webm` alt=`Ein Router in Form des Frankenrechens mit der Aufschrift "franconian.net" und einem "Fenster" in die Welt des rC3. Daran angeschlossen sind die Hackspaces backspace, Hackzogtum und Nerd2Nerd.`>}}
 
-Unsere Streams:
+## Unsere Streams
 
-* [rC3 Stage]({{<ref "rc3stage">}}) (offizielle franconian.net Media CCC Stage)
-
-* [franconian.net Lounge]({{<ref "lounge">}}) (Sub-Stream fuer das Musik Programm)
+* [rC3 Stage]({{<ref "rc3stage">}}) (offizieller franconian.net-Stream via C3VOC)
+* [franconian.net Lounge]({{<ref "lounge">}}) (eigener Stream für unser nicht-CC Musikprogramm)
diff --git a/content/_index.md b/content/_index.md
index f3657a0..8b5b6c1 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -7,8 +7,7 @@ menu:
 
 {{<video mp4=`/franconia_animated.mp4` webm=`/franconia_animated.webm` alt=`A router labelled "franconian.net" with a "window" to the world of rC3 and the hackspaces backspace, Hackzogtum, and Nerd2Nerd connected to it.`>}}
 
-Watch our stages here:
+## Watch our streams here
 
-* [rC3 Stage]({{<ref "rc3stage">}}) (official franconian Media CCC stage)
-
-* [franconian.net Lounge]({{<ref "lounge">}}) (our special sub-stream for music acts)
+* [rC3 Stage]({{<ref "rc3stage">}}) (official franconian.net stream via C3VOC)
+* [franconian.net Lounge]({{<ref "lounge">}}) (our own stream for non-CC music acts)

From 758ff51d4592a92d6cd036796728c60b8fa31432 Mon Sep 17 00:00:00 2001
From: Luca <Luca@hackerspace-bamberg.de>
Date: Sun, 27 Dec 2020 15:00:20 +0100
Subject: [PATCH 7/7] Link to streaming.media.ccc.de from home page directly

---
 content/_index.de.md   |  2 +-
 content/_index.md      |  2 +-
 content/rc3stage.de.md | 11 -----------
 content/rc3stage.md    | 11 -----------
 4 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 content/rc3stage.de.md
 delete mode 100644 content/rc3stage.md

diff --git a/content/_index.de.md b/content/_index.de.md
index 18fc7d3..92c257a 100644
--- a/content/_index.de.md
+++ b/content/_index.de.md
@@ -9,5 +9,5 @@ menu:
 
 ## Unsere Streams
 
-* [rC3 Stage]({{<ref "rc3stage">}}) (offizieller franconian.net-Stream via C3VOC)
+* {{<external href="https://streaming.media.ccc.de/rc3/franconiannet">}}offizieller franconian.net-Stream via C3VOC{{</external>}}
 * [franconian.net Lounge]({{<ref "lounge">}}) (eigener Stream für unser nicht-CC Musikprogramm)
diff --git a/content/_index.md b/content/_index.md
index 8b5b6c1..3a4143c 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -9,5 +9,5 @@ menu:
 
 ## Watch our streams here
 
-* [rC3 Stage]({{<ref "rc3stage">}}) (official franconian.net stream via C3VOC)
+* {{<external href="https://streaming.media.ccc.de/rc3/franconiannet">}}official franconian.net channel via C3VOC{{</external>}}
 * [franconian.net Lounge]({{<ref "lounge">}}) (our own stream for non-CC music acts)
diff --git a/content/rc3stage.de.md b/content/rc3stage.de.md
deleted file mode 100644
index 3848ba3..0000000
--- a/content/rc3stage.de.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: rC3 Stage
-menu:
-  main:
-    weight: 3
----
-
-Du kannst entweder per {{<external href="https://streaming.media.ccc.de/rc3/franconiannet">}}streaming.media.ccc.de{{</external>}} streamen oder hier:
-
-{{<iframe src="https://streaming.media.ccc.de/rc3/embed/franconiannet/dash/native" width="1024" height="576" frameborder="none" allowfullscreen="allowfullscreen" seamless="seamless" scrolling="no">}}
-
diff --git a/content/rc3stage.md b/content/rc3stage.md
deleted file mode 100644
index 4046b54..0000000
--- a/content/rc3stage.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: rC3 Stage
-menu:
-  main:
-    weight: 3
----
-
-Go to {{<external href="https://streaming.media.ccc.de/rc3/franconiannet">}}streaming.media.ccc.de{{</external>}} or watch here.
-
-{{<iframe src="https://streaming.media.ccc.de/rc3/embed/franconiannet/dash/native" width="1024" height="576" frameborder="none" allowfullscreen="allowfullscreen" seamless="seamless" scrolling="no">}}
-