From d9ee5aea3098b7571edf0da049868c91284d1b1c Mon Sep 17 00:00:00 2001 From: marko Date: Mon, 25 Jun 2018 20:09:57 +0200 Subject: [PATCH] =?UTF-8?q?=C3=9Cbernahme=20woanders=20erstellter=20=C3=84?= =?UTF-8?q?nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redesign2018/markdownExperiment/Makefile | 40 +- .../css/cwsvJudo-2018-footer.css | 4 + .../css/cwsvJudo-2018-galTable.css | 7 + .../css/cwsvJudo-2018-header.css | 9 +- .../css/cwsvJudo-2018-mainNav.css | 6 + .../css/cwsvJudo-2018-news.css | 1 + .../css/cwsvJudo-2018-sponsorList.css | 1 + .../css/cwsvJudo-2018-subNav.css | 5 + .../css/cwsvJudo-2018-wkKalender.css | 231 ----------- .../markdownExperiment/htaccess/.htaccess | 22 ++ .../htaccess/.htaccess-phpAppender | 6 + .../htaccess/cwsvjudo.bplaced.de/.htaccess | 29 ++ .../htaccess/cwsvjudo.bplaced.net/.htaccess | 29 ++ .../cwsvjudo.bplaced.net/www/.ftpquota | 1 + .../cwsvjudo.bplaced.net/www/.htaccess | 109 ++++++ .../www/.htaccess-backup-2018-05-29-06-33 | 106 +++++ .../cwsvjudo.bplaced.net/www/.htgroups | 1 + .../cwsvjudo.bplaced.net/www/.htusers | 1 + .../markdownExperiment/md/datenschutz.md | 9 +- .../markdownExperiment/md/downloads.md | 46 +++ .../markdownExperiment/md/extras.md | 15 + .../markdownExperiment/md/galerie.md | 1 + .../markdownExperiment/md/galerien.md | 4 + .../markdownExperiment/md/hilfsmittel.md | 16 + .../markdownExperiment/md/impressum.md | 4 + .../markdownExperiment/md/index.md | 3 + .../markdownExperiment/md/kontakt.md | 7 +- .../markdownExperiment/md/kontakt.md~ | 1 + .../markdownExperiment/md/links.md | 21 + .../markdownExperiment/md/news.md | 2 + .../markdownExperiment/md/quiz.md | 17 + .../markdownExperiment/md/trainingszeiten.md | 5 +- .../markdownExperiment/md/verein.md | 4 + .../markdownExperiment/md/wkKalender.md | 4 + .../cwsvJudo.amp.pandocTemplate | 251 ++++++++++++ ...do.amp.pandocTemplate-2018-06-12-11-36.bak | 237 ++++++++++++ .../cwsvJudo.html5.pandocTemplate | 46 ++- .../phpLib/cwsvJudo/galTable.php | 89 +++-- .../phpLib/cwsvJudo/newsLib.php | 22 +- .../phpLib/cwsvJudo/newsTableHtml.php | 1 + .../phpLib/cwsvJudo/wkKalender.php | 24 +- .../phpLib/cwsvJudo/wkKalender.php.bak | 323 ++++++++++++++++ .../phpLib/imgGallery.bplaced/imgPicker.php | 191 +++++++++ .../phpLib/imgGallery.bplaced/index.php.tmpl | 365 ++++++++++++++++++ .../imgGallery.bplaced/indexDev.php.tmpl | 349 +++++++++++++++++ .../phpLib/imgGallery.bplaced/view.php.tmpl | 95 +++++ .../phpLib/imgGallery.square7/imgPicker.php | 191 +++++++++ .../phpLib/imgGallery.square7/index.php.tmpl | 342 ++++++++++++++++ .../imgGallery.square7/index.php.tmpl.old | 165 ++++++++ .../imgGallery.square7/indexDev.php.tmpl | 320 +++++++++++++++ .../imgGallery.square7/indexDev.php.tmpl.orig | 324 ++++++++++++++++ .../phpLib/imgGallery.square7/view.php.tmpl | 95 +++++ .../phpLib/phplot-6.2.0.zip | Bin 0 -> 183978 bytes .../phpLib/videoGallery/videoGallery.tmpl.php | 245 ++++++++++++ .../yaml/downloads.subNav.yaml | 4 + .../yaml/extras.subNav.yaml | 8 + .../yaml/galerien.subNav.yaml | 2 + .../yaml/hilfsmittel.subNav.yaml | 4 + .../markdownExperiment/yaml/images.yaml | 25 ++ .../markdownExperiment/yaml/index.subNav.yaml | 1 + .../markdownExperiment/yaml/links.subNav.yaml | 4 + .../markdownExperiment/yaml/navTargets.yaml | 23 +- .../markdownExperiment/yaml/quiz.subNav.yaml | 7 + 63 files changed, 4223 insertions(+), 297 deletions(-) create mode 100644 homepage/redesign2018/markdownExperiment/htaccess/.htaccess create mode 100644 homepage/redesign2018/markdownExperiment/htaccess/.htaccess-phpAppender create mode 100644 homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.de/.htaccess create mode 100644 homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess create mode 100644 homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/www/.ftpquota create mode 100644 homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/www/.htaccess create mode 100644 homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/www/.htaccess-backup-2018-05-29-06-33 create mode 100644 homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/www/.htgroups create mode 100644 homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/www/.htusers create mode 100644 homepage/redesign2018/markdownExperiment/md/downloads.md create mode 100644 homepage/redesign2018/markdownExperiment/md/extras.md create mode 100644 homepage/redesign2018/markdownExperiment/md/hilfsmittel.md create mode 100644 homepage/redesign2018/markdownExperiment/md/links.md create mode 100644 homepage/redesign2018/markdownExperiment/md/quiz.md create mode 100644 homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate create mode 100644 homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate-2018-06-12-11-36.bak create mode 100644 homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php.bak create mode 100644 homepage/redesign2018/markdownExperiment/phpLib/imgGallery.bplaced/imgPicker.php create mode 100644 homepage/redesign2018/markdownExperiment/phpLib/imgGallery.bplaced/index.php.tmpl create mode 100644 homepage/redesign2018/markdownExperiment/phpLib/imgGallery.bplaced/indexDev.php.tmpl create mode 100644 homepage/redesign2018/markdownExperiment/phpLib/imgGallery.bplaced/view.php.tmpl create mode 100644 homepage/redesign2018/markdownExperiment/phpLib/imgGallery.square7/imgPicker.php create mode 100644 homepage/redesign2018/markdownExperiment/phpLib/imgGallery.square7/index.php.tmpl create mode 100644 homepage/redesign2018/markdownExperiment/phpLib/imgGallery.square7/index.php.tmpl.old create mode 100644 homepage/redesign2018/markdownExperiment/phpLib/imgGallery.square7/indexDev.php.tmpl create mode 100644 homepage/redesign2018/markdownExperiment/phpLib/imgGallery.square7/indexDev.php.tmpl.orig create mode 100644 homepage/redesign2018/markdownExperiment/phpLib/imgGallery.square7/view.php.tmpl create mode 100644 homepage/redesign2018/markdownExperiment/phpLib/phplot-6.2.0.zip create mode 100644 homepage/redesign2018/markdownExperiment/phpLib/videoGallery/videoGallery.tmpl.php create mode 100644 homepage/redesign2018/markdownExperiment/yaml/downloads.subNav.yaml create mode 100644 homepage/redesign2018/markdownExperiment/yaml/extras.subNav.yaml create mode 100644 homepage/redesign2018/markdownExperiment/yaml/hilfsmittel.subNav.yaml create mode 100644 homepage/redesign2018/markdownExperiment/yaml/links.subNav.yaml create mode 100644 homepage/redesign2018/markdownExperiment/yaml/quiz.subNav.yaml diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile index 4b43a31..f276b8f 100644 --- a/homepage/redesign2018/markdownExperiment/Makefile +++ b/homepage/redesign2018/markdownExperiment/Makefile @@ -3,13 +3,14 @@ RES_LIST = 64 128 256 512 cssFiles = $(wildcard css/*.css) mdFiles = $(wildcard md/*.md) phpFiles = $(patsubst md/%.md, build/%.php, $(mdFiles)) +ampFiles = $(patsubst md/%.md, build/amp/%.php, $(mdFiles)) phpLibFiles = $(wildcard phpLib/cwsvJudo/*.php) phpLib/phpcount/phpcount.php configFiles = $(wildcard config/*.php) -ampFiles = $(patsubst md/%.md, build/amp/%.php, $(mdFiles)) uploadMarker = \ $(patsubst build/%.php, build/.uploadMarker/%.php, $(phpFiles)) \ + $(patsubst build/amp/%.php, build/.uploadMarker/amp/%.php, $(ampFiles)) \ $(patsubst phpLib/%.php, build/.uploadMarker/phpLib/%.php, $(phpLibFiles)) \ $(patsubst config/%.php, build/.uploadMarker/config/%.php, $(configFiles)) \ build/.uploadMarker/config/.htaccess \ @@ -27,9 +28,15 @@ clean: .PHONY: echo echo: + @echo "phpFiles:" @echo $(phpFiles) + @echo "ampFiles:" + @echo $(ampFiles) + @echo "phpLibFiles:" @echo $(phpLibFiles) + @echo "cssFiles:" @echo $(cssFiles) + @echo "uploadMarker:" @echo $(uploadMarker) @@ -37,8 +44,9 @@ echo: ampTest: $(ampFiles) build/css/cwsvJudo.css: $(cssFiles) - mkdir -p build/css - cat $(cssFiles) > $@ + mkdir -p $(dir $@) +# cat $(cssFiles) > $@ + cat $^ | csso -o $@ # cat $(cssFiles) | cleancss -o $@ build/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate @@ -58,13 +66,9 @@ build/amp/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.amp.pandocTem --template=pandocTemplate/cwsvJudo.amp.pandocTemplate \ --output=$@ \ $< $(word 2,$^) - curl \ - --upload-file $@ \ - --user cwsvjudo:***REMOVED*** \ - ftp://cwsvjudo.bplaced.net/www/pages/responsive/$(patsubst build/%.php,%.php,$^) \ - --ftp-create-dirs - touch $@ - +# Die auskommentierte Variante fand ich besser, aber der Validator hat ein Problem mit http bei src in img ;) +# sed --in-place 's//