diff --git a/homepage/participo/event.php b/homepage/participo/event.php
new file mode 100644
index 0000000..a74d301
--- /dev/null
+++ b/homepage/participo/event.php
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <?php echo($meta['title']); ?>
+
+
+
+
+
+
+
+
+
+
+
+ html(); ?>
+
+
+
+
\ No newline at end of file
diff --git a/homepage/participo/lib/participoLib/event.php b/homepage/participo/lib/participoLib/event.php
index 5906ddc..5328cce 100644
--- a/homepage/participo/lib/participoLib/event.php
+++ b/homepage/participo/lib/participoLib/event.php
@@ -87,6 +87,9 @@ class Event
if ((!isset($this->shiai) || $forceLoading) && isset($this->shiaiId)) {
$this->shiai = Shiai::loadFromDb($this->shiaiId);
}
+ if ($this->shiai == null){
+ $this->shiai = Shiai::fromDbArray(json_decode($this->remarks, true));
+ }
return $this->shiai;
}
diff --git a/homepage/participo/wk.api.php b/homepage/participo/wk.api.php
index a512f4e..2c307eb 100644
--- a/homepage/participo/wk.api.php
+++ b/homepage/participo/wk.api.php
@@ -13,7 +13,7 @@ $db = dbConnector::connect(
$cwsvJudoConfig['db']['user'],
$cwsvJudoConfig['db']['password']
);
-echo($db);
+// echo($db);
$wkSqlQuery = 'SELECT * FROM `wettkampfkalender` WHERE `Datum` >= CURDATE();';
$wkSqlResponse = dbConnector::query($wkSqlQuery);
diff --git a/infoZettelOrg/Makefile b/infoZettelOrg/Makefile
index 096d549..7f53d09 100644
--- a/infoZettelOrg/Makefile
+++ b/infoZettelOrg/Makefile
@@ -2,6 +2,7 @@ include Makefile.private
infoZettel=$(patsubst %.md,%.pdf,$(wildcard *.md))
infoZettel-2x2=$(patsubst %.md,%-2x2.pdf,$(wildcard *.md))
+infoZettel-booklet=$(patsubst %.md,%-booklet.pdf,$(wildcard *.md))
wkZettel=$(patsubst %.md,%.pdf,$(wildcard wkZettel/*.md))
wkZettel-2x2=$(patsubst %.md,%-2x2.pdf,$(wildcard wkZettel/*.md))
kyuZettel=$(patsubst %.md,%.pdf,$(wildcard kyuZettel/*.md))
@@ -37,7 +38,7 @@ aushaenge: $(aushaenge)
--variable classoption="twoside=true" \
--variable classoption="DIV=28" \
--variable classoption="BCOR=0mm" \
- --variable classoption="paper=A6" \
+ --variable classoption="paper=A5" \
--variable classoption="fontsize=10pt" \
--variable classoption="parskip=never" \
--variable classoption="headsepline=true" \
@@ -48,7 +49,10 @@ aushaenge: $(aushaenge)
$^
%-2x2.pdf: %.pdf
- pdfjam --no-landscape --nup 2x2 --suffix '2x2' $^ '1,1,1,1,2,2,2,2' --outfile $@
+ pdfjam --no-landscape --nup 2x1 --suffix '2x2' $^ '2,3,1,4,2,2,2,2' --outfile $@
+
+%-booklet.pdf: %.pdf
+ pdfjam --landscape --nup 2x1 --suffix 'booklet' $^ '2,3,1,4' --outfile $@
aushang/%.pdf: aushang/%.md
pandoc \
diff --git a/submodules/Makefile b/submodules/Makefile
index 1dff116..f17068a 100644
--- a/submodules/Makefile
+++ b/submodules/Makefile
@@ -4,7 +4,7 @@ include passwords
.PHONY: updateSubmodules
updateSubmodules: checkoutSubmodulesDefaultBranches
git submodule foreach git pull
-
+
.PHONY:
checkoutSubmodulesDefaultBranches:
git -C lite-youtube-embed checkout master
@@ -13,12 +13,11 @@ checkoutSubmodulesDefaultBranches:
git -C spyc checkout master
git -C zopfli checkout master
-
.PHONY: buildMaterialize
buildMaterialize: updateSubmodules
./buildMaterialize.sh
.PHONY: deployMaterialize
-# deployMaterialize: buildMaterialize
-deployMaterialize: $(materialiceCssDist)
- cd materialize/dist/ && find . -type f -exec curl --verbose -u cwsvjudo:$(ftpPassword) --ftp-create-dirs -T {} ftp://cwsvjudo.bplaced.net/www/ressourcen/materializeCss/{} \;
\ No newline at end of file
+deployMaterialize: buildMaterialize
+ # @todo correctly check the cert
+ lftp -e "set ftp:ssl-allow no; mirror -R 'materialize/dist' 'www/ressourcen/materializeCss'; bye;" -u cwsvjudo,$(ftpPassword) cwsvjudo.bplaced.net
diff --git a/submodules/lite-youtube-embed b/submodules/lite-youtube-embed
index be6f03e..f9fc3a2 160000
--- a/submodules/lite-youtube-embed
+++ b/submodules/lite-youtube-embed
@@ -1 +1 @@
-Subproject commit be6f03ef53b33866e38a917a256cefca95262804
+Subproject commit f9fc3a2475ade166d0cf7bb3e3caa3ec236ee74e
diff --git a/submodules/materialize b/submodules/materialize
index bf29da7..68e5224 160000
--- a/submodules/materialize
+++ b/submodules/materialize
@@ -1 +1 @@
-Subproject commit bf29da7b2a234ec3d3428b7585d5ac7f724541f2
+Subproject commit 68e5224811ba6b568316de60da5af66d9a569a48
diff --git a/submodules/parsedown b/submodules/parsedown
index 6598f38..77947ed 160000
--- a/submodules/parsedown
+++ b/submodules/parsedown
@@ -1 +1 @@
-Subproject commit 6598f3860c2698fe2f0f1bc98212fc01d0a1893c
+Subproject commit 77947eda2fdaf06b181c63a7db13e38968306aee
diff --git a/tShirts/tShirts.2023/groessen.gnumeric b/tShirts/tShirts.2023/groessen.gnumeric
index d5f2570..ee1da88 100644
Binary files a/tShirts/tShirts.2023/groessen.gnumeric and b/tShirts/tShirts.2023/groessen.gnumeric differ