From 22c58960e9ac24fa58cb67892609123c5d57fad4 Mon Sep 17 00:00:00 2001 From: marko Date: Tue, 26 Jun 2018 15:00:37 +0200 Subject: [PATCH] On branch redesign2018 Your branch is up to date with 'origin/redesign2018'. Changes to be committed: modified: homepage/redesign2018/markdownExperiment/Makefile modified: homepage/redesign2018/markdownExperiment/md/wkKalender.md modified: homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate modified: homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php --- .../redesign2018/markdownExperiment/Makefile | 4 +- .../markdownExperiment/md/wkKalender.md | 2 +- .../cwsvJudo.html5.pandocTemplate | 4 ++ .../phpLib/cwsvJudo/wkKalender.php | 39 +++++++++++++++++++ 4 files changed, 46 insertions(+), 3 deletions(-) diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile index 7ca2e8c..ceb16a8 100644 --- a/homepage/redesign2018/markdownExperiment/Makefile +++ b/homepage/redesign2018/markdownExperiment/Makefile @@ -45,9 +45,9 @@ ampTest: $(ampFiles) build/css/cwsvJudo.css: $(cssFiles) mkdir -p $(dir $@) - cat $(cssFiles) > $@ -# cat $^ | csso -o $@ +# cat $(cssFiles) > $@ # cat $(cssFiles) | cleancss -o $@ + cat $^ | csso -o $@ build/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate mkdir -p build diff --git a/homepage/redesign2018/markdownExperiment/md/wkKalender.md b/homepage/redesign2018/markdownExperiment/md/wkKalender.md index e78b2d9..d20619e 100644 --- a/homepage/redesign2018/markdownExperiment/md/wkKalender.md +++ b/homepage/redesign2018/markdownExperiment/md/wkKalender.md @@ -1,6 +1,6 @@ --- lang: de -title: Wettkampfkalender der Judoka des Chemnitzer Freizeit- und Wohngebiets­sportverein e. V. +title: "Wettkampfkalender der Judoka des Chemnitzer Freizeit- und Wohngebiets­sportvereines e. V." author: marko keywords: - Judo diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate index a790a8f..bfa7257 100644 --- a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate +++ b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate @@ -18,7 +18,11 @@ galleryRedirector(); +$if(phpTitleString)$ + PHPCount::AddHit($phpTitleString$);?> +$else$ PHPCount::AddHit("$title$");?> +$endif$ diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php index f9a4ba9..be69592 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php @@ -1,4 +1,40 @@ getMessage(); + return $alternative; + } + + try{ + $pdoStatementForQuerryingWkById = $db_connection->prepare( + "SELECT Veranstaltung FROM cwsvjudo.wettkampfkalender WHERE wettkampfkalender.lfdeNr = :wkId;" + ); + $pdoStatementForQuerryingWkById->bindParam(':wkId', intval($wkId), PDO::PARAM_INT); + $pdoStatementForQuerryingWkById->execute(); + $ret = $pdoStatementForQuerryingWkById->fetchAll(PDO::FETCH_ASSOC); + + return $ret[0]['Veranstaltung']; + } + catch(PDOException $db_error){ +// $siteData['errors'][] = "Error!: " . $db_error->getMessage(); + return $alternative; + } +return $alternative; +} /// Wettkämpfe per ID abfragen /// @@ -97,6 +133,7 @@ return $ret; /// Aus einer Liste von Wettkämpfen den htmlCode der Wettkampftabelle bereit stellen function wkList2htmlWkTable( $aWkList, $someOptions = [] ){ +setlocale(LC_ALL, 'de_DE.utf8'); if( empty($aWkList) ) return ""; @@ -126,6 +163,8 @@ $htmlWkTableString = ""; } ); + //echo( "locale is ".get_locale() ); + if($lastMonthName != strftime("%B %Y", strtotime($wk['Datum']) )){ $lastMonthName = strftime("%B %Y", strtotime($wk['Datum']) ); $htmlWkTableString .= "".$lastMonthName."";