From 23a97d4d8fb25ddb91c296b93ef2a80a2e963649 Mon Sep 17 00:00:00 2001 From: marko Date: Thu, 14 Feb 2019 13:17:23 +0100 Subject: [PATCH 01/14] =?UTF-8?q?=20zum=20Commit=20vorgemerkte=20=C3=84nde?= =?UTF-8?q?rungen:=20=09ge=C3=A4ndert:=20=20=20=20=20=20=20src/Makefiles/M?= =?UTF-8?q?akefile.ftpUpload?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Makefiles/Makefile.ftpUpload | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload index c00c6ac..2ba49b4 100644 --- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload @@ -16,6 +16,17 @@ httpUrlBase = http://cwsvjudo.bplaced.net.net/ ftpFilePath = videoalben/videoalben.2018 ftpPathBase = /www + +#ftpPathBase = /htdocs +#ftpFilePath = videoalben/videoalben.2018 + +ftpServer = cwsvjudo.bplaced.net +ftpUser = cwsvjudo +ftpPassword = ***REMOVED*** + +ftpPathBase = /www +ftpFilePath = videoalben/videoalben.2018 + vidGalIndexPhp = ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php dryRun = --dry-run timeHandling= --only-newer @@ -24,14 +35,13 @@ lftpNetLimitRate = 0 domain = cwsvJudo.dedyn.io vidGalInsertScript = ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py - .PHONY: all all: .PHONY: ftpUpload ftpUpload: - lftp -e 'set ftp:ssl-allow no; set net:limit-rate $(lftpNetLimitRate); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; quit; ' \ - -u $(ftpUser),$(ftpPassword) ftp://$(ftpServer) +# lftp -e 'set ftp:ssl-allow no; set net:limit-rate $(lftpNetLimitRate); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; quit; ' \ +# -u $(ftpUser),$(ftpPassword) ftp://$(ftpServer) registerFiles: for file in videos/webm/*; do \ @@ -47,4 +57,15 @@ registerFiles: --vidUrl="http://$(domain)/webm/$${filename}" \ --posterUrl="http://cwsvjudo-media-2018.unaux.com/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails/$${filename%.*}.jpg" \ --checkSum=$${filename%.*}; \ +# lftp -e 'set ftp:ssl-allow no; set net:limit-rate $(lftpNetLimitRate); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; quit; ' \ +# -u $(ftpUser),$(ftpPassword) ftp://$(ftpServer) + + for file in videos/webm/*; do \ + filename=$${file##*/}; \ + $(vidGalInsertScript) \ + --shiaiYamlFile=./shiaiData.yaml \ +# --vidUrl="http://cwsvjudo.dedyn.io/videos/$${filename}" \ + --vidUrl="http://cwsvjudo.dedyn.io/videos/$${filename}" \ + --posterUrl="http://cwsvjudo-media-2018.unaux.com/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails/$${filename%.*}.jpg" \ + --checkSum=$${filename%.*};\ done;\ From ba40a087f0e42a22b5616a87d76c592ca78e4f16 Mon Sep 17 00:00:00 2001 From: marko Date: Tue, 26 Feb 2019 10:57:16 +0100 Subject: [PATCH 02/14] Druckversion des Wettkampfkalenders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Spalte mit qrCode hinzugefügt geändert: phpLib/cwsvJudo/wkKalender.php neue Datei: phpLib/cwsvJudo/wkQrCode.php - Designanpassungen für die Druckversion geändert: src/css/cwsvJudo-2018-footer.css geändert: src/css/cwsvJudo-2018-header.css geändert: src/css/cwsvJudo-2018-layout.css geändert: src/css/cwsvJudo-2018-mainNav.css geändert: src/css/cwsvJudo-2018-sideBar.css geändert: src/css/cwsvJudo-2018-subNav.css geändert: src/css/cwsvJudo-2018-wkKalender.css geändert: src/css/cwsvJudo-2018.css --- .../phpLib/cwsvJudo/wkKalender.php | 8 +- .../phpLib/cwsvJudo/wkQrCode.php | 24 ++ .../src/css/cwsvJudo-2018-footer.css | 6 + .../src/css/cwsvJudo-2018-header.css | 7 + .../src/css/cwsvJudo-2018-layout.css | 7 + .../src/css/cwsvJudo-2018-mainNav.css | 7 + .../src/css/cwsvJudo-2018-sideBar.css | 2 +- .../src/css/cwsvJudo-2018-subNav.css | 7 + .../src/css/cwsvJudo-2018-wkKalender.css | 257 ++++++++++++++++++ .../src/css/cwsvJudo-2018.css | 19 +- 10 files changed, 341 insertions(+), 3 deletions(-) create mode 100644 homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkQrCode.php diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php index 2f92ee9..f6da7cf 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php @@ -154,6 +154,11 @@ return $ret; /// Aus einer Liste von Wettkämpfen den htmlCode der Wettkampftabelle bereit stellen function wkList2htmlWkTable( $aWkList, $someOptions = [] ){ setlocale(LC_ALL, 'de_DE.utf8'); + +require_once("./config.inc.php"); +require_once("/users/cwsvjudo/www/ressourcen/phpLib/phpqrcode/qrlib.php"); + + if( empty($aWkList) ) return ""; @@ -226,6 +231,7 @@ $htmlWkTableString = ""; "". "". "iCal". + "". "". "\n"; } @@ -454,7 +460,7 @@ function wkTableHtml(){ $siteData['mainContent'] .= "

Wettkampfkalender ".$jahr."

