From fb377d5b1bf6667911d5f6afe387104d307fea48 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 29 Apr 2018 18:59:09 +0200 Subject: [PATCH 1/2] Type: address --- content/ort.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/ort.en.md b/content/ort.en.md index 99fe0ec..98bb6f6 100644 --- a/content/ort.en.md +++ b/content/ort.en.md @@ -23,7 +23,7 @@ This year's CoSin takes place in the [Villa Ritter][1] in {{< cosin "city" >}}. ## Getting there -* Address: Faubourd du Jura 36, 2502 Biel/Bienne +* Address: Faubourg du Jura 36, 2502 Biel/Bienne * [OpenStreetMap][2] * The railway station is approximately a 15-minute walk away * Parking spaces are available From 6382fdcc174563445af32de0db65665b42f0c2a8 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 29 Apr 2018 20:01:45 +0200 Subject: [PATCH 2/2] FEAT: Update schedule publication mechanics --- content/fahrplan.de.md | 3 +-- content/fahrplan.en.md | 3 +-- content/fahrplan.fr.md | 3 +-- content/fahrplan.it.md | 3 +-- data/cosin.toml | 3 ++- layouts/shortcodes/schedule.html | 9 +++++++++ themes/cosin-theme/layouts/partials/fahrplan.de.html | 12 ++++++++++++ themes/cosin-theme/layouts/partials/fahrplan.en.html | 12 ++++++++++++ themes/cosin-theme/layouts/partials/fahrplan.fr.html | 12 ++++++++++++ themes/cosin-theme/layouts/partials/fahrplan.it.html | 12 ++++++++++++ .../layouts/partials/site-sidebar.de.html | 2 +- .../layouts/partials/site-sidebar.en.html | 2 +- .../layouts/partials/site-sidebar.fr.html | 2 +- .../layouts/partials/site-sidebar.it.html | 2 +- 14 files changed, 67 insertions(+), 13 deletions(-) create mode 100644 layouts/shortcodes/schedule.html create mode 100644 themes/cosin-theme/layouts/partials/fahrplan.de.html create mode 100644 themes/cosin-theme/layouts/partials/fahrplan.en.html create mode 100644 themes/cosin-theme/layouts/partials/fahrplan.fr.html create mode 100644 themes/cosin-theme/layouts/partials/fahrplan.it.html diff --git a/content/fahrplan.de.md b/content/fahrplan.de.md index 037641d..d278447 100644 --- a/content/fahrplan.de.md +++ b/content/fahrplan.de.md @@ -9,8 +9,7 @@ menu: ## Fahrplan {{< cosin "date_year" >}} -Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni. - +{{< schedule >}} ## Ältere Fahrpläne diff --git a/content/fahrplan.en.md b/content/fahrplan.en.md index 55b6036..59aca69 100644 --- a/content/fahrplan.en.md +++ b/content/fahrplan.en.md @@ -9,8 +9,7 @@ menu: ## Schedule {{< cosin "date_year" >}} -Schedule of this year's CoSin will be online in early June. - +{{< schedule >}} ## Older schedules diff --git a/content/fahrplan.fr.md b/content/fahrplan.fr.md index 45c9035..a03382c 100644 --- a/content/fahrplan.fr.md +++ b/content/fahrplan.fr.md @@ -9,8 +9,7 @@ menu: ## Programme {{< cosin "date_year" >}} -Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni. - +{{< schedule >}} ## Anciens programmes diff --git a/content/fahrplan.it.md b/content/fahrplan.it.md index 244c64b..9e4992c 100644 --- a/content/fahrplan.it.md +++ b/content/fahrplan.it.md @@ -9,8 +9,7 @@ menu: ## Tabella di marcia {{< cosin "date_year" >}} -Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni. - +{{< schedule >}} ## Tabelle di marcia precedenti diff --git a/data/cosin.toml b/data/cosin.toml index d373a71..6ad191b 100644 --- a/data/cosin.toml +++ b/data/cosin.toml @@ -36,7 +36,8 @@ cfp_url = "https://frab.ccczh.ch/en/cosin/cfp/session/new" schedule_available = true -schedule_urls = [ +schedule_main_url = "https://www.cosin.ch/fahrplan/2017/index.html" +schedule_day_urls = [ "https://www.cosin.ch/fahrplan/2017/schedule/1.html", "https://www.cosin.ch/fahrplan/2017/schedule/2.html", "https://www.cosin.ch/fahrplan/2017/schedule/3.html"] diff --git a/layouts/shortcodes/schedule.html b/layouts/shortcodes/schedule.html new file mode 100644 index 0000000..95f81fc --- /dev/null +++ b/layouts/shortcodes/schedule.html @@ -0,0 +1,9 @@ +{{ if eq .Site.Language.Lang "de" }} + {{ partial "fahrplan.de.html" . }} +{{ else if eq .Site.Language.Lang "fr" }} + {{ partial "fahrplan.fr.html" . }} +{{ else if eq .Site.Language.Lang "it" }} + {{ partial "fahrplan.it.html" . }} +{{ else if eq .Site.Language.Lang "en" }} + {{ partial "fahrplan.en.html" . }} +{{ end }} diff --git a/themes/cosin-theme/layouts/partials/fahrplan.de.html b/themes/cosin-theme/layouts/partials/fahrplan.de.html new file mode 100644 index 0000000..f33cc50 --- /dev/null +++ b/themes/cosin-theme/layouts/partials/fahrplan.de.html @@ -0,0 +1,12 @@ +{{ if .Site.Data.cosin.schedule_available }} +

