From b4b09f4c32252f846b6b8d5aaf9bcad37e7af5b1 Mon Sep 17 00:00:00 2001 From: marko Date: Mon, 9 Jul 2018 14:47:59 +0200 Subject: [PATCH 1/4] Nur kleinere Korrekturen modified: .gitignore modified: Makefile deleted: Makefile~ modified: pandocTemplate/cwsvJudo.amp.pandocTemplate modified: pandocTemplate/cwsvJudo.html5.pandocTemplate modified: phpLib/cwsvJudo/galleryRedirector.php --- .../markdownExperiment/.gitignore | 1 - .../redesign2018/markdownExperiment/Makefile | 23 ++++---- .../redesign2018/markdownExperiment/Makefile~ | 55 ------------------- .../cwsvJudo.amp.pandocTemplate | 9 ++- .../cwsvJudo.html5.pandocTemplate | 10 ++-- .../phpLib/cwsvJudo/galleryRedirector.php | 10 +++- 6 files changed, 30 insertions(+), 78 deletions(-) delete mode 100644 homepage/redesign2018/markdownExperiment/Makefile~ diff --git a/homepage/redesign2018/markdownExperiment/.gitignore b/homepage/redesign2018/markdownExperiment/.gitignore index 35da9a1..dc5000f 100644 --- a/homepage/redesign2018/markdownExperiment/.gitignore +++ b/homepage/redesign2018/markdownExperiment/.gitignore @@ -1,4 +1,3 @@ *~ - temp/* diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile index f38968b..3eb0d61 100644 --- a/homepage/redesign2018/markdownExperiment/Makefile +++ b/homepage/redesign2018/markdownExperiment/Makefile @@ -47,7 +47,8 @@ build/css/cwsvJudo.css: $(cssFiles) mkdir -p $(dir $@) # cat $(cssFiles) > $@ # cat $(cssFiles) | cleancss -o $@ - cat $^ | ./node_modules/.bin/csso -o $@ +# cat $^ | ./node_modules/.bin/csso -o $@ + cat $^ | csso -o $@ build/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate mkdir -p build @@ -127,12 +128,7 @@ build/.uploadMarker/css/%.css: build/css/%.css curl \ --upload-file $^ \ --user cwsvjudo:Dee4oquu \ - ftp://cwsvjudo.square7.net/pages/responsive/$(patsubst build/%,%,$^) \ - --ftp-create-dirs - curl \ - --upload-file $^ \ - --user cwsvjudo:***REMOVED*** \ - ftp://cwsvjudo.bplaced.net/www/pages/responsive/$(patsubst build/%,%,$^) \ + ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%,%,$^) \ --ftp-create-dirs curl \ --upload-file $^ \ @@ -165,20 +161,21 @@ cwsvLogoWappen: $(addprefix build/graphiken/cwsvLogoWappen/cwsvLogoWappen., build/graphiken/cwsvJudoLogoWappen/cwsvJudoLogoWappen.png: graphiken/cwsvJudoLogoWappen.xcf mkdir -p $(dir $@) convert -layers merge -background transparent $< $@ -build/graphiken/cwsvLogoWappen/cwsvLogoWappen.png: graphiken/cwsvLogoWappen.xcf +build/graphiken/cwsvLogoWappen/cwsvLogoWappen.png: graphiken/cwsvLogoWappen.xcf mkdir -p $(dir $@) convert -layers flatten -background transparent $< $@ build/graphiken/cwsvJudoLogoWappen/cwsvJudoLogoWappen.%w.png: build/graphiken/cwsvJudoLogoWappen/cwsvJudoLogoWappen.png mkdir -p $(dir $@) convert -layers merge -background transparent -resize $*x $< $@ -# zopfli/zopflipng --iterations=500 --filters=01234mepb --lossy_8bit --lossy_transparent $@ $@ - zopflipng -my $@ $@ -build/graphiken/cwsvLogoWappen/cwsvLogoWappen.%w.png: build/graphiken/cwsvLogoWappen/cwsvLogoWappen.png + zopflipng --iterations=500 --filters=01234mepb --lossy_8bit --lossy_transparent $@ $@ +# zopflipng -my $@ $@ + +build/graphiken/cwsvLogoWappen/cwsvLogoWappen.%w.png: build/graphiken/cwsvLogoWappen/cwsvLogoWappen.png mkdir -p $(dir $@) convert -layers flatten -background transparent -resize $*x $< $@ -# zopfli/zopflipng --iterations=500 --filters=01234mepb --lossy_8bit --lossy_transparent $@ $@ - zopflipng -my $@ $@ + zopflipng --iterations=500 --filters=01234mepb --lossy_8bit --lossy_transparent $@ $@ +# zopflipng -my $@ $@ .PHONY: favIcons diff --git a/homepage/redesign2018/markdownExperiment/Makefile~ b/homepage/redesign2018/markdownExperiment/Makefile~ deleted file mode 100644 index 1843a78..0000000 --- a/homepage/redesign2018/markdownExperiment/Makefile~ +++ /dev/null @@ -1,55 +0,0 @@ -cssFiles = $(wildcard css/*.css) -mdFiles = $(wildcard md/*.md) -phpFiles = $(patsubst md/%.md, build/%.php, $(mdFiles)) - -uploadMarker = $(patsubst build/%.php, build/.uploadMarker/%.php, $(phpFiles)) build/.uploadMarker/css/cwsvJudo.css - -all: $(phpFiles) build/css/cwsvJudo.css - -.PHONY: echo -echo: - @echo $(phpFiles) - -build/css/cwsvJudo.css: $(cssFiles) - mkdir -p build/css - cat $(cssFiles) > $@ - -build/%.php: md/%.md pandocTemplate/cwsvJudo.html5.pandocTemplate - mkdir -p build - pandoc \ - --standalone \ - --css=css/cwsvJudo.css \ - --template=pandocTemplate/cwsvJudo.html5.pandocTemplate \ - --output=$@ \ - $< - -.PHONY: upload -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*** \ - ftp://cwsvjudo.bplaced.net/pages/responsive/$(patsubst build/%.php,%.php,$^) \ - --ftp-create-dirs - touch $@ - -build/.uploadMarker/css/%.css: build/css/%.css - mkdir -p build/.uploadMarker/css - curl \ - --upload-file $^ \ - --user cwsvjudo:Dee4oquu \ - ftp://cwsvjudo.square7.net/pages/responsive/$(patsubst build/%,%,$^) \ - --ftp-create-dirs - curl \ - --upload-file $^ \ - --user cwsvjudo:***REMOVED*** \ - ftp://cwsvjudo.bplaced.net/pages/responsive/$(patsubst build/%,%,$^) \ - --ftp-create-dirs - touch $@ diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate index c903db0..2fccdb2 100644 --- a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate +++ b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate @@ -75,7 +75,8 @@ $endfor$ margin-top: 50px; } .hamburger { - padding-left: 10px; + padding-left: .5em; + padding-right: .5em; } .sidebar { padding: 10px; @@ -132,8 +133,10 @@ $endfor$ alt="Judo im Chemnitzer WSV - Promo" src="http://cwsvjudo.bplaced.net/ressourcen/graphiken/banner/bannerlogo.1.jpg" > - Judo - + + Judo + + $if(title-prefix)$$title-prefix$ – $endif$$pagetitle$ $endif$ - + $if(quotes)$ $endif$ -$for(css)$ - -$endfor$ $for(extraCss)$ $endfor$ diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galleryRedirector.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galleryRedirector.php index 7e7d75d..6aa0261 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galleryRedirector.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galleryRedirector.php @@ -1,13 +1,19 @@ Date: Tue, 10 Jul 2018 13:53:26 +0200 Subject: [PATCH 2/4] =?UTF-8?q?-=20zwischen=20den=20Uploads=20Pausen=20ein?= =?UTF-8?q?gef=C3=BCgt=20(ich=20wurde=20st=C3=A4ndig=20geblockt)=20=09modi?= =?UTF-8?q?fied:=20=20=20Makefile=20-=20die=20Sidebar/SubNav=20der=20ampVe?= =?UTF-8?q?rsion=20gestaltet=20=09new=20file:=20=20=20css/cwsvJudo-2018-si?= =?UTF-8?q?deBar.css=20=09modified:=20=20=20pandocTemplate/cwsvJudo.amp.pa?= =?UTF-8?q?ndocTemplate=20-=20eine=20absolute=20Url=20f=C3=BCr=20den=20Wet?= =?UTF-8?q?tkampfplaner=20=09modified:=20=20=20yaml/navTargets.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redesign2018/markdownExperiment/Makefile | 8 ++++--- .../css/cwsvJudo-2018-sideBar.css | 22 +++++++++++++++++++ .../cwsvJudo.amp.pandocTemplate | 15 ------------- .../markdownExperiment/yaml/navTargets.yaml | 2 +- 4 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-sideBar.css diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile index 3eb0d61..d5879ed 100644 --- a/homepage/redesign2018/markdownExperiment/Makefile +++ b/homepage/redesign2018/markdownExperiment/Makefile @@ -18,7 +18,7 @@ uploadMarker = \ # $(patsubst phpLib/cwsvJudo/%.php, build/.uploadMarker/phpLib/cwsvJudo/%.php, $(phpLibFiles)) \ .PHONY: all -all: $(phpFiles) build/css/cwsvJudo.css +all: $(ampFiles) $(phpFiles) build/css/cwsvJudo.css .PHONY: clean clean: @@ -91,11 +91,10 @@ build/.uploadMarker/%.php: build/%.php ftp://cwsvjudo.bplaced.net/www/pages/responsive/$(patsubst build/%.php,%.php,$^) \ --ftp-create-dirs touch $@ + sleep 1s build/.uploadMarker/amp/%.php: build/amp/%.php mkdir -p build/.uploadMarker/amp -# @toDo: das wenn die Entwicklung des ampParts fertig ist auf das -# Zielverzeichnis pages/amp umstellen curl \ --upload-file $^ \ --user cwsvjudo:Dee4oquu \ @@ -107,6 +106,7 @@ build/.uploadMarker/amp/%.php: build/amp/%.php ftp://cwsvjudo.bplaced.net/www/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \ --ftp-create-dirs touch $@ + sleep 1s build/.uploadMarker/phpLib/%.php: phpLib/%.php mkdir -p build/.uploadMarker/phpLib/cwsvJudo @@ -136,6 +136,7 @@ build/.uploadMarker/css/%.css: build/css/%.css ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%,%,$^) \ --ftp-create-dirs touch $@ + sleep 1s build/.uploadMarker/config/%: config/% mkdir -p build/.uploadMarker/config @@ -150,6 +151,7 @@ build/.uploadMarker/config/%: config/% ftp://cwsvjudo.bplaced.net/www/$(patsubst build/%,%,$^) \ --ftp-create-dirs touch $@ + sleep 1s .PHONY: graphiken diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-sideBar.css b/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-sideBar.css new file mode 100644 index 0000000..f25f265 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-sideBar.css @@ -0,0 +1,22 @@ +amp-sidebar { + background-color: #FF8100; +} +.sidebar { + padding: 10px; + margin: 0; + background-color: #FF8100; + font-size: 1.5em; + font-family: 'Orbitron-Medium',sans-serif; +} +.sidebar > li { + list-style: none; + margin-bottom:10px; +} +.sidebar a { + text-decoration: none; + color: inherit; +} +.close-sidebar { + font-size: 1.5em; + padding-left: 5px; +} diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate index 2fccdb2..d6c00c8 100644 --- a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate +++ b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate @@ -78,21 +78,6 @@ $endfor$ padding-left: .5em; padding-right: .5em; } - .sidebar { - padding: 10px; - margin: 0; - } - .sidebar > li { - list-style: none; - margin-bottom:10px; - } - .sidebar a { - text-decoration: none; - } - .close-sidebar { - font-size: 1.5em; - padding-left: 5px; - } #mainNav > a > span{ width: 2em; } diff --git a/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml b/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml index d6704f3..69b2bec 100644 --- a/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml +++ b/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml @@ -25,7 +25,7 @@ wkKalender: &wkKalender wkParticipo: &wkParticipo caption: "Wettkampf­planer" icon: *iconPlanner - url: "/pages/desktop/wkParticipo" + url: "http://cwsvjudo.bplaced.net/pages/desktop/wkParticipo" galerien: &galerien caption: "Galerien" url: "/galerien" From c448ef86a15b037250cd59312628e1231b8b14a9 Mon Sep 17 00:00:00 2001 From: marko Date: Wed, 11 Jul 2018 12:34:50 +0200 Subject: [PATCH 3/4] =?UTF-8?q?-=20$this=20wurde=20als=20Variablenname=20v?= =?UTF-8?q?erwendet=20(unter=20Php7=20offenbar=20nicht=20mehr=20erlaubt)?= =?UTF-8?q?=20=09modified:=20=20=20phpLib/cwsvJudo/miscAssis.php=20-=20den?= =?UTF-8?q?=20Serverteil=20mit=20in=20den=20Ausschreibungslink=20=C3=BCber?= =?UTF-8?q?nommen=20(subdomainseiten=20-=20insbes.=20Amp=20-=20haben=20son?= =?UTF-8?q?st=20ins=20Leere=20gezeigt!=20Damit=20geht=20aber=20nat=C3=BCrl?= =?UTF-8?q?ich=20Portability=20verloren)=20=09modified:=20=20=20phpLib/cws?= =?UTF-8?q?vJudo/wkKalender.php=20-=20Absoluter=20Link=20f=C3=BCr=20das=20?= =?UTF-8?q?Wiki=20(wg.=20ampSubDomain)=20=09modified:=20=20=20yaml/navTarg?= =?UTF-8?q?ets.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../markdownExperiment/phpLib/cwsvJudo/miscAssis.php | 12 ++++++------ .../phpLib/cwsvJudo/wkKalender.php | 2 +- .../markdownExperiment/yaml/navTargets.yaml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/miscAssis.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/miscAssis.php index 1c9e2cb..75b3924 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/miscAssis.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/miscAssis.php @@ -109,14 +109,14 @@ return arrayKeyFilter( ); } -function echoThisOrThat($this, $that){ - echo( !empty($this) ? $this : $that ); +function echoThisOrThat($This, $that){ + echo( !empty($This) ? $This : $that ); } -function echoThisWhenThat($this, $that){ - if( !empty($that) ) echo( $this ); +function echoThisWhenThat($This, $that){ + if( !empty($that) ) echo( $This ); } -function thisWhenThat($this, $that){ +function thisWhenThat($This, $that){ if( empty($that) ) return ""; - return $this; + return $This; } ?> diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php index b10df91..55c9c34 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php @@ -200,7 +200,7 @@ $htmlWkTableString = ""; "". "". "". - "".$wk['Veranstaltung']."". + "".$wk['Veranstaltung']."". "". "". "".$wk['Ort']."". diff --git a/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml b/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml index 69b2bec..daf40eb 100644 --- a/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml +++ b/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml @@ -6,7 +6,7 @@ home: &home icon: *cwsvJudoLogoWappen judoWiki: &judoWiki caption: "JudoWiki" - url: "/JudoWiki" + url: "http://cwsvjudo.bplaced.net/JudoWiki" title: "Lexikon über Judo in Form eines Wiki" icon: *iconWikipediaW training: &training From b8d707016283dd2db9fc8c3bd98de681dca43d70 Mon Sep 17 00:00:00 2001 From: marko Date: Sat, 14 Jul 2018 13:29:28 +0200 Subject: [PATCH 4/4] index on redesign2018: f4eb1bb Merge /media/sdb1/judoRepo into redesign2018 --- ...udo.html5.pandocTemplate => cwsvJudo.html5.pandocTemplate.bak} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename homepage/redesign2018/markdownExperiment/pandocTemplate/{cwsvJudo.html5.pandocTemplate => cwsvJudo.html5.pandocTemplate.bak} (100%) diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate.bak similarity index 100% rename from homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate rename to homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate.bak