From 1e8f4e730090d57a887f6ce5317a1ce92006eeb8 Mon Sep 17 00:00:00 2001 From: marko Date: Sat, 30 Nov 2024 20:09:47 +0100 Subject: [PATCH] WIP: index loads on heliohost --- homepage/cwsvJudo/.gitignore | 3 + homepage/cwsvJudo/Makefile.heliohost | 1 + homepage/cwsvJudo/admin/newsAdmin.php | 2 +- .../cwsvJudo.html5.pandocTemplate | 2 +- .../pandocTemplate/materialize.pandocTemplate | 6 +- homepage/cwsvJudo/phpLib/cwsvJudo/newsLib.php | 18 ++- .../phpLib/cwsvJudo/newsTableHtml.php | 8 +- .../res/IntegrationDurchSport2018.250x.png | Bin 0 -> 17262 bytes .../scripts/upload-heliohost.template | 4 +- homepage/cwsvJudo/src/favIcons/README.md | 23 ++++ .../src/favIcons/android-chrome-192x192.png | Bin 0 -> 11609 bytes .../src/favIcons/android-chrome-256x256.png | Bin 0 -> 16402 bytes .../src/favIcons/apple-touch-icon.png | Bin 0 -> 10412 bytes .../cwsvJudo/src/favIcons/browserconfig.xml | 9 ++ .../cwsvJudo/src/favIcons/favicon-16x16.png | Bin 0 -> 1093 bytes .../cwsvJudo/src/favIcons/favicon-32x32.png | Bin 0 -> 1877 bytes homepage/cwsvJudo/src/favIcons/favicon.ico | Bin 0 -> 15086 bytes homepage/cwsvJudo/src/favIcons/html_code.html | 9 ++ .../cwsvJudo/src/favIcons/mstile-150x150.png | Bin 0 -> 7167 bytes .../src/favIcons/safari-pinned-tab.svg | 120 ++++++++++++++++++ .../cwsvJudo/src/favIcons/site.webmanifest | 19 +++ .../cwsvJudo/src/shared/ehrungen.html.inc | 38 +++--- homepage/cwsvJudo/src/shared/favicon.html.inc | 45 +++++-- .../cwsvJudo/src/shared/faviconAmp.inc.html | 20 +-- .../cwsvJudo/src/shared/sponsorlist.inc.amp | 4 +- .../cwsvJudo/src/shared/sponsorlist.inc.html | 16 +-- homepage/cwsvJudo/src/yaml/images.yaml | 4 +- 27 files changed, 285 insertions(+), 66 deletions(-) create mode 100644 homepage/cwsvJudo/res/IntegrationDurchSport2018.250x.png create mode 100644 homepage/cwsvJudo/src/favIcons/README.md create mode 100644 homepage/cwsvJudo/src/favIcons/android-chrome-192x192.png create mode 100644 homepage/cwsvJudo/src/favIcons/android-chrome-256x256.png create mode 100644 homepage/cwsvJudo/src/favIcons/apple-touch-icon.png create mode 100644 homepage/cwsvJudo/src/favIcons/browserconfig.xml create mode 100644 homepage/cwsvJudo/src/favIcons/favicon-16x16.png create mode 100644 homepage/cwsvJudo/src/favIcons/favicon-32x32.png create mode 100644 homepage/cwsvJudo/src/favIcons/favicon.ico create mode 100644 homepage/cwsvJudo/src/favIcons/html_code.html create mode 100644 homepage/cwsvJudo/src/favIcons/mstile-150x150.png create mode 100644 homepage/cwsvJudo/src/favIcons/safari-pinned-tab.svg create mode 100644 homepage/cwsvJudo/src/favIcons/site.webmanifest diff --git a/homepage/cwsvJudo/.gitignore b/homepage/cwsvJudo/.gitignore index be243a0..851d031 100644 --- a/homepage/cwsvJudo/.gitignore +++ b/homepage/cwsvJudo/.gitignore @@ -1,5 +1,8 @@ build/* temp/* +scripts/ +!scripts/*.template + # don't commit any secrets Makefile.local \ No newline at end of file diff --git a/homepage/cwsvJudo/Makefile.heliohost b/homepage/cwsvJudo/Makefile.heliohost index dadd819..03b8d87 100644 --- a/homepage/cwsvJudo/Makefile.heliohost +++ b/homepage/cwsvJudo/Makefile.heliohost @@ -27,6 +27,7 @@ build/materialize/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/materializ --css="ressourcen/css/cwsvJudo.css" \ --template=pandocTemplate/materialize.pandocTemplate \ --to=html \ + --wrap=preserve \ --output=$@ \ $< $(word 2,$^) diff --git a/homepage/cwsvJudo/admin/newsAdmin.php b/homepage/cwsvJudo/admin/newsAdmin.php index af51ae0..780267d 100644 --- a/homepage/cwsvJudo/admin/newsAdmin.php +++ b/homepage/cwsvJudo/admin/newsAdmin.php @@ -57,7 +57,7 @@ $someOptions['dbCharset'] = firstNonEmptyOf([$someOptions['dbCharset'], "ISO-885 return; } - $defaultPromoImg['src'] = "http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvJudoLogoWappen.x256.png"; + $defaultPromoImg['src'] = "/ressourcen/graphiken/logos/cwsvJudoLogoWappen.256w.png"; $defaultPromoImg['width'] = "207"; $defaultPromoImg['height'] = "256"; $defaultPromoImg['alt'] = "cwsvJudo"; diff --git a/homepage/cwsvJudo/pandocTemplate/cwsvJudo.html5.pandocTemplate b/homepage/cwsvJudo/pandocTemplate/cwsvJudo.html5.pandocTemplate index e64df08..4fa394d 100644 --- a/homepage/cwsvJudo/pandocTemplate/cwsvJudo.html5.pandocTemplate +++ b/homepage/cwsvJudo/pandocTemplate/cwsvJudo.html5.pandocTemplate @@ -138,7 +138,7 @@ $endfor$ title="Judo im Chemnitzer WSV" alt="Judo im Chemnitzer WSV - Logo" src="/ressourcen/graphiken/logos/cwsvJudoLogoWappen.128w.png" - srcset="/ressourcen/graphiken/logos/cwsvJudoLogoWappen.x256.png 2x" + srcset="/ressourcen/graphiken/logos/cwsvJudoLogoWappen.256w.png 2x" > diff --git a/homepage/cwsvJudo/pandocTemplate/materialize.pandocTemplate b/homepage/cwsvJudo/pandocTemplate/materialize.pandocTemplate index db2c446..3935ab7 100644 --- a/homepage/cwsvJudo/pandocTemplate/materialize.pandocTemplate +++ b/homepage/cwsvJudo/pandocTemplate/materialize.pandocTemplate @@ -19,9 +19,9 @@ galleryRedirector(); $if(phpTitleString)$ -// PHPCount::AddHit($phpTitleString$); + // PHPCount::AddHit($phpTitleString$); $else$ -// PHPCount::AddHit("$title$"); + // PHPCount::AddHit("$title$"); $endif$ ?> @@ -146,7 +146,7 @@ $endif$ Judo im Chemnitzer WSV - Logo + srcset="/ressourcen/graphiken/logos/cwsvJudoLogoWappen.256w.png 2x"> $if(mainNav)$ diff --git a/homepage/cwsvJudo/phpLib/cwsvJudo/newsLib.php b/homepage/cwsvJudo/phpLib/cwsvJudo/newsLib.php index 0602b84..c77e4e3 100644 --- a/homepage/cwsvJudo/phpLib/cwsvJudo/newsLib.php +++ b/homepage/cwsvJudo/phpLib/cwsvJudo/newsLib.php @@ -10,6 +10,11 @@ function get_inner_html( $node ) { return $innerHTML; } +/** checks if the page is a amp page by checking the reqested url for our amp source */ +function check_for_amp_site(){ + return (strpos( $_SERVER['REQUEST_URI'], "pages/amp" ) !== false ); +} + /// Eine Liste mit News abfragen /// /// Der Rückgabewert sollte vor Verwendung (und zur Fehlerbeheandlung) @@ -27,7 +32,7 @@ if( !is_positive_integer($optionsArray['limit']) ) $optionsArray['limit'] = "1"; $ret = array(); // Falls eine konkrete newsId angegeben wurde, wollen wir ab dieser News haben - if( is_positive_integer($optionsArray['newsId']) ){ + if( is_positive_integer($optionsArray['newsId']??null) ){ $pdoStatementForQuerryingNews = $aMysqlConn->prepare( "SELECT * FROM cwsvjudo.nachrichten WHERE nachrichten.datum <= (SELECT nachrichten.datum FROM nachrichten WHERE nachrichten.nr = :newsId ) ORDER BY nachrichten.datum DESC LIMIT :limit OFFSET 0;" ); @@ -37,7 +42,7 @@ $ret = array(); else{ $query = "SELECT * FROM nachrichten"; - if( is_positive_integer($optionsArray['jahr']) ) + if( is_positive_integer($optionsArray['jahr']??null) ) $query .= " WHERE DATE_FORMAT( datum, '%Y') = :jahr"; $query .= " ORDER BY datum DESC, nr DESC LIMIT :limit;"; @@ -107,7 +112,8 @@ $options = getKeyValueArray($someOptions); } if( !filter_var($aNews['promoImg'], FILTER_VALIDATE_URL) && !filter_var($aNews['promoImg']['src'], FILTER_VALIDATE_URL) ){ $domDoc = new DOMDocument(); - $domDoc->loadHTML( mb_convert_encoding($aNews['nachricht'], 'HTML-ENTITIES', "UTF-8") ); + // @todo With php8.4 use Dom\HTMLDocument::createFromString() and don't ignore the warnings. + @$domDoc->loadHTML( mb_convert_encoding($aNews['nachricht'], 'HTML-ENTITIES', "UTF-8") ); foreach($domDoc->getElementsByTagName('a') as $anchor){ $anchorDad = $anchor->parentNode; foreach($anchor->getElementsByTagName('img') as $img){ @@ -141,7 +147,7 @@ $options = getKeyValueArray($someOptions); } // Für den Fall einer ampSeite müssen die imgTags angepasst werden - if( strpos( $_SERVER['ORIG_PATH_TRANSLATED'], "pages/amp" ) !== false ){ + if( check_for_amp_site() ){ $retHtml = str_replace("", ">", $retHtml); } @@ -204,7 +210,7 @@ function getHtmlNewsTitle(){ function img2ampimg($inText){ $outText = $inText; // Zuweilen sind im Nachtrichtentext selbst auch schon Bilder, auch diese müssen bei ampSeiten angepasst werden - if( strpos( $_SERVER['ORIG_PATH_TRANSLATED'], "pages/amp" ) !== false ){ + if( check_for_amp_site() ){ // bei bereits im Newstext vorhandenen Bildern, gehen wir davon aus, dass widt+heigth bereits gesetzt sind $outText = str_replace("", ">", $outText); @@ -216,7 +222,7 @@ function img2ampimg($inText){ function video2ampvideo($inText){ $outText = $inText; // Zuweilen sind im Nachtrichtentext selbst auch schon Bilder, auch diese müssen bei ampSeiten angepasst werden - if( strpos( $_SERVER['ORIG_PATH_TRANSLATED'], "pages/amp" ) !== false ){ + if( check_for_amp_site() ){ // bei bereits im Newstext vorhandenen Bildern, gehen wir davon aus, dass widt+heigth bereits gesetzt sind $outText = str_replace("