marko/cwsvJudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Beim upload square7 entfernt

Browse Source 
modified:   homepage/redesign2018/markdownExperiment/Makefile
- font-display eingefügt
	modified:   homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css
- 1000 statt 1024
	modified:   homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
This commit is contained in:
marko
2018-11-16 08:25:48 +01:00
parent e808faf8eb
commit b6e95671d5
3 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
homepage/redesign2018/markdownExperiment/Makefile
View File

@@ -82,11 +82,11 @@ upload: $(uploadMarker)
build/.uploadMarker/%.php: build/%.php build/.uploadMarker/%.php: build/%.php
mkdir -p build/.uploadMarker mkdir -p build/.uploadMarker
curl \ # curl \
--upload-file $^ \ # --upload-file $^ \
--user cwsvjudo:Dee4oquu \ # --user cwsvjudo:Dee4oquu \
ftp://cwsvjudo.square7.net/pages/responsive/$(patsubst build/%.php,%.php,$^) \ # ftp://cwsvjudo.square7.net/pages/responsive/$(patsubst build/%.php,%.php,$^) \
--ftp-create-dirs # --ftp-create-dirs
curl \ curl \
--upload-file $^ \ --upload-file $^ \
--user cwsvjudo:***REMOVED*** \ --user cwsvjudo:***REMOVED*** \
@@ -97,11 +97,11 @@ build/.uploadMarker/%.php: build/%.php
build/.uploadMarker/amp/%.php: build/amp/%.php build/.uploadMarker/amp/%.php: build/amp/%.php
mkdir -p build/.uploadMarker/amp mkdir -p build/.uploadMarker/amp
curl \ # curl \
--upload-file $^ \ # --upload-file $^ \
--user cwsvjudo:Dee4oquu \ # --user cwsvjudo:Dee4oquu \
ftp://cwsvjudo.square7.net/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \ # ftp://cwsvjudo.square7.net/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \
--ftp-create-dirs # --ftp-create-dirs
curl \ curl \
--upload-file $^ \ --upload-file $^ \
--user cwsvjudo:***REMOVED*** \ --user cwsvjudo:***REMOVED*** \
@@ -113,11 +113,11 @@ build/.uploadMarker/amp/%.php: build/amp/%.php
build/.uploadMarker/phpLib/%.php: phpLib/%.php build/.uploadMarker/phpLib/%.php: phpLib/%.php
mkdir -p build/.uploadMarker/phpLib/cwsvJudo mkdir -p build/.uploadMarker/phpLib/cwsvJudo
mkdir -p build/.uploadMarker/phpLib/phpcount mkdir -p build/.uploadMarker/phpLib/phpcount
curl \ # curl \
--upload-file $^ \ # --upload-file $^ \
--user cwsvjudo:Dee4oquu \ # --user cwsvjudo:Dee4oquu \
ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%.php,%.php,$^) \ # ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%.php,%.php,$^) \
--ftp-create-dirs # --ftp-create-dirs
curl \ curl \
--upload-file $^ \ --upload-file $^ \
--user cwsvjudo:***REMOVED*** \ --user cwsvjudo:***REMOVED*** \
@@ -127,11 +127,11 @@ build/.uploadMarker/phpLib/%.php: phpLib/%.php
build/.uploadMarker/css/%.css: build/css/%.css build/.uploadMarker/css/%.css: build/css/%.css
mkdir -p build/.uploadMarker/css mkdir -p build/.uploadMarker/css
curl \ # curl \
--upload-file $^ \ # --upload-file $^ \
--user cwsvjudo:Dee4oquu \ # --user cwsvjudo:Dee4oquu \
ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%,%,$^) \ # ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%,%,$^) \
--ftp-create-dirs # --ftp-create-dirs
curl \ curl \
--upload-file $^ \ --upload-file $^ \
--user cwsvjudo:***REMOVED*** \ --user cwsvjudo:***REMOVED*** \

1
homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css
View File

@@ -3,6 +3,7 @@
*/ */
@font-face { @font-face {
font-family: Orbitron-Medium; font-family: Orbitron-Medium;
font-display: fallback;
src: url(http://cwsvjudo.bplaced.net/ressourcen/fonts/Orbitron-Medium.otf); src: url(http://cwsvjudo.bplaced.net/ressourcen/fonts/Orbitron-Medium.otf);
} }

3
homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
View File

@@ -63,6 +63,7 @@ if __name__ == "__main__":
video_file_path = sys.argv[1] video_file_path = sys.argv[1]
durationInSec = duration(video_file_path) durationInSec = duration(video_file_path)
rateInKbPerSec = (10 * 1024 * 1024 * 8)/( durationInSec * 1000 ) # rateInKbPerSec = (10 * 1024 * 1024 * 8)/( durationInSec * 1000 )
rateInKbPerSec = (10 * 1000 * 1000 * 8)/( durationInSec * 1000 )
#print( duration(video_file_path) ) # 10.008 #print( duration(video_file_path) ) # 10.008
print( int(min(500, rateInKbPerSec)) ) print( int(min(500, rateInKbPerSec)) )