"; $siteData['mainContent'].= - "
"; + "
"; if(in_array((intval($_GET["jahr"])-1), $jahre)){ $siteData['mainContent'].= diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkQrCode.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkQrCode.php new file mode 100644 index 0000000..c19dfc5 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkQrCode.php @@ -0,0 +1,24 @@ + + diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-footer.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-footer.css index 3d38967..7ff4ae7 100644 --- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-footer.css +++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-footer.css @@ -13,3 +13,9 @@ max-width: 1em; } +@media print{ + .footerBar + { + display: none; + } +} diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-header.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-header.css index b7633c4..2784013 100644 --- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-header.css +++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-header.css @@ -66,3 +66,10 @@ align-items: center; } } + +@media print{ + .cwsvHeader + { + display: none; + } +} diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-layout.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-layout.css index eeb9ceb..f22f1d3 100644 --- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-layout.css +++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-layout.css @@ -74,3 +74,10 @@ body > * { flex-basis: 25%; } } + +@media print{ + .sideNotes + { + display: none; + } +} diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css index a927b90..21591e7 100644 --- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css +++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css @@ -85,3 +85,10 @@ display: initial; } } + +@media print{ + #mainNav + { + display: none; + } +} diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-sideBar.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-sideBar.css index f25f265..e5e0ca2 100644 --- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-sideBar.css +++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-sideBar.css @@ -14,7 +14,7 @@ amp-sidebar { } .sidebar a { text-decoration: none; - color: inherit; + color: inherit; } .close-sidebar { font-size: 1.5em; diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-subNav.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-subNav.css index beb2b70..de22c25 100644 --- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-subNav.css +++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-subNav.css @@ -87,3 +87,10 @@ text-align: initial; } } + +@media print{ + .subNav + { + display: none; + } +} diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css index 87fbd74..1fbd357 100644 --- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css +++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css @@ -885,3 +885,260 @@ background-color: #FF8100; border-radius: .5em; } + +@media print{ + .wkMonthBar + { + display: none; + } + .wkKalender > thead{ + display: table-header-group; + width: 100%; + } + .wkKalender > tbody > tr{ + display: table-row; + width: 100%; + } + .wkKalender > tbody > tr > td { + display: table-cell; + } + /*qrCode*/ + .wkKalender > tbody > tr > td > img{ + width: 1cm; + } + .wkKalender > tbody > tr > td:nth-of-type(5) > a{ + display: none; + } + .wkKalender > tbody > tr > td[data-title]:before { + display: none; + content: ""; + } + .wkKalender > tbody{ + display: table-row-group; + } + .wkKalender > tfoot{ + display: table-footer-group; + } + .wkKalender > tbody > tr { + border: 1px solid #e0e0e0; + border-radius: 2px; + margin-bottom: 1.6rem; + } + .wkKalender > tbody > tr > td { + vertical-align: middle; + text-align: initial; + } + .wkKalender > tbody > tr:nth-child(odd) { + background-color: #FF8100; + } + .wkKalender > tbody > tr > td:nth-child(odd) { + background-color: inherit; + } + .wkKalender > tbody > tr > td[data-title]:before { + content: initial; + } + .wkKalender tr, th, td { + border: 1px solid black; + } + .wkKalender th { + display: table-cell; + } + + .kalenderDatum{ + flex-direction: column; + align-items: center; + } + .kalenderDatum > span:nth-child(4)::after{ + content: initial; + white-space: initial; + } + .kalenderDatum > span:nth-child(4){ + display: none; + } + .kalenderDatum > span:nth-child(3)::after{ + content: "."; + white-space: pre; + } + .kalenderDatum > span:nth-child(2)::after{ + content: initial; + white-space: initial; + } + +/* https://codepen.io/denilsonsa/pen/Etrba */ + + /****************************************/ + /* Styling rules, such as font and colors */ + .date-as-calendar { + font-variant: normal; + font-style: normal; + font-weight: normal; + font-family: "Helvetica", "Arial", sans-serif; + + /* It seems vertical-align: baseline does not work correctly with display: inline-flex. */ + vertical-align: top; + + /* margin: 1ex; */ + + color: black; + background: white; + background : linear-gradient(to bottom right, #FFF 0%, #EEE 100%); + + border: 1px solid #888; + border-radius: 3px; + overflow: hidden; + + box-shadow: 2px 2px 2px -2px black; + } + .date-as-calendar .weekday, + .date-as-calendar .day, + .date-as-calendar .month, + .date-as-calendar .year { + text-align: center; + line-height: 1.0; + } + .date-as-calendar .month { + font-family: "Oswald", sans-serif; + text-transform: uppercase; + background: #B11; + background : linear-gradient(to bottom right, #D66 0%, #A00 100%); + color: white; + } + + /****************************************/ + /* Layout rules using position: absolute and pixels. */ + .position-pixels.date-as-calendar { + display: inline-block; + position: relative; + width: 64px; + height: 64px; + } + .position-pixels.date-as-calendar .weekday, + .position-pixels.date-as-calendar .day, + .position-pixels.date-as-calendar .month, + .position-pixels.date-as-calendar .year { + display: block; + position: absolute; + left: 0; + right: 0; + width: 100%; + height: 1em; + } + .position-pixels.date-as-calendar .month { + top: 0px; + font-size: 12px; + padding: 2px 0; + } + .position-pixels.date-as-calendar .weekday { + top: 16px; + font-size: 10px; + } + .position-pixels.date-as-calendar .day { + top: 26px; + font-size: 24px; + } + .position-pixels.date-as-calendar .year { + top: 50px; + font-size: 14px; + } + + /****************************************/ + /* Layout rules using position: absolute and relative dimensions using em. */ + .position-em.date-as-calendar { + display: inline-block; + position: relative; + + width: 4em; + height: 4em; + } + .position-em.date-as-calendar .weekday, + .position-em.date-as-calendar .day, + .position-em.date-as-calendar .month, + .position-em.date-as-calendar .year { + display: block; + position: absolute; + left: 0; + right: 0; + width: 100%; + height: 1em; + } + .position-em.date-as-calendar .month { + top: 0px; + font-size: 0.75em; + padding: 0.1em 0; + } + .position-em.date-as-calendar .weekday { + top: 1.6em; + font-size: 0.6125em; + } + .position-em.date-as-calendar .day { + top: 1.1em; + font-size: 1.5em + } + .position-em.date-as-calendar .year { + bottom: 0px; + font-size: 0.87750em; + } + + /****************************************/ + /* Layout rules using display: inline-flex and relative dimensions using em. */ + .inline-flex.date-as-calendar { + display: inline-flex; + flex-direction: column; + flex-wrap: nowrap; + justify-content: space-between; + + width: 4em; + height: 4em; + } + .inline-flex.date-as-calendar .weekday, + .inline-flex.date-as-calendar .day, + .inline-flex.date-as-calendar .month, + .inline-flex.date-as-calendar .year { + display: block; + flex: 1 1 auto; + } + .inline-flex.date-as-calendar .month { + order: 1; + font-size: 0.75em; + padding: 0.1em 0; + } + .inline-flex.date-as-calendar .weekday { + order: 2; + font-size: 0.6125em; + } + .inline-flex.date-as-calendar .day { + order: 3; + font-size: 1.5em; + } + .inline-flex.date-as-calendar .year { + order: 4; + font-size: 0.87750em; + } + + /****************************************/ + /* Multiple sizes. */ + .date-as-calendar.size0_5x { + font-size: 8px; + } + .date-as-calendar.size0_75x { + font-size: 12px; + } + .date-as-calendar.size1x { + font-size: 16px; + } + .date-as-calendar.size1_25x { + font-size: 20px; + } + .date-as-calendar.size1_5x { + font-size: 24px; + } + .date-as-calendar.size1_75x { + font-size: 28px; + } + .date-as-calendar.size2x { + font-size: 32px; + } + .date-as-calendar.size3x { + font-size: 48px; + } +} diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css index 59daa70..68b2364 100644 --- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css +++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css @@ -24,6 +24,13 @@ body{ } } +@media print{ + body{ + font-size: 1.3vw; + } +} + + /* * Ein Reset für das BoxSizing * Wir wollen Maße auf die "äußere Boundingbox" beziehen @@ -169,9 +176,19 @@ body{ } .displayNone{ - display: none !important; + display: none; } .fontSizeXxSmall{ font-size: xx-small; } + +.print-only{ + display: none; +} + +@media print{ + .print-only{ + display: initial; + } +} From d95da364e412becdfd52d3fb8967e214096e0c70 Mon Sep 17 00:00:00 2001 From: marko Date: Wed, 13 Mar 2019 07:14:49 +0100 Subject: [PATCH 03/14] Fehler aus letztem Marge korregiert modified: homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest --- .../src/Makefiles/Makefile.vidstabTest | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest index 9cee755..d827f68 100644 --- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest @@ -88,6 +88,7 @@ targets: # Die Stabilisierungsberechnung: # eventuell sollte hier die Skalierung vorgeschaltet werden... +# @toDo: Ist es mit vorheriger Skalierung schneller, oder langsamer? videos/.forCompressing/%.trf: videos/.forCompressing/%.video $(FFMPEG) -i $^ \ -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabDetect):result="$@" \ @@ -128,15 +129,9 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf -codec:v $(VID_CODEC) \ -pass 2 \ -passlogfile "$(basename $<).firstPassLog" \ -<<<<<<< HEAD - -deadline best \ + $(VID_CODEC_DEADLINE) \ -b:v $(shell /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<)k \ -aspect $(ffmpegDisplayAspectRatio)\ -======= - $(VID_CODEC_DEADLINE) \ - -b:v $(shell ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<)k \ - -aspect 16:9 \ ->>>>>>> a763569bdbb2f100ce14b50dcb7828db4e6f4852 -threads 1 \ -speed 0 \ -tile-columns 0 \ @@ -149,18 +144,14 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf -f webm \ $@ -videos/thumbnails/%.png: videos/.forCompressing/%.video +#videos/thumbnails/%.png: videos/.forCompressing/%.video +videos/thumbnails/%.png: videos/webm/%.webm mkdir -p videos/thumbnails # $(FFMPEG) -i "$<" -vf "select=gt(scene\,0.4)" -frames:v 5 -vsync vfr -vf $(ffmpegVideoScaleFilter)fps=fps=1/600 "$@" # $(FFMPEG) -i "$<" -vf $(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@" # $(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4,thumbnail -frames:v 1 "$@" - $(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@" + $(FFMPEG) -i "$<" -aspect $(ffmpegDisplayAspectRatio) -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@" videos/thumbnails/%.jpg: videos/thumbnails/%.png -<<<<<<< HEAD $(GUETZLI) --quality 90 "$<" "$@" -======= -# $(GUETZLI) --quality 90 "$<" "$@" - convert "$<" "$@" - ->>>>>>> a763569bdbb2f100ce14b50dcb7828db4e6f4852 +# convert "$<" "$@" From 18394392de7de256fc11aa6da572b6baace9aece Mon Sep 17 00:00:00 2001 From: marko Date: Sun, 24 Mar 2019 11:35:09 +0100 Subject: [PATCH 04/14] =?UTF-8?q?Eigener=20Zweig=20f=C3=BCr=20den=20Wettka?= =?UTF-8?q?mpfplaner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Alle Dateien in ein neues Verzeichnis kopiert umbenannt: ../redesign2018/markdownExperiment/wkParticipo/addEvent.php -> addEvent.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/addFahrt.php -> addFahrt.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/addStarter.php -> addStarter.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/addStarterDev.php -> addStarterDev.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/.htaccess -> admin/.htaccess umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php -> admin/addEvent.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/addMitfahrer.php -> admin/addMitfahrer.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/adminAddStarter.php -> admin/adminAddStarter.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/adminFunctions.php -> admin/adminFunctions.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/adminFunctions.php.inc -> admin/adminFunctions.php.inc umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/adminUpdateStarterErgebnis.php -> admin/adminUpdateStarterErgebnis.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/config.inc.php -> admin/config.inc.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/index.php -> admin/index.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php -> admin/listEvents.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/listUsers.php -> admin/listUsers.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php -> admin/newsLetter.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/register.php -> admin/register.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/resetPassword.php -> admin/resetPassword.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/reseteMitfahrer.php -> admin/reseteMitfahrer.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php -> admin/showEvent.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php -> admin/showFahrt.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/showUser.php -> admin/showUser.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/admin/verteileMitfahrer.php -> admin/verteileMitfahrer.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/auth.php -> auth.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/authLogin.php -> authLogin.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/calendar.php -> calendar.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/changePassword.php -> changePassword.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/editFahrt.php -> editFahrt.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/eventKalender.php -> eventKalender.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/galImgPicker.php -> galImgPicker.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/horstWolfJudosport.php -> horstWolfJudosport.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/index.php -> index.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/infoZettel.php -> infoZettel.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/lib/wkParticipo-userAttribute.php -> lib/wkParticipo-userAttribute.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php -> lib/wkParticipoLib.inc.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/local/.htaccess -> local/.htaccess umbenannt: ../redesign2018/markdownExperiment/wkParticipo/local/db.php.inc -> local/db.php.inc umbenannt: ../redesign2018/markdownExperiment/wkParticipo/local/wkParticipoConf.php.inc -> local/wkParticipoConf.php.inc umbenannt: ../redesign2018/markdownExperiment/wkParticipo/login.php -> login.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/logout.php -> logout.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/showWkEvent.php -> showWkEvent.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/style.css -> style.css umbenannt: ../redesign2018/markdownExperiment/wkParticipo/styleDev.css -> styleDev.css umbenannt: ../redesign2018/markdownExperiment/wkParticipo/userInfo.php -> userInfo.php umbenannt: ../redesign2018/markdownExperiment/wkParticipo/wkParticipo.css -> wkParticipo.css --- .../markdownExperiment => }/wkParticipo/addEvent.php | 0 .../markdownExperiment => }/wkParticipo/addFahrt.php | 0 .../markdownExperiment => }/wkParticipo/addStarter.php | 0 .../markdownExperiment => }/wkParticipo/addStarterDev.php | 0 .../markdownExperiment => }/wkParticipo/admin/.htaccess | 0 .../markdownExperiment => }/wkParticipo/admin/addEvent.php | 0 .../markdownExperiment => }/wkParticipo/admin/addMitfahrer.php | 0 .../markdownExperiment => }/wkParticipo/admin/adminAddStarter.php | 0 .../markdownExperiment => }/wkParticipo/admin/adminFunctions.php | 0 .../wkParticipo/admin/adminFunctions.php.inc | 0 .../wkParticipo/admin/adminUpdateStarterErgebnis.php | 0 .../markdownExperiment => }/wkParticipo/admin/config.inc.php | 0 .../markdownExperiment => }/wkParticipo/admin/index.php | 0 .../markdownExperiment => }/wkParticipo/admin/listEvents.php | 0 .../markdownExperiment => }/wkParticipo/admin/listUsers.php | 0 .../markdownExperiment => }/wkParticipo/admin/newsLetter.php | 0 .../markdownExperiment => }/wkParticipo/admin/register.php | 0 .../markdownExperiment => }/wkParticipo/admin/resetPassword.php | 0 .../markdownExperiment => }/wkParticipo/admin/reseteMitfahrer.php | 0 .../markdownExperiment => }/wkParticipo/admin/showEvent.php | 0 .../markdownExperiment => }/wkParticipo/admin/showFahrt.php | 0 .../markdownExperiment => }/wkParticipo/admin/showUser.php | 0 .../wkParticipo/admin/verteileMitfahrer.php | 0 .../{redesign2018/markdownExperiment => }/wkParticipo/auth.php | 0 .../markdownExperiment => }/wkParticipo/authLogin.php | 0 .../markdownExperiment => }/wkParticipo/calendar.php | 0 .../markdownExperiment => }/wkParticipo/changePassword.php | 0 .../markdownExperiment => }/wkParticipo/editFahrt.php | 0 .../markdownExperiment => }/wkParticipo/eventKalender.php | 0 .../markdownExperiment => }/wkParticipo/galImgPicker.php | 0 .../markdownExperiment => }/wkParticipo/horstWolfJudosport.php | 0 .../{redesign2018/markdownExperiment => }/wkParticipo/index.php | 0 .../markdownExperiment => }/wkParticipo/infoZettel.php | 0 .../wkParticipo/lib/wkParticipo-userAttribute.php | 0 .../wkParticipo/lib/wkParticipoLib.inc.php | 0 .../markdownExperiment => }/wkParticipo/local/.htaccess | 0 .../markdownExperiment => }/wkParticipo/local/db.php.inc | 0 .../wkParticipo/local/wkParticipoConf.php.inc | 0 .../{redesign2018/markdownExperiment => }/wkParticipo/login.php | 0 .../{redesign2018/markdownExperiment => }/wkParticipo/logout.php | 0 .../markdownExperiment => }/wkParticipo/showWkEvent.php | 0 .../{redesign2018/markdownExperiment => }/wkParticipo/style.css | 0 .../markdownExperiment => }/wkParticipo/styleDev.css | 0 .../markdownExperiment => }/wkParticipo/userInfo.php | 0 .../markdownExperiment => }/wkParticipo/wkParticipo.css | 0 45 files changed, 0 insertions(+), 0 deletions(-) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/addEvent.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/addFahrt.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/addStarter.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/addStarterDev.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/.htaccess (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/addEvent.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/addMitfahrer.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/adminAddStarter.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/adminFunctions.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/adminFunctions.php.inc (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/adminUpdateStarterErgebnis.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/config.inc.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/index.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/listEvents.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/listUsers.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/newsLetter.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/register.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/resetPassword.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/reseteMitfahrer.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/showEvent.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/showFahrt.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/showUser.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/verteileMitfahrer.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/auth.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/authLogin.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/calendar.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/changePassword.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/editFahrt.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/eventKalender.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/galImgPicker.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/horstWolfJudosport.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/index.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/infoZettel.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/lib/wkParticipo-userAttribute.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/lib/wkParticipoLib.inc.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/local/.htaccess (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/local/db.php.inc (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/local/wkParticipoConf.php.inc (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/login.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/logout.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/showWkEvent.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/style.css (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/styleDev.css (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/userInfo.php (100%) rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/wkParticipo.css (100%) diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/addEvent.php b/homepage/wkParticipo/addEvent.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/addEvent.php rename to homepage/wkParticipo/addEvent.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/addFahrt.php b/homepage/wkParticipo/addFahrt.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/addFahrt.php rename to homepage/wkParticipo/addFahrt.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/addStarter.php b/homepage/wkParticipo/addStarter.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/addStarter.php rename to homepage/wkParticipo/addStarter.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/addStarterDev.php b/homepage/wkParticipo/addStarterDev.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/addStarterDev.php rename to homepage/wkParticipo/addStarterDev.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/.htaccess b/homepage/wkParticipo/admin/.htaccess similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/.htaccess rename to homepage/wkParticipo/admin/.htaccess diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php b/homepage/wkParticipo/admin/addEvent.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php rename to homepage/wkParticipo/admin/addEvent.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/addMitfahrer.php b/homepage/wkParticipo/admin/addMitfahrer.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/addMitfahrer.php rename to homepage/wkParticipo/admin/addMitfahrer.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminAddStarter.php b/homepage/wkParticipo/admin/adminAddStarter.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminAddStarter.php rename to homepage/wkParticipo/admin/adminAddStarter.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminFunctions.php b/homepage/wkParticipo/admin/adminFunctions.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminFunctions.php rename to homepage/wkParticipo/admin/adminFunctions.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminFunctions.php.inc b/homepage/wkParticipo/admin/adminFunctions.php.inc similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminFunctions.php.inc rename to homepage/wkParticipo/admin/adminFunctions.php.inc diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminUpdateStarterErgebnis.php b/homepage/wkParticipo/admin/adminUpdateStarterErgebnis.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminUpdateStarterErgebnis.php rename to homepage/wkParticipo/admin/adminUpdateStarterErgebnis.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/config.inc.php b/homepage/wkParticipo/admin/config.inc.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/config.inc.php rename to homepage/wkParticipo/admin/config.inc.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/index.php b/homepage/wkParticipo/admin/index.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/index.php rename to homepage/wkParticipo/admin/index.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php b/homepage/wkParticipo/admin/listEvents.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php rename to homepage/wkParticipo/admin/listEvents.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listUsers.php b/homepage/wkParticipo/admin/listUsers.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/listUsers.php rename to homepage/wkParticipo/admin/listUsers.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php b/homepage/wkParticipo/admin/newsLetter.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php rename to homepage/wkParticipo/admin/newsLetter.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/register.php b/homepage/wkParticipo/admin/register.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/register.php rename to homepage/wkParticipo/admin/register.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/resetPassword.php b/homepage/wkParticipo/admin/resetPassword.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/resetPassword.php rename to homepage/wkParticipo/admin/resetPassword.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/reseteMitfahrer.php b/homepage/wkParticipo/admin/reseteMitfahrer.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/reseteMitfahrer.php rename to homepage/wkParticipo/admin/reseteMitfahrer.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php b/homepage/wkParticipo/admin/showEvent.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php rename to homepage/wkParticipo/admin/showEvent.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php b/homepage/wkParticipo/admin/showFahrt.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php rename to homepage/wkParticipo/admin/showFahrt.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showUser.php b/homepage/wkParticipo/admin/showUser.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/showUser.php rename to homepage/wkParticipo/admin/showUser.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/verteileMitfahrer.php b/homepage/wkParticipo/admin/verteileMitfahrer.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/verteileMitfahrer.php rename to homepage/wkParticipo/admin/verteileMitfahrer.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/auth.php b/homepage/wkParticipo/auth.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/auth.php rename to homepage/wkParticipo/auth.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/authLogin.php b/homepage/wkParticipo/authLogin.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/authLogin.php rename to homepage/wkParticipo/authLogin.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/calendar.php b/homepage/wkParticipo/calendar.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/calendar.php rename to homepage/wkParticipo/calendar.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/changePassword.php b/homepage/wkParticipo/changePassword.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/changePassword.php rename to homepage/wkParticipo/changePassword.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/editFahrt.php b/homepage/wkParticipo/editFahrt.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/editFahrt.php rename to homepage/wkParticipo/editFahrt.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/eventKalender.php b/homepage/wkParticipo/eventKalender.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/eventKalender.php rename to homepage/wkParticipo/eventKalender.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/galImgPicker.php b/homepage/wkParticipo/galImgPicker.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/galImgPicker.php rename to homepage/wkParticipo/galImgPicker.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/horstWolfJudosport.php b/homepage/wkParticipo/horstWolfJudosport.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/horstWolfJudosport.php rename to homepage/wkParticipo/horstWolfJudosport.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/index.php b/homepage/wkParticipo/index.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/index.php rename to homepage/wkParticipo/index.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/infoZettel.php b/homepage/wkParticipo/infoZettel.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/infoZettel.php rename to homepage/wkParticipo/infoZettel.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipo-userAttribute.php b/homepage/wkParticipo/lib/wkParticipo-userAttribute.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipo-userAttribute.php rename to homepage/wkParticipo/lib/wkParticipo-userAttribute.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php b/homepage/wkParticipo/lib/wkParticipoLib.inc.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php rename to homepage/wkParticipo/lib/wkParticipoLib.inc.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/local/.htaccess b/homepage/wkParticipo/local/.htaccess similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/local/.htaccess rename to homepage/wkParticipo/local/.htaccess diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/local/db.php.inc b/homepage/wkParticipo/local/db.php.inc similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/local/db.php.inc rename to homepage/wkParticipo/local/db.php.inc diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/local/wkParticipoConf.php.inc b/homepage/wkParticipo/local/wkParticipoConf.php.inc similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/local/wkParticipoConf.php.inc rename to homepage/wkParticipo/local/wkParticipoConf.php.inc diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/login.php b/homepage/wkParticipo/login.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/login.php rename to homepage/wkParticipo/login.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/logout.php b/homepage/wkParticipo/logout.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/logout.php rename to homepage/wkParticipo/logout.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php b/homepage/wkParticipo/showWkEvent.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php rename to homepage/wkParticipo/showWkEvent.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/style.css b/homepage/wkParticipo/style.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/style.css rename to homepage/wkParticipo/style.css diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/styleDev.css b/homepage/wkParticipo/styleDev.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/styleDev.css rename to homepage/wkParticipo/styleDev.css diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/userInfo.php b/homepage/wkParticipo/userInfo.php similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/userInfo.php rename to homepage/wkParticipo/userInfo.php diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/wkParticipo.css b/homepage/wkParticipo/wkParticipo.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/wkParticipo/wkParticipo.css rename to homepage/wkParticipo/wkParticipo.css From 1f422394eb8f0826cca4880874404d47596146be Mon Sep 17 00:00:00 2001 From: marko Date: Wed, 27 Mar 2019 17:22:55 +0100 Subject: [PATCH 05/14] =?UTF-8?q?-=20Upload=20teilweise=20entfernt=20(ist?= =?UTF-8?q?=20aber=20sowieso=20das=20falsche=20Makefile)=20=09modified:=20?= =?UTF-8?q?=20=20homepage/redesign2018/markdownExperiment/src/Makefiles/Ma?= =?UTF-8?q?kefile.vidstab=20-=20Variable=20f=C3=BCr=20getVideoDuration=20?= =?UTF-8?q?=09modified:=20=20=20homepage/redesign2018/markdownExperiment/s?= =?UTF-8?q?rc/Makefiles/Makefile.vidstabTest=20-=20veralteten=20Link=20kor?= =?UTF-8?q?rigiert=20=09modified:=20=20=20homepage/redesign2018/markdownEx?= =?UTF-8?q?periment/src/md/hilfsmittel.md=20=09modified:=20=20=20homepage/?= =?UTF-8?q?redesign2018/markdownExperiment/src/yaml/index.subNav.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Makefiles/Makefile.vidstab | 20 +++++++++---------- .../src/Makefiles/Makefile.vidstabTest | 7 +++++-- .../markdownExperiment/src/md/hilfsmittel.md | 2 +- .../src/yaml/index.subNav.yaml | 2 +- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstab b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstab index 7f2f90b..87de5c9 100644 --- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstab +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstab @@ -257,16 +257,16 @@ videos/webm/%.webm: videos/aufnahmen/elly/%.mp4 -an \ -f webm \ "$@" - curl \ - --upload-file "$@" \ - --user cwsvjudo:Dee4oquu \ - "ftp://cwsvjudo.square7.net/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \ - --ftp-create-dirs - curl \ - --upload-file "$@" \ - --user cwsvjudo:***REMOVED*** \ - "ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \ - --ftp-create-dirs +# curl \ +# --upload-file "$@" \ +# --user cwsvjudo:Dee4oquu \ +# "ftp://cwsvjudo.square7.net/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \ +# --ftp-create-dirs +# curl \ +# --upload-file "$@" \ +# --user cwsvjudo:***REMOVED*** \ +# "ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \ +# --ftp-create-dirs videos/thumbnails/%.jpg: videos/webm/%.webm mkdir -p videos/thumbnails diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest index d827f68..32ce5fa 100644 --- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest @@ -6,6 +6,9 @@ GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe DEFAULT_FFMPEG = ffmpeg #DEFAULT_FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe +GET_VIDEO_DURATION_JSON = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py + + # Für eine schnelle Komprimierung libvpx, sonst vp9 DEFAULT_VID_CODEC_HEIGHT = 360 DEFAULT_VID_CODEC_WIDTH = -2 @@ -121,7 +124,7 @@ videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video vide # Die erste Abhängigkeit muss das quellVideo sein! videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf videos/.forCompressing/%.firstPassLog-0.log mkdir -p videos/webm - ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $< + $(GET_VIDEO_DURATION_JSON) $< # -b:v $(VID_CODEC_BITRATE) \ # Second Pass $(FFMPEG) -i $< \ @@ -130,7 +133,7 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf -pass 2 \ -passlogfile "$(basename $<).firstPassLog" \ $(VID_CODEC_DEADLINE) \ - -b:v $(shell /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<)k \ + -b:v $(shell $(GET_VIDEO_DURATION_JSON) $<)k \ -aspect $(ffmpegDisplayAspectRatio)\ -threads 1 \ -speed 0 \ diff --git a/homepage/redesign2018/markdownExperiment/src/md/hilfsmittel.md b/homepage/redesign2018/markdownExperiment/src/md/hilfsmittel.md index 13f785c..c5178f8 100644 --- a/homepage/redesign2018/markdownExperiment/src/md/hilfsmittel.md +++ b/homepage/redesign2018/markdownExperiment/src/md/hilfsmittel.md @@ -1,6 +1,6 @@ --- lang: de -title: "Helferlein für das Juodtraining" +title: "Helferlein für das Judotraining" description: "Kleine Helferlein für das Training, insbesondere das Judotraining" author: "marko" keywords: diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/index.subNav.yaml b/homepage/redesign2018/markdownExperiment/src/yaml/index.subNav.yaml index 0cbd470..c01dbc0 100644 --- a/homepage/redesign2018/markdownExperiment/src/yaml/index.subNav.yaml +++ b/homepage/redesign2018/markdownExperiment/src/yaml/index.subNav.yaml @@ -6,5 +6,5 @@ subNav: - *galerien - *kontakt - *judoWiki - - *extras + - *tools ... From e6826149e95dc8ed8a6bf5a4d9c3286f57aa9a4a Mon Sep 17 00:00:00 2001 From: marko Date: Tue, 14 May 2019 14:44:14 +0200 Subject: [PATCH 06/14] Neuordnung der videogalerieerzeugung new file: markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal new file: markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal.cfg new file: markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress new file: markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg --- .../Makefiles.vidGal.d/Makefile.vidGal | 42 +++++++++++ .../Makefiles.vidGal.d/Makefile.vidGal.cfg | 15 ++++ .../Makefiles.vidGal.d/Makefile.webmCompress | 72 +++++++++++++++++++ .../Makefile.webmCompress.cfg | 51 +++++++++++++ 4 files changed, 180 insertions(+) create mode 100644 homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal create mode 100644 homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal.cfg create mode 100644 homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress create mode 100644 homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal new file mode 100644 index 0000000..82384b3 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal @@ -0,0 +1,42 @@ +include Makefile.vidGal.cfg + +.PHONY: all clean +all: $(webmVideos) $(jpegThumbs) + +clean: + $(RM) \ + $(vidstabLogs) \ + $(firstPassLogs) \ + $(webmVideos) \ + $(jpegThumbs) + +.PHONY: thumbnails +thumbnails: $(jpegThumbs) + +videos/thumbnails/%.jpg: videos/.forCompressing/%.video + make --include-dir=${makefileDir} --file=${makefileDir}/Makefile.webmCompress $@ + +.PHONY: echo +echo: + @echo $(webmVideos) + @echo $(firstPassLogs) + @echo $(targetSourceDirectories) + +# Erzeugen der Targets +# @todo das muss ich immer noch einzeln aufrufen ... +.PHONY: targetSources +targetSources: + mkdir -p videos/.forCompressing + for directory in $(targetSourceDirectories) ;\ + do for file in $${directory}/*.*;\ + do \ + checkSum=$$(sha512sum $${file});\ + ln -f $${file} videos/.forCompressing/$${checkSum%%\ *}.video;\ + done;\ + done; + +# target und dependencies müssen noch angepasst werden +# Die erste Abhängigkeit muss das quellVideo sein! +videos/webm/%.webm: videos/.forCompressing/%.video + make --include-dir=${makefileDir} --file=${makefileDir}/Makefile.webmCompress $@ + diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal.cfg b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal.cfg new file mode 100644 index 0000000..5eda504 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal.cfg @@ -0,0 +1,15 @@ +defaultTargetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/))) +#targetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/))) + +targetSourceDirectories := $(if $(targetSourceDirectories), $(targetSourceDirectories), $(defaultTargetSourceDirectories)) + +sourceVideos = $(wildcard videos/.forCompressing/*.video) + +# Zwischentargets, für ein clean +vidstabLogs = $(addsuffix .trf, $(basename $(sourceVideos))) +firstPassLogs = $(addsuffix .firstPassLog-0.log, $(basename $(sourceVideos))) + +webmVideos = $(addprefix videos/webm/, $(addsuffix .webm, $(basename $(notdir $(sourceVideos))))) +jpegThumbs = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(notdir $(sourceVideos))))) + +makefileDir = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress new file mode 100644 index 0000000..56e05f9 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress @@ -0,0 +1,72 @@ +include Makefile.webmCompress.cfg + +.SECONDARY: $(vidstabLogs) $(firstPassLogs) + +.DEFAULT: info +info: + @echo Es muss ein Target übergeben werden! + +# Die Stabilisierungsberechnung: +# eventuell sollte hier die Skalierung vorgeschaltet werden... +# @toDo: Ist es mit vorheriger Skalierung schneller, oder langsamer? +videos/.forCompressing/%.trf: videos/.forCompressing/%.video + $(FFMPEG) -i $^ \ + -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabDetect):result="$@" \ + -f null \ + - + +# First Pass +# @todo: irgendwo habe ich mal gelesen, dass man den ersten Pass auch +# als ansehbares Video (mit höchster Qualittätseinstellung) speichern +# kann. Wäre praktisch für eine leicht schnellere Verfügbarkeit. +videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video videos/.forCompressing/%.trf + $(FFMPEG) -i $< \ + -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \ + -codec:v $(VID_CODEC) \ + -pass 1 \ + -passlogfile "$(basename $<).firstPassLog" \ + -threads 1 \ + -speed 4 \ + -tile-columns 0 \ + -frame-parallel 0 \ + -g 9999 \ + -aq-mode 0 \ + -an \ + -f webm \ + -y \ + /dev/null + +# Second Pass +# - Die erste Abhängigkeit muss das quellVideo sein! +videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf videos/.forCompressing/%.firstPassLog-0.log + mkdir -p videos/webm + $(FFMPEG) -i $< \ + -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \ + -codec:v $(VID_CODEC) \ + -pass 2 \ + -passlogfile "$(basename $<).firstPassLog" \ + $(VID_CODEC_DEADLINE) \ + -b:v $(shell $(GET_VIDEO_DURATION_JSON) $<)k \ + -threads 1 \ + -speed 0 \ + -tile-columns 0 \ + -frame-parallel 0 \ + -auto-alt-ref 1 \ + -lag-in-frames 25 \ + -g 9999 \ + -aq-mode 0 \ + -an \ + -f webm \ + $@ + +videos/thumbnails/%.png: videos/.forCompressing/%.video + mkdir -p videos/thumbnails +# $(FFMPEG) -i "$<" -vf "select=gt(scene\,0.4)" -frames:v 5 -vsync vfr -vf $(ffmpegVideoScaleFilter)fps=fps=1/600 "$@" +# $(FFMPEG) -i "$<" -vf $(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@" +# $(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4,thumbnail -frames:v 1 "$@" +# $(FFMPEG) -i "$<" -aspect $(ffmpegDisplayAspectRatio) -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@" + $(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@" + +videos/thumbnails/%.jpg: videos/thumbnails/%.png + $(GUETZLI) --quality 90 "$<" "$@" +# convert "$<" "$@" diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg new file mode 100644 index 0000000..e6f9bf5 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg @@ -0,0 +1,51 @@ +#FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe +FFMPEG = ffmpeg +GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe +#GUETZLI = /home/marko/proggis/guetzli/bin/Release/guetzli + +DEFAULT_FFMPEG = ffmpeg +#DEFAULT_FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe + +GET_VIDEO_DURATION_JSON = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py + + +# Für eine schnelle Komprimierung libvpx, sonst vp9 +DEFAULT_VID_CODEC_HEIGHT = 360 +DEFAULT_VID_CODEC_WIDTH = -2 +DEFAULT_VID_CODEC_BITRATE = 500k +DEFAULT_VID_CODEC = libvpx-vp9 + +# Standardwerte auf die benutzen Variablen schreiben, falls diese noch +# nicht (z.B. aus dem Terminal heraus oder über ein IncludeCfgFile) +# gesetzt worden sind +VID_CODEC_BITRATE := $(if $(VID_CODEC_BITRATE),$(VID_CODEC_BITRATE),$(DEFAULT_VID_CODEC_BITRATE)) +VID_CODEC_HEIGHT := $(if $(VID_CODEC_HEIGHT),$(VID_CODEC_HEIGHT),$(DEFAULT_VID_CODEC_HEIGHT)) +VID_CODEC_WIDTH := $(if $(VID_CODEC_WIDTH),$(VID_CODEC_WIDTH),$(DEFAULT_VID_CODEC_WIDTH)) +VID_CODEC := $(if $(VID_CODEC),$(VID_CODEC),$(DEFAULT_VID_CODEC)) + +defaultTargetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/))) +VID_CODEC_DEADLINE := -deadline best +#VID_CODEC_DEADLINE := -deadline realtime + +targetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/))) + +targetSourceDirectories := $(if $(targetSourceDirectories), $(targetSourceDirectories), $(defaultTargetSourceDirectories)) +sourceVideos = $(wildcard videos/.forCompressing/*.video) + +vidstabLogs = $(addsuffix .trf, $(basename $(sourceVideos))) +firstPassLogs = $(addsuffix .firstPassLog-0.log, $(basename $(sourceVideos))) +webmVideos = $(addprefix videos/webm/, $(addsuffix .webm, $(basename $(notdir $(sourceVideos))))) +jpegThumbs = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(notdir $(sourceVideos))))) + +# das result= fehlt absichtlich +ffmpegVideoFilterVidstabDetect = vidstabdetect=shakiness=10:accuracy=15 +# das input= fehlt absichtlich +ffmpegVideoFilterVidstabTransform = vidstabtransform=optzoom=2:interpol=bicubic:smoothing=30 + +ffmpegVideoScaleFilter = scale=$(VID_CODEC_WIDTH):$(VID_CODEC_HEIGHT):sws_flags=lanczos, +ffmpegVideoFilterDeinterlace = yadif, +ffmpegVideoFilterDenoise = nlmeans, +#ffmpegVideoFilterDenoise = hqdn3d, +#ffmpegDisplayAspectRatio = 16:9 +#ffmpegDisplayAspectRatio = 9:16 + From 69ab51bf61c75dbb0c61dd6046ae9e4cbb9b08ee Mon Sep 17 00:00:00 2001 From: marko Date: Fri, 17 May 2019 12:37:45 +0200 Subject: [PATCH 07/14] Die Vorschaubilder der Galerien in der Wettkampfeinzelansicht wurden optisch leicht verbessert. modified: src/css/cwsvJudo-2018-wkKalender.css --- .../markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css index 87fbd74..28a7ab3 100644 --- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css +++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css @@ -809,7 +809,7 @@ } .textoverlayedImage > div { z-index: 99; - width: 70%; + width: fit-content; position: absolute; top: 50%; left: 50%; @@ -834,6 +834,7 @@ } .wkBoxMediaGallery > *{ flex-basis:50%; + padding: 5%; } From fc46b4e0e787d67cd6e7661f849f4f1141e13efb Mon Sep 17 00:00:00 2001 From: Marko Bunzel Date: Sun, 30 Jun 2019 19:09:26 +0200 Subject: [PATCH 08/14] =?UTF-8?q?Die=20nicht-wiederaufnehmbaren=20Targets?= =?UTF-8?q?=20werden=20erstmal=20in=20eine=20tempor=C3=A4re=20Datei=20gesc?= =?UTF-8?q?hrieben=20und=20am=20Ende=20in=20das=20eigentliche=20Target=20k?= =?UTF-8?q?opiert.=20Damit=20eine=20unvollst=C3=A4ndige=20Bearbeitung=20ni?= =?UTF-8?q?cht=20eine=20Reencodierung=20verhindert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Makefiles.vidGal.d/Makefile.vidGal.cfg | 6 +++++- .../Makefiles.vidGal.d/Makefile.webmCompress | 13 ++++++++++--- .../Makefiles.vidGal.d/Makefile.webmCompress.cfg | 10 +++++++--- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal.cfg b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal.cfg index 5eda504..d9ce64b 100644 --- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal.cfg +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal.cfg @@ -12,4 +12,8 @@ firstPassLogs = $(addsuffix .firstPassLog-0.log, $(basename $(sourceVideos))) webmVideos = $(addprefix videos/webm/, $(addsuffix .webm, $(basename $(notdir $(sourceVideos))))) jpegThumbs = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(notdir $(sourceVideos))))) -makefileDir = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d +#makefileDir = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d +makefileDir = ~/keeper/cwsvJudo/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d + +FFMPEG = /home/marko/Downloads/ffmpeg-4.1.3-amd64-static/ffmpeg + diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress index 56e05f9..81570d5 100644 --- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress @@ -11,9 +11,10 @@ info: # @toDo: Ist es mit vorheriger Skalierung schneller, oder langsamer? videos/.forCompressing/%.trf: videos/.forCompressing/%.video $(FFMPEG) -i $^ \ - -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabDetect):result="$@" \ + -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabDetect):result="$@.tmp" \ -f null \ - + mv $@.tmp $@ # First Pass # @todo: irgendwo habe ich mal gelesen, dass man den ersten Pass auch @@ -24,7 +25,7 @@ videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video vide -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \ -codec:v $(VID_CODEC) \ -pass 1 \ - -passlogfile "$(basename $<).firstPassLog" \ + -passlogfile "tmp.$(basename $<).firstPassLog" \ -threads 1 \ -speed 4 \ -tile-columns 0 \ @@ -35,6 +36,7 @@ videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video vide -f webm \ -y \ /dev/null + mv tmp.$@ $@ # Second Pass # - Die erste Abhängigkeit muss das quellVideo sein! @@ -57,7 +59,8 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf -aq-mode 0 \ -an \ -f webm \ - $@ + $@.tmp + mv $@.tmp $@ videos/thumbnails/%.png: videos/.forCompressing/%.video mkdir -p videos/thumbnails @@ -70,3 +73,7 @@ videos/thumbnails/%.png: videos/.forCompressing/%.video videos/thumbnails/%.jpg: videos/thumbnails/%.png $(GUETZLI) --quality 90 "$<" "$@" # convert "$<" "$@" + +.PHONY: echo +echo: + echo $(GET_VIDEO_DURATION_JSON) diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg index e6f9bf5..d6db073 100644 --- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg @@ -1,12 +1,16 @@ #FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe -FFMPEG = ffmpeg -GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe +#FFMPEG = ffmpeg +FFMPEG = /home/marko/Downloads/ffmpeg-4.1.3-amd64-static/ffmpeg + +GUETZLI = ~/tmp/guetzli/bin/Release/guetzli +#GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe #GUETZLI = /home/marko/proggis/guetzli/bin/Release/guetzli DEFAULT_FFMPEG = ffmpeg #DEFAULT_FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe -GET_VIDEO_DURATION_JSON = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py +#GET_VIDEO_DURATION_JSON = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py +GET_VIDEO_DURATION_JSON = ~/keeper/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py # Für eine schnelle Komprimierung libvpx, sonst vp9 From 494827655d16c1e9f72f33bb7c382f2d1d3b3d88 Mon Sep 17 00:00:00 2001 From: marko Date: Wed, 3 Jul 2019 14:45:54 +0200 Subject: [PATCH 09/14] =?UTF-8?q?Skalierung=20der=20Videos=20nach=20der=20?= =?UTF-8?q?gr=C3=B6=C3=9Feren=20Seite?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit new file: homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.shiaiVidsSpeedupTest new file: homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9encodeGoogleVodRecommendations new file: homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile new file: homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.cfg new file: homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.sub modified: homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal modified: homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg --- .../Makefiles/Makefile.shiaiVidsSpeedupTest | 183 ++++++++++++++++++ ...Makefile.vp9encodeGoogleVodRecommendations | 158 +++++++++++++++ .../Makefiles.recursiveVariableTest/Makefile | 9 + .../Makefile.cfg | 1 + .../Makefile.sub | 3 + .../Makefiles.vidGal.d/Makefile.vidGal | 2 +- .../Makefile.webmCompress.cfg | 3 +- 7 files changed, 357 insertions(+), 2 deletions(-) create mode 100644 homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.shiaiVidsSpeedupTest create mode 100644 homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9encodeGoogleVodRecommendations create mode 100644 homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile create mode 100644 homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.cfg create mode 100644 homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.sub diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.shiaiVidsSpeedupTest b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.shiaiVidsSpeedupTest new file mode 100644 index 0000000..de171e0 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.shiaiVidsSpeedupTest @@ -0,0 +1,183 @@ +# Makefile für die Verarbeitung der Wettkampfvideos +# +# devVersion für: +# - Beschleunigung der ganzen Sache +# - Reihenfolge der Filter +# - Einbeziehen des Uploads +# - zwei verschiedene Server +# - der erste Pass kommt auf den Hauptserver, auch wenn er größer +# ist; er wird aber auch wieder gelöscht, wenn die nächste +# Videogalerie kommt +# - der zweite Pass kommt auf den Medienserver (unter +# Berücksichtigung der Limitationen wie Einzeldateigrößen) + + +# Systemspezifische Anpassungen (gehören eigentlich in ein +# Makefile.cfg, aber in jedem Wettkampordner eines anlegen, ist wieder +# mühsam) +FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe +#FFMPEG = ffmpeg +GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe +#GUETZLI = /home/marko/proggis/guetzli/bin/Release/guetzli + +DEFAULT_FFMPEG = ffmpeg +#DEFAULT_FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe + +GET_VIDEO_DURATION_JSON = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py + + +# Für eine schnelle Komprimierung libvpx, sonst vp9 +DEFAULT_VID_CODEC_HEIGHT = 360 +DEFAULT_VID_CODEC_WIDTH = -2 +DEFAULT_VID_CODEC_BITRATE = 500k +DEFAULT_VID_CODEC = libvpx-vp9 + +# Standardwerte auf die benutzen Variablen schreiben, falls diese noch +# nicht (z.B. aus dem Terminal heraus oder über ein IncludeCfgFile) +# gesetzt worden sind +VID_CODEC_BITRATE := $(if $(VID_CODEC_BITRATE),$(VID_CODEC_BITRATE),$(DEFAULT_VID_CODEC_BITRATE)) +VID_CODEC_HEIGHT := $(if $(VID_CODEC_HEIGHT),$(VID_CODEC_HEIGHT),$(DEFAULT_VID_CODEC_HEIGHT)) +VID_CODEC_WIDTH := $(if $(VID_CODEC_WIDTH),$(VID_CODEC_WIDTH),$(DEFAULT_VID_CODEC_WIDTH)) +VID_CODEC := $(if $(VID_CODEC),$(VID_CODEC),$(DEFAULT_VID_CODEC)) + +defaultTargetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/))) +VID_CODEC_DEADLINE := -deadline best +#VID_CODEC_DEADLINE := -deadline realtime + +targetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/))) + +targetSourceDirectories := $(if $(targetSourceDirectories), $(targetSourceDirectories), $(defaultTargetSourceDirectories)) +sourceVideos = $(wildcard videos/.forCompressing/*.video) + +vidstabLogs = $(addsuffix .trf, $(basename $(sourceVideos))) +firstPassLogs = $(addsuffix .firstPassLog-0.log, $(basename $(sourceVideos))) +webmVideos = $(addprefix videos/webm/, $(addsuffix .webm, $(basename $(notdir $(sourceVideos))))) +jpegThumbs = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(notdir $(sourceVideos))))) + +# das result= fehlt absichtlich +ffmpegVideoFilterVidstabDetect = vidstabdetect=shakiness=10:accuracy=15 +# das input= fehlt absichtlich +ffmpegVideoFilterVidstabTransform = vidstabtransform=optzoom=2:interpol=bicubic:smoothing=30 + +# Der deinterlaceFilter sollte immer der erste sein! +ffmpegVideoFilterDeinterlace = yadif, +# Der einzige Grund, den ich für Skalierung zuerst gefunden habe, ist, +# dass beim Hochskalieren das Rasschen zunimmt. Mache ich aber nicht. +ffmpegVideoScaleFilter = scale=$(VID_CODEC_WIDTH):$(VID_CODEC_HEIGHT):sws_flags=lanczos, +# nlmeans soll klar besser sein, aber hqdn3d sehr viel schneller +ffmpegVideoFilterDenoise = hqdn3d, +#ffmpegVideoFilterDenoise = hqdn3d, +# Aspect ratio ist eigentlich nur notwendig, wenn das +# Pixelseitenverhältnis nicht 1:1 ist +ffmpegVideoFilterUnsharp = unsharp=5:5:0.8:3:3:0.4 +ffmpegDisplayAspectRatio = 16:9 +#ffmpegDisplayAspectRatio = 9:16 + + +.SECONDARY: $(vidstabLogs) $(firstPassLogs) + +.PHONY: all clean +all: $(webmVideos) $(jpegThumbs) + +clean: + $(RM) \ + $(vidstabLogs) \ + $(firstPassLogs) \ + $(webmVideos) \ + $(jpegThumbs) + +.PHONY: thumbnails +thumbnails: $(jpegThumbs) + +.PHONY: echo +echo: + @echo $(webmVideos) + @echo $(firstPassLogs) + @echo $(targetSourceDirectories) + + +# Erzeugen der Targets +.PHONY: targets +targets: + mkdir -p videos/.forCompressing + for directory in $(targetSourceDirectories) ;\ + do for file in $${directory}/*.*;\ + do \ + checkSum=$$(sha512sum $${file});\ + ln -f $${file} videos/.forCompressing/$${checkSum%%\ *}.video;\ + done;\ + done; + +# Die Stabilisierungsberechnung: +# eventuell sollte hier die Skalierung vorgeschaltet werden... +# @toDo: Ist es mit vorheriger Skalierung schneller, oder langsamer? +# Denoise ist in der Stabilisation eigentlich unnötig, ebenso das unsharp +# Die Skalierung sollte vieleicht vor der Stabilisierung stattfinden (und braucht nicht hochwertig zu sein?) +videos/.forCompressing/%.trf: videos/.forCompressing/%.video + $(FFMPEG) -i $^ \ + -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)$(ffmpegVideoFilterVidstabDetect):result="$@" \ + -f null \ + - + +videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video videos/.forCompressing/%.trf +# -b:v $(VID_CODEC_BITRATE) \ +# -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",nlmeans=s=6:p=5:r=7,$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \ +# wir speichern mal schon den ersten pass, damit haben wir zwar eine +# größere Dateigröße, aber können bereits etwas hochladen +# /dev/null +# First Pass + $(FFMPEG) -i $< \ + -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoFilterUnsharp) \ + -codec:v $(VID_CODEC) \ + -pass 1 \ + -passlogfile "$(basename $<).firstPassLog" \ + -aspect $(ffmpegDisplayAspectRatio) \ + -threads 1 \ + -speed 4 \ + -tile-columns 0 \ + -frame-parallel 0 \ + -g 9999 \ + -aq-mode 0 \ + -an \ + -f webm \ + -y \ + "$(basename $<).webm" + +# target und dependencies müssen noch angepasst werden +# Die erste Abhängigkeit muss das quellVideo sein! +videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf videos/.forCompressing/%.firstPassLog-0.log + mkdir -p videos/webm + $(GET_VIDEO_DURATION_JSON) $< +# -b:v $(VID_CODEC_BITRATE) \ +# Second Pass + $(FFMPEG) -i $< \ + -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \ + -codec:v $(VID_CODEC) \ + -pass 2 \ + -passlogfile "$(basename $<).firstPassLog" \ + $(VID_CODEC_DEADLINE) \ + -b:v $(shell $(GET_VIDEO_DURATION_JSON) $<)k \ + -aspect $(ffmpegDisplayAspectRatio)\ + -threads 1 \ + -speed 0 \ + -tile-columns 0 \ + -frame-parallel 0 \ + -auto-alt-ref 1 \ + -lag-in-frames 25 \ + -g 9999 \ + -aq-mode 0 \ + -an \ + -f webm \ + $@ + +#videos/thumbnails/%.png: videos/.forCompressing/%.video +videos/thumbnails/%.png: videos/webm/%.webm + mkdir -p videos/thumbnails +# $(FFMPEG) -i "$<" -vf "select=gt(scene\,0.4)" -frames:v 5 -vsync vfr -vf $(ffmpegVideoScaleFilter)fps=fps=1/600 "$@" +# $(FFMPEG) -i "$<" -vf $(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@" +# $(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4,thumbnail -frames:v 1 "$@" + $(FFMPEG) -i "$<" -aspect $(ffmpegDisplayAspectRatio) -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@" + +videos/thumbnails/%.jpg: videos/thumbnails/%.png + $(GUETZLI) --quality 90 "$<" "$@" +# convert "$<" "$@" diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9encodeGoogleVodRecommendations b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9encodeGoogleVodRecommendations new file mode 100644 index 0000000..396de29 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9encodeGoogleVodRecommendations @@ -0,0 +1,158 @@ +FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe +#FFMPEG = ffmpeg +GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe +#GUETZLI = /home/marko/proggis/guetzli/bin/Release/guetzli + +DEFAULT_FFMPEG = ffmpeg +DEFAULT_GUETZLI = guetzli + +GET_VIDEO_DURATION_JSON = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py + +# Für eine schnelle Komprimierung libvpx, sonst vp9 +DEFAULT_VID_CODEC_HEIGHT = 360 +DEFAULT_VID_CODEC_WIDTH = -2 +DEFAULT_VID_CODEC_BITRATE = 500k +DEFAULT_VID_CODEC = libvpx-vp9 + +# Standardwerte auf die benutzen Variablen schreiben, falls diese noch +# nicht (z.B. aus dem Terminal heraus oder über ein IncludeCfgFile) +# gesetzt worden sind +VID_CODEC_BITRATE := $(if $(VID_CODEC_BITRATE),$(VID_CODEC_BITRATE),$(DEFAULT_VID_CODEC_BITRATE)) +VID_CODEC_HEIGHT := $(if $(VID_CODEC_HEIGHT),$(VID_CODEC_HEIGHT),$(DEFAULT_VID_CODEC_HEIGHT)) +VID_CODEC_WIDTH := $(if $(VID_CODEC_WIDTH),$(VID_CODEC_WIDTH),$(DEFAULT_VID_CODEC_WIDTH)) +VID_CODEC := $(if $(VID_CODEC),$(VID_CODEC),$(DEFAULT_VID_CODEC)) + +defaultTargetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/))) +VID_CODEC_DEADLINE := -deadline good +#VID_CODEC_DEADLINE := -deadline best +#VID_CODEC_DEADLINE := -deadline good +#VID_CODEC_DEADLINE := -deadline realtime + +targetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/))) + +targetSourceDirectories := $(if $(targetSourceDirectories), $(targetSourceDirectories), $(defaultTargetSourceDirectories)) +sourceVideos = $(wildcard videos/.forCompressing/*.video) + +vidstabLogs = $(addsuffix .trf, $(basename $(sourceVideos))) +firstPassLogs = $(addsuffix .firstPassLog-0.log, $(basename $(sourceVideos))) +webmVideos = $(addprefix videos/webm/, $(addsuffix .webm, $(basename $(notdir $(sourceVideos))))) +jpegThumbs = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(notdir $(sourceVideos))))) + +# das result= fehlt absichtlich +ffmpegVideoFilterVidstabDetect = vidstabdetect=shakiness=10:accuracy=15 +# das input= fehlt absichtlich +ffmpegVideoFilterVidstabTransform = vidstabtransform=optzoom=2:interpol=bicubic:smoothing=30 + +ffmpegVideoScaleFilter = scale=$(VID_CODEC_WIDTH):$(VID_CODEC_HEIGHT):sws_flags=lanczos, +ffmpegVideoFilterDeinterlace = yadif, +ffmpegVideoFilterDenoise = nlmeans, +#ffmpegVideoFilterDenoise = hqdn3d, +ffmpegDisplayAspectRatio = 16:9 +#ffmpegDisplayAspectRatio = 9:16 +ffmpegVideoFilterUnsharp = unsharp=5:5:0.8:3:3:0.4 + +.SECONDARY: $(vidstabLogs) $(firstPassLogs) + +.PHONY: all clean +all: $(webmVideos) $(jpegThumbs) + +clean: + $(RM) \ + $(vidstabLogs) \ + $(firstPassLogs) \ + $(webmVideos) \ + $(jpegThumbs) + +.PHONY: thumbnails +thumbnails: $(jpegThumbs) + +.PHONY: echo +echo: + @echo $(webmVideos) + @echo $(firstPassLogs) + @echo $(targetSourceDirectories) + + +# Erzeugen der Targets +.PHONY: targets +targets: + mkdir -p videos/.forCompressing + for directory in $(targetSourceDirectories) ;\ + do for file in $${directory}/*.*;\ + do \ + checkSum=$$(sha512sum $${file});\ + ln -f $${file} videos/.forCompressing/$${checkSum%%\ *}.video;\ + done;\ + done; + +# Die Stabilisierungsberechnung: +# eventuell sollte hier die Skalierung vorgeschaltet werden... +# @toDo: Ist es mit vorheriger Skalierung schneller, oder langsamer? +# Denoise ist in der Stabilisation eigentlich unnötig, ebenso das unsharp +# Die Skalierung sollte vieleicht vor der Stabilisierung stattfinden (und braucht nicht hochwertig zu sein?) +videos/.forCompressing/%.trf: videos/.forCompressing/%.video + $(FFMPEG) -i $^ \ + -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterVidstabDetect):result="$@" \ + -f null \ + - + +videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video videos/.forCompressing/%.trf +# wir speichern mal schon den ersten pass, damit haben wir zwar eine +# größere Dateigröße, aber können bereits etwas hochladen +# "$(basename $<).webm" +# First Pass + $(FFMPEG) -i $< \ + -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \ + -codec:v $(VID_CODEC) \ + $(VID_CODEC_DEADLINE) \ + -pass 1 \ + -b:v $(shell $(GET_VIDEO_DURATION_JSON) $<)k \ + -passlogfile "$(basename $<).firstPassLog" \ + -aspect $(ffmpegDisplayAspectRatio) \ + -threads 1 \ + -speed 4 \ + -tile-columns 0 \ + -frame-parallel 0 \ + -g 9999 \ + -aq-mode 0 \ + -an \ + -f webm \ + -y \ + /dev/null + +# Second Pass +# target und dependencies müssen noch angepasst werden +# Die erste Abhängigkeit muss das quellVideo sein! +videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf videos/.forCompressing/%.firstPassLog-0.log + mkdir -p videos/webm + $(FFMPEG) -i $< \ + -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \ + -codec:v $(VID_CODEC) \ + -pass 2 \ + -passlogfile "$(basename $<).firstPassLog" \ + $(VID_CODEC_DEADLINE) \ + -b:v $(shell $(GET_VIDEO_DURATION_JSON) $<)k \ + -aspect $(ffmpegDisplayAspectRatio)\ + -threads 1 \ + -speed 0 \ + -tile-columns 0 \ + -frame-parallel 0 \ + -auto-alt-ref 1 \ + -lag-in-frames 25 \ + -g 9999 \ + -aq-mode 0 \ + -an \ + -f webm \ + $@ + +videos/thumbnails/%.png: videos/.forCompressing/%.video +#videos/thumbnails/%.png: videos/webm/%.webm + mkdir -p videos/thumbnails +# $(FFMPEG) -i "$<" -vf "select=gt(scene\,0.4)" -frames:v 5 -vsync vfr -vf $(ffmpegVideoScaleFilter)fps=fps=1/600 "$@" +# $(FFMPEG) -i "$<" -vf $(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@" +# $(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4,thumbnail -frames:v 1 "$@" + $(FFMPEG) -i "$<" -aspect $(ffmpegDisplayAspectRatio) -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@" + +videos/thumbnails/%.jpg: videos/thumbnails/%.png + $(GUETZLI) --quality 90 "$<" "$@" +# convert "$<" "$@" diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile new file mode 100644 index 0000000..dc17219 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile @@ -0,0 +1,9 @@ +include Makefile.cfg + +recTestVar = Hallo +#export recTestVar + +.PHONY: recTest +recTest: + echo ${recTestVar} + make -e --file=Makefile.sub diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.cfg b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.cfg new file mode 100644 index 0000000..99675e2 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.cfg @@ -0,0 +1 @@ +recTestVar = Hallo diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.sub b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.sub new file mode 100644 index 0000000..60ad504 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.recursiveVariableTest/Makefile.sub @@ -0,0 +1,3 @@ +.PHONY: echo +echo: + echo ${recTestVar} diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal index 82384b3..abf0cb6 100644 --- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal @@ -1,4 +1,4 @@ -include Makefile.vidGal.cfg +include ${makefileDir}/Makefile.vidGal.cfg .PHONY: all clean all: $(webmVideos) $(jpegThumbs) diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg index e6f9bf5..4db4437 100644 --- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg @@ -42,7 +42,8 @@ ffmpegVideoFilterVidstabDetect = vidstabdetect=shakiness=10:accuracy=15 # das input= fehlt absichtlich ffmpegVideoFilterVidstabTransform = vidstabtransform=optzoom=2:interpol=bicubic:smoothing=30 -ffmpegVideoScaleFilter = scale=$(VID_CODEC_WIDTH):$(VID_CODEC_HEIGHT):sws_flags=lanczos, +#ffmpegVideoScaleFilter = scale=$(VID_CODEC_WIDTH):$(VID_CODEC_HEIGHT):sws_flags=lanczos, +ffmpegVideoScaleFilter = scale=if( gt(in_w, in_h), -2, $(VID_CODEC_HEIGHT) ):if( gt(in_w, in_h), $(VID_CODEC_HEIGHT), -2):sws_flags=lanczos, ffmpegVideoFilterDeinterlace = yadif, ffmpegVideoFilterDenoise = nlmeans, #ffmpegVideoFilterDenoise = hqdn3d, From dec3760046036925660fc94f7b155e194234f650 Mon Sep 17 00:00:00 2001 From: Marko Bunzel Date: Sat, 6 Jul 2019 16:03:09 +0200 Subject: [PATCH 10/14] =?UTF-8?q?=09ge=C3=A4ndert:=20=20=20=20=20=20=20ind?= =?UTF-8?q?ex.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- homepage/wkParticipo/admin/index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/homepage/wkParticipo/admin/index.php b/homepage/wkParticipo/admin/index.php index f59da92..ad967ae 100644 --- a/homepage/wkParticipo/admin/index.php +++ b/homepage/wkParticipo/admin/index.php @@ -1,4 +1,5 @@ Neuen Event anlegen.

