Merge branch 'redesign2018' of /media/sdb1/gitRepositories/judo into redesign2018
This commit is contained in:
marko
2
homepage/redesign2018/.gitignore
vendored
2
homepage/redesign2018/.gitignore
vendored
@@ -1,2 +1,2 @@
|
||||
markdownExperiment/build/*
|
||||
|
||||
temp/*
|
||||
|
||||
@@ -45,10 +45,10 @@ ampTest: $(ampFiles)
|
||||
|
||||
build/css/cwsvJudo.css: $(cssFiles)
|
||||
mkdir -p $(dir $@)
|
||||
cat $^ > $@
|
||||
# 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
|
||||
@@ -82,11 +82,11 @@ upload: $(uploadMarker)
|
||||
|
||||
build/.uploadMarker/%.php: build/%.php
|
||||
mkdir -p build/.uploadMarker
|
||||
curl \
|
||||
--upload-file $^ \
|
||||
--user cwsvjudo:Dee4oquu \
|
||||
ftp://cwsvjudo.square7.net/pages/responsive/$(patsubst build/%.php,%.php,$^) \
|
||||
--ftp-create-dirs
|
||||
# curl \
|
||||
# --upload-file $^ \
|
||||
# --user cwsvjudo:Dee4oquu \
|
||||
# ftp://cwsvjudo.square7.net/pages/responsive/$(patsubst build/%.php,%.php,$^) \
|
||||
# --ftp-create-dirs
|
||||
curl \
|
||||
--upload-file $^ \
|
||||
--user cwsvjudo:***REMOVED*** \
|
||||
@@ -97,11 +97,11 @@ build/.uploadMarker/%.php: build/%.php
|
||||
|
||||
build/.uploadMarker/amp/%.php: build/amp/%.php
|
||||
mkdir -p build/.uploadMarker/amp
|
||||
curl \
|
||||
--upload-file $^ \
|
||||
--user cwsvjudo:Dee4oquu \
|
||||
ftp://cwsvjudo.square7.net/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \
|
||||
--ftp-create-dirs
|
||||
# curl \
|
||||
# --upload-file $^ \
|
||||
# --user cwsvjudo:Dee4oquu \
|
||||
# ftp://cwsvjudo.square7.net/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \
|
||||
# --ftp-create-dirs
|
||||
curl \
|
||||
--upload-file $^ \
|
||||
--user cwsvjudo:***REMOVED*** \
|
||||
@@ -113,11 +113,11 @@ build/.uploadMarker/amp/%.php: build/amp/%.php
|
||||
build/.uploadMarker/phpLib/%.php: phpLib/%.php
|
||||
mkdir -p build/.uploadMarker/phpLib/cwsvJudo
|
||||
mkdir -p build/.uploadMarker/phpLib/phpcount
|
||||
curl \
|
||||
--upload-file $^ \
|
||||
--user cwsvjudo:Dee4oquu \
|
||||
ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%.php,%.php,$^) \
|
||||
--ftp-create-dirs
|
||||
# curl \
|
||||
# --upload-file $^ \
|
||||
# --user cwsvjudo:Dee4oquu \
|
||||
# ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%.php,%.php,$^) \
|
||||
# --ftp-create-dirs
|
||||
curl \
|
||||
--upload-file $^ \
|
||||
--user cwsvjudo:***REMOVED*** \
|
||||
@@ -127,11 +127,11 @@ build/.uploadMarker/phpLib/%.php: phpLib/%.php
|
||||
|
||||
build/.uploadMarker/css/%.css: build/css/%.css
|
||||
mkdir -p build/.uploadMarker/css
|
||||
curl \
|
||||
--upload-file $^ \
|
||||
--user cwsvjudo:Dee4oquu \
|
||||
ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%,%,$^) \
|
||||
--ftp-create-dirs
|
||||
# curl \
|
||||
# --upload-file $^ \
|
||||
# --user cwsvjudo:Dee4oquu \
|
||||
# ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%,%,$^) \
|
||||
# --ftp-create-dirs
|
||||
curl \
|
||||
--upload-file $^ \
|
||||
--user cwsvjudo:***REMOVED*** \
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512"><g fill="#231F20"><path d="M119.387 20.312h21.298v21.045h19.485V20.312h21.303v63.727H160.17V62.7h-19.485v21.338h-21.298V20.312zm90.095 21.132h-18.754V20.312h58.812v21.133h-18.759v42.594h-21.3V41.444zm49.397-21.132h22.21l13.661 22.392 13.648-22.392h22.219v63.727h-21.212V52.453L294.75 75.111h-.366l-14.665-22.658v31.585h-20.84V20.312zm82.34 0h21.308v42.664h29.955v21.062h-51.263V20.312zM200.662 266.676H256v-42.92h-59.169l3.831 42.92zM88.686 111.982l30.47 341.74 136.762 37.966 136.891-37.948 30.507-341.758H88.686zm278.008 319.999L256 462.668v-43.494l-.067.02-85.858-23.835-6.004-67.298h42.075l3.116 34.914 46.68 12.607.059-.019V308.59h-93.669l-11.306-126.749H256v-41.914h136.766l-26.072 292.054z"/><path opacity=".8" d="M307.592 308.59H256v66.974l46.728-12.613 4.864-54.361zM256 139.927v41.914h104.975l-3.754 41.915H256v42.92h97.406l-11.499 128.683L256 419.174v43.494l110.694-30.687 26.071-292.055H256z"/><path d="M256 181.841H151.025l11.306 126.749H256v-41.914h-55.338l-3.831-42.92H256zm0 193.722l-.059.019-46.679-12.607-3.116-34.914H164.07l6.004 67.297 85.859 23.835.067-.019z" opacity=".2"/></g></svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
@@ -0,0 +1 @@
|
||||
<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg"><path d="M359.71 38.478l-1.119 371.45-104.05 54.824-108.53-54.824 2.237-372.57 106.29 54.824 105.17-53.705z" fill-rule="evenodd" stroke="#000" stroke-width="1.25"/></svg>
|
||||
|
After Width: | Height: | Size: 232 B |
@@ -0,0 +1 @@
|
||||
<svg width="782.27" height="800" viewBox="0 0 782.268 800" xmlns="http://www.w3.org/2000/svg"><defs><mask id="a" maskUnits="userSpaceOnUse"><circle cx="400" cy="400" r="400" color="#000" fill="#fff" fill-rule="evenodd" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/></mask></defs><path transform="translate(-366.061 -357.19) scale(1.893)" d="M250 188.69v61.18h15.789v-61.18H250zm142.11 0v61.18h15.791v-61.18H392.11zm142.1 0v61.18h15.791v-61.18H534.21zm-325.79 24.35c-8.284 0-15 6.716-15 15v39.217h-.043v344.05h413.25v-344.05h-.043V228.04c0-8.284-6.716-15-15-15h-37.828v40.58h-23.291v-40.58h-118.81v40.58h-23.289v-40.58h-118.82v40.58h-23.289v-40.58h-37.832zm9.111 72.846h364.94v39.285h-364.94v-39.285zm0 77.145h61v61h-61v-61zm75.99 0h61v61h-61v-61zm75.98 0h61v61h-61v-61zm75.99 0h61v61h-61v-61zm75.98 0h61v61h-61v-61zm-303.94 82h61v61h-61v-61zm75.99 0h61v61h-61v-61zm75.978 0h61v61h-61v-61zm75.99 0h61v61h-61v-61zm75.98 0h61v61h-61v-61zm-303.94 82.01h61v61h-61v-61zm75.99 0h61v61h-61v-61zm75.98 0h61v61h-61v-61zm75.99 0h61v61h-61v-61zm75.98 0h61v61h-61v-61z" color="#000" fill="#404040" fill-rule="evenodd" mask="url(#a)" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/></svg>
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
@@ -0,0 +1 @@
|
||||
<svg viewBox="0 0 112 112" xmlns="http://www.w3.org/2000/svg"><path d="M59.4 55.6l31.3-15 3.1 5.7L61 66l-4-.7L21.1 52l1.8-5.7 36.5 9.3zm52.6.4c0 30.9-25.1 56-56 56S0 86.9 0 56 25.1 0 56 0s56 25.1 56 56zm-9.3 0c0-25.8-20.9-46.7-46.7-46.7S9.3 30.2 9.3 56s20.9 46.7 46.7 46.7 46.7-20.9 46.7-46.7z"/></svg>
|
||||
|
After Width: | Height: | Size: 302 B |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 21 KiB |
@@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<defs>
|
||||
<linearGradient id="a">
|
||||
<stop stop-color="#fff" offset="0"/>
|
||||
<stop stop-color="#fff" stop-opacity="0" offset="1"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="f" x1="46.504" x2="41.439" y1="37.131" y2="36.153" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#888a85" offset="0"/>
|
||||
<stop stop-color="#888a85" stop-opacity="0" offset="1"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="e" x1="23.816" x2="29.049" y1="12.75" y2="25.772" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#888a85" offset="0"/>
|
||||
<stop stop-color="#b8b9b6" offset="1"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="g" x1="21.032" x2="21.108" y1="31.868" y2="-4.5986" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
|
||||
<linearGradient id="d" x1="43.688" x2="26.625" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
|
||||
<radialGradient id="c" cx="22.627" cy="33.955" r="14.152" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#767676" offset="0"/>
|
||||
<stop stop-color="#484848" offset="1"/>
|
||||
</radialGradient>
|
||||
<radialGradient id="b" cx="23.158" cy="26.964" r="21.567" gradientTransform="matrix(1 0 0 .66393 0 9.0615)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0"/>
|
||||
<stop stop-opacity="0" offset="1"/>
|
||||
</radialGradient>
|
||||
</defs>
|
||||
<path transform="translate(1.2374 .76256)" d="m44.724 26.964a21.567 14.319 0 1 1 -43.134 0 21.567 14.319 0 1 1 43.134 0z" fill="url(#b)" fill-rule="evenodd" opacity=".7033"/>
|
||||
<path transform="matrix(1.2542 0 0 1.5419 -9.7966 -6.2795)" d="m40.5 21a14.75 8.25 0 1 1 -29.5 0 14.75 8.25 0 1 1 29.5 0z" fill="#a1a39f" fill-rule="evenodd" stroke="#6d6f6a" stroke-linecap="round" stroke-linejoin="round" stroke-width=".71908"/>
|
||||
<path transform="matrix(.76401 0 0 1.0018 2.3105 2.5431)" d="m40.5 21a14.75 8.25 0 1 1 -29.5 0 14.75 8.25 0 1 1 29.5 0z" fill="#555753" fill-rule="evenodd"/>
|
||||
<path d="m46.026 41.226s-8.3239-3.737-13.656-3.2667c-5.683 0.50124-15.177 0.83744-18.898-5.0393 15.798 4.7645 23.087-3.1458 33.779 1.3095l-1.2253 6.9965z" fill="url(#c)" stroke="#3b3d39"/>
|
||||
<path transform="matrix(.76097 0 0 .98666 2.905 .58427)" d="m40.5 21a14.75 8.25 0 1 1 -29.5 0 14.75 8.25 0 1 1 29.5 0z" fill="url(#e)" fill-rule="evenodd" stroke="#757972" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2341"/>
|
||||
<path d="m21.094 7.7188c-9.5575 0.52567-17.094 6.4146-17.094 13.531 0 7.461 8.288 13.531 18.5 13.531s18.5-6.0702 18.5-13.531-8.288-13.531-18.5-13.531h-0.125c-0.23806 0.0011-0.48291-0.00764-0.71875 0-0.11516 0.00373-0.22915-0.00527-0.34375 0h-0.21875zm-1.375 2.1875c0.06325-0.00511 0.12359 0.00347 0.1875 0 0.1341-0.00728 0.26954 0 0.40625 0 2.9164 0 5.2812 1.7022 5.2812 3.7812s-2.3649 3.75-5.2812 3.75-5.2812-1.671-5.2812-3.75c0-1.9352 2.052-3.5685 4.6875-3.7812zm11.5 4.5938c0.06665-0.00596 0.12018 0.00425 0.1875 0 0.11675-0.00737 0.22514 0.00215 0.34375 0h0.125c3.1034 0 5.625 1.8142 5.625 4.0312s-2.5216 4-5.625 4-5.625-1.783-5.625-4c0-2.048 2.1918-3.7828 4.9688-4.0312zm-19.219 3.1562c0.21783-0.01782 0.46303 0 0.6875 0 3.1924 0 5.7812 1.8424 5.7812 4.125s-2.5889 4.125-5.7812 4.125-5.7812-1.8424-5.7812-4.125c0-2.1222 2.2136-3.8893 5.0938-4.125zm11.531 5.125h0.28125c0.24098-0.01978 0.47043 0 0.71875 0 3.5317 0 6.4062 2.0296 6.4062 4.5625s-2.8746 4.5938-6.4062 4.5938-6.4062-2.0608-6.4062-4.5938c0-2.282 2.3614-4.2087 5.4062-4.5625z" fill="#d3d7cf" fill-rule="evenodd" stroke="#888a85" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path transform="matrix(.95053 0 0 .9375 1.451 3.3206)" d="m40.659 19.009a18.473 13.435 0 1 1 -36.946 0 18.473 13.435 0 1 1 36.946 0z" fill="none" stroke="url(#g)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.0593"/>
|
||||
<path d="m46.875 34.494-1.0816 6.05c-2.609-0.87544-4.182-1.5682-7.0712-2.2569l0.33183-4.9126c1.8985-0.20131 4.8633 0.14173 7.8209 1.1195z" fill="url(#f)" fill-rule="evenodd"/>
|
||||
<path d="m46.875 34.312-0.1875 0.875c-8.1049-3.0289-15.566-0.22672-23.375 0 10.611-0.88258 14.09-3.7157 23.562-0.875z" fill="url(#d)" fill-rule="evenodd" opacity=".7033"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 4.0 KiB |
@@ -0,0 +1 @@
|
||||
<svg width="500" height="500" xmlns="http://www.w3.org/2000/svg"><g transform="translate(28.92 -506.336)"><path d="M91.797 896.7h313.42s-86.961-176.96-104.13-180.36c-17.172-3.4-92.233 117.99-92.233 117.99s-41.09-77.418-57.755-75.466c-16.664 1.951-59.295 137.84-59.295 137.84z"/><circle cx="190.37" cy="697.26" r="29.262" opacity=".97"/></g><path d="M77.426 126.017v300h400v-300h-400zm25 20h350v260h-350v-260z"/><path d="M25 80v300h40v-20H50V100h350v15.365h25V80H25z"/></svg>
|
||||
|
After Width: | Height: | Size: 474 B |
@@ -0,0 +1,98 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<defs>
|
||||
<linearGradient id="a">
|
||||
<stop offset="0"/>
|
||||
<stop stop-opacity="0" offset="1"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="j" x2="0" y1="-150.7" y2="327.66" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-opacity="0" offset="0"/>
|
||||
<stop offset=".5"/>
|
||||
<stop stop-opacity="0" offset="1"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="c">
|
||||
<stop stop-color="#fff" offset="0"/>
|
||||
<stop stop-color="#fff" stop-opacity="0" offset="1"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="d">
|
||||
<stop stop-color="#555753" offset="0"/>
|
||||
<stop stop-color="#313330" offset="1"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="b">
|
||||
<stop stop-color="#fff" offset="0"/>
|
||||
<stop stop-color="#cbcbcb" offset="1"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="u" x1="22.55" x2="38.416" y1="39.052" y2="30.566" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#363d40" offset="0"/>
|
||||
<stop stop-color="#818f95" offset=".5"/>
|
||||
<stop stop-color="#31383b" offset="1"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="t" x1="23.661" x2="33.904" y1="35.303" y2="30.917" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#8b8b8b" offset="0"/>
|
||||
<stop stop-color="#d3d9da" offset=".5"/>
|
||||
<stop stop-color="#828282" offset="1"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="s" x1="12.836" x2="18.422" y1="18.849" y2="27.073" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#010101" offset="0"/>
|
||||
<stop stop-color="#959595" offset="1"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="p" x2="0" y1="9.6071" y2="4.8784" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#eee" offset="0"/>
|
||||
<stop stop-color="#a2a2a2" offset="1"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="o" x2="0" y1="9.4122" y2="12.847" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#555753" offset="0"/>
|
||||
<stop stop-color="#141514" offset="1"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="l" x1="16.353" x2="30.13" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#353633" offset="0"/>
|
||||
<stop stop-color="#676964" offset="1"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="r" x2="0" y1="20.214" y2="21.765" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
|
||||
<linearGradient id="q" x2="0" y1="6.6165" y2="8.2366" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
|
||||
<linearGradient id="n" x1="16.667" x2="35.888" y1="16.125" y2="57.125" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
|
||||
<linearGradient id="m" x1="7.9993" x2="15.147" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
|
||||
<linearGradient id="k" x1="7.9895" x2="15.212" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
|
||||
<radialGradient id="h" cx="16.875" cy="23.688" r="4.625" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#7a7a7a" offset="0"/>
|
||||
<stop offset="1"/>
|
||||
</radialGradient>
|
||||
<radialGradient id="e" cx="605.71" cy="486.65" r="117.14" gradientTransform="matrix(-2.7744 0 0 1.9697 112.76 -872.89)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
|
||||
<radialGradient id="f" cx="605.71" cy="486.65" r="117.14" gradientTransform="matrix(2.7744 0 0 1.9697 -1891.6 -872.89)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
|
||||
<radialGradient id="i" cx="25.375" cy="36.812" r="17.5" gradientTransform="matrix(1 0 0 .45357 -8.4177e-16 20.115)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
|
||||
<radialGradient id="g" cx="14.75" cy="22.687" r="1.75" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
|
||||
</defs>
|
||||
<g transform="matrix(.024527 0 0 .020868 45.15 37.315)">
|
||||
<path d="m-1559.3-150.7h1339.6v478.36h-1339.6z" fill="url(#j)" opacity=".40206"/>
|
||||
<path d="m-219.62-150.68v478.33c142.87 0.90045 345.4-107.17 345.4-239.2s-159.44-239.13-345.4-239.13z" fill="url(#f)" opacity=".40206"/>
|
||||
<path d="m-1559.3-150.68v478.33c-142.87 0.90045-345.4-107.17-345.4-239.2s159.44-239.13 345.4-239.13z" fill="url(#e)" opacity=".40206"/>
|
||||
</g>
|
||||
<path transform="matrix(.69319 0 0 .81102 13.91 9.9567)" d="m42.875 36.812a17.5 7.9375 0 1 1 -35 0 17.5 7.9375 0 1 1 35 0z" display="block" fill="url(#i)" opacity=".39873"/>
|
||||
<path d="m8.93278,18.92078c-3.47127,0-6.27928,1.12-6.27928,2.5 0,.15679.15701.28868.22657.4375-.01019.04943-.0971.04118-.0971.09375 0,0-.12947,16.31196-.12947,16.46875 0,1.38 2.80801,2.5 6.27928,2.5s6.27928-1.12 6.27928-2.5l-.12947-16.46875c0-.05257-.08692-.04432-.0971-.09375 .06956-.14882.22657-.28071.22657-.4375 0-1.38-2.80801-2.5-6.27928-2.5z" display="block" fill="url(#k)" stroke="#282828" stroke-width="2"/>
|
||||
<path d="m2.1429 38.648h40.143c1.1112 0.10101 2.2194-1.15 2.2194-1.8571v-17.648c-0.10102-1.1112-3.969-2.4238-4.8781-2.5248h-2.4321l-2.9235-3.085h-10.557l-3.4355 3.0314s-6.7268 0.21165-11.941 1.1671-6.3377 2.5873-6.3377 3.7995l0.14286 17.117z" display="block" fill="url(#l)" stroke="#282828"/>
|
||||
<path d="m33.891 13.907 1.3637 3.7881 1.8688-0.45457-3.2325-3.3335z" display="block" fill="#3f413e"/>
|
||||
<path transform="matrix(1.2569 0 0 1.2569 -11.687 -10.025)" d="m43.134 33.908a1.9698 1.9698 0 1 1 -3.9396 0 1.9698 1.9698 0 1 1 3.9396 0z" display="block" fill="#585b57" stroke="#a7a7a7" stroke-width=".7956"/>
|
||||
<path transform="matrix(1.0829 0 0 1.0829 -3.3205 -4.3857)" d="m40.714 33.571a10.143 10.143 0 1 1 -20.286 0 10.143 10.143 0 1 1 20.286 0z" display="block" fill="url(#u)"/>
|
||||
<path transform="matrix(1.0829 0 0 1.0829 -3.155 -2.4959)" d="m40.714 33.571a10.143 10.143 0 1 1 -20.286 0 10.143 10.143 0 1 1 20.286 0z" display="block" fill="url(#t)"/>
|
||||
<path d="m8.93277,18.71875c-3.43519,0-6.21402,1.12-6.21402,2.5 0,.15679.15538.28868.22422.4375-.01008.04943-.09609.04118-.09609.09375 0,0-.12812,16.31196-.12812,16.46875 0,1.38 2.77883,2.5 6.21402,2.5s6.21402-1.12 6.21402-2.5l-.12812-16.46875c0-.05257-.08601-.04432-.09609-.09375 .06884-.14882.22422-.28071.22422-.4375 0-1.38-2.77883-2.5-6.21402-2.5z" display="block" fill="url(#m)"/>
|
||||
<path d="m24.244 14.16-0.75761 3.6366-0.35355 1.2122-2.7779-2.0708 3.8891-2.7779z" display="block" fill="#7b7e79"/>
|
||||
<path d="m19.03 27.995 4.9105-8.5826h11.213l4.8386 7.1154-4.7376-8.7316h-11.819l-4.4055 10.199z" display="block" fill="#a7aba7"/>
|
||||
<path d="m20.312 16.875s-12.146 0.63806-16.156 2.75c-0.85204 0.4487-1.488 0.84061-1.488 1.4422 0 1.38 2.8241 3.0265 6.1755 3.0265s6-1.495 6-2.875c0-0.31434-0.17993-0.62905-0.4375-0.90625l8.625-1.8125-2.7188-1.625z" display="block" fill="#888a85"/>
|
||||
<path d="m24.553 14.482-3.9173 2.793s-6.4447 0.43503-11.249 1.3154-6.2201 1.8334-6.3451 3.0128l0.22612 16.591c0.29596 1.1611 3.2301 2.0731 6.2286 2.0731s5.5014-1.5996 5.7974-2.7606l26.488 0.125c1.4613 0.03057 1.7318-0.70109 1.7318-1.3526v-16.677c0-0.71198-2.8416-1.8642-3.6793-1.9573l-2.9334 0.0625-3.2403-3.2256h-9.1073z" display="block" fill="none" opacity=".41772" stroke="url(#n)"/>
|
||||
<path transform="matrix(1.0829 0 0 1.0829 -3.0509 -1.5688)" d="m40.714 33.571a10.143 10.143 0 1 1 -20.286 0 10.143 10.143 0 1 1 20.286 0z" display="block" fill="#2e3436"/>
|
||||
<path transform="matrix(1.677 0 0 1.677 3.4884 -3.0505)" d="m19.875 22.562a4.125 4.1875 0 1 1 -8.25 0 4.125 4.1875 0 1 1 8.25 0z" fill="url(#h)" stroke="url(#s)" stroke-width=".59631"/>
|
||||
<path transform="matrix(1.677 0 0 1.677 5.5 -3.1952)" d="m16.5 22.688a1.75 1.8125 0 1 1 -3.5 0 1.75 1.8125 0 1 1 3.5 0z" fill="#fff" fill-opacity=".52866" opacity=".60759"/>
|
||||
<path transform="matrix(1.6732 0 0 1.6732 3.3339 -5.0006)" d="m16.5 22.688a1.75 1.8125 0 1 1 -3.5 0 1.75 1.8125 0 1 1 3.5 0z" fill="#fff" opacity=".37342"/>
|
||||
<path transform="matrix(.41273 0 0 .41273 27.451 28.982)" d="m16.5 22.688a1.75 1.8125 0 1 1 -3.5 0 1.75 1.8125 0 1 1 3.5 0z" fill="url(#g)"/>
|
||||
<path d="m22.223 15.574 2.9294-2.1213 0.90914-2.4244h6.364l1.3132 2.9294 2.8284 2.4244-2.5254-10.91h-9.8995l-1.9193 10.102z" display="block" fill="url(#o)"/>
|
||||
<path d="m25.982 4.6367h6.3214a1.5035 1.5036 0 0 1 1.5035 1.5036v1.5767a1.5035 1.5036 0 0 1 -1.5035 1.5036h-6.3214a1.5035 1.5036 0 0 1 -1.5035 -1.5036v-1.5767a1.5035 1.5036 0 0 1 1.5035 -1.5036" fill="url(#q)" stroke="url(#p)"/>
|
||||
<path transform="matrix(.35944 0 0 .55434 7.6986 .073055)" d="m14.857 38.214a6.0714 2.5 0 1 1 -12.143 0 6.0714 2.5 0 1 1 12.143 0z" display="block" fill="#2f302e"/>
|
||||
<path d="m2.7034 21.251c-0.13555 1.7857 2.4438 3.8802 6.1954 3.8815 3.814 0.00127 5.8494-2.1838 6.0515-4.1031l4.5457-1.7173-5.1518 1.0102c0.10102 1.9193-1.7018 3.8305-5.4403 3.771-4.0864-0.06598-5.5754-1.6548-6.2004-2.8423z" display="block" fill="#c4c6c3"/>
|
||||
<path d="m18.25834,18.31747h2.74538a.69542,.69542 0 0,1 .69542.69542v2.99938a.69542,.69542 0 0,1 -.69542.69542h-2.74538a.69542,.69542 0 0,1 -.69542-.69542v-2.99938a.69542,.69542 0 0,1 .69542-.69542" fill="url(#r)" stroke="#464646"/>
|
||||
<path transform="matrix(.38983 0 0 .38983 4.4525 12.387)" d="m16.5 22.688a1.75 1.8125 0 1 1 -3.5 0 1.75 1.8125 0 1 1 3.5 0z" fill="#fff" opacity=".43038"/>
|
||||
<path transform="matrix(.45611 0 0 .45611 20.303 21.393)" d="m16.5 22.688a1.75 1.8125 0 1 1 -3.5 0 1.75 1.8125 0 1 1 3.5 0z" fill="#fff"/>
|
||||
<path transform="matrix(1.0385 0 0 1.6364 -1.1875 -12.71)" d="m42.25,20.5625a1.625,.6875 0 1,1 -3.25,0 1.625,.6875 0 1,1 3.25,0z" display="block" fill="#c5c5c5" fill-opacity=".52866"/>
|
||||
<path transform="matrix(1.0385 0 0 1.6364 -1.125 -12.335)" d="m42.25,20.5625a1.625,.6875 0 1,1 -3.25,0 1.625,.6875 0 1,1 3.25,0z" display="block" fill="#565656"/>
|
||||
<path d="m23.271 28.422c2.6027-3.3676 8.7557-4.1927 12.275-1.0412" display="block" fill="none" stroke="#777"/>
|
||||
<path d="m30.21998,31.81805c-1.61997,0-2.91035,1.3679-2.91035,3.04572 0,.38385.24672.64316.37225.9814 .12668.01735.20718.13537.33841.13537 1.61635,0 2.91035-1.3378 2.91035-3.01188 0-.39361-.27415-.67006-.4061-1.01524-.11496-.01419-.18594-.13537-.30457-.13537z" fill="#fff" opacity=".67089"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 9.4 KiB |
@@ -0,0 +1 @@
|
||||
<svg version="1" xmlns="http://www.w3.org/2000/svg" width="98.918" height="100"><ellipse cx="13.566" cy="86.286" rx="13.566" ry="13.714"/><path d="M65.569 100H46.35c0-25.879-20.752-46.858-46.35-46.858V33.715c36.214 0 65.569 29.676 65.569 66.285z"/><path d="M79.135 100c0-44.183-35.429-80-79.135-80V0c54.631 0 98.918 44.772 98.918 100H79.135z"/></svg>
|
||||
|
After Width: | Height: | Size: 350 B |
@@ -0,0 +1 @@
|
||||
<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="a"><stop offset="0"/><stop stop-opacity="0" offset="1"/></linearGradient><linearGradient id="b" x2="0" y1="-150.7" y2="327.66" gradientUnits="userSpaceOnUse"><stop stop-opacity="0" offset="0"/><stop offset=".5"/><stop stop-opacity="0" offset="1"/></linearGradient><linearGradient id="e" x1="23.104" x2="23.078" y1="35.714" y2="11.819" gradientUnits="userSpaceOnUse"><stop stop-color="#919191" offset="0"/><stop stop-color="#e9e9e9" offset=".202"/><stop stop-color="#f3f3f3" offset=".236"/><stop stop-color="#e6e6e6" offset=".299"/><stop stop-color="#f8f8f8" offset="1"/></linearGradient><linearGradient id="f" x1="14.394" x2="14.375" y1="32.938" y2="21.688" gradientUnits="userSpaceOnUse"><stop stop-color="#787878" offset="0"/><stop stop-color="#d0d0d0" offset="1"/></linearGradient><linearGradient id="g" x1="4.681" x2="40.419" y1="13.835" y2="73.136" gradientTransform="matrix(1.3105 0 0 .76306 .125 -1.125)" gradientUnits="userSpaceOnUse"><stop stop-color="#fff" offset="0"/><stop stop-color="#fff" stop-opacity="0" offset="1"/></linearGradient><radialGradient id="d" cx="605.71" cy="486.65" r="117.14" gradientTransform="matrix(-2.7744 0 0 1.9697 112.76 -872.89)" gradientUnits="userSpaceOnUse" xlink:href="#a"/><radialGradient id="c" cx="605.71" cy="486.65" r="117.14" gradientTransform="matrix(2.7744 0 0 1.9697 -1891.6 -872.89)" gradientUnits="userSpaceOnUse" xlink:href="#a"/></defs><path d="M-1559.3-150.7h1339.6v478.36h-1339.6z" fill="url(#b)" opacity=".402" transform="matrix(.02374 0 0 .02087 44.682 33.279)"/><path d="M-219.62-150.68v478.33c142.87.9 345.4-107.17 345.4-239.2s-159.44-239.13-345.4-239.13z" fill="url(#c)" opacity=".402" transform="matrix(.02374 0 0 .02087 44.682 33.279)"/><path d="M-1559.3-150.68v478.33c-142.87.9-345.4-107.17-345.4-239.2s159.44-239.13 345.4-239.13z" fill="url(#d)" opacity=".402" transform="matrix(.02374 0 0 .02087 44.682 33.279)"/><path d="M6.632 11.549L2.379 31.036c-.68 3.12.808 5.114 2.961 5.114h37.251c2.153 0 3.655-2.335 2.907-5.06l-5.383-19.594c-.148-.54-.837-.97-1.4-.97l-30.684.055c-.827.001-1.239.232-1.4.969z" fill="url(#e)" fill-rule="evenodd" stroke="#828282"/><path d="M36.855 13.732h-8.319l.776 4.571h8.385l-.842-4.571z" fill-opacity=".175" fill-rule="evenodd"/><path d="M38.714 21.357h-15m15.5 2h-15.5" fill="none" stroke="#000" stroke-linecap="round" stroke-opacity=".099"/><path d="M39.839 25.357H23.714" fill="none" stroke="#000" stroke-linecap="round" stroke-opacity=".123"/><path d="M40.41 27.357H23.705" fill="none" stroke="#000" stroke-linecap="round" stroke-opacity=".152" stroke-width=".991"/><path d="M41.035 29.357H23.706m18.079 2H23.706" fill="none" stroke="#000" stroke-linecap="round" stroke-opacity=".152" stroke-width=".992"/><path d="M40.853 33.357H23.701" fill="none" stroke="#000" stroke-linecap="round" stroke-opacity=".117" stroke-width=".986"/><text transform="matrix(1 0 -.1692 1 .5 -1.125)" x="11.74" y="19.332" font-family="Times New Roman" font-size="6.588"><tspan x="11.74" y="19.332">N</tspan></text><text transform="matrix(1 0 -.11463 1 .5 -1.125)" x="15.445" y="19.332" font-family="Times New Roman" font-size="6.588"><tspan x="15.445" y="19.332">E</tspan></text><text transform="matrix(1 0 .05603 1 .5 -1.125)" x="16.638" y="19.332" font-family="Times New Roman" font-size="6.588"><tspan x="16.638" y="19.332">W</tspan></text><text transform="matrix(1 0 .10962 1 .5 -1.125)" x="21.811" y="19.329" font-family="Times New Roman" font-size="6.588"><tspan x="21.811" y="19.329">S</tspan></text><path d="M21.125 21.375v12H8.187c-1.132 0-2.063-1.188-1.5-2.875l1.937-9.125h12.5z" fill="url(#f)" fill-rule="evenodd" stroke="#9e9e9e"/><path d="M20.188 31.438h-12.5" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".31"/><path d="M20.188 31.437h-12.5" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".31" stroke-width="2.45"/><path d="M7.433 12.29l-3.98 18.765c-.442 2.08-.319 4.086 1.977 4.086h36.693c2.234 0 2.956-1.846 2.178-4.661L39.28 12.303c-.137-.497-.458-.831-.976-.83l-29.83.049c-.637.001-.927.234-1.04.768z" fill="none" stroke="url(#g)" stroke-width=".982"/><path d="M6.063 31.563a.969.969 0 1 1-1.938 0 .969.969 0 1 1 1.938 0z" fill="#fff" fill-opacity=".637"/></svg>
|
||||
|
After Width: | Height: | Size: 4.3 KiB |
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="100mm" height="100mm" viewBox="0 0 100 100"><path d="M71.507 287.062c-4.362 4.746-19.203-4.937-25.522-3.662-6.318 1.275-16.243 15.956-22.104 13.273-5.861-2.682-1.238-19.789-4.403-25.404-3.165-5.615-20.194-10.517-19.455-16.92.74-6.404 18.438-7.294 22.8-12.039 4.363-4.745 3.763-22.456 10.081-23.73 6.319-1.276 12.634 15.281 18.495 17.964 5.861 2.682 22.52-3.362 25.685 2.254 3.165 5.615-10.63 16.737-11.37 23.14-.74 6.404 10.155 20.379 5.793 25.124z" transform="matrix(1.16047 0 0 1.14663 5 -245.55)" fill="none" stroke="#000" stroke-width="1.734" stroke-linecap="round" stroke-linejoin="round"/></svg>
|
||||
|
After Width: | Height: | Size: 648 B |
@@ -0,0 +1 @@
|
||||
<svg viewBox="0 0 60 60" xmlns="http://www.w3.org/2000/svg"><path d="M6.476 17.328h46.79a2.002 2.002 0 0 1 2.002 2.002v33.604a2.002 2.002 0 0 1-2.002 2.002H6.476a2.002 2.002 0 0 1-2.003-2.002V19.33a2.002 2.002 0 0 1 2.002-2.002" fill="#ccc" fill-rule="evenodd" stroke="#7f7f7f" stroke-linejoin="round" stroke-width="3.125"/><path d="M4.962 42.365h50.306M4.962 29.949h50.306M29.871 17.816v36.387" fill="none" stroke="#7f7f7f" stroke-width="2.5"/><path d="M30.485 38.02l-10.189 7.413 6.278-10.916 3.91 3.503z" fill="#595959" fill-rule="evenodd" stroke="#333" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/><path d="M30.466 37.987l-3.835-3.469L51.605 6.904l3.836 3.468z" fill="#b3b3b3" fill-rule="evenodd" stroke="#333" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/><path d="M22.335 42.149a.663.663 0 1 0 .984.89.663.663 0 1 0-.984-.89l.492.445z" fill="#333" fill-rule="evenodd" stroke="#333" stroke-width="2.5"/><path d="M54.388 9.576l-1.961-1.774a1.603 1.626-47.874 0 1-.13-2.279 1.603 1.626-47.874 0 1 2.28-.099l1.962 1.774a1.603 1.626-47.874 0 1 .13 2.28 1.603 1.626-47.874 0 1-2.281.098" fill="#ccc" fill-rule="evenodd" stroke="#333" stroke-width="2.5"/></svg>
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1700 1700"><path d="M560.95 1412.7h74.09l247.37-479.88 203.5 479.88h71.33l422.78-972.73c23.7-54.57 69.9-87.34 119-94.76v-57.933h-341.86v57.953c45.36 10.09 93.51 27.09 114.92 74.961l-310.44 716.06c-56.12-119.35-113.66-249.77-168.58-379.92 56.685-120.43 102.98-232.29 172.52-342.22 40.656-64.68 106.63-66.2 140.63-69.38v-57.45h-363.4v57.45c45.34.045 139.69 4.078 97.62 92.49l-105.39 221.59-111.63-246.49c-17.379-38.38 16.38-63.95 71.49-66.997l-.405-57.993h-408.98v57.45c48.728 1.601 117.43 1.34 142.79 42.655 78.09 143.45 130.3 292.46 201.49 438.72l-184.22 344.49-309.64-711.78c-34.892-80.21 47.945-106.05 101.76-112.75l-.605-58.794H1.03v57.45c60.21 19.908 137.88 109.48 159.56 154.81 162.89 340.7 244.91 569.12 400.39 913.18z"/></svg>
|
||||
|
After Width: | Height: | Size: 786 B |
@@ -4,9 +4,15 @@ ftpServer = ftpupload.net
|
||||
ftpUser = unaux_22935783
|
||||
ftpPassword = eeloor0D
|
||||
|
||||
ftpPathBase = /htdocs/videoalben/videoalben.2018
|
||||
ftpPathBase = /htdocs
|
||||
ftpFilePath = videoalben/videoalben.2018
|
||||
|
||||
vidGalIndexPhp = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
|
||||
dryRun = --dry-run
|
||||
timeHandling= --only-newer
|
||||
|
||||
vidGalInsertScript = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
|
||||
|
||||
|
||||
|
||||
.PHONY: all
|
||||
@@ -14,5 +20,10 @@ all:
|
||||
|
||||
.PHONY: ftpUpload
|
||||
ftpUpload:
|
||||
lftp -e 'set net:limit-rate 25600; mkdir -f $(ftpPathBase)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(VID_GAL_DIR)/config.inc.php; mirror -R --ignore-time videos/thumbnails $(ftpPathBase)/$(VID_GAL_DIR)/thumbnails; mirror -R --ignore-time videos/webm $(ftpPathBase)/$(VID_GAL_DIR)/webm;quit' -u $(ftpUser),$(ftpPassword) ftp://$(ftpServer)
|
||||
|
||||
lftp -e 'set net:limit-rate 25600; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; quit; ' \
|
||||
-u $(ftpUser),$(ftpPassword) ftp://$(ftpServer)
|
||||
|
||||
for file in videos/webm/*; do \
|
||||
filename=$${file##*/}; \
|
||||
$(vidGalInsertScript) --shiaiYamlFile=./shiaiData.yaml --vidUrl="http://cwsvjudo-media-2018.unaux.com/$(ftpFilePath)/$(VID_GAL_DIR)/webm/$${filename}" --checkSum=$${filename%.*};\
|
||||
done;\
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
pngCompressed/%.png: %.png
|
||||
mkdir -p pngCompressed
|
||||
pngquant --speed 1 --force --output $@ $^
|
||||
zopflipng -y --iterations=500 --filters=01234mepb --lossy_8bit --lossy_transparent $@ $@
|
||||
|
||||
pngCompressed/%.png: %.jpg
|
||||
mkdir -p pngCompressed
|
||||
convert $^ $(patsubst %.jpg,%.png,$^)
|
||||
pngquant --speed 1 --force --output $@ $^
|
||||
zopflipng -y --iterations=500 --filters=01234mepb --lossy_8bit --lossy_transparent $@ $@
|
||||
rm -f $(patsubst %.jpg,%.png,$^)
|
||||
@@ -1,18 +1,42 @@
|
||||
FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
|
||||
GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe
|
||||
|
||||
VID_CODEC_HEIGHT = 360
|
||||
VID_CODEC_BITRATE = 500k
|
||||
VID_CODEC = libvpx-vp9
|
||||
#DEFAULT_FFMPEG = ffmpeg
|
||||
DEFAULT_FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
|
||||
|
||||
# Für eine schnelle Komprimierung libvpx, sonst vp9
|
||||
DEFAULT_VID_CODEC_HEIGHT = 360
|
||||
DEFAULT_VID_CODEC_WIDTH = -2
|
||||
DEFAULT_VID_CODEC_BITRATE = 500k
|
||||
DEFAULT_VID_CODEC = libvpx-vp9
|
||||
|
||||
# Standardwerte auf die benutzen Variablen schreiben, falls diese noch
|
||||
# nicht (z.B. aus dem Terminal heraus oder über ein IncludeCfgFile)
|
||||
# gesetzt worden sind
|
||||
VID_CODEC_BITRATE := $(if $(VID_CODEC_BITRATE),$(VID_CODEC_BITRATE),$(DEFAULT_VID_CODEC_BITRATE))
|
||||
VID_CODEC_HEIGHT := $(if $(VID_CODEC_HEIGHT),$(VID_CODEC_HEIGHT),$(DEFAULT_VID_CODEC_HEIGHT))
|
||||
VID_CODEC_WIDTH := $(if $(VID_CODEC_WIDTH),$(VID_CODEC_WIDTH),$(DEFAULT_VID_CODEC_WIDTH))
|
||||
VID_CODEC := $(if $(VID_CODEC),$(VID_CODEC),$(DEFAULT_VID_CODEC))
|
||||
|
||||
targetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))
|
||||
targetSourceDir = videos/aufnahmen/
|
||||
sourceVideos = $(wildcard videos/.forCompressing/*.video)
|
||||
|
||||
sourceVideos = $(wildcard videos/.forCompressing/*.video)
|
||||
|
||||
vidstabLogs = $(addsuffix .trf, $(basename $(sourceVideos)))
|
||||
firstPassLogs = $(addsuffix .firstPassLog, $(basename $(sourceVideos)))
|
||||
firstPassLogs = $(addsuffix .firstPassLog-0.log, $(basename $(sourceVideos)))
|
||||
webmVideos = $(addprefix videos/webm/, $(addsuffix .webm, $(basename $(notdir $(sourceVideos)))))
|
||||
jpegThumbs = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(notdir $(sourceVideos)))))
|
||||
|
||||
# das result= fehlt absichtlich
|
||||
ffmpegVideoFilterVidstabDetect = vidstabdetect=shakiness=10:accuracy=15
|
||||
# das input= fehlt absichtlich
|
||||
ffmpegVideoFilterVidstabTransform = vidstabtransform=optzoom=2:interpol=bicubic:smoothing=30
|
||||
|
||||
ffmpegVideoScaleFilter = scale=$(VID_CODEC_WIDTH):$(VID_CODEC_HEIGHT):sws_flags=lanczos,
|
||||
ffmpegVideoFilterDeinterlace = yadif,
|
||||
ffmpegVideoFilterDenoise = hqdn3d,
|
||||
|
||||
|
||||
.SECONDARY: $(vidstabLogs) $(firstPassLogs)
|
||||
|
||||
@@ -29,31 +53,47 @@ clean:
|
||||
.PHONY: thumbnails
|
||||
thumbnails: $(jpegThumbs)
|
||||
|
||||
.PHONY: echo
|
||||
echo:
|
||||
@echo $(webmVideos)
|
||||
@echo $(firstPassLogs)
|
||||
@echo $(targetSourceDir)
|
||||
|
||||
|
||||
# Erzeugen der Targets
|
||||
.PHONY: targets
|
||||
targets:
|
||||
for file in videos/aufnahmen/papaRomy/*.webm;\
|
||||
do \
|
||||
checkSum=$$(sha512sum $${file});\
|
||||
ln -f $${file} videos/.forCompressing/$${checkSum%%\ *}.video;\
|
||||
mkdir -p videos/.forCompressing
|
||||
# for file in videos/aufnahmen/papaRomy/*.webm;\
|
||||
# do \
|
||||
# checkSum=$$(sha512sum $${file});\
|
||||
# ln -f $${file} videos/.forCompressing/$${checkSum%%\ *}.video;\
|
||||
# done;
|
||||
for directory in $(targetSourceDirectories) ;\
|
||||
do for file in $${directory}/*.*;\
|
||||
do \
|
||||
checkSum=$$(sha512sum $${file});\
|
||||
ln -f $${file} videos/.forCompressing/$${checkSum%%\ *}.video;\
|
||||
done;\
|
||||
done;
|
||||
|
||||
videos/.forCompressing/%.trf: videos/.forCompressing/%.video
|
||||
# Die Stabilisierungsberechnung:
|
||||
# eventuell sollte hier die Skalierung vorgeschaltet werden...
|
||||
videos/.forCompressing/%.trf: videos/.forCompressing/%.video
|
||||
$(FFMPEG) -i $^ \
|
||||
-filter:v vidstabdetect=result="$@" \
|
||||
-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabDetect):result="$@" \
|
||||
-f null \
|
||||
-
|
||||
|
||||
videos/.forCompressing/%.log: videos/.forCompressing/%.video videos/.forCompressing/%.trf
|
||||
videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video videos/.forCompressing/%.trf
|
||||
# -b:v $(VID_CODEC_BITRATE) \
|
||||
# First Pass
|
||||
$(FFMPEG) -i $< \
|
||||
-filter:v vidstabtransform=smoothing=30:input="$(basename $<).trf",nlmeans=s=6:p=5:r=7,scale=-2:$(VID_CODEC_HEIGHT):sws_flags=sinc,unsharp=5:5:0.8:3:3:0.4 \
|
||||
-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",nlmeans=s=6:p=5:r=7,$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 1 \
|
||||
-passlogfile "$(basename $<).firstPassLog" \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-aspect 16:9 \
|
||||
-threads 1 \
|
||||
-speed 4 \
|
||||
-tile-columns 0 \
|
||||
@@ -68,16 +108,19 @@ videos/.forCompressing/%.log: videos/.forCompressing/%.video videos/.forCompress
|
||||
|
||||
# target und dependencies müssen noch angepasst werden
|
||||
# Die erste Abhängigkeit muss das quellVideo sein!
|
||||
videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf videos/.forCompressing/%.log
|
||||
videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf videos/.forCompressing/%.firstPassLog-0.log
|
||||
mkdir -p videos/webm
|
||||
|
||||
# -b:v $(VID_CODEC_BITRATE) \
|
||||
# Second Pass
|
||||
$(FFMPEG) -i $< \
|
||||
-filter:v vidstabtransform=smoothing=30:input="$(basename $<).trf",nlmeans=s=6:p=5:r=7,scale=-2:$(VID_CODEC_HEIGHT),unsharp=5:5:0.8:3:3:0.4 \
|
||||
-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",nlmeans=s=6:p=5:r=7,$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 2 \
|
||||
-passlogfile "$(basename $<).firstPassLog" \
|
||||
-deadline best \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-b:v $(shell /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<)k \
|
||||
-aspect 16:9 \
|
||||
-threads 1 \
|
||||
-speed 0 \
|
||||
-tile-columns 0 \
|
||||
@@ -92,14 +135,9 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf
|
||||
|
||||
videos/thumbnails/%.png: videos/.forCompressing/%.video
|
||||
mkdir -p videos/thumbnails
|
||||
# $(FFMPEG) -i "$<" -vf "select=gt(scene\,0.4)" -frames:v 5 -vsync vfr -vf scale=-2:$(VID_CODEC_HEIGHT),fps=fps=1/600 "$@"
|
||||
$(FFMPEG) -i "$<" -vf thumbnail,scale=-2:$(VID_CODEC_HEIGHT) -frames:v 1 "$@"
|
||||
# $(FFMPEG) -i "$<" -vf "select=gt(scene\,0.4)" -frames:v 5 -vsync vfr -vf $(ffmpegVideoScaleFilter)fps=fps=1/600 "$@"
|
||||
$(FFMPEG) -i "$<" -vf $(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
|
||||
|
||||
videos/thumbnails/%.jpg: videos/thumbnails/%.png
|
||||
$(GUETZLI) --quality 90 "$<" "$@"
|
||||
|
||||
|
||||
###
|
||||
|
||||
#$(FFMPEG) -i %1 -map 0 -c copy -c:v libvpx-vp9 -pass 1 -passlogfile "%~dpn1.log" -b:v 150K -threads 1 -deadline good -cpu-used 4 -tile-columns 0 -frame-parallel 0 -auto-alt-ref 1 -lag-in-frames 24 -g 9600 -aq-mode 1 -sws_dither none -pix_fmt yuv420p10le -filter:v nlmeans=s=6:p=5:r=7,scale=w=428:h=240:force_original_aspect_ratio=decrease:sws_flags=area:sws_dither=none,crop=trunc(iw/2)*2:trunc(ih/2)*2:0:0 -an -f null NUL
|
||||
#$(FFMPEG) -i %1 -map 0 -c copy -c:v libvpx-vp9 -pass 2 -passlogfile "%~dpn1.log" -b:v 150K -threads 1 -deadline good -cpu-used 1 -tile-columns 0 -frame-parallel 0 -auto-alt-ref 1 -lag-in-frames 24 -g 9600 -aq-mode 1 -sws_dither none -pix_fmt yuv420p10le -filter:v nlmeans=s=6:p=5:r=7,scale=w=428:h=240:force_original_aspect_ratio=decrease:sws_flags=area:sws_dither=none,crop=trunc(iw/2)*2:trunc(ih/2)*2:0:0 -c:a libopus -b:a 32k -ac 2 -f webm "%~dpn1.webm"
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
*/
|
||||
@font-face {
|
||||
font-family: Orbitron-Medium;
|
||||
font-display: fallback;
|
||||
src: url(http://cwsvjudo.bplaced.net/ressourcen/fonts/Orbitron-Medium.otf);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import sys
|
||||
import subprocess
|
||||
|
||||
#ffprobe =
|
||||
|
||||
def getLength(filename):
|
||||
result = subprocess.Popen(
|
||||
["C:\\proggis\\media\\editoren\\ffmpeg-4.0.2-win64-static\\bin\\ffprobe.exe", filename],
|
||||
stdout = subprocess.PIPE, stderr = subprocess.STDOUT)
|
||||
# print( result.stdout.readlines() )
|
||||
# for x in result.stdout.readlines():
|
||||
# print(x)
|
||||
return [x for x in result.stdout.readlines() if b"Duration" in x]
|
||||
|
||||
#print( str( getLength(sys.argv[1]) ) )
|
||||
getLength(sys.argv[1])
|
||||
@@ -0,0 +1,69 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
#
|
||||
# Command line use of 'ffprobe':
|
||||
#
|
||||
# ffprobe -loglevel quiet -print_format json \
|
||||
# -show_format -show_streams \
|
||||
# video-file-name.mp4
|
||||
#
|
||||
# man ffprobe # for more information about ffprobe
|
||||
#
|
||||
|
||||
import subprocess as sp
|
||||
import json
|
||||
import sys
|
||||
|
||||
|
||||
def probe(vid_file_path):
|
||||
''' Give a json from ffprobe command line
|
||||
|
||||
@vid_file_path : The absolute (full) path of the video file, string.
|
||||
'''
|
||||
if type(vid_file_path) != str:
|
||||
raise Exception('Gvie ffprobe a full file path of the video')
|
||||
return
|
||||
|
||||
command = ["ffprobe",
|
||||
"-loglevel", "quiet",
|
||||
"-print_format", "json",
|
||||
"-show_format",
|
||||
"-show_streams",
|
||||
vid_file_path
|
||||
]
|
||||
|
||||
pipe = sp.Popen(command, stdout=sp.PIPE, stderr=sp.STDOUT)
|
||||
out, err = pipe.communicate()
|
||||
return json.loads(out)
|
||||
|
||||
|
||||
def duration(vid_file_path):
|
||||
''' Video's duration in seconds, return a float number
|
||||
'''
|
||||
_json = probe(vid_file_path)
|
||||
|
||||
if 'format' in _json:
|
||||
if 'duration' in _json['format']:
|
||||
return float(_json['format']['duration'])
|
||||
|
||||
if 'streams' in _json:
|
||||
# commonly stream 0 is the video
|
||||
for s in _json['streams']:
|
||||
if 'duration' in s:
|
||||
return float(s['duration'])
|
||||
|
||||
# if everything didn't happen,
|
||||
# we got here because no single 'return' in the above happen.
|
||||
raise Exception('I found no duration')
|
||||
#return None
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
# video_file_path = "/tmp/tt1.mp4"
|
||||
video_file_path = sys.argv[1]
|
||||
|
||||
durationInSec = duration(video_file_path)
|
||||
# rateInKbPerSec = (10 * 1024 * 1024 * 8)/( durationInSec * 1000 )
|
||||
rateInKbPerSec = (10 * 1000 * 1000 * 8)/( durationInSec * 1000 )
|
||||
#print( duration(video_file_path) ) # 10.008
|
||||
print( int(min(500, rateInKbPerSec)) )
|
||||
@@ -0,0 +1,72 @@
|
||||
<?php
|
||||
include_once("config.inc.php");
|
||||
|
||||
$basePath = "/users/cwsvjudo/www";
|
||||
|
||||
require_once($basePath."/config/cwsvJudo.config.php");
|
||||
|
||||
require_once($basePath."/config/phpcount.config.php");
|
||||
require_once($basePath."/ressourcen/phpLib/phpcount/phpcount.php");
|
||||
|
||||
require_once($basePath."/ressourcen/phpLib/cwsvJudo/miscAssis.php");
|
||||
|
||||
$cwsvJudoDbConnection = getCwsvJudoDbConn();
|
||||
$cwsvJudoDbConnection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
|
||||
|
||||
if($_GET['action'] == "INSERT"){
|
||||
echo("Inserting\n");
|
||||
$wkId = $_GET['wkId'];
|
||||
$checkSum = urldecode( $_GET['checkSum'] );
|
||||
$vidUrl = urldecode( $_GET['vidUrl'] );
|
||||
|
||||
echo("CheckSum is ".$checkSum);
|
||||
echo("vidUrl is ".$vidUrl);
|
||||
|
||||
$vidQuery =
|
||||
$cwsvJudoDbConnection->prepare(
|
||||
"INSERT IGNORE INTO cwsvjudo.`shiai.videos` ( wkId, checkSum, url ) VALUES ( :wkId, HEX(:checkSum), :vidUrl);"
|
||||
);
|
||||
$vidQuery->bindParam(':wkId', intval($wkId), PDO::PARAM_INT);
|
||||
$vidQuery->bindParam(':checkSum', $checkSum );
|
||||
$vidQuery->bindParam(':vidUrl', $vidUrl );
|
||||
|
||||
$vidQuery->execute();
|
||||
|
||||
$vidQuery =
|
||||
$cwsvJudoDbConnection->prepare(
|
||||
"UPDATE cwsvjudo.`shiai.videos` SET wkId=:wkId, url=:vidUrl WHERE checkSum=HEX( :checkSum );"
|
||||
// "UPDATE cwsvjudo.`shiai.videos` url=:vidUrl WHERE checkSum=HEX(:checkSum);"
|
||||
);
|
||||
$vidQuery->bindParam(':wkId', intval($wkId), PDO::PARAM_INT);
|
||||
$vidQuery->bindParam(':checkSum', $checkSum );
|
||||
$vidQuery->bindParam(':vidUrl', $vidUrl );
|
||||
|
||||
$vidQuery->execute();
|
||||
}
|
||||
|
||||
$wkId = 311;
|
||||
|
||||
$vidQuery =
|
||||
$cwsvJudoDbConnection->prepare(
|
||||
"SELECT url FROM cwsvjudo.`shiai.videos` WHERE wkId = :wkId;"
|
||||
);
|
||||
$vidQuery->bindParam(':wkId', intval($wkId), PDO::PARAM_INT);
|
||||
|
||||
$vidQuery->execute();
|
||||
$wkVideos = $vidQuery->fetchAll(PDO::FETCH_ASSOC);
|
||||
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
</head>
|
||||
<body>
|
||||
<?php
|
||||
|
||||
var_dump($_GET);
|
||||
var_dump($wkVideos);
|
||||
|
||||
?>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,34 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import requests
|
||||
import urllib.parse
|
||||
import argparse
|
||||
import yaml
|
||||
|
||||
|
||||
wkId = 311
|
||||
checkSum = "b674aaaa71d18a8ef1e616fb94ddc399e9e3214bbc8497768217278d546c00d63741ad6cbbcfd0e95f518da39fbaee67b5b92fb4f4b5f3933a9bf08e38bb8283"
|
||||
|
||||
argParser = argparse.ArgumentParser()
|
||||
#argParser.add_argument("wkId", type=int)
|
||||
argParser.add_argument("--checkSum")
|
||||
argParser.add_argument("--vidUrl")
|
||||
argParser.add_argument("--shiaiYamlFile")
|
||||
|
||||
argv = argParser.parse_args()
|
||||
|
||||
|
||||
with open(argv.shiaiYamlFile, 'r') as yamlFile:
|
||||
shiaiData = yaml.safe_load(yamlFile)
|
||||
print(shiaiData['wkId'])
|
||||
|
||||
payLoad = {
|
||||
'action' : "INSERT",
|
||||
'wkId' : shiaiData['wkId'],
|
||||
'checkSum': urllib.parse.quote(argv.checkSum),
|
||||
'vidUrl' : urllib.parse.quote(argv.vidUrl)
|
||||
}
|
||||
|
||||
r = requests.get('http://cwsvjudo.bplaced.net/admin/vidGal.php', params=payLoad, auth=('marko', '***REMOVED***'))
|
||||
|
||||
print(r.text)
|
||||
@@ -169,10 +169,24 @@
|
||||
</li>
|
||||
<?php
|
||||
}
|
||||
|
||||
echo("<table>");
|
||||
echo("<tr><th>Name</th><th>Vorname</th><th>Masse</th><th>Platz</th><th>starterId</th><th>fahrtId</th></tr>");
|
||||
|
||||
foreach( $starterData as $starter ){
|
||||
if($starter['type'] != $typeKey) continue;
|
||||
echo("<tr>");
|
||||
$userData = getUserData($mysqli, $starter['userId']);
|
||||
echo("<td>".mb_convert_encoding($userData['name'], 'UTF-8', 'ISO-8859-1')."</td>");
|
||||
echo("<td>".mb_convert_encoding($userData['vorname'], 'UTF-8', 'ISO-8859-1')."</td>");
|
||||
echo("<td>".$starter['masse']."</td>");
|
||||
echo("<td>".$starter['platz']."</td>");
|
||||
echo("<td>".$starter['id']."</td>");
|
||||
echo("<td>".$starter['fahrtId']."</td>");
|
||||
echo("</tr>");
|
||||
}
|
||||
echo("</table>");
|
||||
}
|
||||
?>
|
||||
</ul>
|
||||
<?php
|
||||
}
|
||||
// $fahrtenData = array();
|
||||
// $fahrtenData = getFahrtenForEvent($mysqli, $eventData['id']);
|
||||
|
||||
@@ -94,19 +94,21 @@
|
||||
|
||||
<h2>Einschreibungen:</h2>
|
||||
<?php if( !empty($_SESSION['login']) ){
|
||||
$wkEventStarterData = getEventsStarterData($mysqli, $eventData['id']);
|
||||
?>
|
||||
<?php $wkEventStarterData = getEventsStarterData($mysqli, $eventData['id']);?>
|
||||
|
||||
<li>Eingeschrieben:
|
||||
<?php
|
||||
$starters = getStarterForEvent($mysqli, $eventData['id']);
|
||||
if( empty($starters) ){
|
||||
$anzahlKaempfer = array_count_values(array_column($starters, 'type'))['1'];
|
||||
$anzahlZuschauer = array_count_values(array_column($starters, 'type'))['2'];
|
||||
// if( empty($starters) ){
|
||||
if( ($anzahlKaempfer+$anzahlZuschauer) <= 0 ){
|
||||
?>
|
||||
Noch hat sich niemand für diesen Wettkampf gemeldet!
|
||||
Noch will niemand zu diesem Wettkampf!
|
||||
<?php
|
||||
}
|
||||
else{
|
||||
echo count($starters);
|
||||
echo($anzahlKaempfer+$anzahlZuschauer);
|
||||
}
|
||||
?>
|
||||
<ul>
|
||||
@@ -139,8 +141,9 @@
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
|
||||
<!--
|
||||
<p>Es sind momentan <?php echo (count($wkEventStarterData) == 0 ? "keine" : count($wkEventStarterData));?> Starter eingeschrieben.</p>
|
||||
-->
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user