diff --git a/homepage/redesign2018/css/cwsvJudo-2018.css b/homepage/redesign2018/css/cwsvJudo-2018.css index f5c8b8d..6c1c1dd 100644 --- a/homepage/redesign2018/css/cwsvJudo-2018.css +++ b/homepage/redesign2018/css/cwsvJudo-2018.css @@ -114,6 +114,10 @@ body{ width:100%; } +.valignMiddle{ + vertical-align:middle; +} + /* Bilder in voller Breite */ .bigPicture{ width: 100%; diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile index 5c514de..036456a 100644 --- a/homepage/redesign2018/markdownExperiment/Makefile +++ b/homepage/redesign2018/markdownExperiment/Makefile @@ -45,10 +45,10 @@ ampTest: $(ampFiles) build/css/cwsvJudo.css: $(cssFiles) mkdir -p $(dir $@) -# cat $(cssFiles) > $@ + cat $^ > $@ # cat $(cssFiles) | cleancss -o $@ # cat $^ | ./node_modules/.bin/csso -o $@ - cat $^ | csso -o $@ +# cat $^ | csso -o $@ build/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate mkdir -p build diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php index ba236c2..7231aac 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php @@ -250,6 +250,8 @@ function nicerAkList($akArray){ $ret = join(' und ', $both); return $ret; } + + /// Wettkampfdaten als json-formatierte strukturierte Event-Daten function wkArray2jsonSdEvent($wk){ return @@ -303,6 +305,23 @@ 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

    ". "". "". @@ -476,4 +480,40 @@ $wkInfoBoxHtml = ""; return $wkInfoBoxHtml; } + +function wkBoxMediaGalleryHtml($wkGals){ +if(empty($wkGals)) return ""; +$retHtml = ""; + +$retHtml .= "
    "; + +foreach($wkGals as $wkGal){ + $retHtml.= + ""; + + if(strpos( $_SERVER['ORIG_PATH_TRANSLATED'], "pages/amp" ) !== false) + $retHtml .= "

    ".$wkGal['typ']."galerie

    "; + + $retHtml .= ""; +} + +$retHtml .= "
    "; // Ende galImgList + +return $retHtml; +} + ?> diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css index 46d879c..dcf2ce0 100644 --- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css +++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css @@ -794,3 +794,31 @@ } } */ + +/* + * Mit Text overlay-tes Bild +*/ + +.textoverlayedImage{ + position: relative; + display: table; +} +.textoverlayedImage > img { + width: 100%; + height: auto; +} +.textoverlayedImage > div { + z-index: 99; + width: 70%; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%,-50%); +} +.textoverlayedImage > div > p{ + text-align: center; + color: white; + font-weight: lighter; + line-height: 2; + padding: 0 10%; +} diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css index f997542..ebf4d44 100644 --- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css +++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css @@ -38,13 +38,17 @@ html{ /* * Body */ + body{ background: #FFAE00; font-family: arial, helvetica, sans-serif; } -/* Container für eine einzelne News */ +/* + * Container für eine einzelne News + */ + .newsBox{ border: solid 1px #000000; padding: 1vmin; @@ -113,6 +117,9 @@ body{ .fullWidth{ width:100%; } +.valignMiddle{ + vertical-align:middle; +} /* Bilder in voller Breite */ .bigPicture{