diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile index 036456a..00be903 100644 --- a/homepage/redesign2018/markdownExperiment/Makefile +++ b/homepage/redesign2018/markdownExperiment/Makefile @@ -45,10 +45,10 @@ ampTest: $(ampFiles) build/css/cwsvJudo.css: $(cssFiles) mkdir -p $(dir $@) - cat $^ > $@ +# cat $^ > $@ # cat $(cssFiles) | cleancss -o $@ # cat $^ | ./node_modules/.bin/csso -o $@ -# cat $^ | csso -o $@ + cat $^ | csso -o $@ build/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate mkdir -p build diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload index 9a08228..34bc487 100644 --- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload @@ -7,12 +7,14 @@ ftpPassword = eeloor0D ftpPathBase = /htdocs/videoalben/videoalben.2018 vidGalIndexPhp = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php - +dryRun = --dry-run +timeHandling= --only-newer .PHONY: all all: .PHONY: ftpUpload ftpUpload: - lftp -e 'set net:limit-rate 25600; mkdir -f $(ftpPathBase)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(VID_GAL_DIR)/config.inc.php; mirror -R --ignore-time videos/thumbnails $(ftpPathBase)/$(VID_GAL_DIR)/thumbnails; mirror -R --ignore-time videos/webm $(ftpPathBase)/$(VID_GAL_DIR)/webm;quit' -u $(ftpUser),$(ftpPassword) ftp://$(ftpServer) + lftp -e 'set net:limit-rate 25600; mkdir -f $(ftpPathBase)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(VID_GAL_DIR)/webm; quit; ' \ + -u $(ftpUser),$(ftpPassword) ftp://$(ftpServer) diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php index 150a3c2..37c2f19 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php @@ -169,10 +169,24 @@ "); + echo("NameVornameMassePlatzstarterIdfahrtId"); + + foreach( $starterData as $starter ){ + if($starter['type'] != $typeKey) continue; + echo(""); + $userData = getUserData($mysqli, $starter['userId']); + echo("".mb_convert_encoding($userData['name'], 'UTF-8', 'ISO-8859-1').""); + echo("".mb_convert_encoding($userData['vorname'], 'UTF-8', 'ISO-8859-1').""); + echo("".$starter['masse'].""); + echo("".$starter['platz'].""); + echo("".$starter['id'].""); + echo("".$starter['fahrtId'].""); + echo(""); + } + echo(""); } -?> - -Einschreibungen: - -
  • Eingeschrieben: - Noch hat sich niemand für diesen Wettkampf gemeldet! + Noch will niemand zu diesem Wettkampf!
  • - +