Merge /media/sdb1/gitRepositories/judo into redesign2018

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

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

@@ -1,8 +1,8 @@
 ---
 subNav:
 	- *home
-	- {url: "/links", caption: "Links"}
-	- {url: "/download", caption: "Downloads"}
-	- {url: "/hilfsmittel", caption: "Hilfsmittel"}
+	- *links
+	- *downloads
+	- *tools
 	- *quiz
 ...

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

@@ -43,6 +43,26 @@ iconWikipediaW: &iconWikipediaW
 	height: "1700"
 	alt: "Kontakt"
 	src: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/wikipediaW.svg"
+iconQuizLampe: &iconQuizLampe
+	width: "135"
+	height: "137.01"
+	alt: "Quiz"
+	src: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/quizLampe.svg"
+iconWerkzeug: &iconWerkzeug
+	width: "240"
+	height: "240"
+	alt: "Tools"
+	src: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/werkzeugIcon.svg"
+iconLinks: &iconLinks
+	width: "500"
+	height: "500"
+	alt: "Links"
+	src: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/linksIcon.svg"
+iconDownloads: &iconDownloads
+	width: "200"
+	height: "200"
+	alt: "Links"
+	src: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/downloadIcon.svg"
 iconExtrasStern: &iconExtrasStern
 	width: "100"
 	height: "100"

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

@@ -56,9 +56,26 @@ quiz: &quiz
 	caption: "Quiz"
 	url: "/quiz"
 	title: "Quiz"
+	icon: *iconQuizLampe
+links: &links
+	caption: "Links"
+	url: "/links"
+	title: "Links"
+	icon: *iconLinks
+downloads: &downloads
+	caption: "Downloads"
+	url: "/download"
+	title: "Downloads"
+	icon: *iconDownloads
+tools: &tools
+	caption: "Helferlein"
+	url: "/helferlein"
+	title: "Helferlein"
+	icon: *iconWerkzeug
 extras: &extras
 	caption: "Extras"
 	url: "/extras"
 	title: "Viele, kleine, gesammelte Sachen"
 	icon: *iconExtras
+=======
 ...