Skip to content

Deploy develop to main #645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
splattater merged 6 commits into from
Jun 5, 2025
Merged

Deploy develop to main #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
202ea5d
Update from CMEM
Jun 4, 2025
d49245b
Update from CMEM
Jun 4, 2025
fdc2b5b
Prepare live and stream pages
splattater Jun 4, 2025
f842036
Add live button to greeting
splattater Jun 5, 2025
128f6e2
Update from CMEM
Jun 5, 2025
01e481b
Update from CMEM
Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ translations:
language: de
twitter_username: DataWeekLeipzig

stream_1_1: "!irnMvwCKJtUyHjAAwI:matrix.org" # Menschen vernetzen - Daten nutzen
stream_1_2: "!EgEHuNVtcBsfkKBzBJ:matrix.org" # Data Science Mania
stream_2_1: "!UPyDoiPIBTThTPDQXF:matrix.org" # Kommunen für Kommunen 1 (Sitzungssaal)
stream_2_2: "!LXXKyxfLmjTtRTzzAc:matrix.org" # Kommunen für Kommunen 2 (Festsaal)
stream_3_1: "!wGwIOvxQCUcVwiKPQk:matrix.org" # Urban Data Summit
stream_4_1: "!pEreTkmeqwWZPtAWpA:matrix.org" # LSWT
stream_1_1: "!slhYXYesrqRvWAMjJX:matrix.org" # Sensoren, Satelliten & Stadtentwicklung
stream_1_2: "!MwGlqKJVHWMjNrFgxD:matrix.org" # Stadt, Daten & KI
stream_2_1: "!DeBYSgyrflSrpYyZJO:matrix.org" # Stadt, Digital & Lebenswert
stream_2_2: "!ANIrWpElchEVitpnLm:matrix.org" # Menschen, Daten & Energie
stream_3_1: "!rjAKHGWSkSCKciTDeI:matrix.org" # LSWT2025
stream_3_2: "!txjyhLUdhislnmvCBx:matrix.org" # AIAMOroadshow

# Build settings
permalink: /:year/:month/:day/:title
Expand Down
2 changes: 2 additions & 0 deletions _includes/sections/greeting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{% include strings.html %}
{% assign rootResource = site.rootResource | rdf_get %}
{% assign cfpResource = "dw25:cfp" | rdf_get %}
{% assign liveResource = "dw25:live" | rdf_get %}
<aside class="page-hero">
<div class="page-hero-text">
<h1>
{{str_greeting}}<br/>
</h1>
<p>
<a class="btn2 ripple" href="{{ liveResource.render_path | relativize_url }}" style="background-color: #3da6dc; color: white; border-color: white">Live</a>
<a class="btn2" href="{{ cfpResource.render_path | relativize_url }}" style="color: white; border-color: white">{{ cfpResource | rdf_property: "rdfs:label", site.language }}</a>
<a class="btn2" href="https://www.conftool.net/dataweek2025/" style="color: white; border-color: white">{{str_get_a_ticket}}</a>
</p>
Expand Down
26 changes: 18 additions & 8 deletions graph.nt
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion graph.nt.source
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[email protected]:AKSW/leipzig.dataweek.de-model.git
98a727447bff25bd93ebf292c6cdf7f9efaffa1d
2ef294d42b367d083fc9ed7670148b9a803bb442
62 changes: 17 additions & 45 deletions live.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,6 @@ <h2><span>Data Week</span> Live Streams - {{str_supported}}</h2>
</p>
{% endif %}
</li>
<li>
{% assign affiliation = htwkResource %}
{% assign depiction = affiliation | rdf_property: "site:small_logo" %}
{% unless depiction %}
{% assign depiction = affiliation | rdf_property: "foaf:logo" %}
{% endunless %}
{% assign affiliation_alt = affiliation | rdf_property: "rdfs:label" %}
{% if depiction %}
<a href="{{ affiliation }}">
{% include components/img.html alt=affiliation_alt resource=depiction simple=true %}
</a>
{% else %}
<p>
<a href="{{ affiliation }}">
{{ affiliation_alt }}
</a>
</p>
{% endif %}
</li>
</ul>
</div>

