- temporäre Dateien von vim ignorieren (*~)

neue Datei:     .gitignore
- neue Targets (favicons ampPages)
	geändert:       Makefile
- kleinere Layoutänderungen
	geändert:       css/cwsvJudo-2018-galTable.css
	geändert:       css/cwsvJudo-2018-mainNav.css
	geändert:       css/cwsvJudo-2018-news.css
	geändert:       css/cwsvJudo-2018-wkKalender.css
	geändert:       css/cwsvJudo-2018.css
- Datenschutzerklärung und Impressum hinzugefügt
	geändert:       yaml/navTargets.yaml
	neue Datei:     md/datenschutz.md
	neue Datei:     md/impressum.md
	neue Datei:     yaml/datenschutz.subNav.yaml
	neue Datei:     yaml/impressum.subNav.yaml
	geändert:       md/index.md
	geändert:       md/kontakt.md
	geändert:       md/trainingszeiten.md
	geändert:       yaml/index.subNav.yaml
	geändert:       yaml/kontakt.subNav.yaml
	geändert:       yaml/trainingszeiten.subNav.yaml
	geändert:       yaml/verein.subNav.yaml
	geändert:       yaml/wkKalender.subNav.yaml
	geändert:       pandocTemplate/cwsvJudo.html5.pandocTemplate
- kleine Designänderung an der Jahresauswahl
	geändert:       phpLib/cwsvJudo/galTable.php
- Testen eines neuen Datumsformates
	geändert:       phpLib/cwsvJudo/wkKalender.php

homepage/redesign2018/markdownExperiment/Makefile

@@ -5,6 +5,8 @@ mdFiles = $(wildcard md/*.md)
 phpFiles = $(patsubst md/%.md, build/%.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)) \
@@ -14,8 +16,15 @@ uploadMarker = \
 	build/.uploadMarker/css/cwsvJudo.css
 #	$(patsubst phpLib/cwsvJudo/%.php, build/.uploadMarker/phpLib/cwsvJudo/%.php, $(phpLibFiles)) \
 
+.PHONY: all
 all: $(phpFiles) build/css/cwsvJudo.css
 
+.PHONY: clean
+clean:
+	$(RM) -rf build
+	mkdir -p build
+
+
 .PHONY: echo
 echo:
 	@echo $(phpFiles)
@@ -23,20 +32,40 @@ echo:
 	@echo $(cssFiles)
 	@echo $(uploadMarker)
 
+
+.PHONY: ampTest
+ampTest: $(ampFiles)
+
 build/css/cwsvJudo.css: $(cssFiles)
 	mkdir -p build/css
-#	cat $(cssFiles) > $@
-	cat $(cssFiles) | cleancss -o $@
+	cat $(cssFiles) > $@
+#	cat $(cssFiles) | cleancss -o $@
 
 build/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate
 	mkdir -p build
 	pandoc \
 		--standalone \
-		--css=/ressourcen/css/cwsvJudo.css \
+		--css="ressourcen/css/cwsvJudo.css" \
 		--template=pandocTemplate/cwsvJudo.html5.pandocTemplate \
 		--output=$@ \
 	$< $(word 2,$^)
 
+build/amp/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.amp.pandocTemplate
+	mkdir -p $(dir $@)
+	pandoc \
+		--standalone \
+		--css="ressourcen/css/cwsvJudo.css" \
+		--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 $@
+
+
 build/yaml/%.yaml: yaml/images.yaml yaml/navTargets.yaml yaml/mainNav.yaml yaml/%.subNav.yaml
 	mkdir -p build/yaml
 	python tools/yamlMerge.py $^ > $@
@@ -108,21 +137,39 @@ build/.uploadMarker/config/%: config/%
 
 
 .PHONY: graphiken
-graphiken: cwsvLogoWappen cwsvJudoLogoWappen
+graphiken: cwsvLogoWappen cwsvJudoLogoWappen favIcons
 
 cwsvJudoLogoWappen: $(addprefix build/graphiken/cwsvJudoLogoWappen/cwsvJudoLogoWappen., $(addsuffix w.png, $(RES_LIST)))
 cwsvLogoWappen:     $(addprefix build/graphiken/cwsvLogoWappen/cwsvLogoWappen.,         $(addsuffix w.png, $(RES_LIST)))
 
 build/graphiken/cwsvJudoLogoWappen/cwsvJudoLogoWappen.png: graphiken/cwsvJudoLogoWappen.xcf
+	mkdir -p $(dir $@)
+	convert -layers merge -background transparent $< $@
 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
 	mkdir -p $(dir $@)
 	convert -layers flatten -background transparent -resize $*x $< $@
 #	zopfli/zopflipng --iterations=500 --filters=01234mepb --lossy_8bit --lossy_transparent $@ $@
 	zopflipng -my $@ $@
 
-echo:
+
+.PHONY: favIcons
+favIcons: build/graphiken/favIcons/favicon.ico
+
+build/graphiken/favIcons/favicon.ico: build/graphiken/cwsvJudoLogoWappen/cwsvJudoLogoWappen.png
+	mkdir -p $(dir $@)
+	convert -background transparent -gravity center $< \
+		-resize 64x64 \
+		-extent 64x64 \
+		-channel rgba \
+		-alpha on \
+		-define icon:auto-resize=64,48,32,16 \
+		$@