diff --git a/homepage/cwsvJudo/Makefile b/homepage/cwsvJudo/Makefile index a2671fb..534e15b 100644 --- a/homepage/cwsvJudo/Makefile +++ b/homepage/cwsvJudo/Makefile @@ -47,10 +47,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 diff --git a/homepage/cwsvJudo/Makefile.heliohost b/homepage/cwsvJudo/Makefile.heliohost new file mode 100644 index 0000000..dadd819 --- /dev/null +++ b/homepage/cwsvJudo/Makefile.heliohost @@ -0,0 +1,41 @@ +CSSO = node_modules/csso-cli/bin/csso + +RES_LIST = 64 128 256 512 + +cssFiles = $(wildcard src/css/*.css) +mdFiles = $(wildcard src/md/*.md) +phpFiles = $(patsubst src/md/%.md, build/materialize/%.php, $(mdFiles)) +ampFiles = $(patsubst src/md/%.md, build/amp/%.php, $(mdFiles)) +phpLibFiles = $(wildcard phpLib/cwsvJudo/*.php) phpLib/phpcount/phpcount.php +configFiles = $(wildcard config/*.php) + + +.PHONY: all +all: $(phpFiles) +# @todo This should only be temporary. Better outsource the graphics to it's own Makefile. + make -j graphiken + make build/css/cwsvJudo.css + +.PHONY: clean +clean: + $(RM) -rf build + +build/materialize/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/materialize.pandocTemplate + mkdir -p build/materialize + pandoc \ + --standalone \ + --css="ressourcen/css/cwsvJudo.css" \ + --template=pandocTemplate/materialize.pandocTemplate \ + --to=html \ + --output=$@ \ + $< $(word 2,$^) + +# @toDo: Verzeichnisstruktur überdenken +build/yaml/%.yaml: src/yaml/images.yaml src/yaml/navTargets.yaml src/yaml/mainNav.yaml src/yaml/%.subNav.yaml + mkdir -p build/yaml + python tools/yamlMerge.py $^ > $@ + +.PHONY: upload +upload: all + lftp -f scripts/upload-heliohost + \ No newline at end of file diff --git a/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/.htaccess b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/.htaccess deleted file mode 100644 index 2105dd1..0000000 --- a/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/.htaccess +++ /dev/null @@ -1,14 +0,0 @@ -RewriteEngine on -RewriteRule ^photoalben/(.*) http://cwsvjudo\.bplaced\.net/photoalben/$1 -RewriteRule ^ressourcen/(.*)$ http://cwsvjudo\.bplaced\.net/ressourcen/$1 -RewriteRule ^/ressourcen/(.*)$ http://cwsvjudo\.bplaced\.net/ressourcen/$1 - -RewriteCond %{HTTP_HOST} cwsvjudo.bplaced.net -RewriteRule ^news$ news\.php [L] -RewriteCond %{HTTP_HOST} cwsvjudo.bplaced.net -RewriteRule ^news/([0-9]+)$ news\.php?newsId=$1 - -RewriteCond %{HTTP_HOST} amp.cwsvjudo.bplaced.net -RewriteRule ^news$ news\.php [L] -RewriteCond %{HTTP_HOST} amp.cwsvjudo.bplaced.net -RewriteRule ^news/([0-9]+)$ news\.php?newsId=$1 [L] diff --git a/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/config.inc.php b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/config.inc.php deleted file mode 100644 index 16ec268..0000000 --- a/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/config.inc.php +++ /dev/null @@ -1,20 +0,0 @@ - diff --git a/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/css/cwsvJudoAmp.css b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/css/cwsvJudoAmp.css deleted file mode 100644 index 451e014..0000000 --- a/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/css/cwsvJudoAmp.css +++ /dev/null @@ -1,233 +0,0 @@ -/* -@font-face { - font-family: Orbitron-Medium; - src: url(/ressourcen/fonts/Orbitron-Medium.otf); -} -*/ -html{ - background: #FFAE00; - box-sizing: border-box; -} -*, ::before, ::after { - box-sizing: inherit; -} - -body{ - font-size: 4.5vmin; - font-family: arial, helvetica, sans-serif; - background: #FFAE00; -} - - -.newsTable{ - border: solid 1px #000000; - width:100%; - padding: 1%; -} - -.newsTableHeader{ - background: #FF8100; -} -.newsTableFooter{ - clear: both; - background: #FF8100; -} - -.bigPicture{ - width: 100%; - height: auto; -} - -.centeredText{ - text-align: center; -} - -.orbitronFont{ - font-family: "Orbitron-Medium", Impact, Charcoal, sans-serif; - padding-top: .16em; -} - -.Inhaltsverzeichnis{ - padding: 1%; - width: 100%; - background-color: - #FF8100; - font-variant: - small-caps; - font-size: - larger; - font-weight: - bolder; -} -.Inhaltsverzeichnis a{ - color: inherit; -} -.Inhaltsverzeichnis div a:hover{ - text-decoration: - none; - color: - #993300; -} - -.navButton{ - border-color: white; - border-style: outset; - border-radius: 1em; - text-align: center; - text-decoration: none; - cursor: pointer; - display: inline-block; - padding-left: .5em; - padding-right: .5em; -} - -.messageBox{ - width: 100%; - border:solid 1px #000000; - background-color:#FF8100; - font-size:smaller; -} - -.fullWidth{ - width:100%; -} - -.noMargin{ - margin: 0; -} - -.rightFloat{ - float:right; -} - -.leftFloat{ - float:left; -} - -.clearBoth{ - clear: both; -} - -/*--- - * Formatierung der News in Amp - */ -.ampNewsBox{ - clear: both; - border: solid 1px #000000; - width:100%; - padding: 1%; -} -.ampNewsBoxHeader{ - background: #FF8100; -} -.ampNewsBoxFooter{ - clear: both; - background: #FF8100; -} -/*--- - * Formatierung der subNav in Amp - */ -.ampSubNav{ - display: flex; - justify-content: space-between; -} - -/*--- - * touchable Links -*/ -.touchLink{ - display: inline-block; - padding: 0.25em 0 0.25em 0; - margin: 0.25em 0 0.25em 0; - background-color: #FF8100; - border-radius: .5em; - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); -} - -/*--- - * Eine kleine NachrichtenBox - */ -.messageBox{ - width: 100%; - border:solid 1px #000000; - background-color:#FF8100; - font-size:smaller; -} - -/* - * Unterauswahl-Navigationsleiste - */ - -/* der SubNavContainer*/ -.subNav{ - display: flex; -/* flex-direction: column;*/ - align-items: stretch; - justify-content: space-between; -} -.subNav a{ - color: inherit; -} -.subNavElement{ - /*width: 100%;*/ - background: #FF8100; - padding-top:.125em; - padding-left:.125em; - padding-right:.125em; - border-style: outset; - border-radius: 1em; - font-size: 1.125em; - text-decoration: none; - flex-basis: 20%; - border-style: outset; - display: flex; - justify-content: center; - align-items: center; - text-align: center; -} -.subNavElementIcon{ - text-align: center; - max-width: 2.5em; - height: auto; - padding: .125em; -} -.subNavElementCaption{ - display: none; -} - -.activeNav { - border-color: #A80101; - border-style: inset; -} -.pngAddress{ - width: 20em; - height: auto; - vertical-align: middle; -} - - -/* - * Tabelle mit den GalerieLinks -*/ -.galTable{ - width: 100%; -} -.galTable tr, th, td { - width: auto; - vertical-align: middle; -} - -.galTable tr:nth-child(odd){ - background-color: #FF8100; -} - -.galTable tr td img{ - display: inline; - vertical-align: middle; -} - -.galTable tr td a img{ - display: inline; - vertical-align: middle; -} - diff --git a/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/cwsvJudo.ampTemplate.inc.php b/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/cwsvJudo.ampTemplate.inc.php deleted file mode 100644 index 37e3a13..0000000 --- a/homepage/cwsvJudo/backup/ampPages-backup-2018-06-11-06-49/cwsvJudo.ampTemplate.inc.php +++ /dev/null @@ -1,107 +0,0 @@ - - - - -