diff --git a/homepage/redesign2018/markdownExperiment/md/downloads.md b/homepage/redesign2018/markdownExperiment/md/download.md
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/md/downloads.md
rename to homepage/redesign2018/markdownExperiment/md/download.md
diff --git a/homepage/redesign2018/markdownExperiment/md/index.md b/homepage/redesign2018/markdownExperiment/md/index.md
index 7866892..1f0df98 100644
--- a/homepage/redesign2018/markdownExperiment/md/index.md
+++ b/homepage/redesign2018/markdownExperiment/md/index.md
@@ -14,7 +14,7 @@ jsonSdFiles:
 
 # Willkommen
 
-auf der Website des Judo-Teams des [Chem­nitzer Frei­zeit- und Wohng­ebiets­sport­vereines e. V][cwsvHomepage]
+auf der Website des Judo-Teams des [Chem­nitzer Frei­zeit- und Wohng­ebiets­sport­vereines e. V.][cwsvHomepage]
 Hier findet ihr Informationen zu unseren [Trainingszeiten][cwsvJudoTraining] 
 und [Wettkampfterminen][cwsvJudoWettkampfKalender].
 
diff --git a/homepage/redesign2018/markdownExperiment/md/kontakt.md~ b/homepage/redesign2018/markdownExperiment/md/kontakt.md~
deleted file mode 100644
index efe4131..0000000
--- a/homepage/redesign2018/markdownExperiment/md/kontakt.md~
+++ /dev/null
@@ -1,46 +0,0 @@
----
-lang: de
-title: Vereinsinformationen des CWSV
-author: marko
-keywords:
-	- Judo
-	- Chemnitz
-	- Chemnitzer Freizeit- und Wohngebietssportverein
-mainNav:
-	- {caption: "Home", url: "http://cwsvjudo.bplaced.net", icon: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvJudoLogoWappen.x256.png"}
-	- {caption: "Verein", url: "http://cwsvjudo.bplaced.net/verein", icon: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvLogoWappen.x250.png"}
-subNav:
-	- {caption: "Trainings­zeiten", icon: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/clockIconFriendly.svg", title: "Trainingszeiten und -orte der Judoka des Chemnitzer WSV", url: "http://cwsvjudo.bplaced.net/training"}
-	- {caption: "Termine", icon: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/calendarIcon.svg", url: "http://cwsvjudo.bplaced.net/wettkampfkalender"}
-...
-# Kontakt
-
-Hier findet Ihr [eMail-Adressen](#email), [Telephonnummern](#telephon) 
-und [Adressen](#adressen), um mit uns in Kontakt zu treten.
-
-## E-Mail
-
--   [eMail an den Chemnitzer Freizeit- und Wohngebietssportverein
-    e. V.(cwsv.sb@web.de)](mailto:cwsv.sb@web.de)
--   Link zum [Kontaktformular][cwsvKontaktFormular] auf der Homepage 
-des Chemnitzer Freizeit- und Wohngebietssportvereines
--   ![eMail](http://cwsvjudo.bplaced.net/ressourcen/graphiken/misc/abc123.png){.pngAddress
-    width="60" height="420"}
-
-## Adressen
-
--   CWSV - Verwaltung ([Karte][cwsvVerwaltungKarte])
-    -   Strasse Usti nad Labem 42
-    -   09119 Chemnitz
-    -   Mo 8:00-16:30, Di 10:00-17:00, Mi 8:00-17:00, Do 10:00-17:00
-
-## Telephon
-
--   CWSV - Verwaltung
-    -   Tel.: [0371 / 28 23 370](tel:+493712823370 "Telefonnummer der Verwaltung des Chemnitzer WSV")
-    -   Fax.: 0371/ 22 91 79
-    -   Mo 8:00-16:30, Di 10:00-17:00, Mi 8:00-17:00, Do 10:00-17:00
-
-[cwsvKontaktFormular]: http://www.cwsv-sport.de/Kontakt.htm "Karte der Verwaltung des Chemnitzer WSV"
-[cwsvVerwaltungKarte]: http://www.openstreetmap.org/?mlat=50.807643&mlon=12.882060#map=17/50.807643/12.882060
-
diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate
index d975109..a95a6c7 100644
--- a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate
+++ b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate
@@ -50,13 +50,18 @@ $if(phpTitleFunction)$
 		<title><?php $phpTitleFunction$();?></title>
 $else$
 		<title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
+$endif$
+$if(css)$
+		<style>
+	$for(css)$
+			<?php include_once( $$basePath."/$css$" );?>
+	$endfor$
+		</style>
 $endif$
 		<style>code{white-space: pre;}</style>
 $if(quotes)$
 		<style>
 			q { quotes: "“" "”" "‘" "’"; }
-			.fontSizeXxSmall{font-size: xx-small;}
-			.displayNone{display: none;}
 		</style>
 $endif$
 $if(highlighting-css)$
@@ -64,9 +69,6 @@ $if(highlighting-css)$
 $highlighting-css$
 		</style>
 $endif$
-$for(css)$
-		<link rel="stylesheet" href="/$css$">
-$endfor$
 $for(extraCss)$
 		<link rel="stylesheet" href="$extraCss$">
 $endfor$
@@ -109,8 +111,10 @@ $endfor$
 				title="Judo im Chemnitzer WSV" alt="Judo im Chemnitzer WSV - Promo" 
 				src="http://cwsvjudo.bplaced.net/ressourcen/graphiken/banner/bannerlogo.1.jpg"
 			/>
-			<span>Judo</span>
-			<span class="breadcrumbs"></span>
+			<span>
+				<span>Judo</span>
+				<span><?php $$zitat = getRandomCite( getCwsvJudoDbConn() ); echo($$zitat['zitat']);?></span>
+			</span>
 			<img 
 				width="64" height="52"
 				title="Judo im Chemnitzer WSV"
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsLib.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsLib.php
index 8bc3cc1..a8364dd 100644
--- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsLib.php
+++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsLib.php
@@ -38,20 +38,19 @@ $ret = array();
 		$query = "SELECT * FROM nachrichten";
 		
 		if( is_positive_integer($optionsArray['jahr']) )
-			$query .= " WHERE DATE_FORMAT( datum, '%Y') = :jahr";
-		
-		$query .= " ORDER BY datum DESC, nr DESC LIMIT :limit;";
-		
-		//echo( $query );
+			$query .= " WHERE DATE_FORMAT( datum, '%Y') = :jahr ORDER BY datum ASC, nr ASC";
+		else
+			$query .= " ORDER BY datum DESC, nr DESC LIMIT :limit;";
 		
 		$pdoStatementForQuerryingNews = $aMysqlConn->prepare(
 			$query
-			//"SELECT * FROM nachrichten ORDER BY datum DESC, nr DESC LIMIT :limit;"
 		);
 	}
 	
-	$pdoStatementForQuerryingNews->bindParam(':limit', intval($optionsArray['limit']), PDO::PARAM_INT);
-//	$pdoStatementForQuerryingNews->bindParam(':jahr', intval($optionsArray['jahr']), PDO::PARAM_INT);
+	if( is_positive_integer($optionsArray['jahr']) )
+		$pdoStatementForQuerryingNews->bindParam(':jahr', intval($optionsArray['jahr']), PDO::PARAM_INT);
+	else
+		$pdoStatementForQuerryingNews->bindParam(':limit', intval($optionsArray['limit']), PDO::PARAM_INT);
 	$pdoStatementForQuerryingNews->execute();
 	$ret = $pdoStatementForQuerryingNews->fetchAll(PDO::FETCH_ASSOC);
 	
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsTableHtml.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsTableHtml.php
index c3da907..c3ca961 100644
--- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsTableHtml.php
+++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsTableHtml.php
@@ -27,8 +27,8 @@ $limit = is_positive_integer($someOptions['limit'])?$someOptions['limit']:1;
 	
 // News abfragen
 // @todo: woher das limit nehmen?
-	$newsList = getNews($db_connection, array('limit'=>$limit));
-//	$newsList = getNews($db_connection, $someOptions);
+//	$newsList = getNews($db_connection, array('limit'=>$limit));
+	$newsList = getNews($db_connection, $someOptions);
 	
 	if( is_array( $newsList ) || is_object( $newsList ) )
 		foreach($newsList as $news)
diff --git a/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirecter.php b/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirecter.php
new file mode 100644
index 0000000..a34b703
--- /dev/null
+++ b/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirecter.php
@@ -0,0 +1,59 @@
+<?php
+function Redirect($url, $permanent = false){
+	header('Location: ' . $url, true, $permanent ? 301 : 302);
+	exit();
+}
+
+#$redirectTarget['protocol'] = "http";
+#$redirectTarget['serverName'] = "cwsvjudo.square7.net";
+
+$redirects = 
+	json_decode(
+		file_get_contents('redirects.json'),
+		 true
+	);
+
+foreach($redirects as $redirect){
+	if(
+		(strtok($_SERVER["REQUEST_URI"],'?') == $redirect['from'])
+		||
+		(strtok($_SERVER["REQUEST_URI"],'&') == $redirect['from']) // DotBot z.B. fügt query mit & beginnend an...
+	){
+		header("Status: 301 Moved Permanently");
+		header("Location: ".$redirect['to'].(!empty($_SERVER['QUERY_STRING'])?("?".$_SERVER['QUERY_STRING']):"") );
+		exit();
+	}
+}
+
+try{
+	$db_connection = new PDO(
+		'mysql:host=localhost;dbname=cwsvjudo', 
+		'cwsvjudo', 
+		'***REMOVED***'
+	);
+	
+	try{
+		
+		$query = $db_connection->prepare(
+			"INSERT INTO cwsvjudo.redirecter (jsonServer) VALUES (:jsonServerString);"
+		);
+		$query->bindParam(':jsonServerString', json_encode($_SERVER) );
+		$query->execute();
+//		if( !$query->execute() )
+//			echo("ERROR: ".$query->errorCode());
+//		else echo("executed\n");
+	}
+	catch(PDOException $db_error){
+//			die( "Error!: " . $db_error->getMessage() );
+		}
+
+}
+catch(PDOException $db_error){
+//		die( "Error!: " . $db_error->getMessage() );
+	}
+
+
+//header("Status: 503 Service Unavailable");
+header("Location: /", true, 302);
+exit();
+?>
diff --git a/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirects.json b/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirects.json
new file mode 100644
index 0000000..581d02c
--- /dev/null
+++ b/homepage/redesign2018/markdownExperiment/redirecting/pagesDesktop/redirects.json
@@ -0,0 +1,78 @@
+[
+	{
+		"from":"\/pages\/desktop\/",
+		"to":"\/"
+	},
+	{
+		"from":"\/pages\/desktop\/index.php",
+		"to":"\/"
+	},
+	{
+		"from":"\/pages\/desktop\/kontakt.php",
+		"to":"\/kontakt"
+	},
+	{
+		"from":"\/pages\/desktop\/kontakt.email.php",
+		"to":"\/kontakt#e-mail"
+	},
+	{
+		"from":"\/pages\/desktop\/kontakt.telephon.php",
+		"to":"\/kontakt#telephon"
+	},
+	{
+		"from":"\/pages\/desktop\/kontakt.adressen.php",
+		"to":"\/kontakt#adressen"
+	},
+	{
+		"from":"\/pages\/desktop\/verein.galerien.php",
+		"to":"\/galerien"
+	},
+	{
+		"from":"\/pages\/desktop\/verein.training.php",
+		"to":"\/trainingszeiten"
+	},
+	{
+		"from":"\/pages\/desktop\/verein.php",
+		"to":"\/verein"
+	},
+	{
+		"from":"\/pages\/desktop\/verein.wettkampf.php",
+		"to":"\/wkKalender"
+	},
+	{
+		"from":"\/pages\/desktop\/verein.wettkampfkalender.php",
+		"to":"\/wkKalender"
+	},
+	{
+		"from":"\/pages\/desktop\/news.php",
+		"to":"\/news"
+	},
+	{
+		"from":"\/pages\/desktop\/verein.feiern.php",
+		"to":"\/galerien?veranstaltungsArt=Feier"
+	},
+	{
+		"from":"\/pages\/desktop\/verein.zelten.php",
+		"to":"\/galerien?veranstaltungsArt=Zelten"
+	},
+	{
+		"from":"\/pages\/desktop\/extras.php",
+		"to":"\/extras"
+	},
+	{
+		"from":"\/pages\/desktop\/extras.downloads.php",
+		"to":"\/downloads"
+	},
+	{
+		"from":"\/pages\/desktop\/extras.quiz.php",
+		"to":"\/quiz"
+	},
+	{
+		"from":"\/pages\/desktop\/extras.links.php",
+		"to":"\/links"
+	},
+	{
+		"from":"\/pages\/desktop\/wkparticipo",
+		"to":"\/pages\/desktop\/wkParticipo"
+	}
+]
diff --git a/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirecter.php b/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirecter.php
new file mode 100644
index 0000000..5b97ed1
--- /dev/null
+++ b/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirecter.php
@@ -0,0 +1,54 @@
+<?php
+function Redirect($url, $permanent = false){
+	header('Location: ' . $url, true, $permanent ? 301 : 302);
+	exit();
+}
+
+#$redirectTarget['protocol'] = "http";
+#$redirectTarget['serverName'] = "cwsvjudo.square7.net";
+
+$redirects = 
+	json_decode(
+		file_get_contents('redirects.json'),
+		 true
+	);
+
+foreach($redirects as $redirect){
+	if(strtok($_SERVER["REQUEST_URI"],'?') == $redirect['from']){
+		header("Status: 301 Moved Permanently");
+		header("Location: ".$redirect['to'].(!empty($_SERVER['QUERY_STRING'])?("?".$_SERVER['QUERY_STRING']):"") );
+		exit();
+	}
+}
+
+try{
+	$db_connection = new PDO(
+		'mysql:host=localhost;dbname=cwsvjudo', 
+		'cwsvjudo', 
+		'***REMOVED***'
+	);
+	
+	try{
+		
+		$query = $db_connection->prepare(
+			"INSERT INTO cwsvjudo.redirecter (jsonServer) VALUES (:jsonServerString);"
+		);
+		$query->bindParam(':jsonServerString', json_encode($_SERVER) );
+		$query->execute();
+//		if( !$query->execute() )
+//			echo("ERROR: ".$query->errorCode());
+//		else echo("executed\n");
+	}
+	catch(PDOException $db_error){
+//			die( "Error!: " . $db_error->getMessage() );
+		}
+
+}
+catch(PDOException $db_error){
+//		die( "Error!: " . $db_error->getMessage() );
+	}
+
+
+header("Location: /", true, 302);
+exit();
+?>
diff --git a/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirects.json b/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirects.json
new file mode 100644
index 0000000..ed3fb03
--- /dev/null
+++ b/homepage/redesign2018/markdownExperiment/redirecting/pagesMobile/redirects.json
@@ -0,0 +1,34 @@
+[
+	{
+		"from":"\/pages\/mobile\/",
+		"to":"\/"
+	},
+	{
+		"from":"\/pages\/mobile\/news.php",
+		"to":"\/news"
+	},
+	{
+		"from":"\/pages\/mobile\/index.php",
+		"to":"\/"
+	},
+	{
+		"from":"\/pages\/mobile\/verein.wettkampfgalerien.php",
+		"to":"\/galerien"
+	},
+	{
+		"from":"\/pages\/mobile\/verein.wetkampfgalerien.php",
+		"to":"\/galerien"
+	},
+	{
+		"from":"\/pages\/mobile\/verein.training.php",
+		"to":"\/trainingszeiten"
+	},
+	{
+		"from":"\/pages\/mobile\/verein.wettkampfkalender.php",
+		"to":"\/wkKalender"
+	},
+	{
+		"from":"\/pages\/mobile\/kontakt.php",
+		"to":"\/kontakt"
+	}
+]
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/eventKalender.php b/homepage/redesign2018/markdownExperiment/wkParticipo/eventKalender.php
index b3a1ecc..e7c406f 100644
--- a/homepage/redesign2018/markdownExperiment/wkParticipo/eventKalender.php
+++ b/homepage/redesign2018/markdownExperiment/wkParticipo/eventKalender.php
@@ -1,79 +1,80 @@
-<?php
-	require_once('./local/wkParticipoConf.php.inc');
-	require_once('./authLogin.php');
-	require_once('./local/db.php.inc');
-	require_once('./lib/wkParticipoLib.inc.php');
-	
-	$sqlMessage = array();
-	
-	$mysqlConn = @new mysqli($db_server, $db_user, $db_password, $db_name);
-	if ($mysqlConn->connect_error) {
-		$sqlMessage['error'] .= 'Datenbankverbindung fehlgeschlagen: ' . $mysqlConn->connect_error;
-	}
-	
-	
-	
-?>
-
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		
-		<title>Wettkampfplanung der Judoka des CWSV</title>
-		<link rel="stylesheet" href="./style.css">
-	</head>
-	<body>
-		<?php echo $login_status;?>
-		<?php echo htmlRetMessage($sqlMessage);?>
-		
-		<h1>Wettkampfplanung - Kalender</h1>
-		
-		<style>
-			.navBar{
-				display: flex;
-				flex-flow: column;
-			}
-		</style>
-		<div class="navBar">
-			<a class="touchLink" href="./index.php">
-				<div>Zur Übersicht zurück</div>
-			</a>
-			<a class="touchLink" href="http://cwsvjudo.bplaced.net/pages/desktop/wkParticipo/calendar.php">
-				<div>die geplanten Wettkämpfe als iCal</div>
-			</a>
-			<a class="touchLink" href="https://www.google.com/calendar/render?cid=http://cwsvjudo.bplaced.net/pages/desktop/wkParticipo/calendar.php">
-				<div>alle geplanten Wettkämpfe in den Google Kalender übernehmen</div>
-			</a>
-		</div>
-		
-		<h2 id="wettkaempfen">Anstehende Wettkämpfe</h2>
-<?php
-		$wkEvents = getCommingWkEvents($mysqlConn);
-		
-		if( empty($wkEvents) ){
-?>
-			<p>Momentan befinden sich anscheinend keine Wettkämpfe in Planung!</p>
-<?php
-		}
-		else{
-			foreach( $wkEvents as $wk){
-				$wkEvent = getWkEventData($mysqlConn, $wk['id']);
-				echo htmlWkEvent($wkEvent, getStarterForEvent($mysqlConn, $wkEvent['id']), getFahrtenForEvent($mysqlConn, $wkEvent['id']));
-?>
-				<hr />
-<?php
-			}
-		}
-?>
-
-<!--Beginn der Einbindung des Counters-->
-<?php
-	$chCounter_page_title = "Wettkampfplaner -- Eventkalender";
-	$chCounter_page_url = $_SERVER[HTTP_HOST] . $_SERVER[REQUEST_URI] . "?user=".$_SESSION['user']['username'];
-	$chCounter_visible=0;
-//	include( $_SERVER['DOCUMENT_ROOT'].'/expCounter/counter.php');
-?>
-	</body>
-</html>
+<?php
+	require_once('./local/wkParticipoConf.php.inc');
+	require_once('./authLogin.php');
+	require_once('./local/db.php.inc');
+	require_once('./lib/wkParticipoLib.inc.php');
+	
+	$sqlMessage = array();
+	
+	$mysqlConn = @new mysqli($db_server, $db_user, $db_password, $db_name);
+	if ($mysqlConn->connect_error) {
+		$sqlMessage['error'] .= 'Datenbankverbindung fehlgeschlagen: ' . $mysqlConn->connect_error;
+	}
+	
+	
+	
+?>
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		
+		<title>Wettkampfplanung der Judoka des CWSV</title>
+		<link rel="stylesheet" href="./style.css">
+		<link rel="stylesheet" href="wkParticipo.css">
+	</head>
+	<body>
+		<?php echo $login_status;?>
+		<?php echo htmlRetMessage($sqlMessage);?>
+		
+		<h1>Wettkampfplanung - Kalender</h1>
+		
+		<style>
+			.navBar{
+				display: flex;
+				flex-flow: column;
+			}
+		</style>
+		<div class="navBar">
+			<a class="touchLink" href="./index.php">
+				<div>Zur Übersicht zurück</div>
+			</a>
+			<a class="touchLink" href="http://cwsvjudo.bplaced.net/pages/desktop/wkParticipo/calendar.php">
+				<div>die geplanten Wettkämpfe als iCal</div>
+			</a>
+			<a class="touchLink" href="https://www.google.com/calendar/render?cid=http://cwsvjudo.bplaced.net/pages/desktop/wkParticipo/calendar.php">
+				<div>alle geplanten Wettkämpfe in den Google Kalender übernehmen</div>
+			</a>
+		</div>
+		
+		<h2 id="wettkaempfen">Anstehende Wettkämpfe</h2>
+<?php
+		$wkEvents = getCommingWkEvents($mysqlConn);
+		
+		if( empty($wkEvents) ){
+?>
+			<p>Momentan befinden sich anscheinend keine Wettkämpfe in Planung!</p>
+<?php
+		}
+		else{
+			foreach( $wkEvents as $wk){
+				$wkEvent = getWkEventData($mysqlConn, $wk['id']);
+				echo htmlWkEvent($wkEvent, getStarterForEvent($mysqlConn, $wkEvent['id']), getFahrtenForEvent($mysqlConn, $wkEvent['id']));
+?>
+				<hr />
+<?php
+			}
+		}
+?>
+
+<!--Beginn der Einbindung des Counters-->
+<?php
+	$chCounter_page_title = "Wettkampfplaner -- Eventkalender";
+	$chCounter_page_url = $_SERVER[HTTP_HOST] . $_SERVER[REQUEST_URI] . "?user=".$_SESSION['user']['username'];
+	$chCounter_visible=0;
+//	include( $_SERVER['DOCUMENT_ROOT'].'/expCounter/counter.php');
+?>
+	</body>
+</html>
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php b/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php
index 931f10d..696d37e 100644
--- a/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php
+++ b/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php
@@ -1209,6 +1209,9 @@ $retHtml = "";
 	foreach($fahrten as $fahrt)
 		$anzPlätze += $fahrt['plaetze'];
 
+	$heuteDateTime       = DateTime::createFromFormat("Y-m-d", date("Y-m-d"));
+	$einschreibeDateTime = DateTime::createFromFormat("Y-m-d", $aWkEvent['meldefrist']);
+
 	$retHtml = 
 		"<div class=\"wkInfoCard\">".
 			"<time class=\"wkInfoCardDate\" datetime=\"".$aWkEvent['Datum']."\">".
@@ -1244,10 +1247,13 @@ $retHtml = "";
 								"<input type=\"hidden\" name=\"f[eventId]\" value=".
 									( isset( $aWkEvent['id'] ) ? $aWkEvent['id'] : "").
 								" />".
-								( date("Y-m-d") > $aWkEvent['meldefrist']?
-									"<button type=\"submit\" disabled>ist die Einschreibefrist bereits abgelaufen!</button>".
-									"<p>Frist für das Einschreiben verpasst? Für ein nachträgliches Einschreiben mit dem Admin verständigen (<a href=\"mailto:cwsvjudo@arcor.de?Subject=" . ( rawurlencode("Meldefrist ".$aWkEvent['Veranstaltung']) ) . "\" target=\"_top\">Email an cwsvjudo@arcor.de</a>).</p>"
-									:"<button type=\"submit\">jmd. einschreiben</button>"
+								( $heuteDateTime->modify( "+ 4 weeks") < $einschreibeDateTime? 
+									"<button type=\"submit\" disabled>ist es noch zu früh jemanden einzuschreiben!</button>"
+									:( date("Y-m-d") > $aWkEvent['meldefrist']?
+										"<button type=\"submit\" disabled>ist die Einschreibefrist bereits abgelaufen!</button>".
+										"<p>Frist für das Einschreiben verpasst? Für ein nachträgliches Einschreiben mit dem Admin verständigen (<a href=\"mailto:cwsvjudo@arcor.de?Subject=" . ( rawurlencode("Meldefrist ".$aWkEvent['Veranstaltung']) ) . "\" target=\"_top\">Email an cwsvjudo@arcor.de</a>).</p>"
+										:"<button type=\"submit\">jmd. einschreiben</button>"
+									)
 								).
 							"</form>"
 						).
@@ -1269,7 +1275,7 @@ $retHtml = "";
 				"</div>".
 
 				"<div class=\"wkInfoCardButtonBar\">".
-					"<a href =\"./showWkEvent.php?eventId=".$aWkEvent['eventId']."\" class=\"wkInfoCardButton wkInfoCardButtonSuccess wkInfoCardButtonRaised\">Detailansicht</a>".
+					"<a href =\"./showWkEvent.php?eventId=".$aWkEvent['id']."\" class=\"wkInfoCardButton wkInfoCardButtonSuccess wkInfoCardButtonRaised\">Detailansicht</a>".
 					"<a href =\"/ressourcen/phpLib/calendar.php?wkID=".$aWkEvent['wkId']."\" class=\"wkInfoCardButton wkInfoCardButtonSuccess wkInfoCardButtonRaised\">Termin als iCal</a>".
 					"<a href =\"".addToGcalUrl( $aWkEvent['Veranstaltung'], $aWkEvent['Datum'] )."\" class=\"wkInfoCardButton wkInfoCardButtonSuccess wkInfoCardButtonRaised\">In den Google Calendar</a>".
 				"</div>".
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php b/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php
index 1557d9e..e940971 100644
--- a/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php
+++ b/homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php
@@ -61,7 +61,7 @@
 			<ul>
 				<li>Wettkampfname: <?php echo mb_convert_encoding($eventData['Veranstaltung'], 'UTF-8', 'ISO-8859-1');?></li>
 				<li>Datum: <time datetime="<?php echo mb_convert_encoding($eventData['Datum'], 'UTF-8', 'ISO-8859-1');?>"><?php echo mb_convert_encoding($eventData['Datum'], 'UTF-8', 'ISO-8859-1');?></time></li>
-				<li>Frist zum Einschreiben: <time datetime="<?php echo mb_convert_encoding($eventData['meldefrist'], 'UTF-8', 'ISO-8859-1');?>"><?php echo mb_convert_encoding($eventData['meldefrist'], 'UTF-8', 'ISO-8859-1');?></time> <a class="touchLink" href ="<?php echo(addToGcalUrl(mb_convert_encoding($eventData['Veranstaltung'], 'UTF-8', 'ISO-8859-1'), mb_convert_encoding($eventData['meldefrist'], 'UTF-8', 'ISO-8859-1') ));?>">Einschreibefrist in den Google Calendar eintragen</a></li>
+				<li>Frist zum Einschreiben: <time datetime="<?php echo mb_convert_encoding($eventData['meldefrist'], 'UTF-8', 'ISO-8859-1');?>"><?php echo mb_convert_encoding($eventData['meldefrist'], 'UTF-8', 'ISO-8859-1');?></time> <a class="touchLink" href ="<?php echo(addToGcalUrl(mb_convert_encoding($eventData['Veranstaltung'], 'UTF-8', 'ISO-8859-1'), mb_convert_encoding($eventData['meldefrist'], 'UTF-8', 'ISO-8859-1') ));?>">Einschreibefrist in den Google Calendar übernehmen</a></li>
 				<li>Altersklassen: <?php echo mb_convert_encoding($eventData['Altersklassen'], 'UTF-8', 'ISO-8859-1');?></li>
 				<li>Ort: <a class="touchLink" href="<?php echo $eventData['Routenplaner'];?>"><?php echo mb_convert_encoding($eventData['Ort'], 'UTF-8', 'ISO-8859-1');?></a></li>
 			</ul>
@@ -165,19 +165,22 @@
 								echo("<div>Bereits eingeschrieben!</div>");
 							}
 							else{
-								if( date("Y-m-d") > $eventData['meldefrist']){
-									echo "<button class=\"touchButton\" type=\"submit\" disabled>Die Frist zum Einschreiben (".$eventData['meldefrist'].") ist bereits abgelaufen!</button>";
-									
-									if (!empty($_SESSION['login'])){
-										echo( "<p>Frist für das Einschreiben verpasst? Für ein nachträgliches Eintragen mit dem Admin verständigen (<a href=\"mailto:cwsvjudo@arcor.de?Subject=".rawurlencode("Meldefrist ".mb_convert_encoding($eventData['Veranstaltung'], 'UTF-8', 'ISO-8859-1'))."\" target=\"_top\">Email an cwsvjudo@arcor.de</a>).</p>" );
-									}
-
-
-									
-								
+								$heuteDateTime       = DateTime::createFromFormat("Y-m-d", date("Y-m-d"));
+								$einschreibeDateTime = DateTime::createFromFormat("Y-m-d", $eventData['meldefrist']);
+								if($heuteDateTime->modify( "+ 4 weeks") < $einschreibeDateTime){
+									echo("<button type=\"submit\" disabled>Es ist noch zu früh jemanden einzuschreiben!</button>");
 								}
 								else{
-									echo "<button class=\"touchButton\" type=\"submit\" name=\"submit\">Einschreiben</button>";
+									if( date("Y-m-d") > $eventData['meldefrist']){
+										echo "<button class=\"touchButton\" type=\"submit\" disabled>Die Frist zum Einschreiben (".$eventData['meldefrist'].") ist bereits abgelaufen!</button>";
+										
+										if (!empty($_SESSION['login'])){
+											echo( "<p>Frist für das Einschreiben verpasst? Für ein nachträgliches Eintragen mit dem Admin verständigen (<a href=\"mailto:cwsvjudo@arcor.de?Subject=".rawurlencode("Meldefrist ".mb_convert_encoding($eventData['Veranstaltung'], 'UTF-8', 'ISO-8859-1'))."\" target=\"_top\">Email an cwsvjudo@arcor.de</a>).</p>" );
+										}
+									}
+									else{
+										echo "<button class=\"touchButton\" type=\"submit\" name=\"submit\">Einschreiben</button>";
+									}
 								}
 							}
 ?>
diff --git a/homepage/redesign2018/markdownExperiment/yaml/downloads.subNav.yaml b/homepage/redesign2018/markdownExperiment/yaml/download.subNav.yaml
similarity index 100%
rename from homepage/redesign2018/markdownExperiment/yaml/downloads.subNav.yaml
rename to homepage/redesign2018/markdownExperiment/yaml/download.subNav.yaml
diff --git a/homepage/redesign2018/markdownExperiment/yaml/extras.subNav.yaml b/homepage/redesign2018/markdownExperiment/yaml/extras.subNav.yaml
index 397e1e8..72f4e94 100644
--- a/homepage/redesign2018/markdownExperiment/yaml/extras.subNav.yaml
+++ b/homepage/redesign2018/markdownExperiment/yaml/extras.subNav.yaml
@@ -2,7 +2,7 @@
 subNav:
 	- *home
 	- {url: "/links", caption: "Links"}
-	- {url: "/downloads", caption: "Downloads"}
+	- {url: "/download", caption: "Downloads"}
 	- {url: "/hilfsmittel", caption: "Hilfsmittel"}
 	- *quiz
 ...