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

Nur kleinere Korrekturen

Browse Source 
modified:   .gitignore
	modified:   Makefile
	deleted:    Makefile~
	modified:   pandocTemplate/cwsvJudo.amp.pandocTemplate
	modified:   pandocTemplate/cwsvJudo.html5.pandocTemplate
	modified:   phpLib/cwsvJudo/galleryRedirector.php
This commit is contained in:
marko
2018-07-09 14:47:59 +02:00
parent a9e0a30538
commit b4b09f4c32
6 changed files with 30 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
homepage/redesign2018/markdownExperiment/.gitignore vendored
View File

@@ -1,4 +1,3 @@
*~
temp/*

23
homepage/redesign2018/markdownExperiment/Makefile
View File

@@ -47,7 +47,8 @@ build/css/cwsvJudo.css: $(cssFiles)
mkdir -p $(dir $@)
# cat $(cssFiles) > $@
# cat $(cssFiles) | cleancss -o $@
cat $^ | ./node_modules/.bin/csso -o $@
# cat $^ | ./node_modules/.bin/csso -o $@
cat $^ | csso -o $@
build/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate
mkdir -p build
@@ -127,12 +128,7 @@ build/.uploadMarker/css/%.css: build/css/%.css
curl \
--upload-file $^ \
--user cwsvjudo:Dee4oquu \
ftp://cwsvjudo.square7.net/pages/responsive/$(patsubst build/%,%,$^) \
--ftp-create-dirs
curl \
--upload-file $^ \
--user cwsvjudo:***REMOVED*** \
ftp://cwsvjudo.bplaced.net/www/pages/responsive/$(patsubst build/%,%,$^) \
ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%,%,$^) \
--ftp-create-dirs
curl \
--upload-file $^ \
@@ -165,20 +161,21 @@ cwsvLogoWappen: $(addprefix build/graphiken/cwsvLogoWappen/cwsvLogoWappen.,
build/graphiken/cwsvJudoLogoWappen/cwsvJudoLogoWappen.png: graphiken/cwsvJudoLogoWappen.xcf
mkdir -p $(dir $@)
convert -layers merge -background transparent $< $@
build/graphiken/cwsvLogoWappen/cwsvLogoWappen.png: graphiken/cwsvLogoWappen.xcf
build/graphiken/cwsvLogoWappen/cwsvLogoWappen.png: graphiken/cwsvLogoWappen.xcf
mkdir -p $(dir $@)
convert -layers flatten -background transparent $< $@
build/graphiken/cwsvJudoLogoWappen/cwsvJudoLogoWappen.%w.png: build/graphiken/cwsvJudoLogoWappen/cwsvJudoLogoWappen.png
mkdir -p $(dir $@)
convert -layers merge -background transparent -resize $*x $< $@
# zopfli/zopflipng --iterations=500 --filters=01234mepb --lossy_8bit --lossy_transparent $@ $@
zopflipng -my $@ $@
build/graphiken/cwsvLogoWappen/cwsvLogoWappen.%w.png: build/graphiken/cwsvLogoWappen/cwsvLogoWappen.png
zopflipng --iterations=500 --filters=01234mepb --lossy_8bit --lossy_transparent $@ $@
# zopflipng -my $@ $@
build/graphiken/cwsvLogoWappen/cwsvLogoWappen.%w.png: build/graphiken/cwsvLogoWappen/cwsvLogoWappen.png
mkdir -p $(dir $@)
convert -layers flatten -background transparent -resize $*x $< $@
# zopfli/zopflipng --iterations=500 --filters=01234mepb --lossy_8bit --lossy_transparent $@ $@
zopflipng -my $@ $@
zopflipng --iterations=500 --filters=01234mepb --lossy_8bit --lossy_transparent $@ $@
# zopflipng -my $@ $@
.PHONY: favIcons

55
homepage/redesign2018/markdownExperiment/Makefile~
View File

@@ -1,55 +0,0 @@
cssFiles = $(wildcard css/*.css)
mdFiles = $(wildcard md/*.md)
phpFiles = $(patsubst md/%.md, build/%.php, $(mdFiles))
uploadMarker = $(patsubst build/%.php, build/.uploadMarker/%.php, $(phpFiles)) build/.uploadMarker/css/cwsvJudo.css
all: $(phpFiles) build/css/cwsvJudo.css
.PHONY: echo
echo:
@echo $(phpFiles)
build/css/cwsvJudo.css: $(cssFiles)
mkdir -p build/css
cat $(cssFiles) > $@
build/%.php: md/%.md pandocTemplate/cwsvJudo.html5.pandocTemplate
mkdir -p build
pandoc \
--standalone \
--css=css/cwsvJudo.css \
--template=pandocTemplate/cwsvJudo.html5.pandocTemplate \
--output=$@ \
$<
.PHONY: upload
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:***REMOVED*** \
ftp://cwsvjudo.bplaced.net/pages/responsive/$(patsubst build/%.php,%.php,$^) \
--ftp-create-dirs
touch $@
build/.uploadMarker/css/%.css: build/css/%.css
mkdir -p build/.uploadMarker/css
curl \
--upload-file $^ \
--user cwsvjudo:Dee4oquu \
ftp://cwsvjudo.square7.net/pages/responsive/$(patsubst build/%,%,$^) \
--ftp-create-dirs
curl \
--upload-file $^ \
--user cwsvjudo:***REMOVED*** \
ftp://cwsvjudo.bplaced.net/pages/responsive/$(patsubst build/%,%,$^) \
--ftp-create-dirs
touch $@

9
homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate
View File

@@ -75,7 +75,8 @@ $endfor$
margin-top: 50px;
}
.hamburger {
padding-left: 10px;
padding-left: .5em;
padding-right: .5em;
}
.sidebar {
padding: 10px;
@@ -132,8 +133,10 @@ $endfor$
alt="Judo im Chemnitzer WSV - Promo"
src="http://cwsvjudo.bplaced.net/ressourcen/graphiken/banner/bannerlogo.1.jpg"
></amp-img>
<span>Judo</span>
<span class="breadcrumbs"></span>
<span>
<span>Judo</span>
<span><?php $$zitat = getRandomCite( getCwsvJudoDbConn() ); echo($$zitat['zitat']);?></span>
</span>
<amp-img layout="responsive"
width="64" height="52"
title="Judo im Chemnitzer WSV"

10
homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate
View File

@@ -51,7 +51,12 @@ $if(phpTitleFunction)$
$else$
<title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
$endif$
<style>code{white-space: pre;}</style>
<style>
code{white-space: pre;}
$for(css)$
<?php include($$basePath."/$css$");?>
$endfor$
</style>
$if(quotes)$
<style>
q { quotes: "“" "”" "‘" "’"; }
@@ -62,9 +67,6 @@ $if(highlighting-css)$
$highlighting-css$
</style>
$endif$
$for(css)$
<link rel="stylesheet" href="/$css$">
$endfor$
$for(extraCss)$
<link rel="stylesheet" href="$extraCss$">
$endfor$

10
homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galleryRedirector.php
View File

@@ -1,13 +1,19 @@
<?php
// Umleiten auf eine per query galId im $_GET gegebene Galerie
function galleryRedirector(){
require_once($_SERVER['DOCUMENT_ROOT']."/bonus/db.inc");
global $cwsvJudoConfig;
// require_once($_SERVER['DOCUMENT_ROOT']."/bonus/db.inc");
if(isset($_GET['galId'])){
$redirectLink = $baseDomain."/pages/desktop/verein.galerien.php";
// Datenbankverbindung bereit stellen
try{
$db_connection = new PDO('mysql:host='.$db_server.';dbname='.$db_name, $db_user, $db_password);
$db_connection = new PDO(
'mysql:host='.$cwsvJudoConfig["db"]["host"].';dbname='.$cwsvJudoConfig["db"]["name"],
$cwsvJudoConfig["db"]["user"],
$cwsvJudoConfig["db"]["password"]
);
if(is_positive_integer($_GET['galId'])){
// mögliche Werte für das jahr herausfinden