Merge /media/sdb1/gitRepositories/judo into redesign2018

Conflicts:
	homepage/redesign2018/markdownExperiment/src/md/galerien.md
	homepage/redesign2018/markdownExperiment/src/yaml/images.yaml

homepage/redesign2018/markdownExperiment/Makefile

@@ -1,9 +1,9 @@
 RES_LIST = 64 128 256 512
 
-cssFiles = $(wildcard css/*.css)
+cssFiles = $(wildcard src/css/*.css)
-mdFiles = $(wildcard md/*.md)
+mdFiles = $(wildcard src/md/*.md)
-phpFiles = $(patsubst md/%.md, build/%.php, $(mdFiles))
+phpFiles = $(patsubst src/md/%.md, build/%.php, $(mdFiles))
-ampFiles = $(patsubst md/%.md, build/amp/%.php, $(mdFiles))
+ampFiles = $(patsubst src/md/%.md, build/amp/%.php, $(mdFiles))
 phpLibFiles = $(wildcard phpLib/cwsvJudo/*.php) phpLib/phpcount/phpcount.php
 configFiles = $(wildcard config/*.php)
 
@@ -50,7 +50,7 @@ build/css/cwsvJudo.css: $(cssFiles)
 #	cat $^ | ./node_modules/.bin/csso -o $@
 	cat $^ | csso -o $@
 
-build/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate
+build/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate
 	mkdir -p build
 	pandoc \
 		--standalone \
@@ -59,7 +59,7 @@ build/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTempl
 		--output=$@ \
 	$< $(word 2,$^)
 
-build/amp/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.amp.pandocTemplate
+build/amp/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.amp.pandocTemplate
 	mkdir -p $(dir $@)
 	pandoc \
 		--standalone \
@@ -71,7 +71,9 @@ build/amp/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.amp.pandocTem
 #	sed --in-place 's/<img \(.*\)\/>/<amp-img \1 layout=\"responsive\"><noscript><img \1\/><\/noscript><\/amp-img>/g;' $@
 	sed --in-place 's/<img \(.*\)\/>/<amp-img \1 layout=\"responsive\"><\/amp-img>/g;' $@
 
-build/yaml/%.yaml: yaml/images.yaml yaml/navTargets.yaml yaml/mainNav.yaml yaml/%.subNav.yaml
+
+# @toDo: Verzeichnisstruktur überdenken
+build/yaml/%.yaml: src/yaml/images.yaml src/yaml/navTargets.yaml src/yaml/mainNav.yaml src/yaml/%.subNav.yaml
 	mkdir -p build/yaml
 	python tools/yamlMerge.py $^ > $@
 

homepage/redesign2018/markdownExperiment/readMe.md

@@ -0,0 +1,10 @@
+# Homepage der Judoka des CWSV
+
+## Verzeichnisstruktur
+
+`src`
+: (Handgeschriebene) Quellen (Quellcodes)
+
+`res`
+: nicht selber erzeugte Quellen (z.B. Graphiken)
+

homepage/redesign2018/markdownExperiment/src/yaml/galerien.subNav.yaml

@@ -0,0 +1,10 @@
+---
+subNav:
+	- *home
+	- *training
+	- *verein
+	- *wkKalender
+	- {caption: "Galerien <?php echo(date('Y'));?>", icon: *iconGallery, url: "/galerien?jahr=<?php echo(date('Y'));?>"}
+	- *feierGalerien
+	- *zeltenGalerien
+...

homepage/redesign2018/markdownExperiment/src/yaml/images.yaml

@@ -43,7 +43,7 @@ iconWikipediaW: &iconWikipediaW
 	height: "1700"
 	alt: "Kontakt"
 	src: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/wikipediaW.svg"
-iconExtras: &iconExtras
+iconExtrasStern: &iconExtrasStern
 	width: "100"
 	height: "100"
 	alt: "Extras"

homepage/redesign2018/markdownExperiment/src/yaml/navTargets.yaml

@@ -42,10 +42,14 @@ kontakt: &kontakt
 	caption: "Kontakt"
 	url: "/kontakt"
 	icon: *iconContact
-kontakt: &impressum
+extras: &extras
+	caption: "Extras"
+	url: "/extras"
+	icon: *iconExtrasStern
+impressum: &impressum
 	caption: "Impressum"
 	url: "/impressum"
-kontakt: &datenschutz
+datenschutz: &datenschutz
 	caption: "Datenschutz"
 	url: "/datenschutz"
 quiz: &quiz

homepage/redesign2018/markdownExperiment/yaml/galerien.subNav.yaml

@@ -1,9 +0,0 @@
----
-subNav:
-	- *home
-	- *training
-	- *verein
-	- *wkKalender
-	- *feierGalerien
-	- *zeltenGalerien
-...