added thumbnails for Kyu8
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -14,3 +14,6 @@
|
|||||||
path = submodules/materialize
|
path = submodules/materialize
|
||||||
url = https://github.com/materializecss/materialize.git
|
url = https://github.com/materializecss/materialize.git
|
||||||
|
|
||||||
|
[submodule "submodules/video.js"]
|
||||||
|
path = submodules/video.js
|
||||||
|
url = https://github.com/videojs/video.js.git
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"source": "http://download.m-m-sports.com/extras/judo_guertelpruefung/1_8%20fallrw.mp4",
|
"source": "http://download.m-m-sports.com/extras/judo_guertelpruefung/1_8%20fallrw.mp4",
|
||||||
"target": "videos/8terKyu/Ukemi/Ushiro.webm",
|
"target": "videos/8terKyu/Ukemi/Ushiro.webm",
|
||||||
"poster":{
|
"poster":{
|
||||||
"timeIndex": "34.760"
|
"timeIndex": "20.520"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -69,10 +69,12 @@ for clip in clipDict:
|
|||||||
# @todo This is a very bad hack because the outtmpl options doesn't seem to be working if the file gets reencoded
|
# @todo This is a very bad hack because the outtmpl options doesn't seem to be working if the file gets reencoded
|
||||||
inputFilename = glob.glob(infoDict['id']+"*")[0]
|
inputFilename = glob.glob(infoDict['id']+"*")[0]
|
||||||
|
|
||||||
|
h, w = getDimensions(config, clip)
|
||||||
|
|
||||||
# generate preview image for the video
|
# generate preview image for the video
|
||||||
if 'poster' in clip:
|
if 'poster' in clip:
|
||||||
generate_thumbnail(inputFilename, os.path.splitext(clip['target'])[0]+".jpg", clip['poster']['timeIndex'], h )
|
generate_thumbnail(inputFilename, os.path.splitext(clip['target'])[0]+".jpg", clip['poster']['timeIndex'], h )
|
||||||
|
|
||||||
kwArgs = {}
|
kwArgs = {}
|
||||||
if 'from' in clip:
|
if 'from' in clip:
|
||||||
kwArgs['ss'] = clip['from']
|
kwArgs['ss'] = clip['from']
|
||||||
@@ -92,8 +94,6 @@ for clip in clipDict:
|
|||||||
h=clip['crop']['h']
|
h=clip['crop']['h']
|
||||||
)
|
)
|
||||||
|
|
||||||
h, w = getDimensions(config, clip)
|
|
||||||
|
|
||||||
stream = ffmpeg.output(stream,
|
stream = ffmpeg.output(stream,
|
||||||
clip['target'],
|
clip['target'],
|
||||||
vcodec=config['vcodec'],
|
vcodec=config['vcodec'],
|
||||||
|
|||||||
@@ -3,7 +3,11 @@ title: Fallen rückwärts
|
|||||||
video:
|
video:
|
||||||
url: "videos/8terKyu/Ukemi/Ushiro.webm"
|
url: "videos/8terKyu/Ukemi/Ushiro.webm"
|
||||||
width: 854
|
width: 854
|
||||||
height: 480
|
height: 480
|
||||||
|
poster:
|
||||||
|
url: "videos/8terKyu/Ukemi/Ushiro.jpg"
|
||||||
|
width: 854
|
||||||
|
height: 480
|
||||||
---
|
---
|
||||||
## Stichpunkte
|
## Stichpunkte
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,10 @@ video:
|
|||||||
url: "videos/8terKyu/Ukemi/Yoko.webm"
|
url: "videos/8terKyu/Ukemi/Yoko.webm"
|
||||||
width: 854
|
width: 854
|
||||||
height: 480
|
height: 480
|
||||||
|
poster:
|
||||||
|
url: "videos/8terKyu/Ukemi/Yoko.jpg"
|
||||||
|
width: 854
|
||||||
|
height: 480
|
||||||
---
|
---
|
||||||
## Stichpunkte
|
## Stichpunkte
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,10 @@ video:
|
|||||||
url: "videos/8terKyu/NageWaza/OGoshiUkiGoshi.webm"
|
url: "videos/8terKyu/NageWaza/OGoshiUkiGoshi.webm"
|
||||||
width: 854
|
width: 854
|
||||||
height: 480
|
height: 480
|
||||||
|
poster:
|
||||||
|
url: "videos/8terKyu/NageWaza/OGoshiUkiGoshi.jpg"
|
||||||
|
width: 854
|
||||||
|
height: 480
|
||||||
---
|
---
|
||||||
## Stichpunkte
|
## Stichpunkte
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,10 @@ video:
|
|||||||
url: "videos/8terKyu/NageWaza/BeidbeinigeEindrehtechnik.webm"
|
url: "videos/8terKyu/NageWaza/BeidbeinigeEindrehtechnik.webm"
|
||||||
width: 854
|
width: 854
|
||||||
height: 480
|
height: 480
|
||||||
|
poster:
|
||||||
|
url: "videos/8terKyu/NageWaza/BeidbeinigeEindrehtechnik.jpg"
|
||||||
|
width: 854
|
||||||
|
height: 480
|
||||||
---
|
---
|
||||||
## Stichpunkte
|
## Stichpunkte
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,10 @@ video:
|
|||||||
url: "videos/8terKyu/NageWaza/OSotoOtoshi.webm"
|
url: "videos/8terKyu/NageWaza/OSotoOtoshi.webm"
|
||||||
width: 854
|
width: 854
|
||||||
height: 480
|
height: 480
|
||||||
|
poster:
|
||||||
|
url: "videos/8terKyu/NageWaza/OSotoOtoshi.jpg"
|
||||||
|
width: 854
|
||||||
|
height: 480
|
||||||
---
|
---
|
||||||
## Stichpunkte
|
## Stichpunkte
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,10 @@ video:
|
|||||||
url: "videos/8terKyu/OsaeKomiWaza/KesaGatame.webm"
|
url: "videos/8terKyu/OsaeKomiWaza/KesaGatame.webm"
|
||||||
width: 854
|
width: 854
|
||||||
height: 480
|
height: 480
|
||||||
|
poster:
|
||||||
|
url: "videos/8terKyu/OsaeKomiWaza/KesaGatame.jpg"
|
||||||
|
width: 854
|
||||||
|
height: 480
|
||||||
---
|
---
|
||||||
## Stichpunkte
|
## Stichpunkte
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,10 @@ video:
|
|||||||
url: "videos/8terKyu/OsaeKomiWaza/MuneGatame.webm"
|
url: "videos/8terKyu/OsaeKomiWaza/MuneGatame.webm"
|
||||||
width: 854
|
width: 854
|
||||||
height: 480
|
height: 480
|
||||||
|
poster:
|
||||||
|
url: "videos/8terKyu/OsaeKomiWaza/MuneGatame.jpg"
|
||||||
|
width: 854
|
||||||
|
height: 480
|
||||||
---
|
---
|
||||||
## Stichpunkte
|
## Stichpunkte
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,10 @@ video:
|
|||||||
url: "videos/8terKyu/TachiWaza/UebergangStandBoden.webm"
|
url: "videos/8terKyu/TachiWaza/UebergangStandBoden.webm"
|
||||||
width: 854
|
width: 854
|
||||||
height: 480
|
height: 480
|
||||||
|
poster:
|
||||||
|
url: "videos/8terKyu/TachiWaza/UebergangStandBoden.jpg"
|
||||||
|
width: 854
|
||||||
|
height: 480
|
||||||
---
|
---
|
||||||
## Stichpunkte
|
## Stichpunkte
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,10 @@ video:
|
|||||||
url: "videos/8terKyu/NeWaza/BefreiungOsaeKomi.webm"
|
url: "videos/8terKyu/NeWaza/BefreiungOsaeKomi.webm"
|
||||||
width: 854
|
width: 854
|
||||||
height: 480
|
height: 480
|
||||||
|
poster:
|
||||||
|
url: "videos/8terKyu/NeWaza/BefreiungOsaeKomi.jpg"
|
||||||
|
width: 854
|
||||||
|
height: 480
|
||||||
---
|
---
|
||||||
## Stichpunkte
|
## Stichpunkte
|
||||||
|
|
||||||
|
|||||||
@@ -4,5 +4,9 @@ video:
|
|||||||
url: "videos/8terKyu/Randori/Randori.webm"
|
url: "videos/8terKyu/Randori/Randori.webm"
|
||||||
width: 854
|
width: 854
|
||||||
height: 480
|
height: 480
|
||||||
|
poster:
|
||||||
|
url: "videos/8terKyu/Randori/Randori.jpg"
|
||||||
|
width: 854
|
||||||
|
height: 480
|
||||||
---
|
---
|
||||||
Die einzelnen Boden-Randoris sollten nicht länger als eine Minute dauern, die Gesamtprüfungszeit nicht viel mehr als fünf Minuten. Dazu sind im Training höhere Umfänge notwendig, d.h. mehrere Randoris mit längeren Übungszeiten. Die beim Randori übenden Judoka sollen sich **nicht** als Sieger und Besiegte fühlen, **sondern** wissen, dass beide durch das Studium der Judotechniken aus der Bewegung gewinnen und **nicht** mit maximalen Kraftaufwand und völlig verbisssen **kämpfen**, sondern sich mit viel Bewegung "spielerisch balgen".
|
Die einzelnen Boden-Randoris sollten nicht länger als eine Minute dauern, die Gesamtprüfungszeit nicht viel mehr als fünf Minuten. Dazu sind im Training höhere Umfänge notwendig, d.h. mehrere Randoris mit längeren Übungszeiten. Die beim Randori übenden Judoka sollen sich **nicht** als Sieger und Besiegte fühlen, **sondern** wissen, dass beide durch das Studium der Judotechniken aus der Bewegung gewinnen und **nicht** mit maximalen Kraftaufwand und völlig verbisssen **kämpfen**, sondern sich mit viel Bewegung "spielerisch balgen".
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
require_once("./auth.php");
|
require_once("./config/participo.php");
|
||||||
|
//require_once("./auth.php");
|
||||||
|
|
||||||
require("lib/Parsedown.php");
|
require($config['basePath']."/ressourcen/parsedown/Parsedown.php");
|
||||||
require("lib/Spyc.php");
|
require($config['basePath']."/ressourcen/spyc/Spyc.php");
|
||||||
|
|
||||||
$mdRoot = "markdown/".(array_key_exists('kyu', $_GET)?$_GET['kyu']:"8")."terKyu";
|
$mdRoot = "markdown/".(array_key_exists('kyu', $_GET)?$_GET['kyu']:"8")."terKyu";
|
||||||
|
|
||||||
@@ -114,6 +115,8 @@ function html5VideoFrame($item){
|
|||||||
." width=\"".$item['width']."\""
|
." width=\"".$item['width']."\""
|
||||||
." height=\"".$item['height']."\""
|
." height=\"".$item['height']."\""
|
||||||
." controls"
|
." controls"
|
||||||
|
." preload=\"none\""
|
||||||
|
.( array_key_exists('poster', $item) ? " poster=\"".$item['poster']['url']."\"" : "" )
|
||||||
."></video>";
|
."></video>";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,16 +140,14 @@ function ytLightEmbed($item){
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<title>Gürtelprüfungsordnung</title>
|
<title>Gürtelprüfungsordnung</title>
|
||||||
|
|
||||||
<?php readfile("./shared/imports.php");?>
|
<?php readfile("./shared/imports.php");?>
|
||||||
|
|
||||||
<!-- unpkg : use the latest version of Video.js -->
|
<link rel="stylesheet" type="text/css" href="<?php echo($config['baseUrl']);?>/ressourcen/video-js/video-js.min.css">
|
||||||
<link href="https://unpkg.com/video.js/dist/video-js.min.css" rel="stylesheet">
|
<script type="javascript" src="<?php echo($config['baseUrl']);?>/ressourcen/video-js/video.min.js"></script>
|
||||||
<script src="https://unpkg.com/video.js/dist/video.min.js"></script>
|
|
||||||
|
|
||||||
<!-- Include the CSS & JS.. (This could be direct from the package or bundled) -->
|
<!-- Include the CSS & JS.. (This could be direct from the package or bundled) -->
|
||||||
<link rel="stylesheet" href="lib/lite-youtube-embed/lite-yt-embed.css" />
|
<!-- <link rel="stylesheet" href="lib/lite-youtube-embed/lite-yt-embed.css" />
|
||||||
<script src="lib/lite-youtube-embed/lite-yt-embed.js"></script>
|
<script src="lib/lite-youtube-embed/lite-yt-embed.js"></script> -->
|
||||||
|
|
||||||
<!--- AutoInit -->
|
<!--- AutoInit -->
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
1
submodules/video.js
Submodule
1
submodules/video.js
Submodule
Submodule submodules/video.js added at 53cbfc6222
Reference in New Issue
Block a user