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>";
 }