From 23a97d4d8fb25ddb91c296b93ef2a80a2e963649 Mon Sep 17 00:00:00 2001
From: marko <cwsvjudo@arcor.de>
Date: Thu, 14 Feb 2019 13:17:23 +0100
Subject: [PATCH 1/7] =?UTF-8?q?=20zum=20Commit=20vorgemerkte=20=C3=84nderu?=
 =?UTF-8?q?ngen:=20=09ge=C3=A4ndert:=20=20=20=20=20=20=20src/Makefiles/Mak?=
 =?UTF-8?q?efile.ftpUpload?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Makefiles/Makefile.ftpUpload          | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
index c00c6ac..2ba49b4 100644
--- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
@@ -16,6 +16,17 @@ httpUrlBase = http://cwsvjudo.bplaced.net.net/
 ftpFilePath = videoalben/videoalben.2018
 ftpPathBase = /www
 
+
+#ftpPathBase = /htdocs
+#ftpFilePath = videoalben/videoalben.2018
+
+ftpServer = cwsvjudo.bplaced.net
+ftpUser = cwsvjudo
+ftpPassword = ***REMOVED***
+
+ftpPathBase = /www
+ftpFilePath = videoalben/videoalben.2018
+
 vidGalIndexPhp = ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
 dryRun = --dry-run
 timeHandling= --only-newer
@@ -24,14 +35,13 @@ lftpNetLimitRate = 0
 domain = cwsvJudo.dedyn.io
 vidGalInsertScript = ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
 
-
 .PHONY: all
 all:
 
 .PHONY: ftpUpload
 ftpUpload:
-	lftp -e 'set ftp:ssl-allow no; set net:limit-rate $(lftpNetLimitRate); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; quit; ' \
-		-u $(ftpUser),$(ftpPassword) ftp://$(ftpServer)
+#	lftp -e 'set ftp:ssl-allow no; set net:limit-rate $(lftpNetLimitRate); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; quit; ' \
+#		-u $(ftpUser),$(ftpPassword) ftp://$(ftpServer)
 	
 registerFiles:
 	for file in videos/webm/*; do \
@@ -47,4 +57,15 @@ registerFiles:
 			--vidUrl="http://$(domain)/webm/$${filename}" \
 			--posterUrl="http://cwsvjudo-media-2018.unaux.com/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails/$${filename%.*}.jpg" \
 			--checkSum=$${filename%.*}; \
+#	lftp -e 'set ftp:ssl-allow no; set net:limit-rate $(lftpNetLimitRate); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; quit; ' \
+#		-u $(ftpUser),$(ftpPassword) ftp://$(ftpServer)
+	
+	for file in videos/webm/*; do \
+		filename=$${file##*/}; \
+		$(vidGalInsertScript) \
+			--shiaiYamlFile=./shiaiData.yaml \
+#			--vidUrl="http://cwsvjudo.dedyn.io/videos/$${filename}" \
+			--vidUrl="http://cwsvjudo.dedyn.io/videos/$${filename}" \
+			--posterUrl="http://cwsvjudo-media-2018.unaux.com/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails/$${filename%.*}.jpg" \
+			--checkSum=$${filename%.*};\
 	done;\

From ba40a087f0e42a22b5616a87d76c592ca78e4f16 Mon Sep 17 00:00:00 2001
From: marko <cwsvjudo@arcor.de>
Date: Tue, 26 Feb 2019 10:57:16 +0100
Subject: [PATCH 2/7] Druckversion des Wettkampfkalenders
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Spalte mit qrCode hinzugefügt
	geändert:       phpLib/cwsvJudo/wkKalender.php
	neue Datei:     phpLib/cwsvJudo/wkQrCode.php
- Designanpassungen für die Druckversion
	geändert:       src/css/cwsvJudo-2018-footer.css
	geändert:       src/css/cwsvJudo-2018-header.css
	geändert:       src/css/cwsvJudo-2018-layout.css
	geändert:       src/css/cwsvJudo-2018-mainNav.css
	geändert:       src/css/cwsvJudo-2018-sideBar.css
	geändert:       src/css/cwsvJudo-2018-subNav.css
	geändert:       src/css/cwsvJudo-2018-wkKalender.css
	geändert:       src/css/cwsvJudo-2018.css
---
 .../phpLib/cwsvJudo/wkKalender.php            |   8 +-
 .../phpLib/cwsvJudo/wkQrCode.php              |  24 ++
 .../src/css/cwsvJudo-2018-footer.css          |   6 +
 .../src/css/cwsvJudo-2018-header.css          |   7 +
 .../src/css/cwsvJudo-2018-layout.css          |   7 +
 .../src/css/cwsvJudo-2018-mainNav.css         |   7 +
 .../src/css/cwsvJudo-2018-sideBar.css         |   2 +-
 .../src/css/cwsvJudo-2018-subNav.css          |   7 +
 .../src/css/cwsvJudo-2018-wkKalender.css      | 257 ++++++++++++++++++
 .../src/css/cwsvJudo-2018.css                 |  19 +-
 10 files changed, 341 insertions(+), 3 deletions(-)
 create mode 100644 homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkQrCode.php

diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
index 2f92ee9..f6da7cf 100644
--- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
+++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
@@ -154,6 +154,11 @@ return $ret;
 /// Aus einer Liste von Wettkämpfen den htmlCode der Wettkampftabelle bereit stellen
 function wkList2htmlWkTable( $aWkList, $someOptions = [] ){
 setlocale(LC_ALL, 'de_DE.utf8');
+
+require_once("./config.inc.php");
+require_once("/users/cwsvjudo/www/ressourcen/phpLib/phpqrcode/qrlib.php"); 
+
+
 if( empty($aWkList) )
 	return "";
 
@@ -226,6 +231,7 @@ $htmlWkTableString = "";
 					"</td>".
 					"<td data-title=\"iCal\">".
 						"<a title=\"Termin für ".$wk['Veranstaltung']." in Kalender übernehmen\" href=\"/ressourcen/phpLib/calendar.php?wkID=".$wk['lfdeNr']."\">iCal</a>".
+						"<img class=\"print-only\" heigtht=\"111\" width=\"111\" src=http://cwsvjudo.bplaced.net/pages/responsive/wkQrCode.php?id=".$wk['lfdeNr']." />".
 					"</td>".
 				"</tr></a>\n";
 	}
