Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/2025/develop' into develop
Browse files Browse the repository at this point in the history
Start with DataWeek 2025
  • Loading branch information
splattater committed Jun 12, 2024
2 parents 6ebbb85 + 39e24b3 commit 52918a2
Show file tree
Hide file tree
Showing 20 changed files with 76 additions and 170 deletions.
12 changes: 6 additions & 6 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Site settings
title: Data Week Leipzig 2024
title: Data Week Leipzig 2025
email: [email protected]
baseurl: ""
url: "https://2024.dataweek.de"
rootResource: "<https://2024.dataweek.de/>"
url: "https://2025.dataweek.de"
rootResource: "<https://2025.dataweek.de/>"
translations:
de: "<https://2024.dataweek.de/>"
en: "<https://2024.dataweek.de/en/>"
de: "<https://2025.dataweek.de/>"
en: "<https://2025.dataweek.de/en/>"
language: de
twitter_username: DataWeekLeipzig

Expand Down Expand Up @@ -38,7 +38,7 @@ exclude:

jekyll_rdf:
path: "graph.nt"
restriction: "SELECT ?resourceUri WHERE { ?resourceUri ?p ?o . FILTER regex(str(?resourceUri), \"^https://2024.dataweek.de\") }"
restriction: "SELECT ?resourceUri WHERE { ?resourceUri ?p ?o . FILTER regex(str(?resourceUri), \"^https://2025.dataweek.de\") }"
default_template: default.html
class_template_mappings:
"https://dataweek.de/#ProgramView" : "program_view.html"
Expand Down
2 changes: 1 addition & 1 deletion _data/prefixes.sparql
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ PREFIX aksw: <http://aksw.org/>
PREFIX akswgroups: <http://aksw.org/Groups/>
PREFIX akswpartner: <http://aksw.org/Partner/>
PREFIX dw: <https://dataweek.de/#>
PREFIX dw23: <https://2023.dataweek.de/>
PREFIX dw24: <https://2024.dataweek.de/>
PREFIX dw25: <https://2024.dataweek.de/>
PREFIX or: <https://www.openresearch.org/wiki/Property:>
PREFIX gnd: <https://d-nb.info/standards/elementset/gnd#>
PREFIX void: <http://rdfs.org/ns/void#>
6 changes: 3 additions & 3 deletions _includes/sections/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<li>
<a href="https://infai.org/das-institut/impressum/">{{ str_imprint }}</a>
</li>
{% assign datenschutz = "<https://2024.dataweek.de/datenschutz/>" | rdf_get %}
{% assign team = "<https://2024.dataweek.de/team>" | rdf_get %}
{% assign contact = "<https://2024.dataweek.de/contact/>" | rdf_get %}
{% assign datenschutz = "<https://2025.dataweek.de/datenschutz/>" | rdf_get %}
{% assign team = "<https://2025.dataweek.de/team>" | rdf_get %}
{% assign contact = "<https://2025.dataweek.de/contact/>" | rdf_get %}

