diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile
index b6e4d3d..d882deb 100644
--- a/homepage/redesign2018/markdownExperiment/Makefile
+++ b/homepage/redesign2018/markdownExperiment/Makefile
@@ -56,6 +56,7 @@ build/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocT
--standalone \
--css="ressourcen/css/cwsvJudo.css" \
--template=pandocTemplate/cwsvJudo.html5.pandocTemplate \
+ --to=html \
--output=$@ \
$< $(word 2,$^)
@@ -65,6 +66,7 @@ build/amp/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.amp.pando
--standalone \
--css="ressourcen/css/cwsvJudo.css" \
--template=pandocTemplate/cwsvJudo.amp.pandocTemplate \
+ --to=html \
--output=$@ \
$< $(word 2,$^)
# Die auskommentierte Variante fand ich besser, aber der Validator hat ein Problem mit http bei src in img ;)
@@ -82,11 +84,6 @@ 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*** \
@@ -97,11 +94,6 @@ 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:***REMOVED*** \
@@ -113,11 +105,6 @@ 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:***REMOVED*** \
@@ -127,11 +114,6 @@ 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:***REMOVED*** \
@@ -142,11 +124,6 @@ build/.uploadMarker/css/%.css: build/css/%.css
build/.uploadMarker/config/%: config/%
mkdir -p build/.uploadMarker/config
- curl \
- --upload-file $^ \
- --user cwsvjudo:Dee4oquu \
- ftp://cwsvjudo.square7.net/$(patsubst build/%,%,$^) \
- --ftp-create-dirs
curl \
--upload-file $^ \
--user cwsvjudo:***REMOVED*** \
diff --git a/homepage/redesign2018/markdownExperiment/admin/mdDisplayer/index.php b/homepage/redesign2018/markdownExperiment/admin/mdDisplayer/index.php
new file mode 100644
index 0000000..e0d2a5d
--- /dev/null
+++ b/homepage/redesign2018/markdownExperiment/admin/mdDisplayer/index.php
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+ mdDisplayer
+
+
+
+");
+ foreach($fileList as $file){
+ echo("".mb_convert_encoding( basename($file), "UTF-8", "ISO-8859-1" )."");
+ }
+ echo("");
+
+ foreach($fileList as $file){
+ echo("
");
+ echo("" . ParsedownExtra::instance()->text( file_get_contents($file) ) . "
");
+ }
+?>
+
+
+
diff --git a/homepage/redesign2018/markdownExperiment/config/db.inc b/homepage/redesign2018/markdownExperiment/config/db.inc
index 2789491..255479b 100644
--- a/homepage/redesign2018/markdownExperiment/config/db.inc
+++ b/homepage/redesign2018/markdownExperiment/config/db.inc
@@ -7,5 +7,5 @@ $db_name='cwsvjudo';
$phpcountConfig["db"]["host"] = "localhost";
$phpcountConfig["db"]["name"] = "cwsvjudo";
$phpcountConfig["db"]["user"] = "cwsvjudo";
-$phpcountConfig["db"]["password"] = "Dee4oquu";
+$phpcountConfig["db"]["password"] = "***REMOVED***";
?>
diff --git a/homepage/redesign2018/markdownExperiment/config/phpcount.config.php b/homepage/redesign2018/markdownExperiment/config/phpcount.config.php
index df1d3a0..35ce128 100644
--- a/homepage/redesign2018/markdownExperiment/config/phpcount.config.php
+++ b/homepage/redesign2018/markdownExperiment/config/phpcount.config.php
@@ -2,7 +2,7 @@
$phpcountConfig["db"]["host"] = "localhost";
$phpcountConfig["db"]["name"] = "cwsvjudo";
$phpcountConfig["db"]["user"] = "cwsvjudo";
-$phpcountConfig["db"]["password"] = "Dee4oquu";
+$phpcountConfig["db"]["password"] = "***REMOVED***";
$phpcountConfig["db"]["hitsTable"] = "phpcount_hits";
$phpcountConfig["db"]["nodupesTable"] = "phpcount_nodupes";
diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate
index 0424dd4..d6c8901 100644
--- a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate
+++ b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate
@@ -39,14 +39,14 @@ $if(keywords)$
$endif$
$if(phpTitleString)$
<?php echo( $phpTitleString$ );?>
-$else$
+$else$$if(title)$
$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$
-$endif$
+$endif$$endif$
$if(phpDescriptionString)$
-$else$
+$else$$if(description)$
-$endif$
+$endif$$endif$
$if(canonicalLink)$
$endif$
@@ -232,29 +232,7 @@ $endif$
$body$
-
+