kleinere Korrektur für ampTauglichkeit:

modified:   redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
This commit is contained in:
marko
2018-10-25 12:39:06 +02:00
parent 0b5a1e26d8
commit 5696b24f4f

View File

@@ -11,7 +11,11 @@ function echoWkTitle(){
}
/// Einen Wettkampfnamen per ID abfragen
function getWkName( $wkId, $alternative="Judo-Wettkampf" ){
if( !is_positive_integer($wkId) ) return $alternative;
if( !is_positive_integer($wkId) ) return $alternative;
if( empty($optionsArray['dbCharset']) ) $optionsArray['dbCharset'] = "ISO-8859-1";
if( empty($optionsArray['outCharset']) ) $optionsArray['outCharset'] = "UTF-8";
// Datenbankverbindung bereit stellen
global $cwsvJudoConfig;
@@ -35,7 +39,7 @@ function getWkName( $wkId, $alternative="Judo-Wettkampf" ){
$pdoStatementForQuerryingWkById->execute();
$ret = $pdoStatementForQuerryingWkById->fetchAll(PDO::FETCH_ASSOC);
return $ret[0]['Veranstaltung'];
return iconv($optionsArray['dbCharset'], $optionsArray['outCharset'], $ret[0]['Veranstaltung']);
}
catch(PDOException $db_error){
// $siteData['errors'][] = "Error!: " . $db_error->getMessage();
@@ -191,9 +195,11 @@ $htmlWkTableString = "";
str_replace("randori", "­randori", $wk['Veranstaltung']);
$wk['Veranstaltung'] =
str_replace("spiele", "­spiele", $wk['Veranstaltung']);
$wk['Veranstaltung'] =
str_replace("mannschaft", "mann­schaft", $wk['Veranstaltung']);
$htmlWkTableString .=
"<tr>".
"<a href=\"http://cwsvjudo.bplaced.net/wkKalender/".$wk['lfdeNr']."\"><tr>".
"<script type=\"application/ld+json\">".$wkJsonSd."</script>".
"<td data-title=\"Datum\" class=\"noWrap\">".
"<time class=\"kalenderDatum\" datetime=".$wk['Datum'].">".
@@ -215,7 +221,7 @@ $htmlWkTableString = "";
"<td data-title=\"iCal\">".
"<a title=\"Termin für ".$wk['Veranstaltung']." in Kalender übernehmen\" href=\"/ressourcen/phpLib/calendar.php?wkID=".$wk['lfdeNr']."\">iCal</a>".
"</td>".
"</tr>\n";
"</tr></a>\n";
}
$htmlWkTableString .=
"</tbody>".
@@ -310,8 +316,17 @@ function wkTableHtml(){
"<li><a href =\"/ressourcen/phpLib/calendar.php?wkID=".$wk['lfdeNr']."\"><div>Termin in Kalender übernehmen</div></a></li>";
if( !empty($wkGals) ){
foreach($wkGals as $wkGal){
$siteData['mainContent'] .=
"<li><a href=\"".$wkGal['url']."\">".$wkGal['typ']."galerie</a></li>";
// Für den Fall einer ampSeite müssen die imgTags angepasst werden
if( strpos( $_SERVER['ORIG_PATH_TRANSLATED'], "pages/amp" ) !== false ){
$siteData['mainContent'] .=
"<li><a style=\"position:relative;display:block;\" href=\"".$wkGal['url']."\">".( !empty($wkGal['teaserBildUrl'])?("<amp-img layout=\"responsive\" width=\"200\" height=\"133\" class=\"valignMiddle\" src=\"".$wkGal['teaserBildUrl']."\" ></amp-img>"):"").("<div style=\"color:white;position:absolute;left:0;top:42%;\">".$wkGal['typ']."galerie</div>")."</a></li>";
}
else{
$siteData['mainContent'] .=
// "<li><a href=\"".$wkGal['url']."\">".$wkGal['typ']."galerie</a></li>";
"<li><a style=\"position:relative;display:block;\" href=\"".$wkGal['url']."\">".( !empty($wkGal['teaserBildUrl'])?("<img class=\"valignMiddle\" src=\"".$wkGal['teaserBildUrl']."\" />"):"").("<div style=\"color:white;position:absolute;left:0;top:42%;\">".$wkGal['typ']."galerie</div>")."</a></li>";
// "<li><a style=\"position:relative;display:block;\" href=\"".$wkGal['url']."\">".( !empty($wkGal['teaserBildUrl'])?("<img class=\"valignMiddle\" style=\"width:100%;\" src=\"".$wkGal['teaserBildUrl']."\" </img>"):"").("<img style=\"width:50%;display:block;color:white;position:absolute;left:0;top:0;opacity:0.5;\" src=\"http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/filmrolle-grau.svg\" />")."</a></li>";
}
}
}
$siteData['mainContent'] .=