From bdb7dd5514aed3077a4cc4a11c073bfa1971e247 Mon Sep 17 00:00:00 2001 From: marko Date: Fri, 21 May 2021 11:29:12 +0200 Subject: [PATCH] Update nach langer Zeit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - description zu den seiten hinzugefügt - square7 etwas entfernt - update pandoc: version 2.13 benötigt --- .../redesign2018/markdownExperiment/Makefile | 27 +- .../admin/mdDisplayer/index.php | 34 +++ .../markdownExperiment/config/db.inc | 2 +- .../config/phpcount.config.php | 2 +- .../cwsvJudo.amp.pandocTemplate | 32 +- .../cwsvJudo.html5.pandocTemplate | 37 +-- .../phpLib/cwsvJudo/newsLib.php | 12 + .../markdownExperiment/phpLib/phpcount | 1 + .../src/Makefiles/Makefile.vidstab | 36 --- .../src/galleryTemplates/config.inc.php | 4 + .../galleryTemplates/indexBilderInArbeit.php | 5 + .../markdownExperiment/src/md/galerie.md | 3 +- .../markdownExperiment/src/md/news.md | 5 +- .../src/md/trainingszeiten.md | 31 +- .../markdownExperiment/src/md/wkKalender.md | 5 +- .../src/shared/ehrungen.html.inc | 19 ++ .../src/shared/favicon.html.inc | 10 + .../src/shared/faviconAmp.inc.html | 9 + .../src/shared/sponsorlist.inc.amp | 23 ++ .../src/shared/sponsorlist.inc.html | 23 ++ .../src/vidGa/config.inc.php | 4 + .../markdownExperiment/src/vidGa/index.php | 7 + .../src/vidGa/videoGallery.tmpl.php | 277 ++++++++++++++++++ 23 files changed, 477 insertions(+), 131 deletions(-) create mode 100644 homepage/redesign2018/markdownExperiment/admin/mdDisplayer/index.php create mode 160000 homepage/redesign2018/markdownExperiment/phpLib/phpcount create mode 100644 homepage/redesign2018/markdownExperiment/src/galleryTemplates/config.inc.php create mode 100644 homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexBilderInArbeit.php create mode 100644 homepage/redesign2018/markdownExperiment/src/shared/ehrungen.html.inc create mode 100644 homepage/redesign2018/markdownExperiment/src/shared/favicon.html.inc create mode 100644 homepage/redesign2018/markdownExperiment/src/shared/faviconAmp.inc.html create mode 100644 homepage/redesign2018/markdownExperiment/src/shared/sponsorlist.inc.amp create mode 100644 homepage/redesign2018/markdownExperiment/src/shared/sponsorlist.inc.html create mode 100644 homepage/redesign2018/markdownExperiment/src/vidGa/config.inc.php create mode 100644 homepage/redesign2018/markdownExperiment/src/vidGa/index.php create mode 100644 homepage/redesign2018/markdownExperiment/src/vidGa/videoGallery.tmpl.php diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile index b6e4d3d..d882deb 100644 --- a/homepage/redesign2018/markdownExperiment/Makefile +++ b/homepage/redesign2018/markdownExperiment/Makefile @@ -56,6 +56,7 @@ build/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocT --standalone \ --css="ressourcen/css/cwsvJudo.css" \ --template=pandocTemplate/cwsvJudo.html5.pandocTemplate \ + --to=html \ --output=$@ \ $< $(word 2,$^) @@ -65,6 +66,7 @@ build/amp/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.amp.pando --standalone \ --css="ressourcen/css/cwsvJudo.css" \ --template=pandocTemplate/cwsvJudo.amp.pandocTemplate \ + --to=html \ --output=$@ \ $< $(word 2,$^) # Die auskommentierte Variante fand ich besser, aber der Validator hat ein Problem mit http bei src in img ;) @@ -82,11 +84,6 @@ upload: $(uploadMarker) build/.uploadMarker/%.php: build/%.php mkdir -p build/.uploadMarker -# curl \ -# --upload-file $^ \ -# --user cwsvjudo:Dee4oquu \ -# ftp://cwsvjudo.square7.net/pages/responsive/$(patsubst build/%.php,%.php,$^) \ -# --ftp-create-dirs curl \ --upload-file $^ \ --user cwsvjudo:***REMOVED*** \ @@ -97,11 +94,6 @@ build/.uploadMarker/%.php: build/%.php build/.uploadMarker/amp/%.php: build/amp/%.php mkdir -p build/.uploadMarker/amp -# curl \ -# --upload-file $^ \ -# --user cwsvjudo:Dee4oquu \ -# ftp://cwsvjudo.square7.net/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \ -# --ftp-create-dirs curl \ --upload-file $^ \ --user cwsvjudo:***REMOVED*** \ @@ -113,11 +105,6 @@ build/.uploadMarker/amp/%.php: build/amp/%.php build/.uploadMarker/phpLib/%.php: phpLib/%.php mkdir -p build/.uploadMarker/phpLib/cwsvJudo mkdir -p build/.uploadMarker/phpLib/phpcount -# curl \ -# --upload-file $^ \ -# --user cwsvjudo:Dee4oquu \ -# ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%.php,%.php,$^) \ -# --ftp-create-dirs curl \ --upload-file $^ \ --user cwsvjudo:***REMOVED*** \ @@ -127,11 +114,6 @@ build/.uploadMarker/phpLib/%.php: phpLib/%.php build/.uploadMarker/css/%.css: build/css/%.css mkdir -p build/.uploadMarker/css -# curl \ -# --upload-file $^ \ -# --user cwsvjudo:Dee4oquu \ -# ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%,%,$^) \ -# --ftp-create-dirs curl \ --upload-file $^ \ --user cwsvjudo:***REMOVED*** \ @@ -142,11 +124,6 @@ build/.uploadMarker/css/%.css: build/css/%.css build/.uploadMarker/config/%: config/% mkdir -p build/.uploadMarker/config - curl \ - --upload-file $^ \ - --user cwsvjudo:Dee4oquu \ - ftp://cwsvjudo.square7.net/$(patsubst build/%,%,$^) \ - --ftp-create-dirs curl \ --upload-file $^ \ --user cwsvjudo:***REMOVED*** \ diff --git a/homepage/redesign2018/markdownExperiment/admin/mdDisplayer/index.php b/homepage/redesign2018/markdownExperiment/admin/mdDisplayer/index.php new file mode 100644 index 0000000..e0d2a5d --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/admin/mdDisplayer/index.php @@ -0,0 +1,34 @@ + + + + + + + + mdDisplayer + + + +"); + foreach($fileList as $file){ + echo("
  • ".mb_convert_encoding( basename($file), "UTF-8", "ISO-8859-1" )."
  • "); + } + echo(""); + + foreach($fileList as $file){ + echo("
    "); + echo("
    " . ParsedownExtra::instance()->text( file_get_contents($file) ) . "

    "); + } +?> + + + diff --git a/homepage/redesign2018/markdownExperiment/config/db.inc b/homepage/redesign2018/markdownExperiment/config/db.inc index 2789491..255479b 100644 --- a/homepage/redesign2018/markdownExperiment/config/db.inc +++ b/homepage/redesign2018/markdownExperiment/config/db.inc @@ -7,5 +7,5 @@ $db_name='cwsvjudo'; $phpcountConfig["db"]["host"] = "localhost"; $phpcountConfig["db"]["name"] = "cwsvjudo"; $phpcountConfig["db"]["user"] = "cwsvjudo"; -$phpcountConfig["db"]["password"] = "Dee4oquu"; +$phpcountConfig["db"]["password"] = "***REMOVED***"; ?> diff --git a/homepage/redesign2018/markdownExperiment/config/phpcount.config.php b/homepage/redesign2018/markdownExperiment/config/phpcount.config.php index df1d3a0..35ce128 100644 --- a/homepage/redesign2018/markdownExperiment/config/phpcount.config.php +++ b/homepage/redesign2018/markdownExperiment/config/phpcount.config.php @@ -2,7 +2,7 @@ $phpcountConfig["db"]["host"] = "localhost"; $phpcountConfig["db"]["name"] = "cwsvjudo"; $phpcountConfig["db"]["user"] = "cwsvjudo"; -$phpcountConfig["db"]["password"] = "Dee4oquu"; +$phpcountConfig["db"]["password"] = "***REMOVED***"; $phpcountConfig["db"]["hitsTable"] = "phpcount_hits"; $phpcountConfig["db"]["nodupesTable"] = "phpcount_nodupes"; diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate index 0424dd4..d6c8901 100644 --- a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate +++ b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate @@ -39,14 +39,14 @@ $if(keywords)$ $endif$ $if(phpTitleString)$ <?php echo( $phpTitleString$ );?> -$else$ +$else$$if(title)$ $if(title-prefix)$$title-prefix$ – $endif$$pagetitle$ -$endif$ +$endif$$endif$ $if(phpDescriptionString)$ -$else$ +$else$$if(description)$ -$endif$ +$endif$$endif$ $if(canonicalLink)$ $endif$ @@ -232,29 +232,7 @@ $endif$ $body$ - +