Merge branch 'redesign2018' of /media/sdb1/gitRepositories/judo into redesign2018

Conflicts:
	homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
	homepage/redesign2018/markdownExperiment/src/galleryHelper/videoGallery.tmpl.php
This commit is contained in:
marko
2019-01-24 05:18:24 +01:00
15 changed files with 793 additions and 111 deletions

View File

@@ -17,7 +17,7 @@ include_once("config.inc.php");
$vidQuery =
$cwsvJudoDbConnection->prepare(
"SELECT url FROM cwsvjudo.`shiai.videos` WHERE wkId = :wkId;"
"SELECT url, posterUrl FROM cwsvjudo.`shiai.videos` WHERE wkId = :wkId;"
);
$vidQuery->bindParam(':wkId', intval($wkId), PDO::PARAM_INT);
@@ -29,9 +29,10 @@ include_once("config.inc.php");
foreach( $wkVideos as $wkVid){
// $posterSrc = str_replace( ".webm", ".jpg", str_replace("webm/", "thumbnails/", $vid ) );
// $posterSize = getimagesize( $posterSrc );
// 'posterSrc' => $posterSrc,
$vidList[] = array(
'vidSrc' => $wkVid['url'],
// 'posterSrc' => $posterSrc,
'posterSrc' => $wkVid['posterUrl'],
// 'width' => $posterSize[0],
// 'height' => $posterSize[1]
);
@@ -72,13 +73,10 @@ return $retVal;
<link rel="canonical" href="http://cwsvjudo.bplaced.net<?php echo $_SERVER['REQUEST_URI']?>" />
<!--
<script type="text/javascript" src="/ressourcen/blueimpGallery/js/blueimp-gallery.min.js" async=""></script>
-->
<script type="text/javascript" src="<?php echo($urlBase)?>/ressourcen/blueimpGallery/js/blueimp-gallery.min.js" async=""></script>
<!--https://github.com/aFarkas/lazysizes-->
<!--
<script src="/ressourcen/jsLib/lazysizes.min.js" async=""></script>
-->
<script src="<?php echo($urlBase)?>/ressourcen/jsLib/lazysizes.min.js" async=""></script>
<style>
img.lazyload {
display: none;
@@ -108,6 +106,7 @@ return $retVal;
</head>
<body style="color: #000000; background-color: #FFAE00" >
<iframe style="width:100%;height:auto;" src="http://cwsvjudo-media-2018.unaux.com/videoalben/videoalben.2018/2018-11-24-RKPXXI-U7U9U11-Schlettau/"></iframe>
<a title="Galerien der Judoka des Chemnitzer WSV" href="/galerien">Zur Galerieübersicht</a>
<?php
/// Eine kleine Messagebox
@@ -182,9 +181,10 @@ return $retVal;
}
</style>
<?php
foreach( $vidList as $vidKey => $vidEntry ){
echo(
"<video controls preload=\"none\">".
"<video controls preload=\"none\" poster=\"".$vidEntry['posterSrc']."\">".
"<source src=\"".$vidEntry['vidSrc']."\" type=\"video/webm\">".
"Dieser Browser scheint das Video nicht abspielen zu können.".
"</video>"
@@ -202,7 +202,7 @@ foreach( $vidList as $vidKey => $vidEntry ){
// "src=\"".$vidEntry['posterSrc']."\"".
// "srcset=\"data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==\"".
"id=\"Video".( $vidKey )."\" ".
// "data-src=\"".( $vidEntry['posterSrc'] )."\" ".
"data-src=\"".( $vidEntry['posterSrc'] )."\" ".
// "width=\"".$vidEntry['width']."\" ".
// "height=\"".$vidEntry['height']."\" ".
"alt=\"[".( $vidKey + 1 )."/".( count($vidList) )."]\" ".
@@ -212,7 +212,7 @@ foreach( $vidList as $vidKey => $vidEntry ){
echo(
"<noscript>".
// "<video controls preload=\"none\" poster=\"".$vidEntry['posterSrc']."\" width=\"".$vidEntry['width']."\" height=\"".$vidEntry['height']."\">".
"<video controls preload=\"none\">".
"<video controls preload=\"none\" poster=\"".$vidEntry['posterSrc']."\">".
"<source src=\"".$vidEntry['vidSrc']."\" type=\"video/webm\">".
"Dieser Browser scheint das Video nicht abspielen zu können.".
"</video>".
@@ -225,6 +225,7 @@ foreach( $vidList as $vidKey => $vidEntry ){
<!-- BluimpGalerry Lightbox Version -->
<!-- The Gallery as lightbox dialog, should be a child element of the document body -->
<!--
<div id="blueimp-gallery" class="blueimp-gallery blueimp-gallery-controls">
<div class="slides"></div>
@@ -241,7 +242,6 @@ foreach( $vidList as $vidKey => $vidEntry ){
<?php
foreach( $vidList as $vidEntry){
// echo "{href: '".$vidEntry['vidSrc']."', poster: '".$vidEntry['posterSrc']."', type: 'video/webm'},";
echo "{href: '".$vidEntry['vidSrc']."', type: 'video/webm'},";
}
?>
];
@@ -260,7 +260,8 @@ foreach( $vidList as $vidKey => $vidEntry ){
xmlHttp.send(null);
},
*/
startSlideshow: true,
preloadRange: 0,
startSlideshow: false,
stretchImages: true,
index: startIndex,
}
@@ -273,6 +274,6 @@ foreach( $vidList as $vidKey => $vidEntry ){
// startGalleryShow();
</script>
<hr/>
-->
</body>
</html>