From d442b1361b9b690bac8ac608ab4824d5b63d17d6 Mon Sep 17 00:00:00 2001 From: marko Date: Mon, 30 Jul 2018 07:13:48 +0200 Subject: [PATCH 1/7] Hotfix broken addFahrt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Meldung einer Mitfahrgelegenheit war defekt wegen eines fehlenden Anführungszeichens Changes to be committed: - Aufruf der (in PHP 7) veralteten Funktion mysql_error() entfernt modified: wkParticipo/addFahrt.php - fehlendes " ergänzt modified: wkParticipo/lib/wkParticipoLib.inc.php ToDo: - es sollte vollständig auf PDO migriert werden - die Interaktion mit der Datenbank sollte in Funktionen gekapselt werden (Trennung der lowLevelFunktionen wie eben der Datenbankinteraktion von den highLevelFunktionen des eigentlichen Wettkampfplaners) --- .../redesign2018/markdownExperiment/wkParticipo/addFahrt.php | 4 +++- .../markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/addFahrt.php b/homepage/redesign2018/markdownExperiment/wkParticipo/addFahrt.php index 95429b1..d731494 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/addFahrt.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/addFahrt.php @@ -1,4 +1,5 @@ query($query); if(!$result){ - echo "Fehler bei der Meldung: " . mysql_error(); die($query); + //echo "Fehler bei der Meldung: " . mysql_error(); die($query); + echo "Fehler bei der Meldung: "; die($query); } $message['success'] = "Neue Fahrt für eventId " . $_POST['f']['eventId'] . " mit " . $_POST['f']['anzPlaetze'] . " hinzugefügt"; diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php b/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php index 92ce5b2..ab5c18d 100644 --- a/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php +++ b/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php @@ -1257,11 +1257,11 @@ $retHtml = ""; ). "" ). - "Anzahl Plätze
" . $anzPlätze . "
". + "Anzahl Mitfahrgelegenheiten
" . $anzPlätze . "
". (empty($_SESSION['login'])? "
Das Anbieten von Mitfahrgelegenheiten ist nur eingeloggt möglich!
" :"
". - "". + "". ($aWkEvent['Datum'] > date("Y-m-d")? "" :"" From 13601be59eeb03488efa49b411b96fc04e304ec8 Mon Sep 17 00:00:00 2001 From: marko Date: Tue, 31 Jul 2018 11:56:53 +0200 Subject: [PATCH 2/7] Verschieben der einzelnen cascade style sheets in den srcOrdner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - die neue Struktur dokumentieren new file: readMe.md - wenn die Quellen sich verschieben, änder sich auch die (Abhangigkeiten der) Targets modified: Makefile - Verschieben der cssDateien renamed: css/cwsvJudo-2018-content.css -> src/cwsvJudo-2018-content.css renamed: css/cwsvJudo-2018-footer.css -> src/cwsvJudo-2018-footer.css renamed: css/cwsvJudo-2018-galTable.css -> src/cwsvJudo-2018-galTable.css renamed: css/cwsvJudo-2018-header.css -> src/cwsvJudo-2018-header.css renamed: css/cwsvJudo-2018-layout.css -> src/cwsvJudo-2018-layout.css renamed: css/cwsvJudo-2018-mainNav.css -> src/cwsvJudo-2018-mainNav.css renamed: css/cwsvJudo-2018-navBar.css.bak -> src/cwsvJudo-2018-navBar.css.bak renamed: css/cwsvJudo-2018-news.css -> src/cwsvJudo-2018-news.css renamed: css/cwsvJudo-2018-quiz.css -> src/cwsvJudo-2018-quiz.css renamed: css/cwsvJudo-2018-sideBar.css -> src/cwsvJudo-2018-sideBar.css renamed: css/cwsvJudo-2018-sponsorList.css -> src/cwsvJudo-2018-sponsorList.css renamed: css/cwsvJudo-2018-subNav.css -> src/cwsvJudo-2018-subNav.css renamed: css/cwsvJudo-2018-subNav.css.bak -> src/cwsvJudo-2018-subNav.css.bak renamed: css/cwsvJudo-2018-wkKalender.css -> src/cwsvJudo-2018-wkKalender.css renamed: css/cwsvJudo-2018.css -> src/cwsvJudo-2018.css --- homepage/redesign2018/markdownExperiment/Makefile | 2 +- homepage/redesign2018/markdownExperiment/readMe.md | 10 ++++++++++ .../{css => src}/cwsvJudo-2018-content.css | 0 .../{css => src}/cwsvJudo-2018-footer.css | 0 .../{css => src}/cwsvJudo-2018-galTable.css | 0 .../{css => src}/cwsvJudo-2018-header.css | 0 .../{css => src}/cwsvJudo-2018-layout.css | 0 .../{css => src}/cwsvJudo-2018-mainNav.css | 0 .../{css => src}/cwsvJudo-2018-navBar.css.bak | 0 .../{css => src}/cwsvJudo-2018-news.css | 0 .../{css => src}/cwsvJudo-2018-quiz.css | 0 .../{css => src}/cwsvJudo-2018-sideBar.css | 0 .../{css => src}/cwsvJudo-2018-sponsorList.css | 0 .../{css => src}/cwsvJudo-2018-subNav.css | 0 .../{css => src}/cwsvJudo-2018-subNav.css.bak | 0 .../{css => src}/cwsvJudo-2018-wkKalender.css | 0 .../markdownExperiment/{css => src}/cwsvJudo-2018.css | 0 17 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 homepage/redesign2018/markdownExperiment/readMe.md rename homepage/redesign2018/markdownExperiment/{css => src}/cwsvJudo-2018-content.css (100%) rename homepage/redesign2018/markdownExperiment/{css => src}/cwsvJudo-2018-footer.css (100%) rename homepage/redesign2018/markdownExperiment/{css => src}/cwsvJudo-2018-galTable.css (100%) rename homepage/redesign2018/markdownExperiment/{css => src}/cwsvJudo-2018-header.css (100%) rename homepage/redesign2018/markdownExperiment/{css => src}/cwsvJudo-2018-layout.css (100%) rename homepage/redesign2018/markdownExperiment/{css => src}/cwsvJudo-2018-mainNav.css (100%) rename homepage/redesign2018/markdownExperiment/{css => src}/cwsvJudo-2018-navBar.css.bak (100%) rename homepage/redesign2018/markdownExperiment/{css => src}/cwsvJudo-2018-news.css (100%) rename homepage/redesign2018/markdownExperiment/{css => src}/cwsvJudo-2018-quiz.css (100%) rename homepage/redesign2018/markdownExperiment/{css => src}/cwsvJudo-2018-sideBar.css (100%) rename homepage/redesign2018/markdownExperiment/{css => src}/cwsvJudo-2018-sponsorList.css (100%) rename homepage/redesign2018/markdownExperiment/{css => src}/cwsvJudo-2018-subNav.css (100%) rename homepage/redesign2018/markdownExperiment/{css => src}/cwsvJudo-2018-subNav.css.bak (100%) rename homepage/redesign2018/markdownExperiment/{css => src}/cwsvJudo-2018-wkKalender.css (100%) rename homepage/redesign2018/markdownExperiment/{css => src}/cwsvJudo-2018.css (100%) diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile index d5879ed..861e76c 100644 --- a/homepage/redesign2018/markdownExperiment/Makefile +++ b/homepage/redesign2018/markdownExperiment/Makefile @@ -1,6 +1,6 @@ RES_LIST = 64 128 256 512 -cssFiles = $(wildcard css/*.css) +cssFiles = $(wildcard src/css/*.css) mdFiles = $(wildcard md/*.md) phpFiles = $(patsubst md/%.md, build/%.php, $(mdFiles)) ampFiles = $(patsubst md/%.md, build/amp/%.php, $(mdFiles)) diff --git a/homepage/redesign2018/markdownExperiment/readMe.md b/homepage/redesign2018/markdownExperiment/readMe.md new file mode 100644 index 0000000..a6884bf --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/readMe.md @@ -0,0 +1,10 @@ +# Homepage der Judoka des CWSV + +## Verzeichnisstruktur + +`src` +: (Handgeschriebene) Quellen (Quellcodes) + +`res` +: nicht selber erzeugte Quellen (z.B. Graphiken) + diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-content.css b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-content.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-content.css rename to homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-content.css diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-footer.css b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-footer.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-footer.css rename to homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-footer.css diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-galTable.css b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-galTable.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-galTable.css rename to homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-galTable.css diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-header.css b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-header.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-header.css rename to homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-header.css diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-layout.css b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-layout.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-layout.css rename to homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-layout.css diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-mainNav.css b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-mainNav.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-mainNav.css rename to homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-mainNav.css diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-navBar.css.bak b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-navBar.css.bak similarity index 100% rename from homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-navBar.css.bak rename to homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-navBar.css.bak diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-news.css b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-news.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-news.css rename to homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-news.css diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-quiz.css b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-quiz.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-quiz.css rename to homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-quiz.css diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-sideBar.css b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-sideBar.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-sideBar.css rename to homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-sideBar.css diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-sponsorList.css b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-sponsorList.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-sponsorList.css rename to homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-sponsorList.css diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-subNav.css b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-subNav.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-subNav.css rename to homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-subNav.css diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-subNav.css.bak b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-subNav.css.bak similarity index 100% rename from homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-subNav.css.bak rename to homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-subNav.css.bak diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-wkKalender.css b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-wkKalender.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-wkKalender.css rename to homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-wkKalender.css diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018.css b/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018.css rename to homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018.css From 32d8c3aa686497c9d20485cd708ed15a9bb377a0 Mon Sep 17 00:00:00 2001 From: marko Date: Tue, 31 Jul 2018 14:16:52 +0200 Subject: [PATCH 3/7] =?UTF-8?q?Verschieben=20der=20markdownQuellen=20f?= =?UTF-8?q?=C3=BCr=20die=20Seiten=20in=20den=20srcOrdner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - (dependencies der) (build)Targets angepasst modified: Makefile - die verschobenen Dateien renamed: md/datenschutz.md -> src/md/datenschutz.md renamed: md/download.md -> src/md/download.md renamed: md/extras.md -> src/md/extras.md renamed: md/galerie.md -> src/md/galerie.md renamed: md/galerien.md -> src/md/galerien.md renamed: md/hilfsmittel.md -> src/md/hilfsmittel.md renamed: md/impressum.md -> src/md/impressum.md renamed: md/index.md -> src/md/index.md renamed: md/kontakt.md -> src/md/kontakt.md renamed: md/links.md -> src/md/links.md renamed: md/news.md -> src/md/news.md renamed: md/quiz.md -> src/md/quiz.md renamed: md/trainingszeiten.md -> src/md/trainingszeiten.md renamed: md/verein.md -> src/md/verein.md renamed: md/wkKalender.md -> src/md/wkKalender.md --- homepage/redesign2018/markdownExperiment/Makefile | 10 +++++----- .../markdownExperiment/{ => src}/md/datenschutz.md | 0 .../markdownExperiment/{ => src}/md/download.md | 0 .../markdownExperiment/{ => src}/md/extras.md | 0 .../markdownExperiment/{ => src}/md/galerie.md | 0 .../markdownExperiment/{ => src}/md/galerien.md | 0 .../markdownExperiment/{ => src}/md/hilfsmittel.md | 0 .../markdownExperiment/{ => src}/md/impressum.md | 0 .../markdownExperiment/{ => src}/md/index.md | 0 .../markdownExperiment/{ => src}/md/kontakt.md | 0 .../markdownExperiment/{ => src}/md/links.md | 0 .../markdownExperiment/{ => src}/md/news.md | 0 .../markdownExperiment/{ => src}/md/quiz.md | 0 .../markdownExperiment/{ => src}/md/trainingszeiten.md | 0 .../markdownExperiment/{ => src}/md/verein.md | 0 .../markdownExperiment/{ => src}/md/wkKalender.md | 0 16 files changed, 5 insertions(+), 5 deletions(-) rename homepage/redesign2018/markdownExperiment/{ => src}/md/datenschutz.md (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/md/download.md (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/md/extras.md (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/md/galerie.md (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/md/galerien.md (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/md/hilfsmittel.md (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/md/impressum.md (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/md/index.md (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/md/kontakt.md (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/md/links.md (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/md/news.md (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/md/quiz.md (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/md/trainingszeiten.md (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/md/verein.md (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/md/wkKalender.md (100%) diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile index 861e76c..a5b8f3c 100644 --- a/homepage/redesign2018/markdownExperiment/Makefile +++ b/homepage/redesign2018/markdownExperiment/Makefile @@ -1,9 +1,9 @@ RES_LIST = 64 128 256 512 cssFiles = $(wildcard src/css/*.css) -mdFiles = $(wildcard md/*.md) -phpFiles = $(patsubst md/%.md, build/%.php, $(mdFiles)) -ampFiles = $(patsubst md/%.md, build/amp/%.php, $(mdFiles)) +mdFiles = $(wildcard src/md/*.md) +phpFiles = $(patsubst src/md/%.md, build/%.php, $(mdFiles)) +ampFiles = $(patsubst src/md/%.md, build/amp/%.php, $(mdFiles)) phpLibFiles = $(wildcard phpLib/cwsvJudo/*.php) phpLib/phpcount/phpcount.php configFiles = $(wildcard config/*.php) @@ -50,7 +50,7 @@ build/css/cwsvJudo.css: $(cssFiles) # cat $^ | ./node_modules/.bin/csso -o $@ cat $^ | csso -o $@ -build/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate +build/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate mkdir -p build pandoc \ --standalone \ @@ -59,7 +59,7 @@ build/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTempl --output=$@ \ $< $(word 2,$^) -build/amp/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.amp.pandocTemplate +build/amp/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.amp.pandocTemplate mkdir -p $(dir $@) pandoc \ --standalone \ diff --git a/homepage/redesign2018/markdownExperiment/md/datenschutz.md b/homepage/redesign2018/markdownExperiment/src/md/datenschutz.md similarity index 100% rename from homepage/redesign2018/markdownExperiment/md/datenschutz.md rename to homepage/redesign2018/markdownExperiment/src/md/datenschutz.md diff --git a/homepage/redesign2018/markdownExperiment/md/download.md b/homepage/redesign2018/markdownExperiment/src/md/download.md similarity index 100% rename from homepage/redesign2018/markdownExperiment/md/download.md rename to homepage/redesign2018/markdownExperiment/src/md/download.md diff --git a/homepage/redesign2018/markdownExperiment/md/extras.md b/homepage/redesign2018/markdownExperiment/src/md/extras.md similarity index 100% rename from homepage/redesign2018/markdownExperiment/md/extras.md rename to homepage/redesign2018/markdownExperiment/src/md/extras.md diff --git a/homepage/redesign2018/markdownExperiment/md/galerie.md b/homepage/redesign2018/markdownExperiment/src/md/galerie.md similarity index 100% rename from homepage/redesign2018/markdownExperiment/md/galerie.md rename to homepage/redesign2018/markdownExperiment/src/md/galerie.md diff --git a/homepage/redesign2018/markdownExperiment/md/galerien.md b/homepage/redesign2018/markdownExperiment/src/md/galerien.md similarity index 100% rename from homepage/redesign2018/markdownExperiment/md/galerien.md rename to homepage/redesign2018/markdownExperiment/src/md/galerien.md diff --git a/homepage/redesign2018/markdownExperiment/md/hilfsmittel.md b/homepage/redesign2018/markdownExperiment/src/md/hilfsmittel.md similarity index 100% rename from homepage/redesign2018/markdownExperiment/md/hilfsmittel.md rename to homepage/redesign2018/markdownExperiment/src/md/hilfsmittel.md diff --git a/homepage/redesign2018/markdownExperiment/md/impressum.md b/homepage/redesign2018/markdownExperiment/src/md/impressum.md similarity index 100% rename from homepage/redesign2018/markdownExperiment/md/impressum.md rename to homepage/redesign2018/markdownExperiment/src/md/impressum.md diff --git a/homepage/redesign2018/markdownExperiment/md/index.md b/homepage/redesign2018/markdownExperiment/src/md/index.md similarity index 100% rename from homepage/redesign2018/markdownExperiment/md/index.md rename to homepage/redesign2018/markdownExperiment/src/md/index.md diff --git a/homepage/redesign2018/markdownExperiment/md/kontakt.md b/homepage/redesign2018/markdownExperiment/src/md/kontakt.md similarity index 100% rename from homepage/redesign2018/markdownExperiment/md/kontakt.md rename to homepage/redesign2018/markdownExperiment/src/md/kontakt.md diff --git a/homepage/redesign2018/markdownExperiment/md/links.md b/homepage/redesign2018/markdownExperiment/src/md/links.md similarity index 100% rename from homepage/redesign2018/markdownExperiment/md/links.md rename to homepage/redesign2018/markdownExperiment/src/md/links.md diff --git a/homepage/redesign2018/markdownExperiment/md/news.md b/homepage/redesign2018/markdownExperiment/src/md/news.md similarity index 100% rename from homepage/redesign2018/markdownExperiment/md/news.md rename to homepage/redesign2018/markdownExperiment/src/md/news.md diff --git a/homepage/redesign2018/markdownExperiment/md/quiz.md b/homepage/redesign2018/markdownExperiment/src/md/quiz.md similarity index 100% rename from homepage/redesign2018/markdownExperiment/md/quiz.md rename to homepage/redesign2018/markdownExperiment/src/md/quiz.md diff --git a/homepage/redesign2018/markdownExperiment/md/trainingszeiten.md b/homepage/redesign2018/markdownExperiment/src/md/trainingszeiten.md similarity index 100% rename from homepage/redesign2018/markdownExperiment/md/trainingszeiten.md rename to homepage/redesign2018/markdownExperiment/src/md/trainingszeiten.md diff --git a/homepage/redesign2018/markdownExperiment/md/verein.md b/homepage/redesign2018/markdownExperiment/src/md/verein.md similarity index 100% rename from homepage/redesign2018/markdownExperiment/md/verein.md rename to homepage/redesign2018/markdownExperiment/src/md/verein.md diff --git a/homepage/redesign2018/markdownExperiment/md/wkKalender.md b/homepage/redesign2018/markdownExperiment/src/md/wkKalender.md similarity index 100% rename from homepage/redesign2018/markdownExperiment/md/wkKalender.md rename to homepage/redesign2018/markdownExperiment/src/md/wkKalender.md From 4b81de20ef18a572a6c1924c9f0cf862130fb133 Mon Sep 17 00:00:00 2001 From: marko Date: Wed, 1 Aug 2018 13:41:53 +0200 Subject: [PATCH 4/7] =?UTF-8?q?Berichtigung=20eines=20fr=C3=BCheren=20Comm?= =?UTF-8?q?its?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes to be committed: renamed: src/cwsvJudo-2018-content.css -> src/css/cwsvJudo-2018-content.css renamed: src/cwsvJudo-2018-footer.css -> src/css/cwsvJudo-2018-footer.css renamed: src/cwsvJudo-2018-galTable.css -> src/css/cwsvJudo-2018-galTable.css renamed: src/cwsvJudo-2018-header.css -> src/css/cwsvJudo-2018-header.css renamed: src/cwsvJudo-2018-layout.css -> src/css/cwsvJudo-2018-layout.css renamed: src/cwsvJudo-2018-mainNav.css -> src/css/cwsvJudo-2018-mainNav.css renamed: src/cwsvJudo-2018-news.css -> src/css/cwsvJudo-2018-news.css renamed: src/cwsvJudo-2018-quiz.css -> src/css/cwsvJudo-2018-quiz.css renamed: src/cwsvJudo-2018-sideBar.css -> src/css/cwsvJudo-2018-sideBar.css renamed: src/cwsvJudo-2018-sponsorList.css -> src/css/cwsvJudo-2018-sponsorList.css renamed: src/cwsvJudo-2018-subNav.css -> src/css/cwsvJudo-2018-subNav.css renamed: src/cwsvJudo-2018-wkKalender.css -> src/css/cwsvJudo-2018-wkKalender.css renamed: src/cwsvJudo-2018.css -> src/css/cwsvJudo-2018.css --- .../markdownExperiment/src/{ => css}/cwsvJudo-2018-content.css | 0 .../markdownExperiment/src/{ => css}/cwsvJudo-2018-footer.css | 0 .../markdownExperiment/src/{ => css}/cwsvJudo-2018-galTable.css | 0 .../markdownExperiment/src/{ => css}/cwsvJudo-2018-header.css | 0 .../markdownExperiment/src/{ => css}/cwsvJudo-2018-layout.css | 0 .../markdownExperiment/src/{ => css}/cwsvJudo-2018-mainNav.css | 0 .../markdownExperiment/src/{ => css}/cwsvJudo-2018-news.css | 0 .../markdownExperiment/src/{ => css}/cwsvJudo-2018-quiz.css | 0 .../markdownExperiment/src/{ => css}/cwsvJudo-2018-sideBar.css | 0 .../src/{ => css}/cwsvJudo-2018-sponsorList.css | 0 .../markdownExperiment/src/{ => css}/cwsvJudo-2018-subNav.css | 0 .../markdownExperiment/src/{ => css}/cwsvJudo-2018-wkKalender.css | 0 .../markdownExperiment/src/{ => css}/cwsvJudo-2018.css | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename homepage/redesign2018/markdownExperiment/src/{ => css}/cwsvJudo-2018-content.css (100%) rename homepage/redesign2018/markdownExperiment/src/{ => css}/cwsvJudo-2018-footer.css (100%) rename homepage/redesign2018/markdownExperiment/src/{ => css}/cwsvJudo-2018-galTable.css (100%) rename homepage/redesign2018/markdownExperiment/src/{ => css}/cwsvJudo-2018-header.css (100%) rename homepage/redesign2018/markdownExperiment/src/{ => css}/cwsvJudo-2018-layout.css (100%) rename homepage/redesign2018/markdownExperiment/src/{ => css}/cwsvJudo-2018-mainNav.css (100%) rename homepage/redesign2018/markdownExperiment/src/{ => css}/cwsvJudo-2018-news.css (100%) rename homepage/redesign2018/markdownExperiment/src/{ => css}/cwsvJudo-2018-quiz.css (100%) rename homepage/redesign2018/markdownExperiment/src/{ => css}/cwsvJudo-2018-sideBar.css (100%) rename homepage/redesign2018/markdownExperiment/src/{ => css}/cwsvJudo-2018-sponsorList.css (100%) rename homepage/redesign2018/markdownExperiment/src/{ => css}/cwsvJudo-2018-subNav.css (100%) rename homepage/redesign2018/markdownExperiment/src/{ => css}/cwsvJudo-2018-wkKalender.css (100%) rename homepage/redesign2018/markdownExperiment/src/{ => css}/cwsvJudo-2018.css (100%) diff --git a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-content.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-content.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-content.css rename to homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-content.css diff --git a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-footer.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-footer.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-footer.css rename to homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-footer.css diff --git a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-galTable.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-galTable.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-galTable.css rename to homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-galTable.css diff --git a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-header.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-header.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-header.css rename to homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-header.css diff --git a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-layout.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-layout.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-layout.css rename to homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-layout.css diff --git a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-mainNav.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-mainNav.css rename to homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css diff --git a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-news.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-news.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-news.css rename to homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-news.css diff --git a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-quiz.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-quiz.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-quiz.css rename to homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-quiz.css diff --git a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-sideBar.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-sideBar.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-sideBar.css rename to homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-sideBar.css diff --git a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-sponsorList.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-sponsorList.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-sponsorList.css rename to homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-sponsorList.css diff --git a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-subNav.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-subNav.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-subNav.css rename to homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-subNav.css diff --git a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-wkKalender.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018-wkKalender.css rename to homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css diff --git a/homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css similarity index 100% rename from homepage/redesign2018/markdownExperiment/src/cwsvJudo-2018.css rename to homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018.css From 0b89cf940237f1a7b82399b6ec90936f07d30fc7 Mon Sep 17 00:00:00 2001 From: marko Date: Fri, 3 Aug 2018 07:39:09 +0200 Subject: [PATCH 5/7] - die extraSektion hat ein Icon bekommen und wurde als MetaNavTarget angelegt - kleinere Korrekturen in den MetaNavTargets On branch redesign2018 Changes to be committed: modified: homepage/redesign2018/markdownExperiment/yaml/galerien.subNav.yaml modified: homepage/redesign2018/markdownExperiment/yaml/images.yaml modified: homepage/redesign2018/markdownExperiment/yaml/index.subNav.yaml modified: homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml --- .../markdownExperiment/yaml/galerien.subNav.yaml | 1 + homepage/redesign2018/markdownExperiment/yaml/images.yaml | 5 +++++ .../markdownExperiment/yaml/index.subNav.yaml | 2 +- .../redesign2018/markdownExperiment/yaml/navTargets.yaml | 8 ++++++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/homepage/redesign2018/markdownExperiment/yaml/galerien.subNav.yaml b/homepage/redesign2018/markdownExperiment/yaml/galerien.subNav.yaml index a74fc7e..7853e34 100644 --- a/homepage/redesign2018/markdownExperiment/yaml/galerien.subNav.yaml +++ b/homepage/redesign2018/markdownExperiment/yaml/galerien.subNav.yaml @@ -4,6 +4,7 @@ subNav: - *training - *verein - *wkKalender + - {caption: "Galerien ", icon: *iconGallery, url: "/galerien?jahr="} - *feierGalerien - *zeltenGalerien ... diff --git a/homepage/redesign2018/markdownExperiment/yaml/images.yaml b/homepage/redesign2018/markdownExperiment/yaml/images.yaml index 8221045..6d3c8c6 100644 --- a/homepage/redesign2018/markdownExperiment/yaml/images.yaml +++ b/homepage/redesign2018/markdownExperiment/yaml/images.yaml @@ -43,4 +43,9 @@ iconWikipediaW: &iconWikipediaW height: "1700" alt: "Kontakt" src: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/wikipediaW.svg" +iconExtrasStern: &iconExtrasStern + width: "100" + height: "100" + alt: "Extras" + src: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/star.svg" ... diff --git a/homepage/redesign2018/markdownExperiment/yaml/index.subNav.yaml b/homepage/redesign2018/markdownExperiment/yaml/index.subNav.yaml index 0696814..0cbd470 100644 --- a/homepage/redesign2018/markdownExperiment/yaml/index.subNav.yaml +++ b/homepage/redesign2018/markdownExperiment/yaml/index.subNav.yaml @@ -6,5 +6,5 @@ subNav: - *galerien - *kontakt - *judoWiki - - {url: "/extras", caption: "Extras"} + - *extras ... diff --git a/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml b/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml index daf40eb..f9b3cfa 100644 --- a/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml +++ b/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml @@ -42,10 +42,14 @@ kontakt: &kontakt caption: "Kontakt" url: "/kontakt" icon: *iconContact -kontakt: &impressum +extras: &extras + caption: "Extras" + url: "/extras" + icon: *iconExtrasStern +impressum: &impressum caption: "Impressum" url: "/impressum" -kontakt: &datenschutz +datenschutz: &datenschutz caption: "Datenschutz" url: "/datenschutz" quiz: &quiz From 293df723888b5a33b711b62cbfb4496f51c818e8 Mon Sep 17 00:00:00 2001 From: marko Date: Fri, 3 Aug 2018 14:26:01 +0200 Subject: [PATCH 6/7] - Verschieben der yamlMetadaten in den srcOrdner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On branch redesign2018 Changes to be committed: - buildProzess angepasst modified: Makefile - überflüssige Datei entfernt deleted: cleancss - eigentliches Verschieben renamed: yaml/datenschutz.subNav.yaml -> src/yaml/datenschutz.subNav.yaml renamed: yaml/download.subNav.yaml -> src/yaml/download.subNav.yaml renamed: yaml/extras.subNav.yaml -> src/yaml/extras.subNav.yaml renamed: yaml/galerie.subNav.yaml -> src/yaml/galerie.subNav.yaml renamed: yaml/galerien.subNav.yaml -> src/yaml/galerien.subNav.yaml renamed: yaml/hilfsmittel.subNav.yaml -> src/yaml/hilfsmittel.subNav.yaml renamed: yaml/images.yaml -> src/yaml/images.yaml renamed: yaml/impressum.subNav.yaml -> src/yaml/impressum.subNav.yaml renamed: yaml/index.subNav.yaml -> src/yaml/index.subNav.yaml renamed: yaml/kontakt.subNav.yaml -> src/yaml/kontakt.subNav.yaml renamed: yaml/links.subNav.yaml -> src/yaml/links.subNav.yaml renamed: yaml/mainNav.yaml -> src/yaml/mainNav.yaml renamed: yaml/navTargets.yaml -> src/yaml/navTargets.yaml renamed: yaml/news.subNav.yaml -> src/yaml/news.subNav.yaml renamed: yaml/quiz.subNav.yaml -> src/yaml/quiz.subNav.yaml renamed: yaml/trainingszeiten.subNav.yaml -> src/yaml/trainingszeiten.subNav.yaml renamed: yaml/verein.subNav.yaml -> src/yaml/verein.subNav.yaml renamed: yaml/wkKalender.subNav.yaml -> src/yaml/wkKalender.subNav.yaml --- homepage/redesign2018/markdownExperiment/Makefile | 4 +++- homepage/redesign2018/markdownExperiment/cleancss | 0 .../markdownExperiment/{ => src}/yaml/datenschutz.subNav.yaml | 0 .../markdownExperiment/{ => src}/yaml/download.subNav.yaml | 0 .../markdownExperiment/{ => src}/yaml/extras.subNav.yaml | 0 .../markdownExperiment/{ => src}/yaml/galerie.subNav.yaml | 0 .../markdownExperiment/{ => src}/yaml/galerien.subNav.yaml | 0 .../markdownExperiment/{ => src}/yaml/hilfsmittel.subNav.yaml | 0 .../markdownExperiment/{ => src}/yaml/images.yaml | 0 .../markdownExperiment/{ => src}/yaml/impressum.subNav.yaml | 0 .../markdownExperiment/{ => src}/yaml/index.subNav.yaml | 0 .../markdownExperiment/{ => src}/yaml/kontakt.subNav.yaml | 0 .../markdownExperiment/{ => src}/yaml/links.subNav.yaml | 0 .../markdownExperiment/{ => src}/yaml/mainNav.yaml | 0 .../markdownExperiment/{ => src}/yaml/navTargets.yaml | 0 .../markdownExperiment/{ => src}/yaml/news.subNav.yaml | 0 .../markdownExperiment/{ => src}/yaml/quiz.subNav.yaml | 0 .../{ => src}/yaml/trainingszeiten.subNav.yaml | 0 .../markdownExperiment/{ => src}/yaml/verein.subNav.yaml | 0 .../markdownExperiment/{ => src}/yaml/wkKalender.subNav.yaml | 0 20 files changed, 3 insertions(+), 1 deletion(-) delete mode 100644 homepage/redesign2018/markdownExperiment/cleancss rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/datenschutz.subNav.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/download.subNav.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/extras.subNav.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/galerie.subNav.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/galerien.subNav.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/hilfsmittel.subNav.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/images.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/impressum.subNav.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/index.subNav.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/kontakt.subNav.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/links.subNav.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/mainNav.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/navTargets.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/news.subNav.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/quiz.subNav.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/trainingszeiten.subNav.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/verein.subNav.yaml (100%) rename homepage/redesign2018/markdownExperiment/{ => src}/yaml/wkKalender.subNav.yaml (100%) diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile index a5b8f3c..9fcf48d 100644 --- a/homepage/redesign2018/markdownExperiment/Makefile +++ b/homepage/redesign2018/markdownExperiment/Makefile @@ -71,7 +71,9 @@ build/amp/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.amp.pando # sed --in-place 's//