From d691e0130f6655c9a3735312fc4022be953c39e7 Mon Sep 17 00:00:00 2001 From: tvluke <tvluke@chaotikum.org> Date: Mon, 29 May 2023 20:15:07 +0200 Subject: [PATCH] more video stuff, preview images in overview --- _includes/metaog.html | 0 _includes/site-feature.html | 46 +++++++++++-------- _includes/site-header.html | 10 ++-- _includes/twittercard.html | 8 ++-- _layouts/video.html | 2 - _media/2022-05-18-10-jahre.md | 1 + ...igitaler-minimalismus-fuer-kreativitaet.md | 1 + ...1-funktionelle-neurologische-stoerungen.md | 1 + _media/2022-11-11-musikvideos-durch-ki.md | 1 + ...22-11-11-nicht-invasive-hirnstimulation.md | 1 + ...2-aleksis-das-schul-informations-system.md | 1 + _media/2022-11-12-capture-the-flag.md | 1 + ...etektion-von-plaque-in-gefaessen-mit-ki.md | 1 + _media/2022-11-12-kinder-machen-ein-howto.md | 1 + _media/2022-11-12-openbikesensor.md | 1 + ...12-thw-lasst-uns-uebers-machen-sprechen.md | 1 + _media/2022-12-29-i-like-p5.md | 1 + ...022-12-29-jgiven-und-asciidoc-reporting.md | 1 + ...-user-namespaces-und-der-unshare-befehl.md | 1 + _media/2022-12-29-nook22.md | 1 + ...or-auswertung-mittels-jupyter-notebooks.md | 1 + ...ms-portable-puzzle-collection-und-loopy.md | 1 + ...oolchain-schnell-erklaert-aber-maechtig.md | 1 + ...22-end-to-end-arguments-im-systemdesign.md | 1 + _media/2023-03-22-kraehen.md | 1 + _media/2023-05-12-baumbilanzen-befreien.md | 1 + 26 files changed, 57 insertions(+), 30 deletions(-) create mode 100644 _includes/metaog.html diff --git a/_includes/metaog.html b/_includes/metaog.html new file mode 100644 index 00000000..e69de29b diff --git a/_includes/site-feature.html b/_includes/site-feature.html index 4775fa14..ed494558 100644 --- a/_includes/site-feature.html +++ b/_includes/site-feature.html @@ -25,25 +25,35 @@ {% assign feature_image = collectiondata.feature_image -%} {% endif -%} -{% if feature_text or feature_image -%} - {% if feature_image contains 'http' -%} - <div class="feature"{% if feature_image %} style="background-image: url({{ feature_image }})"{% endif %}> - <div class="container typeset"> - {{ feature_text | markdownify }} - </div> - </div> +{% if page.layout == "video" -%} + {%- assign realslug = page.url | split:'/' | last -%} + {% capture feature_image %}https://video.chaotikum.net/thumbnails/{{realslug}}_play.png{% endcapture -%} + {% capture image %}https://video.chaotikum.net/thumbnails/{{realslug}}_play.png{% endcapture -%} +{% endif -%} + +{% if nofeature %} + +{% else %} + {% if feature_text or feature_image -%} + {% if feature_image contains 'http' -%} + <div class="feature"{% if feature_image %} style="background-image: url({{ feature_image }})"{% endif %}> + <div class="container typeset"> + {{ feature_text | markdownify }} + </div> + </div> + {% else -%} + <div class="feature"{% if feature_image %} style="background-image: url({{site.baseurl}}{{ feature_image }})"{% endif %}> + <div class="container typeset"> + {{ feature_text | markdownify }} + </div> + </div> + {% endif -%} {% else -%} - <div class="feature"{% if feature_image %} style="background-image: url({{site.baseurl}}{{ feature_image }})"{% endif %}> - <div class="container typeset"> - {{ feature_text | markdownify }} - </div> + {% assign feature_image = site.default-feature -%} + <div class="feature"{% if feature_image %} style="background-image: url({{site.baseurl}}{{ feature_image }})"{% endif %}> + <div class="container typeset"> + {{ feature_text | markdownify }} </div> - {% endif -%} -{% else -%} -{% assign feature_image = site.default-feature -%} -<div class="feature"{% if feature_image %} style="background-image: url({{site.baseurl}}{{ feature_image }})"{% endif %}> - <div class="container typeset"> - {{ feature_text | markdownify }} </div> -</div> + {% endif -%} {% endif -%} diff --git a/_includes/site-header.html b/_includes/site-header.html index 5d4f0f0e..1eca858f 100644 --- a/_includes/site-header.html +++ b/_includes/site-header.html @@ -16,13 +16,13 @@ </div> - {% if nofeature %} - <!-- no feature --> + {% include site-feature.html %} + {% if nofeature %} + {% else %} - {% include site-feature.html %} <div class="statusmobile" style="width: 80%; margin:0 auto; margin-top: -45px; background-color: #FAFAFA;"> - {% include space-status-mobile.html %} -</div> + {% include space-status-mobile.html %} + </div> {% endif %} {% if page.layout == "video" -%} diff --git a/_includes/twittercard.html b/_includes/twittercard.html index 42a33b36..3edc5b47 100644 --- a/_includes/twittercard.html +++ b/_includes/twittercard.html @@ -12,17 +12,15 @@ {% assign feature_image = page.image %} {% endif %} - {% if page.layout == "video" -%} - {%- assign realslug = page.url | split:'/' | last -%} - {% capture feature_image %}https://video.chaotikum.net/thumbnails/{{realslug}}.jpg{% endcapture -%} - {% endif -%} - {% if feature_image %} {% if feature_image contains '://' %} + <p>a</p> <meta name="twitter:image" content="{{feature_image}}"> {% else %} + <p>b</p> <meta name="twitter:image" content="{{site.url}}{{site.baseurl}}{{feature_image}}"> {% endif %} {% else %} +<p>c</p> <meta name="twitter:image" content="{{site.url}}/{{site.baseurl}}{{ site.default-feature }}"> {% endif %} diff --git a/_layouts/video.html b/_layouts/video.html index c527eb7e..154c4658 100644 --- a/_layouts/video.html +++ b/_layouts/video.html @@ -4,8 +4,6 @@ layout: default {% include site-header.html %} -{% include twittercard.html %} - {% capture nowunix %}{{'now' | date: '%s'}}{% endcapture %} {% capture title %} diff --git a/_media/2022-05-18-10-jahre.md b/_media/2022-05-18-10-jahre.md index 74c3d1dc..2b6308f7 100644 --- a/_media/2022-05-18-10-jahre.md +++ b/_media/2022-05-18-10-jahre.md @@ -7,6 +7,7 @@ room: Parkplatz title: "10 Jahre Chaotikum e.V. - Grillparty" license: "CC-BY-NC" uid: 5e6b423d-9315-4df5-aa9f-66ae0969952c +image: "https://video.chaotikum.net/thumbnails/2022-05-18-10-jahre_play.png" ticket_id: 1173 yt: "https://www.youtube.com/watch?v=5vmi21ztI8k" mccc: "https://media.ccc.de/v/2022-05-18-10-jahre-chaotikum-e-v-grillparty" diff --git a/_media/2022-11-11-digitaler-minimalismus-fuer-kreativitaet.md b/_media/2022-11-11-digitaler-minimalismus-fuer-kreativitaet.md index 9fb4b2d4..b60e23c1 100644 --- a/_media/2022-11-11-digitaler-minimalismus-fuer-kreativitaet.md +++ b/_media/2022-11-11-digitaler-minimalismus-fuer-kreativitaet.md @@ -11,6 +11,7 @@ fahrplan_url: https://2022.nook-luebeck.de/talks/digitaler-minimalismus-fuer-kre image: "https://video.chaotikum.net/nook22/digitaler-minimalismus-fuer-kreativitaet.jpeg" #https://www.uuidgenerator.net/ uid: a5eb5a79-7ea9-4e14-b21b-a66b05dee110 +image: "" yt: "" mccc: "" file: "" diff --git a/_media/2022-11-11-funktionelle-neurologische-stoerungen.md b/_media/2022-11-11-funktionelle-neurologische-stoerungen.md index f79d177c..13e99e4e 100644 --- a/_media/2022-11-11-funktionelle-neurologische-stoerungen.md +++ b/_media/2022-11-11-funktionelle-neurologische-stoerungen.md @@ -10,6 +10,7 @@ persons: fahrplan_url: https://2022.nook-luebeck.de/talks/funktionelle-neurologische-stoerungen/ #https://www.uuidgenerator.net/ uid: 3b44c586-c66c-495d-beaf-725d07b9cc18 +image: "" yt: "" mccc: "" file: "" diff --git a/_media/2022-11-11-musikvideos-durch-ki.md b/_media/2022-11-11-musikvideos-durch-ki.md index 66ff0c5c..c175dd4f 100644 --- a/_media/2022-11-11-musikvideos-durch-ki.md +++ b/_media/2022-11-11-musikvideos-durch-ki.md @@ -12,6 +12,7 @@ fahrplan_url: https://2022.nook-luebeck.de/talks/musikvideos-durch-ki/ image: "https://video.chaotikum.net/nook22/musikvideos-durch-ki.jpeg" #https://www.uuidgenerator.net/ uid: c1af1236-2609-4201-b51f-274108bcc636 +image: "" yt: "" mccc: "" file: "" diff --git a/_media/2022-11-11-nicht-invasive-hirnstimulation.md b/_media/2022-11-11-nicht-invasive-hirnstimulation.md index 9193641a..bbfb31cd 100644 --- a/_media/2022-11-11-nicht-invasive-hirnstimulation.md +++ b/_media/2022-11-11-nicht-invasive-hirnstimulation.md @@ -10,6 +10,7 @@ persons: fahrplan_url: https://2022.nook-luebeck.de/talks/nicht-invasive-hirnstimulation/ #https://www.uuidgenerator.net/ uid: e651ba3b-2e08-4887-9232-e2531e703d3f +image: "" yt: "" mccc: "" file: "" diff --git a/_media/2022-11-12-aleksis-das-schul-informations-system.md b/_media/2022-11-12-aleksis-das-schul-informations-system.md index 12078803..09fa65f5 100644 --- a/_media/2022-11-12-aleksis-das-schul-informations-system.md +++ b/_media/2022-11-12-aleksis-das-schul-informations-system.md @@ -12,6 +12,7 @@ persons: fahrplan_url: https://nook-luebeck.de/talks/aleksis-das-schul-informations-system/ #https://www.uuidgenerator.net/ uid: 3d420d08-60eb-47c0-ab6a-11fd453ae699 +image: "" yt: "https://www.youtube.com/watch?v=xMZwADwdSuY" mccc: "https://media.ccc.de/v/aleksis-das-schul-informations-system" file: "https://video.chaotikum.net/nook22/aleksis-das-schul-informations-system.mov" diff --git a/_media/2022-11-12-capture-the-flag.md b/_media/2022-11-12-capture-the-flag.md index cdd9f4e6..ab74cfc3 100644 --- a/_media/2022-11-12-capture-the-flag.md +++ b/_media/2022-11-12-capture-the-flag.md @@ -11,6 +11,7 @@ persons: fahrplan_url: https://nook-luebeck.de/talks/how-to-capture-the-flag/ #https://www.uuidgenerator.net/ uid: 707df1f4-1d28-45ca-bf57-0578bcc009c9 +image: "" yt: "https://www.youtube.com/watch?v=IO4AewizLVI" mccc: "https://media.ccc.de/v/how-to-capture-the-flag" file: "https://video.chaotikum.net/nook22/how-to-capture-the-flag.mov" diff --git a/_media/2022-11-12-detektion-von-plaque-in-gefaessen-mit-ki.md b/_media/2022-11-12-detektion-von-plaque-in-gefaessen-mit-ki.md index da1d3c40..8b5bda9a 100644 --- a/_media/2022-11-12-detektion-von-plaque-in-gefaessen-mit-ki.md +++ b/_media/2022-11-12-detektion-von-plaque-in-gefaessen-mit-ki.md @@ -10,6 +10,7 @@ persons: fahrplan_url: https://2022.nook-luebeck.de/talks/detektion-von-plaque-in-gefaessen-mit-ki/ #https://www.uuidgenerator.net/ uid: c4434d9c-81f9-4942-9baf-88f2e5fd9fdc +image: "" yt: "" mccc: "" file: "" diff --git a/_media/2022-11-12-kinder-machen-ein-howto.md b/_media/2022-11-12-kinder-machen-ein-howto.md index 9dbd7d33..f82fcceb 100644 --- a/_media/2022-11-12-kinder-machen-ein-howto.md +++ b/_media/2022-11-12-kinder-machen-ein-howto.md @@ -10,6 +10,7 @@ persons: fahrplan_url: https://2022.nook-luebeck.de/talks/kinder-machen-ein-howto/ #https://www.uuidgenerator.net/ uid: 909b7e64-0092-434c-8219-9c126d5503e1 +image: "" yt: "" mccc: "" file: "" diff --git a/_media/2022-11-12-openbikesensor.md b/_media/2022-11-12-openbikesensor.md index e46fb837..2b723a6d 100644 --- a/_media/2022-11-12-openbikesensor.md +++ b/_media/2022-11-12-openbikesensor.md @@ -11,6 +11,7 @@ persons: fahrplan_url: https://2022.nook-luebeck.de/talks/openbikesensor/ #https://www.uuidgenerator.net/ uid: 50f211c1-8765-47b6-a4a2-c69a274eecea +image: "" yt: "" mccc: "" file: "" diff --git a/_media/2022-11-12-thw-lasst-uns-uebers-machen-sprechen.md b/_media/2022-11-12-thw-lasst-uns-uebers-machen-sprechen.md index febc5ae2..f1a6b201 100644 --- a/_media/2022-11-12-thw-lasst-uns-uebers-machen-sprechen.md +++ b/_media/2022-11-12-thw-lasst-uns-uebers-machen-sprechen.md @@ -9,6 +9,7 @@ persons: - "Juljan Bouchagiar" fahrplan_url: https://2022.nook-luebeck.de/talks/thw---lasst-uns-uebers-machen-sprechen/ #https://www.uuidgenerator.net/ +image: "" uid: 8f561e26-d153-4aaf-9749-331e90be0ed4 yt: "" mccc: "" diff --git a/_media/2022-12-29-i-like-p5.md b/_media/2022-12-29-i-like-p5.md index 8c914c53..bdca981e 100644 --- a/_media/2022-12-29-i-like-p5.md +++ b/_media/2022-12-29-i-like-p5.md @@ -7,6 +7,7 @@ persons: - "Fabi" #https://www.uuidgenerator.net/ uid: 67dbaaf2-a392-40da-985f-3f2750326bde +image: "" ticket_id: 1346 yt: "https://www.youtube.com/watch?v=6AJwHBxa6jo" mccc: "https://media.ccc.de/v/2022-12-29-fabi-likes-p5" diff --git a/_media/2022-12-29-jgiven-und-asciidoc-reporting.md b/_media/2022-12-29-jgiven-und-asciidoc-reporting.md index 0b573f69..56dcad52 100644 --- a/_media/2022-12-29-jgiven-und-asciidoc-reporting.md +++ b/_media/2022-12-29-jgiven-und-asciidoc-reporting.md @@ -6,6 +6,7 @@ persons: - "Johannes Thorn" #https://www.uuidgenerator.net/ uid: de51321c-547a-425e-b1bc-5b51f7e05e9c +image: "" ticket_id: 1353 yt: "https://www.youtube.com/watch?v=sFhA3zMYEIA" mccc: "https://media.ccc.de/v/2022-12-29-johannes-thorn-uber-jgiven-und-asciidoc-reporting" diff --git a/_media/2022-12-29-linux-user-namespaces-und-der-unshare-befehl.md b/_media/2022-12-29-linux-user-namespaces-und-der-unshare-befehl.md index d64eecdb..1d40ac60 100644 --- a/_media/2022-12-29-linux-user-namespaces-und-der-unshare-befehl.md +++ b/_media/2022-12-29-linux-user-namespaces-und-der-unshare-befehl.md @@ -7,6 +7,7 @@ persons: license: CC-BY-NC-ND-40 #https://www.uuidgenerator.net/ uid: 1fc7db56-5c9d-452b-ad51-b43894f77c42 +image: "" ticket_id: 1350 yt: "https://www.youtube.com/watch?v=zE07kstdvzc" mccc: "https://media.ccc.de/v/2022-12-29-neoraider-uber-linux-user-namespaces-und-den-unshare-befehl" diff --git a/_media/2022-12-29-nook22.md b/_media/2022-12-29-nook22.md index 3c1ac311..10db4ceb 100644 --- a/_media/2022-12-29-nook22.md +++ b/_media/2022-12-29-nook22.md @@ -6,6 +6,7 @@ persons: - "TVLuke" #https://www.uuidgenerator.net/ uid: 5c5cc720-c18e-414e-a069-7acaa030c88b +image: "" ticket_id: 1352 yt: "https://www.youtube.com/watch?v=KA9-07DPPjg" mccc: "https://media.ccc.de/v/2022-12-29-tvluke-uber-die-zahlen-2c-daten-2c-fakten-der-nook-2022" diff --git a/_media/2022-12-29-openbikesensor-auswertung-mittels-jupyter-notebooks.md b/_media/2022-12-29-openbikesensor-auswertung-mittels-jupyter-notebooks.md index 72377d9b..154b9b43 100644 --- a/_media/2022-12-29-openbikesensor-auswertung-mittels-jupyter-notebooks.md +++ b/_media/2022-12-29-openbikesensor-auswertung-mittels-jupyter-notebooks.md @@ -6,6 +6,7 @@ persons: - "Dennis" #https://www.uuidgenerator.net/ uid: a075bb10-3c8d-4090-af90-e4857749149b +image: "" ticket_id: 1354 yt: "https://www.youtube.com/watch?v=5EvD_gOSksk" mccc: "https://media.ccc.de/v/2022-12-29-dennis-uber-openbikesensor-auswertung-mittels-jupyter-notebooks" diff --git a/_media/2022-12-29-simon-tathams-portable-puzzle-collection-und-loopy.md b/_media/2022-12-29-simon-tathams-portable-puzzle-collection-und-loopy.md index 276878ae..7efe8403 100644 --- a/_media/2022-12-29-simon-tathams-portable-puzzle-collection-und-loopy.md +++ b/_media/2022-12-29-simon-tathams-portable-puzzle-collection-und-loopy.md @@ -6,6 +6,7 @@ persons: - "Jakob" #https://www.uuidgenerator.net/ uid: c7f1466b-3445-4d44-bae4-49cb0706e7be +image: "" ticket_id: 1351 yt: "https://www.youtube.com/watch?v=IP4MIEZvkmg" mccc: "https://media.ccc.de/v/2022-12-29-jakob-uber-simon-tatham-27s-portable-puzzle-collection-und-loopy" diff --git a/_media/2023-03-22-doctoolchain-schnell-erklaert-aber-maechtig.md b/_media/2023-03-22-doctoolchain-schnell-erklaert-aber-maechtig.md index f0f2ca07..e598e7a9 100644 --- a/_media/2023-03-22-doctoolchain-schnell-erklaert-aber-maechtig.md +++ b/_media/2023-03-22-doctoolchain-schnell-erklaert-aber-maechtig.md @@ -6,6 +6,7 @@ persons: - "Johannes Thorn" #https://www.uuidgenerator.net/ uid: 38473793-9e70-41ce-9349-e683dea15d72 +image: "" ticket_id: 1367 yt: "https://www.youtube.com/watch?v=4GqmYf6I4DY" file: "https://video.chaotikum.net/5min/2023-03-22/2023-03-22-johannes-thorn-uber-docttoolschain-schnell-erklart-aber-machtig.mov" diff --git a/_media/2023-03-22-end-to-end-arguments-im-systemdesign.md b/_media/2023-03-22-end-to-end-arguments-im-systemdesign.md index 5e17f13a..bafd8df5 100644 --- a/_media/2023-03-22-end-to-end-arguments-im-systemdesign.md +++ b/_media/2023-03-22-end-to-end-arguments-im-systemdesign.md @@ -6,6 +6,7 @@ persons: - "Jakob" #https://www.uuidgenerator.net/ uid: 233a8fa9-247b-406d-b70d-88d03ba870d9 +image: "" ticket_id: 1375 yt: "https://www.youtube.com/watch?v=jNAcW5j8qeM" file: "https://video.chaotikum.net/5min/2023-03-22/2023-03-22-jakob-uber-end-to-end-arguments-im-systemdesign.mov" diff --git a/_media/2023-03-22-kraehen.md b/_media/2023-03-22-kraehen.md index 48c59835..1dffe3db 100644 --- a/_media/2023-03-22-kraehen.md +++ b/_media/2023-03-22-kraehen.md @@ -6,6 +6,7 @@ persons: - "Svø" #https://www.uuidgenerator.net/ uid: 8c14004d-78ad-43ec-a72a-239179e6e9d3 +image: "https://video.chaotikum.net/thumbnails/2023-03-22-kraehen_play.png" ticket_id: 1372 yt: "https://www.youtube.com/watch?v=WHHr_d5GOHs" file: "https://video.chaotikum.net/5min/2023-03-22/2023-03-22-sv-c3-b8-uber-krahen-e2-99-a5.mov" diff --git a/_media/2023-05-12-baumbilanzen-befreien.md b/_media/2023-05-12-baumbilanzen-befreien.md index 5e0295a3..3d83a282 100644 --- a/_media/2023-05-12-baumbilanzen-befreien.md +++ b/_media/2023-05-12-baumbilanzen-befreien.md @@ -6,6 +6,7 @@ persons: - "TVLuke" #https://www.uuidgenerator.net/ uid: a1d32bbd-7f47-4a9f-83dd-c2e62d1f67f9 +image: "https://video.chaotikum.net/thumbnails/2023-05-12-baumbilanzen-befreien_play.png" ticket_id: 1377 event: eb785692-6bb0-4aac-aa7a-d48c87507da4 yt: "https://www.youtube.com/watch?v=DzV5UAwYQIE" -- GitLab