From 22c58960e9ac24fa58cb67892609123c5d57fad4 Mon Sep 17 00:00:00 2001 From: marko Date: Tue, 26 Jun 2018 15:00:37 +0200 Subject: [PATCH 1/3] 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.""; From f3bce58dbbd29164c4b9a334bdbfe652ded725d0 Mon Sep 17 00:00:00 2001 From: marko Date: Fri, 29 Jun 2018 13:25:31 +0200 Subject: [PATCH 2/3] =?UTF-8?q?-=20canonical=20Link=20f=C3=BCr=20die=20Ein?= =?UTF-8?q?zelansicht=20des=20Wettkampfes=20im=20Wettkampfkalender=20-=20e?= =?UTF-8?q?xpired-Zeiten=20f=C3=BCr=20die=20verschiedenen=20Ressourcen=20b?= =?UTF-8?q?eigef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On branch redesign2018 modified: css/cwsvJudo-2018.css modified: htaccess/cwsvjudo.bplaced.net/.htaccess modified: md/wkKalender.md modified: pandocTemplate/cwsvJudo.html5.pandocTemplate modified: phpLib/cwsvJudo/wkKalender.php --- .../markdownExperiment/css/cwsvJudo-2018.css | 3 + .../htaccess/cwsvjudo.bplaced.net/.htaccess | 92 ++++++++++++++++++- .../markdownExperiment/md/wkKalender.md | 3 +- .../cwsvJudo.html5.pandocTemplate | 7 ++ .../phpLib/cwsvJudo/wkKalender.php | 15 ++- 5 files changed, 112 insertions(+), 8 deletions(-) diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018.css b/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018.css index c0f551e..08eaa53 100644 --- a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018.css +++ b/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018.css @@ -160,3 +160,6 @@ body{ clear: both; } +.fontsizeXXS{ + font-size: xx-small; +} diff --git a/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess b/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess index 635b80d..24bdf38 100644 --- a/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess +++ b/homepage/redesign2018/markdownExperiment/htaccess/cwsvjudo.bplaced.net/.htaccess @@ -1,3 +1,65 @@ +## EXPIRES CACHING ## + +ExpiresActive On +ExpiresByType image/jpg "access 1 year" +ExpiresByType image/jpeg "access 1 year" +ExpiresByType image/gif "access 1 year" +ExpiresByType image/png "access 1 year" +ExpiresByType text/css "access 1 month" +ExpiresByType text/html "access 1 month" +ExpiresByType application/pdf "access 1 month" +ExpiresByType text/x-javascript "access 1 month" +ExpiresByType application/x-shockwave-flash "access 1 month" +ExpiresByType image/x-icon "access 1 year" +ExpiresDefault "access 1 month" + +## EXPIRES CACHING ## + +### +# Weiterleitungen +### + +## www auf nichtwww umleiten + +RewriteEngine On +RewriteBase / +RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC] +RewriteRule ^(.*)$ http://%1/$1 [R=301,L] + +RewriteRule ^wk/([0-9]+)$ pages/desktop/verein.wettkampf.php?wkId=$1 + +RewriteRule ^gallery/([0-9]+)$ ?galId=$1 [L] +RewriteRule ^gallery/([0-9]+)/.*$ ?galId=$1 [L] + +RewriteRule ^galerie/([0-9]+)$ ?galId=$1 [L] +RewriteRule ^galerie/([0-9]+)/.*$ ?galId=$1 [L] + + + +Header set Content-Security-Policy "script-src 'self'" + + +Header always set X-FRAME-OPTIONS "DENY" + + + +# Auf die Fontdatei wird von der Subdomain aus zugegriffen +# - das gesamte ressourcenVerzeichnis wird auf die Maindomain umgeleitet +# - die mainDomain erlaubt aber anscheinend nicht, das fremde domains bei ihr anfragen startet +# - deshalb zumindest für das otf-File den cross domain zugriff erlauben +# (seltsam, dass der Zugriff auf die Bilder unter Photoalben aber erlaubt wird...) + + + Header set Access-Control-Allow-Origin "*" + + + + +### +# redesign2018 Test +### + + # Url-Rewriting aktivieren RewriteEngine on # Das Request ist für diese Domain @@ -5,7 +67,22 @@ RewriteEngine on # www/ch/de/net) auf das Unterverzeichnis geleitet werden soll, aber # interessant zu wissen # Und jetzt nützlich: Ich kann es unter der .de-Domain testen! -RewriteCond %{HTTP_HOST} ^(www.)?cwsvjudo.bplaced.de$ [NC] +#RewriteCond %{HTTP_HOST} ^(www.)?cwsvjudo.bplaced.de$ [NC] + +# einige hotfixes +RewriteRule ^pages/desktop/verein.wettkampfkalender.php$ pages/responsive/wkKalender.php [L] +RewriteRule ^ressourcen/(.*)$ ressourcen/$1 [L] +RewriteRule ^photoalben/(.*)$ photoalben/$1 [L] +RewriteRule ^videoalben/(.*)$ videoalben/$1 [L] +RewriteRule ^downloads/(.*)$ downloads/$1 [L] +RewriteRule ^temp/(.*)$ temp/$1 [L] +RewriteRule ^admin/(.*)$ admin/$1 [L] + + +RewriteCond %{REQUEST_URI} ^/$ +RewriteCond %{QUERY_STRING} ^wkId=([0-9]+)$ +RewriteRule ^(.*)$ /pages/responsive/wkKalender.php [L] + # Die angeforderte Ressource ist nicht bereits in dem Zielverzeichnis: RewriteCond %{REQUEST_URI} !^/pages/responsive/ @@ -18,12 +95,19 @@ RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d # An die angeforderte Ressource das Zielverzeichnis präfixen -# Das Request ist für diese Domain RewriteRule ^(.*)$ /pages/responsive/$1 -# Das Request ist für diese Domain -# RewriteCond %{HTTP_HOST} ^(www.)?cwsvjudo.square7.net$ [NC] +RewriteRule ^(.*)wkKalender/([0-9]+)(.*)$ $1/wkKalender?wkId=$2 +#RewriteCond %{HTTP_HOST} ^(www.)?cwsvjudo.bplaced.de$ [NC] +RewriteRule ^gallery/([0-9]+)$ ?galId=$1 [L] +RewriteRule ^galerie/([0-9]+)$ ?galId=$1 [L] + # Ein Request für die Root-Ressource auf die index.php im # Zielverzeichnis umleiten + +#RewriteCond %{HTTP_HOST} ^(www.)?cwsvjudo.bplaced.de$ [NC] RewriteRule ^(/)?$ pages/responsive/index.php [L] + + +# Ende redesign2018-Test diff --git a/homepage/redesign2018/markdownExperiment/md/wkKalender.md b/homepage/redesign2018/markdownExperiment/md/wkKalender.md index d20619e..8bb4c33 100644 --- a/homepage/redesign2018/markdownExperiment/md/wkKalender.md +++ b/homepage/redesign2018/markdownExperiment/md/wkKalender.md @@ -1,13 +1,14 @@ --- lang: de title: "Wettkampfkalender der Judoka des Chemnitzer Freizeit- und Wohngebiets­sportvereines e. V." +phpTitleFunction: echoWkTitle author: marko keywords: - Judo - Wettkampf - Termine description: "Ein Kalender mit Judo-Wettkampfterminen zur Übersicht" -canonicalLink: "http://cwsvjudo.bplaced.net/wkKalender" +canonicalLink: "http://cwsvjudo.bplaced.net/wkKalender" ampVersionLink: "http://amp.cwsvjudo.bplaced.net/wkKalender" ... diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate index bfa7257..d975109 100644 --- a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate +++ b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate @@ -40,10 +40,17 @@ $endif$ $if(description)$ $endif$ +$if(canonicalLink)$ + +$endif$ $if(ampVersionLink)$ $endif$ +$if(phpTitleFunction)$ + <?php $phpTitleFunction$();?> +$else$ $if(title-prefix)$$title-prefix$ – $endif$$pagetitle$ +$endif$ $if(quotes)$