Expand All @@ -64,18 +45,18 @@ <h2><span>Data Week</span> Live Streams - {{str_supported}}</h2>
<li>
<div class="card">
<h2>
<span class="xl hideunderline">{{ str_monday }}</span>
<span class="xl hideunderline">{{ str_tuesday }}</span>
</h2>
<p class="dates">
<time>
<strong class="highlighted x1">Menschen vernetzen - Daten nutzen</strong><br/>
<strong>9.30–17.00</strong><br/>
<strong class="highlighted x1">Sensoren, Satelliten & Stadtentwicklung</strong><br/>
<strong>10.00–17.40</strong><br/>
<strong>Sitzungssaal</strong><br/>
<a href="{{ "/live/stream.html" | relativize_url }}#{{site.stream_1_1}}"><svg role="img" focusable="false" aria-hidden="true" height="28" width="42"><use xlink:href="{% relative_link /resources/images/socialmedia.svg %}#youtube"></use></svg></a>
</time>
<time>
<strong class="highlighted x1">Data Science Mania</strong><br/>
<strong>11.00–16.45</strong><br/>
<strong class="highlighted x1">Stadt, Daten & KI</strong><br/>
<strong>12.30–17.40</strong><br/>
<strong>Festsaal</strong><br/>
<a href="{{ "/live/stream.html" | relativize_url }}#{{site.stream_1_2}}"><svg role="img" focusable="false" aria-hidden="true" height="28" width="42"><use xlink:href="{% relative_link /resources/images/socialmedia.svg %}#youtube"></use></svg></a>
</time>
Expand All @@ -85,18 +66,18 @@ <h2>
<li>
<div class="card">
<h2>
<span class="xl hideunderline">{{ str_tuesday }}</span>
<span class="xl hideunderline">{{ str_wednesday }}</span>
</h2>
<p class="dates">
<time>
<strong class="highlighted x1">Kommunen für Kommunen</strong><br/>
<strong>9.00–17.00</strong><br/>
<strong class="highlighted x1">Stadt, Digital & Lebenswert</strong><br/>
<strong>9.00–15.00</strong><br/>
<strong>Sitzungssaal</strong><br/>
<a href="{{ "/live/stream.html" | relativize_url }}#{{site.stream_2_1}}"><svg role="img" focusable="false" aria-hidden="true" height="28" width="42"><use xlink:href="{% relative_link /resources/images/socialmedia.svg %}#youtube"></use></svg></a>
</time>
<time>
<strong class="highlighted x1">Kommunen für Kommunen</strong><br/>
<strong>11.00–17.00</strong><br/>
<strong class="highlighted x1">Menschen, Daten & Energie</strong><br/>
<strong>9.00–17.00</strong><br/>
<strong>Festsaal</strong><br/>
<a href="{{ "/live/stream.html" | relativize_url }}#{{site.stream_2_2}}"><svg role="img" focusable="false" aria-hidden="true" height="28" width="42"><use xlink:href="{% relative_link /resources/images/socialmedia.svg %}#youtube"></use></svg></a>
</time>
Expand All @@ -106,29 +87,20 @@ <h2>
<li>
<div class="card">
<h2>
<span class="xl hideunderline">{{ str_wednesday }}</span>
<span class="xl hideunderline">{{ str_thursday }}</span>
</h2>
<p class="dates">
<time>
<strong class="highlighted x1">Urban Data Summit</strong><br/>
<strong class="highlighted x1">LSWT</strong><br/>
<strong>9.00–16.30</strong><br/>
<strong>Sitzungssaal</strong><br/>
<a href="{{ "/live/stream.html" | relativize_url }}#{{site.stream_3_1}}"><svg role="img" focusable="false" aria-hidden="true" height="28" width="42"><use xlink:href="{% relative_link /resources/images/socialmedia.svg %}#youtube"></use></svg></a>
</time>
</p>
</div>
</li>
<li>
<div class="card">
<h2>
<span class="xl hideunderline">{{ str_thursday }}</span>
</h2>
<p class="dates">
<time>
<strong class="highlighted x1">LSWT</strong><br/>
<strong>9.00–16.30</strong><br/>
<strong>Sitzungssaal</strong><br/>
<a href="{{ "/live/stream.html" | relativize_url }}#{{site.stream_4_1}}"><svg role="img" focusable="false" aria-hidden="true" height="28" width="42"><use xlink:href="{% relative_link /resources/images/socialmedia.svg %}#youtube"></use></svg></a>
<time>
<strong class="highlighted x1">AIAMOroadshow</strong><br/>
<strong>11.00–15.00</strong><br/>
<strong>Ratsplenarsaal</strong><br/>
<a href="{{ "/live/stream.html" | relativize_url }}#{{site.stream_3_2}}"><svg role="img" focusable="false" aria-hidden="true" height="28" width="42"><use xlink:href="{% relative_link /resources/images/socialmedia.svg %}#youtube"></use></svg></a>
</time>
</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions live/stream.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@

<div class="container">

<h1>DataWeek 2024 Live Stream</h1>
<h1>DataWeek 2025 Live Stream</h1>

<div id="videoWrapper" class="videoWrapper">
<!--
<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/3FmUIvFg8QM"
<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/8ZGNg7Kou7c"
title="YouTube video player" frameborder="0" allow="accelerometer; autoplay;
clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-->
Expand Down
4 changes: 2 additions & 2 deletions resources/js/chat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use strict';

// const socket = io("wss://chat.lswt2021.comiles.eu/ws");
const socket = io("wss://chat.2023.dataweek.de/");
const socket = io("wss://chat.2024.dataweek.de/");
// const ws = new WebSocket('wss://chat.lswt2021.comiles.eu/ws');
// const ws = new WebSocket('ws://localhost:5000/ws');

let default_room_id = "!irnMvwCKJtUyHjAAwI:matrix.org"
let default_room_id = "!slhYXYesrqRvWAMjJX:matrix.org"
let room_id = window.location.hash.substring(1)

if (room_id == "") {
Expand Down