+ Der Fahrplan für die diesjährige CoSin ist da! +

+ +{{ else }} +

+ Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni. +

+{{ end}} diff --git a/themes/cosin-theme/layouts/partials/fahrplan.en.html b/themes/cosin-theme/layouts/partials/fahrplan.en.html new file mode 100644 index 0000000..c7f902d --- /dev/null +++ b/themes/cosin-theme/layouts/partials/fahrplan.en.html @@ -0,0 +1,12 @@ +{{ if .Site.Data.cosin.schedule_available }} +

+ Schedule of this year's CoSin is ready! +

+ +{{ else }} +

+ Schedule of this year's CoSin will be online in early June. +

+{{ end}} diff --git a/themes/cosin-theme/layouts/partials/fahrplan.fr.html b/themes/cosin-theme/layouts/partials/fahrplan.fr.html new file mode 100644 index 0000000..f33cc50 --- /dev/null +++ b/themes/cosin-theme/layouts/partials/fahrplan.fr.html @@ -0,0 +1,12 @@ +{{ if .Site.Data.cosin.schedule_available }} +

+ Der Fahrplan für die diesjährige CoSin ist da! +

+ +{{ else }} +

+ Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni. +

+{{ end}} diff --git a/themes/cosin-theme/layouts/partials/fahrplan.it.html b/themes/cosin-theme/layouts/partials/fahrplan.it.html new file mode 100644 index 0000000..f33cc50 --- /dev/null +++ b/themes/cosin-theme/layouts/partials/fahrplan.it.html @@ -0,0 +1,12 @@ +{{ if .Site.Data.cosin.schedule_available }} +

+ Der Fahrplan für die diesjährige CoSin ist da! +

+ +{{ else }} +

+ Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni. +

+{{ end}} diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.de.html b/themes/cosin-theme/layouts/partials/site-sidebar.de.html index 56c12df..3b33792 100644 --- a/themes/cosin-theme/layouts/partials/site-sidebar.de.html +++ b/themes/cosin-theme/layouts/partials/site-sidebar.de.html @@ -41,7 +41,7 @@ {{ if .schedule_available }}

Fahrplan:

diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.en.html b/themes/cosin-theme/layouts/partials/site-sidebar.en.html index fc94470..9ed8f49 100644 --- a/themes/cosin-theme/layouts/partials/site-sidebar.en.html +++ b/themes/cosin-theme/layouts/partials/site-sidebar.en.html @@ -41,7 +41,7 @@ {{ if .schedule_available }}

Schedule:

diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html b/themes/cosin-theme/layouts/partials/site-sidebar.fr.html index 3e2243e..c5fd9fe 100644 --- a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html +++ b/themes/cosin-theme/layouts/partials/site-sidebar.fr.html @@ -41,7 +41,7 @@ {{ if .schedule_available }}

Programme:

diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.it.html b/themes/cosin-theme/layouts/partials/site-sidebar.it.html index ea9a09f..06ada9d 100644 --- a/themes/cosin-theme/layouts/partials/site-sidebar.it.html +++ b/themes/cosin-theme/layouts/partials/site-sidebar.it.html @@ -41,7 +41,7 @@ {{ if .schedule_available }}

Tabella di marcia: