From 0f991d0679cb81fc53068b5a7046b67fc9c132d0 Mon Sep 17 00:00:00 2001 From: obertsalome Date: Thu, 26 Jun 2025 10:23:37 +0200 Subject: [PATCH 01/13] prepare registration for testing --- _data/navigation.yml | 2 ++ _includes/registration-form.html | 15 ++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/_data/navigation.yml b/_data/navigation.yml index 216f437..8a9cb97 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -2,6 +2,8 @@ link: /about.html - name: Kursprogramm link: /2025/programm.html +- name: Registrierung + link: /2025/registrierung.html - name: Veranstaltungsort link: /veranstaltungsort.html - name: "Sponsoren" diff --git a/_includes/registration-form.html b/_includes/registration-form.html index b3b94cc..79a70ec 100644 --- a/_includes/registration-form.html +++ b/_includes/registration-form.html @@ -117,16 +117,17 @@
- Studierende (UPB/HfM-DT) + Studierende der Universitäten Kassel, Paderborn oder der Hochschule für Musik Detmold - +
@@ -156,8 +157,8 @@ benötigt! -
+
From 91e57a3e79648fd75b1785de9e7f1958f9453dbb Mon Sep 17 00:00:00 2001 From: obertsalome Date: Tue, 1 Jul 2025 14:01:42 +0200 Subject: [PATCH 02/13] more preparation on registration --- _archiv/2025/formmail.php | 2 +- _archiv/2025/registrierung.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_archiv/2025/formmail.php b/_archiv/2025/formmail.php index 48b5eea..3257c0f 100644 --- a/_archiv/2025/formmail.php +++ b/_archiv/2025/formmail.php @@ -601,7 +601,7 @@ public function checkFileUploadSize($a_file_vars) this value, you *must* set $CSVOPEN = "b". */ /* Help: http://www.tectite.com/fmdoc/templatedir.php */ -$TEMPLATEDIR = "/var/www/html/2024/formTemplates"; /* directory for template files; empty string if you don't have any templates */ +$TEMPLATEDIR = "/var/www/html/2025/formTemplates"; /* directory for template files; empty string if you don't have any templates */ /* Help: http://www.tectite.com/fmdoc/templateurl.php */ $TEMPLATEURL = ""; /* default; no template URL */ diff --git a/_archiv/2025/registrierung.html b/_archiv/2025/registrierung.html index 28ec134..0caed98 100644 --- a/_archiv/2025/registrierung.html +++ b/_archiv/2025/registrierung.html @@ -23,6 +23,6 @@ {% include registration-form.html %}
- {% include registration-closed-overlay.html %} + From 485e075669854669c03149398533601916f1f946 Mon Sep 17 00:00:00 2001 From: obertsalome Date: Tue, 1 Jul 2025 15:01:22 +0200 Subject: [PATCH 03/13] change colors --- _includes/registration-form.html | 2 +- _sass/main.scss | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/_includes/registration-form.html b/_includes/registration-form.html index 79a70ec..78181a8 100644 --- a/_includes/registration-form.html +++ b/_includes/registration-form.html @@ -144,7 +144,7 @@ class="form-check-input ml-1" required="required" /> - +
Bitte akzeptieren Sie die Datenschutzvereinbarung
Alle personenbezogenen Daten werden entsprechend den jeweils geltenden Vorschriften zum Schutz personenbezogener Daten nur zum Zwecke der Tagungsorganisation und Abwicklung erhoben, verarbeitet und genutzt. Eine Weitergabe an Dritte erfolgt nicht. diff --git a/_sass/main.scss b/_sass/main.scss index a12f8c2..ea92d24 100644 --- a/_sass/main.scss +++ b/_sass/main.scss @@ -80,3 +80,6 @@ footer { flex: 1 1 200px; /* Flexibles Wachstum, Mindestbreite von 200px */ } +input[type="checkbox"] { + accent-color: $ess-green-dark; +} \ No newline at end of file From f32e889c6d8439a9b279e734867ca2a3a2d721bd Mon Sep 17 00:00:00 2001 From: obertsalome Date: Tue, 1 Jul 2025 15:02:42 +0200 Subject: [PATCH 04/13] add title --- _archiv/2025/classes/Keynote.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_archiv/2025/classes/Keynote.html b/_archiv/2025/classes/Keynote.html index af041bf..b6086eb 100644 --- a/_archiv/2025/classes/Keynote.html +++ b/_archiv/2025/classes/Keynote.html @@ -1,5 +1,5 @@ --- -title: "tba" +title: "Keynote" title-short: Keynote label: keynote lang: deutsch From ede5033c322b8ad273843d6f57058caa6e1778b7 Mon Sep 17 00:00:00 2001 From: Anne Ferger Date: Tue, 1 Jul 2025 15:12:54 +0200 Subject: [PATCH 05/13] Update docker-publish.yml: switch to apache with php support --- .github/workflows/docker-publish.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 2d8cf91..dea4204 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -51,7 +51,8 @@ jobs: uses: docker/build-push-action@v6 with: context: . - file: ./Dockerfile.nginx + # file: ./Dockerfile.nginx + file: ./Dockerfile.apache push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From 7d4f9ff4513d509075f8cd761b73f64c9559a1d5 Mon Sep 17 00:00:00 2001 From: obertsalome Date: Tue, 1 Jul 2025 15:25:57 +0200 Subject: [PATCH 06/13] awake captcha --- _includes/registration-form.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/registration-form.html b/_includes/registration-form.html index 78181a8..4dfcd1d 100644 --- a/_includes/registration-form.html +++ b/_includes/registration-form.html @@ -157,8 +157,8 @@ benötigt! - +
From 5a7382b9997598c3f26aeca0ffdd5c90672f4f91 Mon Sep 17 00:00:00 2001 From: obertsalome Date: Tue, 1 Jul 2025 15:45:19 +0200 Subject: [PATCH 07/13] change date for tests --- _archiv/2025/registrierung.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_archiv/2025/registrierung.html b/_archiv/2025/registrierung.html index 0caed98..7285a78 100644 --- a/_archiv/2025/registrierung.html +++ b/_archiv/2025/registrierung.html @@ -1,7 +1,7 @@ --- layout: program title: "Registrierung ESS 2025" -registrationstart: "2025-07-08T00:00:00+02:00" +registrationstart: "2025-06-30T00:00:00+02:00" deadline: "2025-08-30T23:59:59+02:00" --- From b84f467013155673f9b8b3891935b09676a89d47 Mon Sep 17 00:00:00 2001 From: Anne Ferger Date: Tue, 1 Jul 2025 16:24:07 +0200 Subject: [PATCH 08/13] update entry point --- entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 4af9273..f29e447 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -27,8 +27,8 @@ sendmail_path = "/usr/bin/msmtp -t" EOF # inject CAPTCHA_PRIVATE_KEY into formmail.php -sed -i -e "s+.*\$RECAPTCHA_PRIVATE_KEY =.*+\$RECAPTCHA_PRIVATE_KEY = \"${CAPTCHA_PRIVATE_KEY}\";+" /var/www/html/2024/formmail.php -sed -i -e "s+data-sitekey=\"[_a-zA-Z0-9]*\"+data-sitekey=\"${CAPTCHA_PUBLIC_KEY}\"+" /var/www/html/2024/registrierung.html +sed -i -e "s+.*\$RECAPTCHA_PRIVATE_KEY =.*+\$RECAPTCHA_PRIVATE_KEY = \"${CAPTCHA_PRIVATE_KEY}\";+" /var/www/html/2025/formmail.php +sed -i -e "s+data-sitekey=\"[_a-zA-Z0-9]*\"+data-sitekey=\"${CAPTCHA_PUBLIC_KEY}\"+" /var/www/html/2025/registrierung.html # call the original entrypoint script docker-php-entrypoint From fe3e70083722ddd70a6df0cd206bcd2616fc9445 Mon Sep 17 00:00:00 2001 From: obertsalome Date: Tue, 1 Jul 2025 16:35:00 +0200 Subject: [PATCH 09/13] re-include overlay and change start of registration --- _archiv/2025/registrierung.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_archiv/2025/registrierung.html b/_archiv/2025/registrierung.html index 7285a78..a5eb75a 100644 --- a/_archiv/2025/registrierung.html +++ b/_archiv/2025/registrierung.html @@ -1,7 +1,7 @@ --- layout: program title: "Registrierung ESS 2025" -registrationstart: "2025-06-30T00:00:00+02:00" +registrationstart: "2025-07-03T00:00:00+02:00" deadline: "2025-08-30T23:59:59+02:00" --- @@ -23,6 +23,6 @@ {% include registration-form.html %}
- + {% include registration-closed-overlay.html %} From 285287b4e6abfac7646a48829d5da2cb121a79fc Mon Sep 17 00:00:00 2001 From: obertsalome Date: Tue, 1 Jul 2025 16:45:08 +0200 Subject: [PATCH 10/13] add lovely @anneferger to autorespond-mailtext --- _archiv/2025/formTemplates/autorespond.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/_archiv/2025/formTemplates/autorespond.txt b/_archiv/2025/formTemplates/autorespond.txt index 80854d5..03f1bf1 100644 --- a/_archiv/2025/formTemplates/autorespond.txt +++ b/_archiv/2025/formTemplates/autorespond.txt @@ -44,5 +44,6 @@ Mit den besten Grüßen aus Detmold/Paderborn Ihr ESS-Team stellv. Salome Obert +Anne Ferger (Diese Mail ist automatisch generiert.) From 04399a4526b9a3365cd594eadb46507c89277016 Mon Sep 17 00:00:00 2001 From: obertsalome Date: Tue, 1 Jul 2025 17:07:10 +0200 Subject: [PATCH 11/13] Update Dockerfile.apache syntax to adress warning --- Dockerfile.apache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.apache b/Dockerfile.apache index 8aab12b..bbd31cb 100644 --- a/Dockerfile.apache +++ b/Dockerfile.apache @@ -2,7 +2,7 @@ # Use the nginx Dockerfile for the static site (when the registration is closed) # and the apache Dockerfile (with php enabled) for the php registration form -FROM jekyll/builder as builder +FROM jekyll/builder AS builder ENV WORK_DIR=/var/jekyllbuilder From 48e4221a2229163524121dfef523fb71ccc599c3 Mon Sep 17 00:00:00 2001 From: obertsalome Date: Wed, 2 Jul 2025 09:24:25 +0200 Subject: [PATCH 12/13] correct start of registration --- _archiv/2025/programm.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_archiv/2025/programm.html b/_archiv/2025/programm.html index 4a6b4ca..d554c69 100644 --- a/_archiv/2025/programm.html +++ b/_archiv/2025/programm.html @@ -9,7 +9,7 @@

Kursangebot zur 16. Edirom-Summer-School

-

Die Anmeldephase findet vom 08. Juli bis zum 25. August statt.

+

Die Anmeldephase findet vom 03. Juli bis zum 25. August statt.

Weitere Informationen folgen hier. Die Programme der vergangenen Jahrgänge sind im Archiv zu finden.

From 20917e979a2ad17b0c6a98ca0894d7d8cf350844 Mon Sep 17 00:00:00 2001 From: obertsalome Date: Wed, 2 Jul 2025 09:24:40 +0200 Subject: [PATCH 13/13] awake registration-button --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index f3cac8f..8057e0a 100644 --- a/index.html +++ b/index.html @@ -22,7 +22,7 @@
{% include index-counter.html %}
- +