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

Merge branch 'redesign2018' of /media/sdb1/judoRepo into redesign2018

Browse Source
This commit is contained in:
marko
2018-07-22 07:04:13 +02:00
parent cba6521dc2 8fdc8fac00
commit bf3d0fd720
10 changed files with 67 additions and 104 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/*

31
homepage/redesign2018/markdownExperiment/Makefile
View File

@@ -18,7 +18,7 @@ uploadMarker = \
# $(patsubst phpLib/cwsvJudo/%.php, build/.uploadMarker/phpLib/cwsvJudo/%.php, $(phpLibFiles)) \
.PHONY: all
all: $(phpFiles) build/css/cwsvJudo.css
all: $(ampFiles) $(phpFiles) build/css/cwsvJudo.css
.PHONY: clean
clean:
@@ -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
@@ -90,11 +91,10 @@ build/.uploadMarker/%.php: build/%.php
ftp://cwsvjudo.bplaced.net/www/pages/responsive/$(patsubst build/%.php,%.php,$^) \
--ftp-create-dirs
touch $@
sleep 1s
build/.uploadMarker/amp/%.php: build/amp/%.php
mkdir -p build/.uploadMarker/amp
# @toDo: das wenn die Entwicklung des ampParts fertig ist auf das
# Zielverzeichnis pages/amp umstellen
curl \
--upload-file $^ \
--user cwsvjudo:Dee4oquu \
@@ -106,6 +106,7 @@ build/.uploadMarker/amp/%.php: build/amp/%.php
ftp://cwsvjudo.bplaced.net/www/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \
--ftp-create-dirs
touch $@
sleep 1s
build/.uploadMarker/phpLib/%.php: phpLib/%.php
mkdir -p build/.uploadMarker/phpLib/cwsvJudo
@@ -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 $^ \
@@ -140,6 +136,7 @@ build/.uploadMarker/css/%.css: build/css/%.css
ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%,%,$^) \
--ftp-create-dirs
touch $@
sleep 1s
build/.uploadMarker/config/%: config/%
mkdir -p build/.uploadMarker/config
@@ -154,6 +151,7 @@ build/.uploadMarker/config/%: config/%
ftp://cwsvjudo.bplaced.net/www/$(patsubst build/%,%,$^) \
--ftp-create-dirs
touch $@
sleep 1s
.PHONY: graphiken
@@ -165,20 +163,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 $@

22
homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-sideBar.css Normal file
View File

@@ -0,0 +1,22 @@
amp-sidebar {
background-color: #FF8100;
}
.sidebar {
padding: 10px;
margin: 0;
background-color: #FF8100;
font-size: 1.5em;
font-family: 'Orbitron-Medium',sans-serif;
}
.sidebar > li {
list-style: none;
margin-bottom:10px;
}
.sidebar a {
text-decoration: none;
color: inherit;
}
.close-sidebar {
font-size: 1.5em;
padding-left: 5px;
}

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

@@ -75,23 +75,9 @@ $endfor$
margin-top: 50px;
}
.hamburger {
padding-left: 10px;
padding-left: .5em;
padding-right: .5em;
}
.sidebar {
padding: 10px;
margin: 0;
}
.sidebar > li {
list-style: none;
margin-bottom:10px;
}
.sidebar a {
text-decoration: none;
}
.close-sidebar {
font-size: 1.5em;
padding-left: 5px;
}
#mainNav > a > span{
width: 2em;
}
@@ -132,8 +118,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 → homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate.bak
View File

@@ -50,6 +50,13 @@ $if(phpTitleFunction)$
<title><?php $phpTitleFunction$();?></title>
$else$
<title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
$endif$
$if(css)$
<style>
$for(css)$
<?php include_once( $$basePath."/$css$" );?>
$endfor$
</style>
$endif$
<style>code{white-space: pre;}</style>
$if(quotes)$
@@ -62,9 +69,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

12
homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/miscAssis.php
View File

@@ -109,14 +109,14 @@ return arrayKeyFilter(
);
}
function echoThisOrThat($this, $that){
echo( !empty($this) ? $this : $that );
function echoThisOrThat($This, $that){
echo( !empty($This) ? $This : $that );
}
function echoThisWhenThat($this, $that){
if( !empty($that) ) echo( $this );
function echoThisWhenThat($This, $that){
if( !empty($that) ) echo( $This );
}
function thisWhenThat($this, $that){
function thisWhenThat($This, $that){
if( empty($that) ) return "";
return $this;
return $This;
}
?>

2
homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
View File

@@ -202,7 +202,7 @@ $htmlWkTableString = "";
"</time>".
"</td>".
"<td data-title=\"Ausschreibung\" class=\"hyphenate\">".
"<a title=\"Ausschreibung ".$wk['Veranstaltung']."\" href=\"".$wk['Ausschreibung']."\"><span property=\"name\">".$wk['Veranstaltung']."</span></a>".
"<a title=\"Ausschreibung ".$wk['Veranstaltung']."\" href=\"http://cwsvjudo.bplaced.net".$wk['Ausschreibung']."\"><span property=\"name\">".$wk['Veranstaltung']."</span></a>".
"</td>".
"<td data-title=\"Wegbeschreibung\">".
"<a title=\"Wegbeschreibung ".$wk['Veranstaltung']."\" href=\"".$wk['Routenplaner']."\"><span>".$wk['Ort']."</span></a>".

4
homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml
View File

@@ -6,7 +6,7 @@ home: &home
icon: *cwsvJudoLogoWappen
judoWiki: &judoWiki
caption: "JudoWiki"
url: "/JudoWiki"
url: "http://cwsvjudo.bplaced.net/JudoWiki"
title: "Lexikon über Judo in Form eines Wiki"
icon: *iconWikipediaW
training: &training
@@ -25,7 +25,7 @@ wkKalender: &wkKalender
wkParticipo: &wkParticipo
caption: "Wettkampf&shy;planer"
icon: *iconPlanner
url: "/pages/desktop/wkParticipo"
url: "http://cwsvjudo.bplaced.net/pages/desktop/wkParticipo"
galerien: &galerien
caption: "Galerien"
url: "/galerien"