Erweiterungen am Wettkampfkalender:

- Einfügen einer Schnellsprungleiste für jeden Monat
	modified:   phpLib/cwsvJudo/wkKalender.php
	modified:   src/css/cwsvJudo-2018-wkKalender.css
	modified:   src/css/cwsvJudo-2018.css
- fehlerhafte globals entfernt
	modified:   src/phpLibs/phpCount/phpcount.php
This commit is contained in:
marko
2019-02-01 06:17:26 +01:00
parent 436e74afd3
commit 3e8e8d2e59
4 changed files with 49 additions and 31 deletions

View File

@@ -2,12 +2,7 @@
setlocale(LC_ALL, 'de_DE.utf8'); setlocale(LC_ALL, 'de_DE.utf8');
function echoWkTitle(){ function echoWkTitle(){
echo( echo( getWkName( $_GET['wkId'] ) );
getWkName(
$_GET['wkId'],
"Wettkampfkalender der Judoka des Chemnitzer Freizeit- und Wohngebiets­sportvereines e. V."
)
);
} }
/// Einen Wettkampfnamen per ID abfragen /// Einen Wettkampfnamen per ID abfragen
@@ -34,13 +29,13 @@ if( empty($optionsArray['outCharset']) ) $optionsArray['outCharset'] = "UTF-8";
try{ try{
$pdoStatementForQuerryingWkById = $db_connection->prepare( $pdoStatementForQuerryingWkById = $db_connection->prepare(
"SELECT Veranstaltung FROM cwsvjudo.wettkampfkalender WHERE wettkampfkalender.lfdeNr = :wkId;" "SELECT Veranstaltung, Datum FROM cwsvjudo.wettkampfkalender WHERE wettkampfkalender.lfdeNr = :wkId;"
); );
$pdoStatementForQuerryingWkById->bindParam(':wkId', intval($wkId), PDO::PARAM_INT); $pdoStatementForQuerryingWkById->bindParam(':wkId', intval($wkId), PDO::PARAM_INT);
$pdoStatementForQuerryingWkById->execute(); $pdoStatementForQuerryingWkById->execute();
$ret = $pdoStatementForQuerryingWkById->fetchAll(PDO::FETCH_ASSOC); $ret = $pdoStatementForQuerryingWkById->fetchAll(PDO::FETCH_ASSOC);
return iconv($optionsArray['dbCharset'], $optionsArray['outCharset'], $ret[0]['Veranstaltung']); return iconv($optionsArray['dbCharset'], $optionsArray['outCharset'], $ret[0]['Veranstaltung']." am ".$ret[0]['Datum']);
} }
catch(PDOException $db_error){ catch(PDOException $db_error){
// $siteData['errors'][] = "Error!: " . $db_error->getMessage(); // $siteData['errors'][] = "Error!: " . $db_error->getMessage();
@@ -176,11 +171,9 @@ $htmlWkTableString = "";
} }
); );
//echo( "locale is ".get_locale() );
if($lastMonthName != strftime("%B %Y", strtotime($wk['Datum']) )){ if($lastMonthName != strftime("%B %Y", strtotime($wk['Datum']) )){
$lastMonthName = strftime("%B %Y", strtotime($wk['Datum']) ); $lastMonthName = strftime("%B %Y", strtotime($wk['Datum']) );
$htmlWkTableString .= "<tr><th colspan=\"5\" >".$lastMonthName."</th></tr><tr class=\"displayNone\" ><th colspan=\"5\"></th></tr>"; $htmlWkTableString .= "<tr id=\"".toAscii(strftime("%b %Y", strtotime($wk['Datum']) ))."\"><th colspan=\"5\" >".$lastMonthName."</th></tr><tr class=\"displayNone\" ><th colspan=\"5\"></th></tr>";
} }
$wkJsonSd = wkArray2jsonSdEvent($wk); $wkJsonSd = wkArray2jsonSdEvent($wk);
@@ -388,21 +381,7 @@ function wkTableHtml(){
"<script type=\"application/ld+json\">".wkArray2jsonSdEvent($wk)."</script>". "<script type=\"application/ld+json\">".wkArray2jsonSdEvent($wk)."</script>".
"<h2>".$wk['Veranstaltung']."</h2>". "<h2>".$wk['Veranstaltung']."</h2>".
wkBoxMediaGalleryHtml($wkGals); wkBoxMediaGalleryHtml($wkGals);
/*
if( !empty($wkGals) ){
foreach($wkGals as $wkGal){
// 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 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>";
}
}
}
*/
$siteData['mainContent'] .= $siteData['mainContent'] .=
"<h3>Veranstaltungsdaten</h3>". "<h3>Veranstaltungsdaten</h3>".
"<ul>". "<ul>".
@@ -420,7 +399,6 @@ function wkTableHtml(){
"</nav>". "</nav>".
"</div>". "</div>".
"<hr />"; "<hr />";
// echo(wkInfoBoxHtml($wk));
} }
} }
else{ else{
@@ -489,6 +467,9 @@ function wkTableHtml(){
} }
$ergebnis = $db_connection->query($query); $ergebnis = $db_connection->query($query);
$siteData['mainContent'] .= htmlWkMonthBar($ergebnis);
$ergebnis = $db_connection->query($query);
$siteData['mainContent'] .= wkList2htmlWkTable($ergebnis); $siteData['mainContent'] .= wkList2htmlWkTable($ergebnis);
$siteData['mainContent'] .= $siteData['mainContent'] .=
@@ -620,4 +601,25 @@ $retHtml .= "</div>"; // Ende wkBoxMediaGallery
return $retHtml; return $retHtml;
} }
/// Eine Navigationsleiste mit den Wettkampfmonaten einer Wettkampfliste
function htmlWkMonthBar($aWkList){
setlocale(LC_ALL, 'de_DE.utf8');
$wkMonthBar = "";
$wkMonthBar .= "<nav class=\"wkMonthBar\" >";
$lastMonthName = "";
foreach($aWkList as $wk){
if($lastMonthName != strftime("%b %Y", strtotime($wk['Datum']) )){
$lastMonthName = strftime("%b %Y", strtotime($wk['Datum']) );
$wkMonthBar .= "<a href=\"#".toAscii($lastMonthName)."\">".$lastMonthName."</a>";
}
}
$wkMonthBar .= "</nav>";
return $wkMonthBar;
}
?> ?>