{% include components/menu_main_entry.html current=current_page resource=datenschutz %}
{% include components/menu_main_entry.html current=current_page resource=team %}
Expand Down
9 changes: 2 additions & 7 deletions _includes/sections/greeting.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
{% include strings.html %}
{% assign rootResource = site.rootResource | rdf_get %}
{% assign programResource = "dw24:program" | rdf_get %}
{% assign liveResource = "dw24:live" | rdf_get %}
{% assign programResource = "dw25:program" | 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="{{ programResource.render_path | relativize_url }}" style="color: white; border-color: white">{{str_program_header}}</a>
<a class="btn2" href="https://www.conftool.net/dataweek2024/" style="color: white; border-color: white">{{str_get_a_ticket}}</a>
</p>
</div>
<figure>
{%- assign size_array = "480 800 1200 1600 1980" | split: " " -%}
Expand Down
2 changes: 1 addition & 1 deletion _includes/sections/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="page-header-inner">
<div class="page-logo">
<p class="title">
<a href="{{ rootResource.page_url | relativize_url }}" title="{{ str_homepage }}"><img src="{{ "/resources/images/dataweek_logo.svg" | relativize_url }}" alt="Data Week Leipzig 2023"></a>
<a href="{{ rootResource.page_url | relativize_url }}" title="{{ str_homepage }}"><img src="{{ "/resources/images/dataweek_logo.svg" | relativize_url }}" alt="Data Week Leipzig 2025"></a>
<strong>{{ rootResource | rdf_property: "dct:date" }}</strong>
</p>
<p class="claim">
Expand Down
2 changes: 1 addition & 1 deletion _includes/sections/header_events.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% include strings.html %}
{% assign eventsMenuResource = "dw24:tracks" | rdf_get %}
{% assign eventsMenuResource = "dw25:tracks" | rdf_get %}
<div class="content-header">
<h1>
{{ str_tracks }}
Expand Down
2 changes: 1 addition & 1 deletion _includes/sections/header_program.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% include strings.html %}
{% assign programMenuResource = "dw24:program" | rdf_get %}
{% assign programMenuResource = "dw25:program" | rdf_get %}
<div class="content-header">
<h1>
{{ str_program_header }}
Expand Down
4 changes: 2 additions & 2 deletions _includes/strings.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
{% assign str_personal_twitter = "Twitter profile" %}
{% assign str_sidevents = "Side Events" %}
{% assign str_supported = "With the friendly support of" %}
{% assign str_welcome = "Welcome to the Data Week 2024" %}
{% assign str_welcome = "Welcome to the Data Week 2025" %}
{% assign str_stream_a = "Stream A" %}
{% assign str_stream_b = "Stream B" %}
{% assign str_subscribe_ical_program = "Subscribt to programm calendar" %}
Expand Down Expand Up @@ -103,7 +103,7 @@
{% assign str_personal_twitter = "Profil bei Twitter" %}
{% assign str_sidevents = "Side Events" %}
{% assign str_supported = "Mit freundlicher Unterstützung durch" %}
{% assign str_welcome = "Willkommen zur Data Week 2024" %}
{% assign str_welcome = "Willkommen zur Data Week 2025" %}
{% assign str_stream_a = "Kanal A" %}
{% assign str_stream_b = "Kanal B" %}
{% assign str_subscribe_ical_program = "Programm als Kalender abonnieren" %}
Expand Down
1 change: 0 additions & 1 deletion _layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
{% include_cached sections/greeting.html %}
<main class="page-main" aria-label="Inhalt" id="inhalt">
<div class="content-header">
{% include_cached sections/keynotes.html %}
{{ content }}
</div>
{% include_cached sections/impressions.html %}
Expand Down
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ <h2>
</summary>
<p>
{% if site.language == 'en' %}
The organisers would also like to invite students, trainees, and interested citizens to take a look behind the scenes or take part in the various training sessions offered during Leipzig Data Week 2024. Several trainings and tutorials will take place during Data Week Leipzig and provide insight into different principles, techniques, use cases or data sets.
The organisers would also like to invite students, trainees, and interested citizens to take a look behind the scenes or take part in the various training sessions offered during Leipzig Data Week 2025. Several trainings and tutorials will take place during Data Week Leipzig and provide insight into different principles, techniques, use cases or data sets.
{% else %}
Die Organisatoren möchten auch Studierende, Auszubildende und interessierte Bürger:innen einladen, einen Blick hinter die Kulissen zu werfen oder an den verschiedenen Schulungen teilzunehmen, die während der Leipzig Data Week 2024 angeboten werden. Während der Data Week Leipzig finden mehrere Schulungen und Tutorien statt, die Einblicke in verschiedene Prinzipien, Techniken, Anwendungsfälle oder Datensätze geben.
Die Organisatoren möchten auch Studierende, Auszubildende und interessierte Bürger:innen einladen, einen Blick hinter die Kulissen zu werfen oder an den verschiedenen Schulungen teilzunehmen, die während der Leipzig Data Week 2025 angeboten werden. Während der Data Week Leipzig finden mehrere Schulungen und Tutorien statt, die Einblicke in verschiedene Prinzipien, Techniken, Anwendungsfälle oder Datensätze geben.
{% endif %}
</p>
</details>
Expand Down
4 changes: 2 additions & 2 deletions live.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
---

{% include strings.html %}
{% assign programResource = "dw24:program" | rdf_get %}
{% assign venueResource = "<https://2024.dataweek.de/venue/>" | rdf_get %}
{% assign programResource = "dw25:program" | rdf_get %}
{% assign venueResource = "<https://2025.dataweek.de/venue/>" | rdf_get %}
{% assign noainvisionResource = "<https://noa-invision.de/>" | rdf_get %}
{% assign htwkResource = "<https://htwk-leipzig.de/>" | rdf_get %}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
Loading

0 comments on commit 52918a2

Please sign in to comment.