Skip to content

Commit 0ede4d7

Browse files
splattatersplattater
authored
Merge pull request #645 from AKSW/develop
Deploy develop to main
2 parents a689a48 + 01e481b commit 0ede4d7

File tree

7 files changed

+48
-64
lines changed

7 files changed

+48
-64
lines changed

‎_config.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ translations:
1010
language: de
1111
twitter_username: DataWeekLeipzig
1212

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

2020
# Build settings
2121
permalink: /:year/:month/:day/:title

‎_includes/sections/greeting.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
{% include strings.html %}
22
{% assign rootResource = site.rootResource | rdf_get %}
33
{% assign cfpResource = "dw25:cfp" | rdf_get %}
4+
{% assign liveResource = "dw25:live" | rdf_get %}
45
<aside class="page-hero">
56
<div class="page-hero-text">
67
<h1>
78
{{str_greeting}}<br/>
89
</h1>
910
<p>
11+
<a class="btn2 ripple" href="{{ liveResource.render_path | relativize_url }}" style="background-color: #3da6dc; color: white; border-color: white">Live</a>
1012
<a class="btn2" href="{{ cfpResource.render_path | relativize_url }}" style="color: white; border-color: white">{{ cfpResource | rdf_property: "rdfs:label", site.language }}</a>
1113
<a class="btn2" href="https://www.conftool.net/dataweek2025/" style="color: white; border-color: white">{{str_get_a_ticket}}</a>
1214
</p>

‎graph.nt‎

Lines changed: 18 additions & 8 deletions
Large diffs are not rendered by default.

‎graph.nt.source‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
git@github.com:AKSW/leipzig.dataweek.de-model.git
2-
98a727447bff25bd93ebf292c6cdf7f9efaffa1d
2+
2ef294d42b367d083fc9ed7670148b9a803bb442

‎live.html‎

Lines changed: 17 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,6 @@ <h2><span>Data Week</span> Live Streams - {{str_supported}}</h2>
3737
</p>
3838
{% endif %}
3939
</li>
40-
<li>
41-
{% assign affiliation = htwkResource %}
42-
{% assign depiction = affiliation | rdf_property: "site:small_logo" %}
43-
{% unless depiction %}
44-
{% assign depiction = affiliation | rdf_property: "foaf:logo" %}
45-
{% endunless %}
46-
{% assign affiliation_alt = affiliation | rdf_property: "rdfs:label" %}
47-
{% if depiction %}
48-
<a href="{{ affiliation }}">
49-
{% include components/img.html alt=affiliation_alt resource=depiction simple=true %}
50-
</a>
51-
{% else %}
52-
<p>
53-
<a href="{{ affiliation }}">
54-
{{ affiliation_alt }}
55-
</a>
56-
</p>
57-
{% endif %}
58-
</li>
5940
</ul>
6041
</div>
6142

@@ -64,18 +45,18 @@ <h2><span>Data Week</span> Live Streams - {{str_supported}}</h2>
6445
<li>
6546
<div class="card">
6647
<h2>
67-
<span class="xl hideunderline">{{ str_monday }}</span>
48+
<span class="xl hideunderline">{{ str_tuesday }}</span>
6849
</h2>
6950
<p class="dates">
7051
<time>
71-
<strong class="highlighted x1">Menschen vernetzen - Daten nutzen</strong><br/>
72-
<strong>9.30–17.00</strong><br/>
52+
<strong class="highlighted x1">Sensoren, Satelliten & Stadtentwicklung</strong><br/>
53+
<strong>10.00–17.40</strong><br/>
7354
<strong>Sitzungssaal</strong><br/>
7455
<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>
7556
</time>
7657
<time>
77-
<strong class="highlighted x1">Data Science Mania</strong><br/>
78-
<strong>11.00–16.45</strong><br/>
58+
<strong class="highlighted x1">Stadt, Daten & KI</strong><br/>
59+
<strong>12.30–17.40</strong><br/>
7960
<strong>Festsaal</strong><br/>
8061
<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>
8162
</time>
@@ -85,18 +66,18 @@ <h2>
8566
<li>
8667
<div class="card">
8768
<h2>
88-
<span class="xl hideunderline">{{ str_tuesday }}</span>
69+
<span class="xl hideunderline">{{ str_wednesday }}</span>
8970
</h2>
9071
<p class="dates">
9172
<time>
92-
<strong class="highlighted x1">Kommunen für Kommunen</strong><br/>
93-
<strong>9.00–17.00</strong><br/>
73+
<strong class="highlighted x1">Stadt, Digital & Lebenswert</strong><br/>
74+
<strong>9.00–15.00</strong><br/>
9475
<strong>Sitzungssaal</strong><br/>
9576
<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>
9677
</time>
9778
<time>
98-
<strong class="highlighted x1">Kommunen für Kommunen</strong><br/>
99-
<strong>11.00–17.00</strong><br/>
79+
<strong class="highlighted x1">Menschen, Daten & Energie</strong><br/>
80+
<strong>9.00–17.00</strong><br/>
10081
<strong>Festsaal</strong><br/>
10182
<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>
10283
</time>
@@ -106,29 +87,20 @@ <h2>
10687
<li>
10788
<div class="card">
10889
<h2>
109-
<span class="xl hideunderline">{{ str_wednesday }}</span>
90+
<span class="xl hideunderline">{{ str_thursday }}</span>
11091
</h2>
11192
<p class="dates">
11293
<time>
113-
<strong class="highlighted x1">Urban Data Summit</strong><br/>
94+
<strong class="highlighted x1">LSWT</strong><br/>
11495
<strong>9.00–16.30</strong><br/>
11596
<strong>Sitzungssaal</strong><br/>
11697
<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>
11798
</time>
118-
</p>
119-
</div>
120-
</li>
121-
<li>
122-
<div class="card">
123-
<h2>
124-
<span class="xl hideunderline">{{ str_thursday }}</span>
125-
</h2>
126-
<p class="dates">
127-
<time>
128-
<strong class="highlighted x1">LSWT</strong><br/>
129-
<strong>9.00–16.30</strong><br/>
130-
<strong>Sitzungssaal</strong><br/>
131-
<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>
99+
<time>
100+
<strong class="highlighted x1">AIAMOroadshow</strong><br/>
101+
<strong>11.00–15.00</strong><br/>
102+
<strong>Ratsplenarsaal</strong><br/>
103+
<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>
132104
</time>
133105
</p>
134106
</div>

‎live/stream.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@
9898

9999
<div class="container">
100100

101-
<h1>DataWeek 2024 Live Stream</h1>
101+
<h1>DataWeek 2025 Live Stream</h1>
102102

103103
<div id="videoWrapper" class="videoWrapper">
104104
<!--
105-
<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/3FmUIvFg8QM"
105+
<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/8ZGNg7Kou7c"
106106
title="YouTube video player" frameborder="0" allow="accelerometer; autoplay;
107107
clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
108108
-->

‎resources/js/chat.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
'use strict';
22

33
// const socket = io("wss://chat.lswt2021.comiles.eu/ws");
4-
const socket = io("wss://chat.2023.dataweek.de/");
4+
const socket = io("wss://chat.2024.dataweek.de/");
55
// const ws = new WebSocket('wss://chat.lswt2021.comiles.eu/ws');
66
// const ws = new WebSocket('ws://localhost:5000/ws');
77

8-
let default_room_id = "!irnMvwCKJtUyHjAAwI:matrix.org"
8+
let default_room_id = "!slhYXYesrqRvWAMjJX:matrix.org"
99
let room_id = window.location.hash.substring(1)
1010

1111
if (room_id == "") {

0 commit comments

Comments
 (0)