View File

@@ -864,10 +864,24 @@
} }
}
/* Show the tooltip text when you mouse over the tooltip container */ /* Show the tooltip text when you mouse over the tooltip container */
.tooltip:hover .tooltiptext { .tooltip:hover .tooltiptext {
visibility: visible; visibility: visible;
} }
.wkMonthBar{
display:flex;
flex-flow:wrap;
justify-content:space-evenly;
}
.wkMonthBar > a {
text-align: center;
width:30%;
display: inline-block;
padding: 0.25em 0.25em 0.25em 0.25em;
margin: 0.25em 0.25em 0.25em 0.25em;
box-shadow: .1em .1em .05em grey;
background-color: #FF8100;
border-radius: .5em;
}

View File

@@ -169,7 +169,7 @@ body{
} }
.displayNone{ .displayNone{
display: none; display: none !important;
} }
.fontSizeXxSmall{ .fontSizeXxSmall{

View File

@@ -201,7 +201,7 @@ class PHPCount
'bot', 'bot',
'spider', 'spider',
'spyder', 'spyder',
'crawlwer', 'crawler',
'walker', 'walker',
'search', 'search',
'yahoo', 'yahoo',
@@ -211,6 +211,8 @@ class PHPCount
'tineye', 'tineye',
'yacy', 'yacy',
'yeti', 'yeti',
'Chrome-Lighthouse',
'Barkrowler',
); );
$agent = strtolower($_SERVER['HTTP_USER_AGENT']); $agent = strtolower($_SERVER['HTTP_USER_AGENT']);