@@ -454,7 +460,7 @@ function wkTableHtml(){
 				$siteData['mainContent'] .= 
 					"<h2>Wettkampfkalender ".$jahr."</h2>";
 				$siteData['mainContent'].=
-					"<div style=\"display:flex;justify-content:space-between;\">";
+					"<div class=\"nonePrint\" style=\"display:flex;justify-content:space-between;\">";
 
 				if(in_array((intval($_GET["jahr"])-1), $jahre)){
 					$siteData['mainContent'].=
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkQrCode.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkQrCode.php
new file mode 100644
index 0000000..c19dfc5
--- /dev/null
+++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkQrCode.php
@@ -0,0 +1,24 @@
+<?php 
+require_once("./config.inc.php");
+require_once($basePath."/ressourcen/phpLib/phpqrcode/qrlib.php"); 
+
+	$param = $_GET['id']; // remember to sanitize that - it is user input! 
+	 
+	// we need to be sure ours script does not output anything!!! 
+	// otherwise it will break up PNG binary! 
+	 
+//	ob_start("callback"); 
+	 
+	// here DB request or some processing 
+	$codeText = "http://cwsvjudo.bplaced.net/wk/".$param; 
+	 
+	// end of processing here 
+	$debugLog = ob_get_contents(); 
+//	ob_end_clean(); 
+	 
+	// outputs image directly into browser, as PNG stream 
+	QRcode::png($codeText, false, QR_ECLEVEL_L, 3, 0, false );
+
+exit();
+?>
+
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-footer.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-footer.css
index 3d38967..7ff4ae7 100644
--- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-footer.css
+++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-footer.css
@@ -13,3 +13,9 @@
 	max-width: 1em;
 }
 
+@media print{
+	.footerBar
+	{
+		display: none;
+	}
+}
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-header.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-header.css
index b7633c4..2784013 100644
--- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-header.css
+++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-header.css
@@ -66,3 +66,10 @@
 		align-items: center;
 	}
 }
+
+@media print{
+	.cwsvHeader
+	{
+		display: none;
+	}
+}
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-layout.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-layout.css
index eeb9ceb..f22f1d3 100644
--- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-layout.css
+++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-layout.css
@@ -74,3 +74,10 @@ body > * {
 		flex-basis: 25%;
 	}
 }
+
+@media print{
+	.sideNotes
+	{
+		display: none;
+	}
+}
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css
index a927b90..21591e7 100644
--- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css
+++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css
@@ -85,3 +85,10 @@
 		display: initial;
 	}
 }
+
+@media print{
+	#mainNav
+	 {
+		display: none;
+	}
+}
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-sideBar.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-sideBar.css
index f25f265..e5e0ca2 100644
--- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-sideBar.css
+++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-sideBar.css
@@ -14,7 +14,7 @@ amp-sidebar {
 }
 .sidebar a {
 	text-decoration: none;
-    color: inherit;
+	color: inherit;
 }
 .close-sidebar {
 	font-size: 1.5em;
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-subNav.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-subNav.css
index beb2b70..de22c25 100644
--- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-subNav.css
+++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-subNav.css
@@ -87,3 +87,10 @@
 		text-align: initial;
 	}
 }
+
+@media print{
+	.subNav
+	 {
+		display: none;
+	}
+}
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css
index 87fbd74..1fbd357 100644
--- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css
+++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css
@@ -885,3 +885,260 @@
 	background-color: #FF8100;
 	border-radius: .5em;
 }
