From 3e8e8d2e5962669a9f17fab8a138e94f3c81be53 Mon Sep 17 00:00:00 2001 From: marko Date: Fri, 1 Feb 2019 06:17:26 +0100 Subject: [PATCH 1/2] Erweiterungen am Wettkampfkalender: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 --- .../phpLib/cwsvJudo/wkKalender.php | 56 ++++++++++--------- .../src/css/cwsvJudo-2018-wkKalender.css | 18 +++++- .../src/css/cwsvJudo-2018.css | 2 +- .../src/phpLibs/phpCount/phpcount.php | 4 +- 4 files changed, 49 insertions(+), 31 deletions(-) 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 Wohngebiets­sportvereines 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

    ". "