diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
index 499ca29..dcab32d 100644
--- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
+++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
@@ -2,12 +2,7 @@
setlocale(LC_ALL, 'de_DE.utf8');
function echoWkTitle(){
- echo(
- getWkName(
- $_GET['wkId'],
- "Wettkampfkalender der Judoka des Chemnitzer Freizeit- und Wohngebietssportvereines e. V."
- )
- );
+ echo( getWkName( $_GET['wkId'] ) );
}
/// Einen Wettkampfnamen per ID abfragen
@@ -34,13 +29,13 @@ if( empty($optionsArray['outCharset']) ) $optionsArray['outCharset'] = "UTF-8";
try{
$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->execute();
$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){
// $siteData['errors'][] = "Error!: " . $db_error->getMessage();
@@ -176,11 +171,9 @@ $htmlWkTableString = "";
}
);
- //echo( "locale is ".get_locale() );
-
if($lastMonthName != strftime("%B %Y", strtotime($wk['Datum']) )){
$lastMonthName = strftime("%B %Y", strtotime($wk['Datum']) );
- $htmlWkTableString .= "
| ".$lastMonthName." |
|---|
|
";
+ $htmlWkTableString .= "| ".$lastMonthName." |
|---|
|
";
}
$wkJsonSd = wkArray2jsonSdEvent($wk);
@@ -388,21 +381,7 @@ function wkTableHtml(){
"".
"".$wk['Veranstaltung']."
".
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'] .=
- "".( !empty($wkGal['teaserBildUrl'])?(""):"").("".$wkGal['typ']."galerie
")."";
- }
- else{
- $siteData['mainContent'] .=
- "".( !empty($wkGal['teaserBildUrl'])?("
"):"").("".$wkGal['typ']."galerie
")."";
- }
- }
- }
-*/
+
$siteData['mainContent'] .=
"Veranstaltungsdaten
".
"".
@@ -420,7 +399,6 @@ function wkTableHtml(){
"".
"".
"
";
-// echo(wkInfoBoxHtml($wk));
}
}
else{
@@ -489,6 +467,9 @@ function wkTableHtml(){
}
$ergebnis = $db_connection->query($query);
+ $siteData['mainContent'] .= htmlWkMonthBar($ergebnis);
+
+ $ergebnis = $db_connection->query($query);
$siteData['mainContent'] .= wkList2htmlWkTable($ergebnis);
$siteData['mainContent'] .=
@@ -620,4 +601,25 @@ $retHtml .= ""; // Ende wkBoxMediaGallery
return $retHtml;
}
+/// Eine Navigationsleiste mit den Wettkampfmonaten einer Wettkampfliste
+function htmlWkMonthBar($aWkList){
+setlocale(LC_ALL, 'de_DE.utf8');
+
+$wkMonthBar = "";
+$wkMonthBar .= "";
+
+return $wkMonthBar;
+}
+
+
?>
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css
index 9b4c6c0..87fbd74 100644
--- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css
+++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css
@@ -864,10 +864,24 @@
}
-}
-
/* Show the tooltip text when you mouse over the tooltip container */
.tooltip:hover .tooltiptext {
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;
+}
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css
index f09eeec..59daa70 100644
--- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css
+++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css
@@ -169,7 +169,7 @@ body{
}
.displayNone{
- display: none;
+ display: none !important;
}
.fontSizeXxSmall{
diff --git a/homepage/redesign2018/markdownExperiment/src/phpLibs/phpCount/phpcount.php b/homepage/redesign2018/markdownExperiment/src/phpLibs/phpCount/phpcount.php
index fbd46b3..b810b3c 100644
--- a/homepage/redesign2018/markdownExperiment/src/phpLibs/phpCount/phpcount.php
+++ b/homepage/redesign2018/markdownExperiment/src/phpLibs/phpCount/phpcount.php
@@ -201,7 +201,7 @@ class PHPCount
'bot',
'spider',
'spyder',
- 'crawlwer',
+ 'crawler',
'walker',
'search',
'yahoo',
@@ -211,6 +211,8 @@ class PHPCount
'tineye',
'yacy',
'yeti',
+ 'Chrome-Lighthouse',
+ 'Barkrowler',
);
$agent = strtolower($_SERVER['HTTP_USER_AGENT']);