+
+@media print{
+	.wkMonthBar
+	{
+		display: none;
+	}
+	.wkKalender > thead{
+		display: table-header-group;
+		width: 100%;
+	}
+	.wkKalender > tbody > tr{
+		display: table-row;
+		width: 100%;
+	}
+	.wkKalender > tbody > tr > td {
+		display: table-cell;
+	}
+	/*qrCode*/
+	.wkKalender > tbody > tr > td > img{
+		width: 1cm;
+	}
+	.wkKalender > tbody > tr > td:nth-of-type(5) > a{
+		display: none;
+	}
+	.wkKalender > tbody > tr > td[data-title]:before {
+		display: none;
+		content: "";
+	}
+	.wkKalender > tbody{
+		display: table-row-group;
+	}
+	.wkKalender > tfoot{
+		display: table-footer-group;
+	}
+	.wkKalender > tbody > tr {
+		border: 1px solid #e0e0e0;
+		border-radius: 2px;
+		margin-bottom: 1.6rem;
+	}
+	.wkKalender > tbody > tr > td {
+		vertical-align: middle;
+		text-align: initial;
+	}
+	.wkKalender > tbody > tr:nth-child(odd) {
+		background-color: #FF8100;
+	}
+	.wkKalender > tbody > tr > td:nth-child(odd) {
+		background-color: inherit;
+	}
+	.wkKalender > tbody > tr > td[data-title]:before {
+		content: initial;
+	}
+	.wkKalender tr, th, td {
+		border: 1px solid black;
+	}
+	.wkKalender th {
+		display: table-cell;
+	}
+	
+	.kalenderDatum{
+		flex-direction: column;
+		align-items: center;
+	}
+	.kalenderDatum > span:nth-child(4)::after{
+		content: initial;
+		white-space: initial;
+	}
+	.kalenderDatum > span:nth-child(4){
+		display: none;
+	}
+	.kalenderDatum > span:nth-child(3)::after{
+		content: ".";
+		white-space: pre;
+	}
+	.kalenderDatum > span:nth-child(2)::after{
+		content: initial;
+		white-space: initial;
+	}
+
+/* https://codepen.io/denilsonsa/pen/Etrba */
+
+	/****************************************/
+	/* Styling rules, such as font and colors */
+	.date-as-calendar {
+	  font-variant: normal;
+	  font-style: normal;
+	  font-weight: normal;
+	  font-family: "Helvetica", "Arial", sans-serif;
+
+	  /* It seems vertical-align: baseline does not work correctly with display: inline-flex. */
+	  vertical-align: top;
+
+	  /* margin: 1ex; */
+
+	  color: black;
+	  background: white;
+	  background : linear-gradient(to bottom right, #FFF 0%, #EEE 100%);
+
+	  border: 1px solid #888;
+	  border-radius: 3px;
+	  overflow: hidden;
+
+	  box-shadow: 2px 2px 2px -2px black;
+	}
+	.date-as-calendar .weekday,
+	.date-as-calendar .day,
+	.date-as-calendar .month,
+	.date-as-calendar .year {
+	  text-align: center;
+	  line-height: 1.0;
+	}
+	.date-as-calendar .month {
+	  font-family: "Oswald", sans-serif;
+	  text-transform: uppercase;
+	  background: #B11;
+	  background : linear-gradient(to bottom right, #D66 0%, #A00 100%);
+	  color: white;
+	}
+
+	/****************************************/
+	/* Layout rules using position: absolute and pixels. */
+	.position-pixels.date-as-calendar {
+	  display: inline-block;
+	  position: relative;
+	  width: 64px;
+	  height: 64px;
+	}
+	.position-pixels.date-as-calendar .weekday,
+	.position-pixels.date-as-calendar .day,
+	.position-pixels.date-as-calendar .month,
+	.position-pixels.date-as-calendar .year {
+	  display: block;
+	  position: absolute;
+	  left: 0;
+	  right: 0;
+	  width: 100%;
+	  height: 1em;
+	}
+	.position-pixels.date-as-calendar .month {
+	  top: 0px;
+	  font-size: 12px;
+	  padding: 2px 0;
+	}
+	.position-pixels.date-as-calendar .weekday {
+	  top: 16px;
+	  font-size: 10px;
+	}
+	.position-pixels.date-as-calendar .day {
+	  top: 26px;
+	  font-size: 24px;
+	}
+	.position-pixels.date-as-calendar .year {
+	  top: 50px;
+	  font-size: 14px;
+	}
+
+	/****************************************/
+	/* Layout rules using position: absolute and relative dimensions using em. */
+	.position-em.date-as-calendar {
+	  display: inline-block;
+	  position: relative;
+	  
+	  width: 4em; 
+	  height: 4em; 
+	}
+	.position-em.date-as-calendar .weekday,
+	.position-em.date-as-calendar .day,
+	.position-em.date-as-calendar .month,
+	.position-em.date-as-calendar .year {
+	  display: block;
+	  position: absolute;
+	  left: 0;
+	  right: 0;
+	  width: 100%;
+	  height: 1em;
+	}
+	.position-em.date-as-calendar .month {
+	  top: 0px;
+	  font-size: 0.75em;
+	  padding: 0.1em 0;
+	}
+	.position-em.date-as-calendar .weekday {
+	  top: 1.6em;
+	  font-size: 0.6125em;
+	}
+	.position-em.date-as-calendar .day {
+	  top: 1.1em;
+	  font-size: 1.5em
+	}
+	.position-em.date-as-calendar .year {
+	  bottom: 0px;
+	  font-size: 0.87750em;
+	}
+
+	/****************************************/
+	/* Layout rules using display: inline-flex and relative dimensions using em. */
+	.inline-flex.date-as-calendar {
+	  display: inline-flex;
+	  flex-direction: column;
+	  flex-wrap: nowrap;
+	  justify-content: space-between;
+	  
+	  width: 4em; 
+	  height: 4em; 
+	}
+	.inline-flex.date-as-calendar .weekday,
+	.inline-flex.date-as-calendar .day,
+	.inline-flex.date-as-calendar .month,
+	.inline-flex.date-as-calendar .year {
+	  display: block;
+	  flex: 1 1 auto;
+	}
+	.inline-flex.date-as-calendar .month {
+	  order: 1;
+	  font-size: 0.75em;
+	  padding: 0.1em 0;
+	}
+	.inline-flex.date-as-calendar .weekday {
+	  order: 2;
+	  font-size: 0.6125em;
+	}
+	.inline-flex.date-as-calendar .day {
+	  order: 3;
+	  font-size: 1.5em;
+	}
+	.inline-flex.date-as-calendar .year {
+	  order: 4;
+	  font-size: 0.87750em;
+	}
+
+	/****************************************/
+	/* Multiple sizes. */
+	.date-as-calendar.size0_5x {
+	  font-size: 8px;
+	}
+	.date-as-calendar.size0_75x {
+	  font-size: 12px;
+	}
+	.date-as-calendar.size1x {
+	  font-size: 16px;
+	}
+	.date-as-calendar.size1_25x {
+	  font-size: 20px;
+	}
+	.date-as-calendar.size1_5x {
+	  font-size: 24px;
+	}
+	.date-as-calendar.size1_75x {
+	  font-size: 28px;
+	}
+	.date-as-calendar.size2x {
+	  font-size: 32px;
+	}
+	.date-as-calendar.size3x {
+	  font-size: 48px;
+	}
+}
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css
index 59daa70..68b2364 100644
--- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css
+++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css
@@ -24,6 +24,13 @@ body{
 	}
 }
 
+@media print{
+	body{
+		font-size: 1.3vw;
+	}
+}
+
+
 /*
  * Ein Reset für das BoxSizing
  * Wir wollen Maße auf die "äußere Boundingbox" beziehen
@@ -169,9 +176,19 @@ body{
 }
 
 .displayNone{
-	display: none !important;
+	display: none;
 }
 
 .fontSizeXxSmall{
 	font-size: xx-small;
 }
+
+.print-only{
+	display: none;
+}
+
+@media print{
+	.print-only{
+		display: initial;
+	}
+}

From 18394392de7de256fc11aa6da572b6baace9aece Mon Sep 17 00:00:00 2001
From: marko <cwsvjudo@arcor.de>
Date: Sun, 24 Mar 2019 11:35:09 +0100
Subject: [PATCH 3/7] =?UTF-8?q?Eigener=20Zweig=20f=C3=BCr=20den=20Wettkamp?=
 =?UTF-8?q?fplaner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Alle Dateien in ein neues Verzeichnis kopiert
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/addEvent.php -> addEvent.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/addFahrt.php -> addFahrt.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/addStarter.php -> addStarter.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/addStarterDev.php -> addStarterDev.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/.htaccess -> admin/.htaccess
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php -> admin/addEvent.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/addMitfahrer.php -> admin/addMitfahrer.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/adminAddStarter.php -> admin/adminAddStarter.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/adminFunctions.php -> admin/adminFunctions.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/adminFunctions.php.inc -> admin/adminFunctions.php.inc
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/adminUpdateStarterErgebnis.php -> admin/adminUpdateStarterErgebnis.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/config.inc.php -> admin/config.inc.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/index.php -> admin/index.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php -> admin/listEvents.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/listUsers.php -> admin/listUsers.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php -> admin/newsLetter.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/register.php -> admin/register.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/resetPassword.php -> admin/resetPassword.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/reseteMitfahrer.php -> admin/reseteMitfahrer.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php -> admin/showEvent.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php -> admin/showFahrt.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/showUser.php -> admin/showUser.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/admin/verteileMitfahrer.php -> admin/verteileMitfahrer.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/auth.php -> auth.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/authLogin.php -> authLogin.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/calendar.php -> calendar.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/changePassword.php -> changePassword.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/editFahrt.php -> editFahrt.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/eventKalender.php -> eventKalender.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/galImgPicker.php -> galImgPicker.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/horstWolfJudosport.php -> horstWolfJudosport.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/index.php -> index.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/infoZettel.php -> infoZettel.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/lib/wkParticipo-userAttribute.php -> lib/wkParticipo-userAttribute.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php -> lib/wkParticipoLib.inc.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/local/.htaccess -> local/.htaccess
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/local/db.php.inc -> local/db.php.inc
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/local/wkParticipoConf.php.inc -> local/wkParticipoConf.php.inc
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/login.php -> login.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/logout.php -> logout.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/showWkEvent.php -> showWkEvent.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/style.css -> style.css
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/styleDev.css -> styleDev.css
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/userInfo.php -> userInfo.php
	umbenannt:      ../redesign2018/markdownExperiment/wkParticipo/wkParticipo.css -> wkParticipo.css
---
 .../markdownExperiment => }/wkParticipo/addEvent.php              | 0
 .../markdownExperiment => }/wkParticipo/addFahrt.php              | 0
 .../markdownExperiment => }/wkParticipo/addStarter.php            | 0
 .../markdownExperiment => }/wkParticipo/addStarterDev.php         | 0
 .../markdownExperiment => }/wkParticipo/admin/.htaccess           | 0
 .../markdownExperiment => }/wkParticipo/admin/addEvent.php        | 0
 .../markdownExperiment => }/wkParticipo/admin/addMitfahrer.php    | 0
 .../markdownExperiment => }/wkParticipo/admin/adminAddStarter.php | 0
 .../markdownExperiment => }/wkParticipo/admin/adminFunctions.php  | 0
 .../wkParticipo/admin/adminFunctions.php.inc                      | 0
 .../wkParticipo/admin/adminUpdateStarterErgebnis.php              | 0
 .../markdownExperiment => }/wkParticipo/admin/config.inc.php      | 0
 .../markdownExperiment => }/wkParticipo/admin/index.php           | 0
 .../markdownExperiment => }/wkParticipo/admin/listEvents.php      | 0
 .../markdownExperiment => }/wkParticipo/admin/listUsers.php       | 0
 .../markdownExperiment => }/wkParticipo/admin/newsLetter.php      | 0
 .../markdownExperiment => }/wkParticipo/admin/register.php        | 0
 .../markdownExperiment => }/wkParticipo/admin/resetPassword.php   | 0
 .../markdownExperiment => }/wkParticipo/admin/reseteMitfahrer.php | 0
 .../markdownExperiment => }/wkParticipo/admin/showEvent.php       | 0
 .../markdownExperiment => }/wkParticipo/admin/showFahrt.php       | 0
 .../markdownExperiment => }/wkParticipo/admin/showUser.php        | 0
 .../wkParticipo/admin/verteileMitfahrer.php                       | 0
 .../{redesign2018/markdownExperiment => }/wkParticipo/auth.php    | 0
 .../markdownExperiment => }/wkParticipo/authLogin.php             | 0
 .../markdownExperiment => }/wkParticipo/calendar.php              | 0
 .../markdownExperiment => }/wkParticipo/changePassword.php        | 0
 .../markdownExperiment => }/wkParticipo/editFahrt.php             | 0
 .../markdownExperiment => }/wkParticipo/eventKalender.php         | 0
 .../markdownExperiment => }/wkParticipo/galImgPicker.php          | 0
 .../markdownExperiment => }/wkParticipo/horstWolfJudosport.php    | 0
 .../{redesign2018/markdownExperiment => }/wkParticipo/index.php   | 0
 .../markdownExperiment => }/wkParticipo/infoZettel.php            | 0
 .../wkParticipo/lib/wkParticipo-userAttribute.php                 | 0
 .../wkParticipo/lib/wkParticipoLib.inc.php                        | 0
 .../markdownExperiment => }/wkParticipo/local/.htaccess           | 0
 .../markdownExperiment => }/wkParticipo/local/db.php.inc          | 0
 .../wkParticipo/local/wkParticipoConf.php.inc                     | 0
 .../{redesign2018/markdownExperiment => }/wkParticipo/login.php   | 0
 .../{redesign2018/markdownExperiment => }/wkParticipo/logout.php  | 0
 .../markdownExperiment => }/wkParticipo/showWkEvent.php           | 0
 .../{redesign2018/markdownExperiment => }/wkParticipo/style.css   | 0
 .../markdownExperiment => }/wkParticipo/styleDev.css              | 0
 .../markdownExperiment => }/wkParticipo/userInfo.php              | 0
 .../markdownExperiment => }/wkParticipo/wkParticipo.css           | 0
 45 files changed, 0 insertions(+), 0 deletions(-)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/addEvent.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/addFahrt.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/addStarter.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/addStarterDev.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/.htaccess (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/addEvent.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/addMitfahrer.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/adminAddStarter.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/adminFunctions.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/adminFunctions.php.inc (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/adminUpdateStarterErgebnis.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/config.inc.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/index.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/listEvents.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/listUsers.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/newsLetter.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/register.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/resetPassword.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/reseteMitfahrer.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/showEvent.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/showFahrt.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/showUser.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/admin/verteileMitfahrer.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/auth.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/authLogin.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/calendar.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/changePassword.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/editFahrt.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/eventKalender.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/galImgPicker.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/horstWolfJudosport.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/index.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/infoZettel.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/lib/wkParticipo-userAttribute.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/lib/wkParticipoLib.inc.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/local/.htaccess (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/local/db.php.inc (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/local/wkParticipoConf.php.inc (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/login.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/logout.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/showWkEvent.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/style.css (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/styleDev.css (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/userInfo.php (100%)
 rename homepage/{redesign2018/markdownExperiment => }/wkParticipo/wkParticipo.css (100%)

diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/addEvent.php b/homepage/wkParticipo/addEvent.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/addEvent.php
rename to homepage/wkParticipo/addEvent.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/addFahrt.php b/homepage/wkParticipo/addFahrt.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/addFahrt.php
rename to homepage/wkParticipo/addFahrt.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/addStarter.php b/homepage/wkParticipo/addStarter.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/addStarter.php
rename to homepage/wkParticipo/addStarter.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/addStarterDev.php b/homepage/wkParticipo/addStarterDev.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/addStarterDev.php
rename to homepage/wkParticipo/addStarterDev.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/.htaccess b/homepage/wkParticipo/admin/.htaccess
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/.htaccess
rename to homepage/wkParticipo/admin/.htaccess
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php b/homepage/wkParticipo/admin/addEvent.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php
rename to homepage/wkParticipo/admin/addEvent.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/addMitfahrer.php b/homepage/wkParticipo/admin/addMitfahrer.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/addMitfahrer.php
rename to homepage/wkParticipo/admin/addMitfahrer.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminAddStarter.php b/homepage/wkParticipo/admin/adminAddStarter.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminAddStarter.php
rename to homepage/wkParticipo/admin/adminAddStarter.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminFunctions.php b/homepage/wkParticipo/admin/adminFunctions.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminFunctions.php
rename to homepage/wkParticipo/admin/adminFunctions.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminFunctions.php.inc b/homepage/wkParticipo/admin/adminFunctions.php.inc
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminFunctions.php.inc
rename to homepage/wkParticipo/admin/adminFunctions.php.inc
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminUpdateStarterErgebnis.php b/homepage/wkParticipo/admin/adminUpdateStarterErgebnis.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminUpdateStarterErgebnis.php
rename to homepage/wkParticipo/admin/adminUpdateStarterErgebnis.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/config.inc.php b/homepage/wkParticipo/admin/config.inc.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/config.inc.php
rename to homepage/wkParticipo/admin/config.inc.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/index.php b/homepage/wkParticipo/admin/index.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/index.php
rename to homepage/wkParticipo/admin/index.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php b/homepage/wkParticipo/admin/listEvents.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php
rename to homepage/wkParticipo/admin/listEvents.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listUsers.php b/homepage/wkParticipo/admin/listUsers.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/listUsers.php
rename to homepage/wkParticipo/admin/listUsers.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php b/homepage/wkParticipo/admin/newsLetter.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php
rename to homepage/wkParticipo/admin/newsLetter.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/register.php b/homepage/wkParticipo/admin/register.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/register.php
rename to homepage/wkParticipo/admin/register.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/resetPassword.php b/homepage/wkParticipo/admin/resetPassword.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/resetPassword.php
rename to homepage/wkParticipo/admin/resetPassword.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/reseteMitfahrer.php b/homepage/wkParticipo/admin/reseteMitfahrer.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/reseteMitfahrer.php
rename to homepage/wkParticipo/admin/reseteMitfahrer.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php b/homepage/wkParticipo/admin/showEvent.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php
rename to homepage/wkParticipo/admin/showEvent.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php b/homepage/wkParticipo/admin/showFahrt.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php
rename to homepage/wkParticipo/admin/showFahrt.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showUser.php b/homepage/wkParticipo/admin/showUser.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/showUser.php
rename to homepage/wkParticipo/admin/showUser.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/verteileMitfahrer.php b/homepage/wkParticipo/admin/verteileMitfahrer.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/admin/verteileMitfahrer.php
rename to homepage/wkParticipo/admin/verteileMitfahrer.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/auth.php b/homepage/wkParticipo/auth.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/auth.php
rename to homepage/wkParticipo/auth.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/authLogin.php b/homepage/wkParticipo/authLogin.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/authLogin.php
rename to homepage/wkParticipo/authLogin.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/calendar.php b/homepage/wkParticipo/calendar.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/calendar.php
rename to homepage/wkParticipo/calendar.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/changePassword.php b/homepage/wkParticipo/changePassword.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/changePassword.php
rename to homepage/wkParticipo/changePassword.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/editFahrt.php b/homepage/wkParticipo/editFahrt.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/editFahrt.php
rename to homepage/wkParticipo/editFahrt.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/eventKalender.php b/homepage/wkParticipo/eventKalender.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/eventKalender.php
rename to homepage/wkParticipo/eventKalender.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/galImgPicker.php b/homepage/wkParticipo/galImgPicker.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/galImgPicker.php
rename to homepage/wkParticipo/galImgPicker.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/horstWolfJudosport.php b/homepage/wkParticipo/horstWolfJudosport.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/horstWolfJudosport.php
rename to homepage/wkParticipo/horstWolfJudosport.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/index.php b/homepage/wkParticipo/index.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/index.php
rename to homepage/wkParticipo/index.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/infoZettel.php b/homepage/wkParticipo/infoZettel.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/infoZettel.php
rename to homepage/wkParticipo/infoZettel.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipo-userAttribute.php b/homepage/wkParticipo/lib/wkParticipo-userAttribute.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipo-userAttribute.php
rename to homepage/wkParticipo/lib/wkParticipo-userAttribute.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php b/homepage/wkParticipo/lib/wkParticipoLib.inc.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php
rename to homepage/wkParticipo/lib/wkParticipoLib.inc.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/local/.htaccess b/homepage/wkParticipo/local/.htaccess
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/local/.htaccess
rename to homepage/wkParticipo/local/.htaccess
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/local/db.php.inc b/homepage/wkParticipo/local/db.php.inc
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/local/db.php.inc
rename to homepage/wkParticipo/local/db.php.inc
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/local/wkParticipoConf.php.inc b/homepage/wkParticipo/local/wkParticipoConf.php.inc
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/local/wkParticipoConf.php.inc
rename to homepage/wkParticipo/local/wkParticipoConf.php.inc
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/login.php b/homepage/wkParticipo/login.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/login.php
rename to homepage/wkParticipo/login.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/logout.php b/homepage/wkParticipo/logout.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/logout.php
rename to homepage/wkParticipo/logout.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php b/homepage/wkParticipo/showWkEvent.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php
rename to homepage/wkParticipo/showWkEvent.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/style.css b/homepage/wkParticipo/style.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/style.css
rename to homepage/wkParticipo/style.css
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/styleDev.css b/homepage/wkParticipo/styleDev.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/styleDev.css
rename to homepage/wkParticipo/styleDev.css
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/userInfo.php b/homepage/wkParticipo/userInfo.php
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/userInfo.php
rename to homepage/wkParticipo/userInfo.php
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/wkParticipo.css b/homepage/wkParticipo/wkParticipo.css
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/wkParticipo/wkParticipo.css
rename to homepage/wkParticipo/wkParticipo.css

From dec3760046036925660fc94f7b155e194234f650 Mon Sep 17 00:00:00 2001
From: Marko Bunzel <marko@dellXps>
Date: Sat, 6 Jul 2019 16:03:09 +0200
Subject: [PATCH 4/7] =?UTF-8?q?=09ge=C3=A4ndert:=20=20=20=20=20=20=20index?=
 =?UTF-8?q?.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 homepage/wkParticipo/admin/index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/homepage/wkParticipo/admin/index.php b/homepage/wkParticipo/admin/index.php
index f59da92..ad967ae 100644
--- a/homepage/wkParticipo/admin/index.php
+++ b/homepage/wkParticipo/admin/index.php
@@ -1,4 +1,5 @@
 <?php
+	$baseUrl = "http://cwsvjudo.bplaced.net/pages/desktop/wkParticipo";
 	require_once('../local/wkParticipoConf.php.inc');
 	require_once('../auth.php');
 	require_once('../local/db.php.inc');
@@ -18,6 +19,6 @@
 		<p><a href="./addEvent.php">Neuen Event anlegen.</a></p>
 		<p><a href="./listUsers.php">User anzeigen.</a></p>
 		<p><a href="./listEvents.php">Events anzeigen.</a></p>
-		
+		<p><a href="<?php echo( $baseUrl."/lib/wkParticipo-userAttribute.php");?>">Attribute verteilen</a></p>
 	</body>
 </html>

From 3ea69162f96eb9375d95b6abb3b3a89c33c44dab Mon Sep 17 00:00:00 2001
From: Marko Bunzel <marko@dellXps>
Date: Sat, 27 Jul 2019 17:11:45 +0200
Subject: [PATCH 5/7] =?UTF-8?q?index=20on=20wkParticipo:=207765a9e=20=09ge?=
 =?UTF-8?q?=C3=A4ndert:=20=20=20=20=20=20=20index.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit


From b9d4b5aa084abc09760ff817dae05efdd60d36b8 Mon Sep 17 00:00:00 2001
From: Marko Bunzel <marko@dellXps>
Date: Sun, 28 Jul 2019 19:12:13 +0200
Subject: [PATCH 6/7] =?UTF-8?q?Vorbereitungen=20f=C3=BCr=20selbstgew=C3=A4?=
 =?UTF-8?q?hlte=20Farben=20im=20Wettkampfplaner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	geändert:       homepage/wkParticipo/index.php
	geändert:       homepage/wkParticipo/wkParticipo.css
---
 homepage/wkParticipo/index.php       |  46 +++-
 homepage/wkParticipo/wkParticipo.css | 304 ++++++++++++++++++++++++++-
 2 files changed, 340 insertions(+), 10 deletions(-)

diff --git a/homepage/wkParticipo/index.php b/homepage/wkParticipo/index.php
index 17a9c5f..956f689 100644
--- a/homepage/wkParticipo/index.php
+++ b/homepage/wkParticipo/index.php
@@ -18,8 +18,26 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
 	if ($mysqlConn->connect_error) {
 		$sqlMessage['error'] .= 'Datenbankverbindung fehlgeschlagen: ' . $mysqlConn->connect_error;
 	}
-
 //	var_dump($_SESSION);
+
+/// Stellt den cssCode mit den Variablendefinitionen bereit
+function colorThemeCss($colorArray = ['backgroundColor'=>"#FFAE00", 'highlightColor'=>"#FF8100", 'buttonColor'=>"#291670"]){
+$colorTypes = ["backgroundColor", "highlightColor", "buttonColor"];
+$defaultColors =['backgroundColor'=> "#FFAE00", 'highlightColor'=>"#FF8100", 'buttonColor'=>"#291670"];
+
+	foreach($colorTypes as $key){
+		if( !preg_match("/^#(?:[0-9a-fA-F]{3}){1,2}$/", $key) ){
+			$colorThemeCss[$key] = $defaultColors[$key];
+		}
+	}
+	$ret = ":root{";
+	
+	foreach($colorArray as $key=>$value){
+		$ret .= "--".$key.": ".$value."; ";
+	}
+	$ret .= "}";
+return $ret;
+}
 ?>
 <!DOCTYPE html>
 <html>
@@ -33,10 +51,28 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
 		<link rel="icon" href="/ressourcen/graphiken/icons/cwsv.ico" />
 		<link rel="apple-touch-icon" href="/apple-touch-icon.png">
 		
-		<link rel="stylesheet" href="style.css">
-		<link rel="stylesheet" href="wkParticipo.css">
-		<link rel="stylesheet" href="http://cwsvjudo.bplaced.net/ressourcen/css/cwsvJudoNavBar.css">
-		
+		<style>
+			<?php 
+				$css = file_get_contents( $basePath."/pages/desktop/wkParticipo/wkParticipo.css");
+					if(!empty($_SESSION['login'])){
+						try{
+							if(!empty($_SESSION['user']['userConfig'])){
+								var_dump($_SESSION);
+								#$config = json_decode($_SESSION['user']['userConfig'], true);
+								#$css = str_replace ( "#FFAE00", $config['color1'], $css );
+								#$css = str_replace ( "#ffae00", $config['color1'], $css );
+								#$css = str_replace ( "#FF8100", $config['color2'], $css );
+								#$css = str_replace ( "#ff8100", $config['color2'], $css );
+							}
+						}
+						catch (Exception $e) {
+							echo 'Exception abgefangen: ',  $e->getMessage(), "\n";
+						}
+					}
+					echo(colorThemeCss($_SESSION['user']['userConfig']));
+					echo($css);
+			?>
+		</style>
 		<?php PHPCount::AddHit("Wettkampfplaner (".htmlspecialchars($_SESSION['user']['username']).")");?>
 	</head>
 	<body>
diff --git a/homepage/wkParticipo/wkParticipo.css b/homepage/wkParticipo/wkParticipo.css
index c7bb573..8ffa86e 100644
--- a/homepage/wkParticipo/wkParticipo.css
+++ b/homepage/wkParticipo/wkParticipo.css
@@ -1,11 +1,257 @@
+/* cssTemplate für den Wettkampfplaner
+ * benötigt die Variablen
+ * 
+ * - --backgroundColor
+ * - --highlightColor
+ * - --buttonColor
+ * 
+ * für die Farben.
+ */
 /* blau: #291670 */
 /* gelb: #fff500*/
 
+
+/* Box-Sizing global auf die BorderBox stellen */
+html{
+	box-sizing: border-box;
+}
+*, ::before, ::after {
+	box-sizing: inherit;
+}
+
+
+.loginForm{}
+.loginForm div{
+	display: flex;
+	flex-direction: column;
+	width: 100%;
+}
+.loginForm input{
+	display: block;
+	margin: 0;
+	width: 100%;
+	font-size: 1.5em;
+	border: 1px solid #bbb;
+}
+.loginForm button[type=submit]{
+	display: block;
+	font-size: 1em;
+	line-height: 2em;
+	color: #333;
+	font-weight: bold;
+	width: 100%;
+	background: #fdfdfd;
+	background: linear-gradient(to bottom, #fdfdfd 0%,#bebebe 100%);
+	border: 1px solid #bbb;
+}
+
+
+/**
+ * Wettkampfbox
+ **/
+
+.wkBox{
+	border: 1px solid black;
+	display: flex;
+	flex-direction: column;
+}
+.wkBox nav{
+/*	width: 32%;
+	float: left;*/
+}
+.wkBox nav ul li{
+	display: list-item;
+}
+.wkBoxWkData{
+	border: none;
+}
+@media (min-width: 65em){
+	.wkBox{
+		flex-direction: row;
+		align-items: stretch;
+		justify-content: space-around;
+		padding: .5em;
+	}
+	.wkBox *{
+		flex-basis: 30%;
+	}
+}
+
+
+/* touchable Links*/
+.touchLink{
+	display: inline-block;
+	padding: 0.25em 0 0.25em 0;
+	margin: 0.25em 0 0.25em 0;
+	background-color: var(--highlightColor);
+	border-radius: .5em;
+	box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+}
+
+/* touchable Buttons */
+
+.touchButton{
+	display: block;
+	margin: .5em 0;
+	font-size: 1em;
+	line-height: 1.5em;
+	color: #333;
+	font-weight: bold;
+	width: 100%;
+	background: #fdfdfd;
+	background: linear-gradient(to bottom, #fdfdfd 0%,#bebebe 100%);
+	border: 1px solid #bbb;
+}
+.touchButton[disabled]{
+	color: Grey;
+}
+
+
+@media (min-width: 65em){
+/*	.loginForm div{
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: flex-end;
+	}
+	.loginForm div div{
+		flex-direction: column;
+		align-items: flex-start;
+		width: 30%;
+	}
+	button{
+	}
+*/
+}
+
+body{
+	background-color: var(--backgroundColor);
+}
+
+
+nav ul {
+	width: 100%;
+	list-style: none;
+	padding: 0;
+}
+
+nav ul li a{
+	text-decoration: none;
+	color: black;
+}
+
+nav ul li a div{
+	text-align: center;
+	font-size: large;
+	font-weight: bolder;
+	border: 3px gray outset;
+	background: linear-gradient(to bottom, var(--backgroundColor) 0%, var(--highlightColor) 100%);
+	padding-top: .25em;
+	padding-bottom: .25em;
+}
+
+.navLink{
+	text-align: center;
+/*	font-size: large;*/
+	font-weight: bolder;
+	border: 3px gray outset;
+	background: linear-gradient(to bottom, var(--backgroundColor) 0%, var(--highlightColor) 100%);
+	padding-top: .25em;
+	padding-bottom: .25em;
+}
+
+.navLink div{
+	display: inline;
+}
+meldungsBox{
+	border: 1px solid black;
+}
+
+
+@media only screen and (min-device-width: 481px){
+	.wkInfo{
+		width: 68%;
+		float: right;
+	}
+	
+	nav ul{
+		display: table;
+	}
+	
+	nav ul li{
+		display: table-cell;
+	}
+	
+	nav ul li a div{
+		text-align: center;
+	}
+	
+	button[type=submit] {
+		display: block;
+		font-size: 1em;
+		line-height: 1.5em;
+		color: #333;
+		font-weight: bold;
+		width: 100%;
+		background: #fdfdfd;
+		background: linear-gradient(to bottom, #fdfdfd 0%,#bebebe 100%);
+		border: 1px solid #bbb;
+	}
+	button[disabled]{
+		color: Grey;
+	}
+}
+
+@media only screen and (max-device-width: 481px) {
+	nav ul li a div{
+		text-align: left;
+	}
+	button[type=submit] {
+		display: block;
+		font-size: 1em;
+		line-height: 1.5em;
+		color: #333;
+		font-weight: bold;
+		width: 100%;
+		background: #fdfdfd;
+		background: -moz-linear-gradient(top, #fdfdfd 0%, #bebebe 100%);
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fdfdfd), color-stop(100%,#bebebe));
+		background: -webkit-linear-gradient(top, #fdfdfd 0%,#bebebe 100%);
+		background: -o-linear-gradient(top, #fdfdfd 0%,#bebebe 100%);
+		background: -ms-linear-gradient(top, #fdfdfd 0%,#bebebe 100%);
+		background: linear-gradient(to bottom, #fdfdfd 0%,#bebebe 100%);
+		border: 1px solid #bbb;
+		-webkit-border-radius: 10px; -moz-border-radius: 10px; border-radius: 10px;
+	}
+	button[disabled]{
+		color: Grey;
+	}
+	input[type=text], input[type=url], input[type=email], input[type=password], input[type=tel] {
+		-webkit-appearance: none; -moz-appearance: none;
+		display: block;
+		margin: 0;
+		width: 100%;
+/*		height: 2em;*/
+/*		line-height: 1.6em;*/
+		font-size: 1.5em;
+		border: 1px solid #bbb;
+	}
+	#meldungsBox{
+/*		font-size: 3em;*/
+		border: 1px solid black;
+	}
+	fieldset div{
+		font-size: 1em;
+	}
+}
+
+
+
+
 .wkInfoCard{
-	border-left: .5rem solid #291670;
+	border-left: .5rem solid var(--buttonColor);
 	margin: 1rem 0;
 	display: flex;
-	background-color: #FFAE00;
+	background-color: var(--backgroundColor);
 	border-radius: 2px;
 	box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.16),
 				0 2px 10px 0 rgba(0, 0, 0, 0.12);
@@ -20,7 +266,7 @@
 	display: flex;
 	flex-direction: column;
 	align-items: center;
-	color: #291670;
+	color: var(--buttonColor);
 	padding: 0rem 0.5rem 0rem 0rem;
 	width: 6rem;
 }
@@ -46,7 +292,7 @@
 	display: flex;
 	flex-direction: column;
 	flex-grow: 1;
-	background-color: #FF8100;
+	background-color: var(--highlightColor);
 }
 @media (min-width: 640px){
 	.wkInfoCardWkData{
@@ -91,7 +337,7 @@
 }
 
 .wkInfoCardButtonSuccess {
-	background-color: #291670;
+	background-color: var(--buttonColor);
 	color: #eee;
 }
 
@@ -130,3 +376,51 @@
 .material-icons {
   width: 1rem;
 }
+
+/*
+css für Navigationsleiste
+*/
+
+
+.navBar{
+	width: 100%;
+	margin: 0 auto;
+}
+
+.navBar > ul{
+	display: flex;
+	flex-flow: column;
+	text-align: center;
+	background: linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.2) 25%, rgba(255, 255, 255, 0.2) 75%, rgba(255, 255, 255, 0) 100%);
+	box-shadow: 0 0 .5em rgba(0, 0, 0, 0.1), inset 0 0 1px rgba(255, 255, 255, 0.6);
+}
+
+.navBar ul > li > a {
+	height: 100%;
+	padding: .25em;
+	text-transform:uppercase;
+	color: rgba(0, 35, 122, 0.5);
+	font-size: Large;
+	text-decoration: none;
+	display: block;
+}
+
+.navBar > ul > li > a:hover {
+	box-shadow: 0 0 .2em rgba(0, 0, 0, 0.1), inset 0 0 1px rgba(255, 255, 255, 0.6);
+	background: rgba(255, 255, 255, 0.1);
+	color: rgba(0, 35, 122, 0.7);
+}
+
+
+@media (min-width: 640px){
+	.navBar > ul{
+		flex-flow: row;
+		justify-content: space-between;
+		align-items: stretch;
+	}
+	.navBar > ul > li {
+		align-items: center;
+		flex-grow: 1;
+		flex-basis: 100%;
+	}
+}

From 84c093fd7ab9213380e182bc809fc4c6b8e8c5e5 Mon Sep 17 00:00:00 2001
From: Marko Bunzel <marko@dellXps>
Date: Sun, 25 Aug 2019 10:25:28 +0200
Subject: [PATCH 7/7] =?UTF-8?q?index=20on=20wkParticipo:=20a4c3076=20Vorbe?=
 =?UTF-8?q?reitungen=20f=C3=BCr=20selbstgew=C3=A4hlte=20Farben=20im=20Wett?=
 =?UTF-8?q?kampfplaner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../phpLib/cwsvJudo/wkKalender.php            | 61 +++++++++++++------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
index f6da7cf..cfafede 100644
--- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
+++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
@@ -1,6 +1,7 @@
 <?php
 setlocale(LC_ALL, 'de_DE.utf8');
 
+require_once($basePath."/ressourcen/phpLib/cwsvJudo/miscAssis.php");
 
 function getWkHtmlMetaDescription($wkId){
 setlocale(LC_ALL, 'de_DE.utf8', 'de_DE@euro');
@@ -210,15 +211,18 @@ $htmlWkTableString = "";
 				str_replace("mannschaft", "mann&shy;schaft", $wk['Veranstaltung']);
 		
 		$htmlWkTableString .=
-				"<a href=\"http://cwsvjudo.bplaced.net/wkKalender/".$wk['lfdeNr']."/".toAscii( html_entity_decode( $wk['Veranstaltung'] ))."-am-".$wk['Datum']."\"><tr>".
+//				"<a href=\"http://cwsvjudo.bplaced.net/wkKalender/".$wk['lfdeNr']."/".toAscii( html_entity_decode( $wk['Veranstaltung'] ))."-am-".$wk['Datum']."\"><tr>".
+				"<tr>".
 					"<script type=\"application/ld+json\">".$wkJsonSd."</script>".
 					"<td data-title=\"Datum\" class=\"noWrap\">".
-						"<time class=\"kalenderDatum\" datetime=".$wk['Datum'].">".
-							"<span>".strftime("%Y", strtotime($wk['Datum']))."</span>".
-							"<span>".strftime("%B", strtotime($wk['Datum']))."</span>".
-							"<span>".strftime("%d", strtotime($wk['Datum']))."</span>".
-							"<span>".strftime("%A", strtotime($wk['Datum']))."</span>".
-						"</time>".
+						"<a href=\"http://cwsvjudo.bplaced.net/wkKalender/".$wk['lfdeNr']."/".toAscii( html_entity_decode( $wk['Veranstaltung'] ))."-am-".$wk['Datum']."\">".
+							"<time class=\"kalenderDatum\" datetime=".$wk['Datum'].">".
+								"<span>".strftime("%Y", strtotime($wk['Datum']))."</span>".
+								"<span>".strftime("%B", strtotime($wk['Datum']))."</span>".
+								"<span>".strftime("%d", strtotime($wk['Datum']))."</span>".
+								"<span>".strftime("%A", strtotime($wk['Datum']))."</span>".
+							"</time>".
+						"</a>".
 					"</td>".
 					"<td data-title=\"Ausschreibung\" class=\"hyphenate\">".
 						"<a title=\"Ausschreibung ".$wk['Veranstaltung']."\" href=\"http://cwsvjudo.bplaced.net".$wk['Ausschreibung']."\"><span property=\"name\">".$wk['Veranstaltung']."</span></a>".
@@ -231,9 +235,9 @@ $htmlWkTableString = "";
 					"</td>".
 					"<td data-title=\"iCal\">".
 						"<a title=\"Termin für ".$wk['Veranstaltung']." in Kalender übernehmen\" href=\"/ressourcen/phpLib/calendar.php?wkID=".$wk['lfdeNr']."\">iCal</a>".
-						"<img class=\"print-only\" heigtht=\"111\" width=\"111\" src=http://cwsvjudo.bplaced.net/pages/responsive/wkQrCode.php?id=".$wk['lfdeNr']." />".
+						"<img class=\"print-only\" alt=\"http://cwsvjudo.bplaced.net/wkKalender/".$wk['lfdeNr']."/".toAscii( html_entity_decode( $wk['Veranstaltung'] ))."-am-".$wk['Datum']."\" height=\"111\" width=\"111\" src=\"http://cwsvjudo.bplaced.net/pages/responsive/wkQrCode.php?id=".$wk['lfdeNr']."\" />".
 					"</td>".
-				"</tr></a>\n";
+				"</tr>\n";
 	}
 	$htmlWkTableString .= 
 		"</tbody>".
@@ -248,10 +252,22 @@ $htmlWkTableString = "";
 		"</tfoot>".
 	"</table>";
 
+	// Für den Fall einer ampSeite müssen die imgTags angepasst werden
+	if( strpos( $_SERVER['ORIG_PATH_TRANSLATED'], "pages/amp" ) !== false ){
+		$htmlWkTableString = str_replace(
+			"<img", 
+// width und height sind gesetzt
+// @todo: es sollte besser gehen!
+//			"<amp-img layout=\"responsive\" width=\"".($aNews['promoImg']['width']?$aNews['promoImg']['width']:"200")."\" height=\"".($aNews['promoImg']['height']?$aNews['promoImg']['height']:"133")."\"", 
+			"<amp-img layout=\"responsive\" ", 
+			$htmlWkTableString
+		);
+		$htmlWkTableString = str_replace("/>", "></amp-img>", $htmlWkTableString);
+	}
+
 return $htmlWkTableString;
 }
 
-
 function nicerAkList($akArray){
 	$ret=explode( " ", $akArray );
 	
@@ -340,7 +356,6 @@ if($matches[0]==$akString){
 return $ret;
 }
 
-
 /// Wettkampfdaten als json-formatierte strukturierte Event-Daten
 function wkArray2jsonSdEvent($wk){
 return 
@@ -407,19 +422,25 @@ function wkTableHtml(){
 						)
 					)
 				)."</script>".
-				"<h1>Einzelansicht</h1>".
+//				"<h1>Einzelansicht</h1>".
+//				"<style>.wkInfoBox{box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px;}</style>".
+//				"<style>.wkInfoBox h1{background:#FF8100;font-size: 1.2em;margin: 0;}</style>".
+//				"<style>.wkInfoBox h2{background:#FF8100;font-size: 1.1em;margin: 0;}</style>".
 				"<div class=\"wkInfoBox\">".
 					"<script type=\"application/ld+json\">".wkArray2jsonSdEvent($wk)."</script>".
-					"<h2>".$wk['Veranstaltung']."</h2>".
-					wkBoxMediaGalleryHtml($wkGals);
+//					"<h2>".$wk['Veranstaltung']."</h2>".
+					"<h1>".$wk['Veranstaltung']."</h1>";
 
 			$siteData['mainContent'] .= 
-					"<h3>Veranstaltungsdaten</h3>".
+//					"<h2>Veranstaltungsdaten</h2>".
 					"<ul>".
 						"<li>Datum: <time datetime=".$wk['Datum'].">".strftime("%a, %d. %B %Y", strtotime($wk['Datum']))."</time></li>".
 						"<li>Altersklassen: ".$wk['Altersklassen']."</li>".
 						"<li>Ort: <a href=\"".$wk['Routenplaner']."\">".$wk['Ort']."</a></li>".
 					"</ul>".
+					(!empty($wkGals)?"<h2>Galerien</h2>":"").
+					wkBoxMediaGalleryHtml($wkGals).
+					"<h2>Links</h2>".
 					"<nav>".
 						"<ul>".
 							"<li><a href =\"".$wk['Ausschreibung']."\"><div>Link zur Ausschreibung</div></a></li>".
@@ -616,16 +637,20 @@ $retHtml = "";
 $retHtml .= "<div class=\"wkBoxMediaGallery\">";
 
 foreach($wkGals as $wkGal){
+	if( empty($wkGal['teaserBildUrl']) ){
+		$wkGal['teaserBildUrl']="http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvJudoLogoWappen.256w.png"; // @toDo: sollte nicht hardcoded sein!
+	}
 	$retHtml.=
 		"<a class=\"textoverlayedImage\" href=\"".$wkGal['url']."\">";
 	
 	if(strpos( $_SERVER['ORIG_PATH_TRANSLATED'], "pages/amp" ) !== false)
 		$retHtml .= "<amp-img layout=\"responsive\" ";
 	else
-		$retHtml .= "<img class=\"valignMiddle\" ";
+//		$retHtml .= "<img class=\"valignMiddle\" ";
+		$retHtml .= "<img ";
 	
 	$retHtml .=
-		"width=\"200\" height=\"133\" class=\"valignMiddle\" src=\"".
+		"alt=\"".$wkGal['name']."\" width=\"200\" height=\"133\" class=\"valignMiddle\" src=\"".
 		$wkGal['teaserBildUrl']."\"";
 	
 	if(strpos( $_SERVER['ORIG_PATH_TRANSLATED'], "pages/amp" ) !== false)
@@ -634,7 +659,7 @@ foreach($wkGals as $wkGal){
 		$retHtml .= "/>";
 	
 	$retHtml .= 
-		"<div><p>".$wkGal['typ']."galerie</p></div>";
+		"<div><p class=\"touchLink\" style=\"opacity:.8\">".$wkGal['typ']."galerie</p></div>";
 	
 	$retHtml .= "</a>";
 }