User anzeigen.

Events anzeigen.

- +

">Attribute verteilen

From f8c8404a44241cbde9ca3f1357f6a36edfe6d058 Mon Sep 17 00:00:00 2001 From: marko Date: Mon, 8 Jul 2019 14:43:27 +0200 Subject: [PATCH 11/14] =?UTF-8?q?-=20adaptive=20Aufl=C3=B6sung=20und=20Bit?= =?UTF-8?q?rate=20f=C3=BCr=20die=20Videos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit modified: Makefiles/Makefiles.vidGal.d/Makefile.webmCompress modified: Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg new file: galleryHelper/getFfmpegFlags.py --- .../Makefiles.vidGal.d/Makefile.webmCompress | 12 ++- .../Makefile.webmCompress.cfg | 13 ++- .../src/galleryHelper/getFfmpegFlags.py | 91 +++++++++++++++++++ 3 files changed, 108 insertions(+), 8 deletions(-) create mode 100644 homepage/redesign2018/markdownExperiment/src/galleryHelper/getFfmpegFlags.py diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress index 56e05f9..a4652ab 100644 --- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress @@ -11,7 +11,7 @@ info: # @toDo: Ist es mit vorheriger Skalierung schneller, oder langsamer? videos/.forCompressing/%.trf: videos/.forCompressing/%.video $(FFMPEG) -i $^ \ - -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabDetect):result="$@" \ + -filter:v $(ffmpegVideoFilterDeinterlace),$(ffmpegVideoScaleFilter),$(ffmpegVideoFilterVidstabDetect):result="$@" \ -f null \ - @@ -21,7 +21,7 @@ videos/.forCompressing/%.trf: videos/.forCompressing/%.video # kann. Wäre praktisch für eine leicht schnellere Verfügbarkeit. videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video videos/.forCompressing/%.trf $(FFMPEG) -i $< \ - -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \ + -filter:v $(ffmpegVideoFilterDeinterlace),$(ffmpegVideoScaleFilter),$(ffmpegVideoFilterDenoise),$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoFilterUnsharp),$(ffmpegVideoScaleFilter) \ -codec:v $(VID_CODEC) \ -pass 1 \ -passlogfile "$(basename $<).firstPassLog" \ @@ -41,12 +41,12 @@ videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video vide videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf videos/.forCompressing/%.firstPassLog-0.log mkdir -p videos/webm $(FFMPEG) -i $< \ - -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \ + -filter:v $(ffmpegVideoFilterDeinterlace),$(ffmpegVideoScaleFilter),$(ffmpegVideoFilterDenoise),$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoFilterUnsharp) \ -codec:v $(VID_CODEC) \ -pass 2 \ -passlogfile "$(basename $<).firstPassLog" \ $(VID_CODEC_DEADLINE) \ - -b:v $(shell $(GET_VIDEO_DURATION_JSON) $<)k \ + -b:v $(shell $(getTargetParameter) $< videoBitrate)k \ -threads 1 \ -speed 0 \ -tile-columns 0 \ @@ -65,7 +65,9 @@ videos/thumbnails/%.png: videos/.forCompressing/%.video # $(FFMPEG) -i "$<" -vf $(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@" # $(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4,thumbnail -frames:v 1 "$@" # $(FFMPEG) -i "$<" -aspect $(ffmpegDisplayAspectRatio) -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@" - $(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@" + $(FFMPEG) -i "$<" \ + -filter:v $(ffmpegVideoFilterDeinterlace),$(ffmpegVideoScaleFilter),thumbnail \ + -frames:v 1 "$@" videos/thumbnails/%.jpg: videos/thumbnails/%.png $(GUETZLI) --quality 90 "$<" "$@" diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg index 4db4437..4b832c5 100644 --- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg @@ -7,6 +7,9 @@ DEFAULT_FFMPEG = ffmpeg #DEFAULT_FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe GET_VIDEO_DURATION_JSON = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py +#GET_VIDEO_DURATION_JSON = ~/keeper/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py + +getTargetParameter = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getFfmpegFlags.py # Für eine schnelle Komprimierung libvpx, sonst vp9 @@ -41,11 +44,15 @@ jpegThumbs = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(n ffmpegVideoFilterVidstabDetect = vidstabdetect=shakiness=10:accuracy=15 # das input= fehlt absichtlich ffmpegVideoFilterVidstabTransform = vidstabtransform=optzoom=2:interpol=bicubic:smoothing=30 +# vidstab empfiehlt die Verwendung des unsharp-Filters bei vidstabtransform +ffmpegVideoFilterUnsharp = unsharp=5:5:0.8:3:3:0.4 #ffmpegVideoScaleFilter = scale=$(VID_CODEC_WIDTH):$(VID_CODEC_HEIGHT):sws_flags=lanczos, -ffmpegVideoScaleFilter = scale=if( gt(in_w, in_h), -2, $(VID_CODEC_HEIGHT) ):if( gt(in_w, in_h), $(VID_CODEC_HEIGHT), -2):sws_flags=lanczos, -ffmpegVideoFilterDeinterlace = yadif, -ffmpegVideoFilterDenoise = nlmeans, +#ffmpegVideoScaleFilter = scale=if\( gt\(in_w, in_h\), -2, $(VID_CODEC_HEIGHT) \):if\( gt\(in_w, in_h\), $(VID_CODEC_HEIGHT), -2\):sws_flags=lanczos +#ffmpegVideoScaleFilter = scale="if\(gt\(in_w\,in_h\)\,-2\,$(VID_CODEC_HEIGHT)\)":"if\(gt\(in_w\,in_h\)\,$(VID_CODEC_HEIGHT)\,-2\)":sws_flags=bicubic +ffmpegVideoScaleFilter = scale="if\(gt\(in_w\,in_h\)\,-2\,$(shell $(getTargetParameter) $< pixelSize)\)":"if\(gt\(in_w\,in_h\)\,$(shell $(getTargetParameter) $< pixelSize)\,-2\)":sws_flags=bicubic +ffmpegVideoFilterDeinterlace = yadif +ffmpegVideoFilterDenoise = nlmeans #ffmpegVideoFilterDenoise = hqdn3d, #ffmpegDisplayAspectRatio = 16:9 #ffmpegDisplayAspectRatio = 9:16 diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/getFfmpegFlags.py b/homepage/redesign2018/markdownExperiment/src/galleryHelper/getFfmpegFlags.py new file mode 100644 index 0000000..56d238a --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/src/galleryHelper/getFfmpegFlags.py @@ -0,0 +1,91 @@ +#!/usr/bin/env python3 + +# +# Command line use of 'ffprobe': +# +# ffprobe -loglevel quiet -print_format json \ +# -show_format -show_streams \ +# video-file-name.mp4 +# +# man ffprobe # for more information about ffprobe +# + +import subprocess as sp +import json +import sys +import argparse + + +def probe(vid_file_path): + ''' Give a json from ffprobe command line + + @vid_file_path : The absolute (full) path of the video file, string. + ''' + if type(vid_file_path) != str: + raise Exception('Give ffprobe a full file path of the video') + return + + command = ["ffprobe", + "-loglevel", "quiet", + "-print_format", "json", + "-show_format", + "-show_streams", + vid_file_path + ] + + pipe = sp.Popen(command, stdout=sp.PIPE, stderr=sp.STDOUT) + out, err = pipe.communicate() + return json.loads(out.decode('utf-8')) + +def duration(vid_file_path): + ''' Video's duration in seconds, return a float number + ''' + _json = probe(vid_file_path) + + if 'format' in _json: + if 'duration' in _json['format']: + return float(_json['format']['duration']) + + if 'streams' in _json: + # commonly stream 0 is the video + for s in _json['streams']: + if 'duration' in s: + return float(s['duration']) + + # if everything didn't happen, + # we got here because no single 'return' in the above happen. + raise Exception('I found no duration') + #return None + +def getPixelSize(bitrate): + if(bitrate >= 500): + return 480 + if(bitrate >= 250): + return 360 + return 240 + +if __name__ == "__main__": + argParser = argparse.ArgumentParser(description='Calculate Bitrate and Pixelsize (height) for a encoding a video with limited (byte-)size') + argParser.add_argument('inFile', help="file to be analysed") + argParser.add_argument('flagToGet', help="Zielparameter wählen", choices=['pixelSize', 'videoBitrate']) + argParser.add_argument('--audioBitrate', help="audio bitrate die abgezogen werden soll (in kbit/s)", default=0) + argParser.add_argument('--targetSize', help="dateigröße der zieldatei in MB", default=10) + argParser.add_argument('--overhead', help="prozentualer overhead in %", default=95) + argParser.add_argument('--maxVidBitrate', help="Videobitrate, bei der gedeckelt werden soll", default=750) + argv = argParser.parse_args() + + video_file_path = argv.inFile + + durationInSec = duration(video_file_path) + + videoBitrateInKbPerSec = argv.overhead/100 * (argv.targetSize * 1000 * 8)/durationInSec - argv.audioBitrate + videoBitrateInKbPerSec = int(min(argv.maxVidBitrate, videoBitrateInKbPerSec)) + + pixelSize = getPixelSize(videoBitrateInKbPerSec) + + if(argv.flagToGet == "pixelSize"): + print(pixelSize) + + if(argv.flagToGet == "videoBitrate"): + print(videoBitrateInKbPerSec) + From 3ea69162f96eb9375d95b6abb3b3a89c33c44dab Mon Sep 17 00:00:00 2001 From: Marko Bunzel Date: Sat, 27 Jul 2019 17:11:45 +0200 Subject: [PATCH 12/14] =?UTF-8?q?index=20on=20wkParticipo:=207765a9e=20=09?= =?UTF-8?q?ge=C3=A4ndert:=20=20=20=20=20=20=20index.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From b9d4b5aa084abc09760ff817dae05efdd60d36b8 Mon Sep 17 00:00:00 2001 From: Marko Bunzel Date: Sun, 28 Jul 2019 19:12:13 +0200 Subject: [PATCH 13/14] =?UTF-8?q?Vorbereitungen=20f=C3=BCr=20selbstgew?= =?UTF-8?q?=C3=A4hlte=20Farben=20im=20Wettkampfplaner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit geändert: homepage/wkParticipo/index.php geändert: homepage/wkParticipo/wkParticipo.css --- homepage/wkParticipo/index.php | 46 +++- homepage/wkParticipo/wkParticipo.css | 304 ++++++++++++++++++++++++++- 2 files changed, 340 insertions(+), 10 deletions(-) diff --git a/homepage/wkParticipo/index.php b/homepage/wkParticipo/index.php index 17a9c5f..956f689 100644 --- a/homepage/wkParticipo/index.php +++ b/homepage/wkParticipo/index.php @@ -18,8 +18,26 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge'); if ($mysqlConn->connect_error) { $sqlMessage['error'] .= 'Datenbankverbindung fehlgeschlagen: ' . $mysqlConn->connect_error; } - // var_dump($_SESSION); + +/// Stellt den cssCode mit den Variablendefinitionen bereit +function colorThemeCss($colorArray = ['backgroundColor'=>"#FFAE00", 'highlightColor'=>"#FF8100", 'buttonColor'=>"#291670"]){ +$colorTypes = ["backgroundColor", "highlightColor", "buttonColor"]; +$defaultColors =['backgroundColor'=> "#FFAE00", 'highlightColor'=>"#FF8100", 'buttonColor'=>"#291670"]; + + foreach($colorTypes as $key){ + if( !preg_match("/^#(?:[0-9a-fA-F]{3}){1,2}$/", $key) ){ + $colorThemeCss[$key] = $defaultColors[$key]; + } + } + $ret = ":root{"; + + foreach($colorArray as $key=>$value){ + $ret .= "--".$key.": ".$value."; "; + } + $ret .= "}"; +return $ret; +} ?> @@ -33,10 +51,28 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge'); - - - - + diff --git a/homepage/wkParticipo/wkParticipo.css b/homepage/wkParticipo/wkParticipo.css index c7bb573..8ffa86e 100644 --- a/homepage/wkParticipo/wkParticipo.css +++ b/homepage/wkParticipo/wkParticipo.css @@ -1,11 +1,257 @@ +/* cssTemplate für den Wettkampfplaner + * benötigt die Variablen + * + * - --backgroundColor + * - --highlightColor + * - --buttonColor + * + * für die Farben. + */ /* blau: #291670 */ /* gelb: #fff500*/ + +/* Box-Sizing global auf die BorderBox stellen */ +html{ + box-sizing: border-box; +} +*, ::before, ::after { + box-sizing: inherit; +} + + +.loginForm{} +.loginForm div{ + display: flex; + flex-direction: column; + width: 100%; +} +.loginForm input{ + display: block; + margin: 0; + width: 100%; + font-size: 1.5em; + border: 1px solid #bbb; +} +.loginForm button[type=submit]{ + display: block; + font-size: 1em; + line-height: 2em; + color: #333; + font-weight: bold; + width: 100%; + background: #fdfdfd; + background: linear-gradient(to bottom, #fdfdfd 0%,#bebebe 100%); + border: 1px solid #bbb; +} + + +/** + * Wettkampfbox + **/ + +.wkBox{ + border: 1px solid black; + display: flex; + flex-direction: column; +} +.wkBox nav{ +/* width: 32%; + float: left;*/ +} +.wkBox nav ul li{ + display: list-item; +} +.wkBoxWkData{ + border: none; +} +@media (min-width: 65em){ + .wkBox{ + flex-direction: row; + align-items: stretch; + justify-content: space-around; + padding: .5em; + } + .wkBox *{ + flex-basis: 30%; + } +} + + +/* touchable Links*/ +.touchLink{ + display: inline-block; + padding: 0.25em 0 0.25em 0; + margin: 0.25em 0 0.25em 0; + background-color: var(--highlightColor); + border-radius: .5em; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); +} + +/* touchable Buttons */ + +.touchButton{ + display: block; + margin: .5em 0; + font-size: 1em; + line-height: 1.5em; + color: #333; + font-weight: bold; + width: 100%; + background: #fdfdfd; + background: linear-gradient(to bottom, #fdfdfd 0%,#bebebe 100%); + border: 1px solid #bbb; +} +.touchButton[disabled]{ + color: Grey; +} + + +@media (min-width: 65em){ +/* .loginForm div{ + flex-direction: row; + justify-content: space-between; + align-items: flex-end; + } + .loginForm div div{ + flex-direction: column; + align-items: flex-start; + width: 30%; + } + button{ + } +*/ +} + +body{ + background-color: var(--backgroundColor); +} + + +nav ul { + width: 100%; + list-style: none; + padding: 0; +} + +nav ul li a{ + text-decoration: none; + color: black; +} + +nav ul li a div{ + text-align: center; + font-size: large; + font-weight: bolder; + border: 3px gray outset; + background: linear-gradient(to bottom, var(--backgroundColor) 0%, var(--highlightColor) 100%); + padding-top: .25em; + padding-bottom: .25em; +} + +.navLink{ + text-align: center; +/* font-size: large;*/ + font-weight: bolder; + border: 3px gray outset; + background: linear-gradient(to bottom, var(--backgroundColor) 0%, var(--highlightColor) 100%); + padding-top: .25em; + padding-bottom: .25em; +} + +.navLink div{ + display: inline; +} +meldungsBox{ + border: 1px solid black; +} + + +@media only screen and (min-device-width: 481px){ + .wkInfo{ + width: 68%; + float: right; + } + + nav ul{ + display: table; + } + + nav ul li{ + display: table-cell; + } + + nav ul li a div{ + text-align: center; + } + + button[type=submit] { + display: block; + font-size: 1em; + line-height: 1.5em; + color: #333; + font-weight: bold; + width: 100%; + background: #fdfdfd; + background: linear-gradient(to bottom, #fdfdfd 0%,#bebebe 100%); + border: 1px solid #bbb; + } + button[disabled]{ + color: Grey; + } +} + +@media only screen and (max-device-width: 481px) { + nav ul li a div{ + text-align: left; + } + button[type=submit] { + display: block; + font-size: 1em; + line-height: 1.5em; + color: #333; + font-weight: bold; + width: 100%; + background: #fdfdfd; + background: -moz-linear-gradient(top, #fdfdfd 0%, #bebebe 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fdfdfd), color-stop(100%,#bebebe)); + background: -webkit-linear-gradient(top, #fdfdfd 0%,#bebebe 100%); + background: -o-linear-gradient(top, #fdfdfd 0%,#bebebe 100%); + background: -ms-linear-gradient(top, #fdfdfd 0%,#bebebe 100%); + background: linear-gradient(to bottom, #fdfdfd 0%,#bebebe 100%); + border: 1px solid #bbb; + -webkit-border-radius: 10px; -moz-border-radius: 10px; border-radius: 10px; + } + button[disabled]{ + color: Grey; + } + input[type=text], input[type=url], input[type=email], input[type=password], input[type=tel] { + -webkit-appearance: none; -moz-appearance: none; + display: block; + margin: 0; + width: 100%; +/* height: 2em;*/ +/* line-height: 1.6em;*/ + font-size: 1.5em; + border: 1px solid #bbb; + } + #meldungsBox{ +/* font-size: 3em;*/ + border: 1px solid black; + } + fieldset div{ + font-size: 1em; + } +} + + + + .wkInfoCard{ - border-left: .5rem solid #291670; + border-left: .5rem solid var(--buttonColor); margin: 1rem 0; display: flex; - background-color: #FFAE00; + background-color: var(--backgroundColor); border-radius: 2px; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); @@ -20,7 +266,7 @@ display: flex; flex-direction: column; align-items: center; - color: #291670; + color: var(--buttonColor); padding: 0rem 0.5rem 0rem 0rem; width: 6rem; } @@ -46,7 +292,7 @@ display: flex; flex-direction: column; flex-grow: 1; - background-color: #FF8100; + background-color: var(--highlightColor); } @media (min-width: 640px){ .wkInfoCardWkData{ @@ -91,7 +337,7 @@ } .wkInfoCardButtonSuccess { - background-color: #291670; + background-color: var(--buttonColor); color: #eee; } @@ -130,3 +376,51 @@ .material-icons { width: 1rem; } + +/* +css für Navigationsleiste +*/ + + +.navBar{ + width: 100%; + margin: 0 auto; +} + +.navBar > ul{ + display: flex; + flex-flow: column; + text-align: center; + background: linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.2) 25%, rgba(255, 255, 255, 0.2) 75%, rgba(255, 255, 255, 0) 100%); + box-shadow: 0 0 .5em rgba(0, 0, 0, 0.1), inset 0 0 1px rgba(255, 255, 255, 0.6); +} + +.navBar ul > li > a { + height: 100%; + padding: .25em; + text-transform:uppercase; + color: rgba(0, 35, 122, 0.5); + font-size: Large; + text-decoration: none; + display: block; +} + +.navBar > ul > li > a:hover { + box-shadow: 0 0 .2em rgba(0, 0, 0, 0.1), inset 0 0 1px rgba(255, 255, 255, 0.6); + background: rgba(255, 255, 255, 0.1); + color: rgba(0, 35, 122, 0.7); +} + + +@media (min-width: 640px){ + .navBar > ul{ + flex-flow: row; + justify-content: space-between; + align-items: stretch; + } + .navBar > ul > li { + align-items: center; + flex-grow: 1; + flex-basis: 100%; + } +} From 84c093fd7ab9213380e182bc809fc4c6b8e8c5e5 Mon Sep 17 00:00:00 2001 From: Marko Bunzel Date: Sun, 25 Aug 2019 10:25:28 +0200 Subject: [PATCH 14/14] =?UTF-8?q?index=20on=20wkParticipo:=20a4c3076=20Vor?= =?UTF-8?q?bereitungen=20f=C3=BCr=20selbstgew=C3=A4hlte=20Farben=20im=20We?= =?UTF-8?q?ttkampfplaner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../phpLib/cwsvJudo/wkKalender.php | 61 +++++++++++++------ 1 file changed, 43 insertions(+), 18 deletions(-) diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php index f6da7cf..cfafede 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php @@ -1,6 +1,7 @@ ". +// "". + "". "". "". - "". + "". + "". + "". "". "". "".$wk['Veranstaltung']."". @@ -231,9 +235,9 @@ $htmlWkTableString = ""; "". "". "iCal". - "". + "\"http://cwsvjudo.bplaced.net/wkKalender/".$wk['lfdeNr']."/".toAscii(". "". - "\n"; + "\n"; } $htmlWkTableString .= "". @@ -248,10 +252,22 @@ $htmlWkTableString = ""; "". ""; + // Für den Fall einer ampSeite müssen die imgTags angepasst werden + if( strpos( $_SERVER['ORIG_PATH_TRANSLATED'], "pages/amp" ) !== false ){ + $htmlWkTableString = str_replace( + "", ">", $htmlWkTableString); + } + return $htmlWkTableString; } - function nicerAkList($akArray){ $ret=explode( " ", $akArray ); @@ -340,7 +356,6 @@ if($matches[0]==$akString){ return $ret; } - /// Wettkampfdaten als json-formatierte strukturierte Event-Daten function wkArray2jsonSdEvent($wk){ return @@ -407,19 +422,25 @@ function wkTableHtml(){ ) ) )."". - "

Einzelansicht

". +// "

Einzelansicht

". +// "". +// "". +// "". "
". "". - "

".$wk['Veranstaltung']."

". - wkBoxMediaGalleryHtml($wkGals); +// "

".$wk['Veranstaltung']."

". + "

".$wk['Veranstaltung']."

"; $siteData['mainContent'] .= - "

Veranstaltungsdaten

". +// "

Veranstaltungsdaten

". "
    ". "
  • Datum:
    • ". "
  • Altersklassen: ".$wk['Altersklassen']."
    • ". "
  • Ort: ".$wk['Ort']."
    • ". "
". + (!empty($wkGals)?"

Galerien

":""). + wkBoxMediaGalleryHtml($wkGals). + "

Links

". "