From 4394153c12d9c6283b1fc8938bfae4b6db1f2e2b Mon Sep 17 00:00:00 2001 From: marko Date: Sun, 8 Jul 2018 11:41:18 +0200 Subject: [PATCH] =?UTF-8?q?-=20das=20tempor=C3=A4re=20Verzeichnis=20ignori?= =?UTF-8?q?eren=20=09ge=C3=A4ndert:=20=20=20=20=20=20=20.gitignore=20-=20d?= =?UTF-8?q?en=20judoWiki-Link=20in=20der=20homeSeite=20hinzugef=C3=BCgt=20?= =?UTF-8?q?=09ge=C3=A4ndert:=20=20=20=20=20=20=20yaml/images.yaml=20=09ge?= =?UTF-8?q?=C3=A4ndert:=20=20=20=20=20=20=20yaml/index.subNav.yaml=20=09ge?= =?UTF-8?q?=C3=A4ndert:=20=20=20=20=20=20=20yaml/navTargets.yaml=20=09ge?= =?UTF-8?q?=C3=A4ndert:=20=20=20=20=20=20=20css/cwsvJudo-2018-subNav.css?= =?UTF-8?q?=20-=20=C3=BCberfl=C3=BCssiges=20entfernt=20=09gel=C3=B6scht:?= =?UTF-8?q?=20=20=20=20=20=20=20md/indexTest.md=20=09gel=C3=B6scht:=20=20?= =?UTF-8?q?=20=20=20=20=20npm-debug.log=20-=20etwas=20an=20der=20Einzelans?= =?UTF-8?q?icht=20gefeilt=20=09ge=C3=A4ndert:=20=20=20=20=20=20=20phpLib/c?= =?UTF-8?q?wsvJudo/wkKalender.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../markdownExperiment/.gitignore | 2 + .../css/cwsvJudo-2018-subNav.css | 9 +- .../markdownExperiment/md/indexTest.md | 36 ----- .../markdownExperiment/npm-debug.log | 130 ------------------ .../phpLib/cwsvJudo/wkKalender.php | 32 +++-- .../markdownExperiment/yaml/images.yaml | 5 + .../markdownExperiment/yaml/index.subNav.yaml | 1 + .../markdownExperiment/yaml/navTargets.yaml | 5 + 8 files changed, 34 insertions(+), 186 deletions(-) delete mode 100644 homepage/redesign2018/markdownExperiment/md/indexTest.md delete mode 100644 homepage/redesign2018/markdownExperiment/npm-debug.log diff --git a/homepage/redesign2018/markdownExperiment/.gitignore b/homepage/redesign2018/markdownExperiment/.gitignore index 5236e1e..35da9a1 100644 --- a/homepage/redesign2018/markdownExperiment/.gitignore +++ b/homepage/redesign2018/markdownExperiment/.gitignore @@ -1,2 +1,4 @@ *~ +temp/* + diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-subNav.css b/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-subNav.css index 7f9b9a1..beb2b70 100644 --- a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-subNav.css +++ b/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-subNav.css @@ -13,7 +13,7 @@ .subNav > a { color: #34495e; text-decoration: none; - padding: 10px 15px; + padding: .25em .5em; text-transform: uppercase; text-align: center; display: block; @@ -27,8 +27,9 @@ max-width: 1em; } .subNav > a > img{ - height: 1em; + height: 1.75em; width: auto; + display: block; } .subNav > a > span{ @@ -41,15 +42,11 @@ } - - /* ================================= Media Queries ==================================== */ - - @media (min-width: 640px) { .subNav { display: flex; diff --git a/homepage/redesign2018/markdownExperiment/md/indexTest.md b/homepage/redesign2018/markdownExperiment/md/indexTest.md deleted file mode 100644 index 2333807..0000000 --- a/homepage/redesign2018/markdownExperiment/md/indexTest.md +++ /dev/null @@ -1,36 +0,0 @@ ---- -home: &home - - {caption: "Home", url: "/", icon: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvJudoLogoWappen.x256.png"} -verein: &verein - - {caption: "Verein", url: "/verein", icon: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvLogoWappen.x250.png"} -galerien: &galerien - - {caption: "Galerien", url: "/galerien", icon: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/gallery.svg"} -title: Homepage der Judoka des Chemnitzer Freizeit- und Wohngebietssportvereines e. V. -author: marko -keywords: - - Judo - - Chemnitzer Freizeit- und Wohngebietssportverein -subNav: - - *home - - *verein - - *galerien -... - -# Willkommen - -auf der Website des Judo-Teams des [Chem­nitzer Frei­zeit- und Wohng­ebiets­sport­vereines e. V][cwsvHomepage] -Hier findet ihr Informationen zu unseren [Trainingszeiten][cwsvJudoTraining] -und [Wettkampfterminen][cwsvJudoWettkampfKalender]. - -Ein kleines Wiki bietet [Wissenswertes über Judo][cwsvJudoWiki], wie -zum Beispiel das [Programm für die Gürtelprüfungen][cwsvJudoWikiKyu]. - -# Die letzten Neuigkeiten - - - -[cwsvHomepage]: http://www.cwsv-sport.de "Homepage des Chemnitzer Freizeit- und Wohngebietssportvereines" -[cwsvJudoTraining]: http://cwsvjudo.bplaced.net/training "Trainingszeiten der Judoka des Chemnitzer Freizeit- und Wohngebietssportvereines -[cwsvJudoWettkampfKalender]: http://cwsvjudo.bplaced.net/wkKalender "Wettkampfkalender der Judoka des CWSV" -[cwsvJudoWiki]: http://cwsvjudo.bplaced.net/JudoWiki "Ein kleines Wiki über Judo" -[cwsvJudoWikiKyu]: http://cwsvjudo.bplaced.net/JudoWiki/Kyu/Kyu "Kyuprüfungsprogramme im Judo" diff --git a/homepage/redesign2018/markdownExperiment/npm-debug.log b/homepage/redesign2018/markdownExperiment/npm-debug.log deleted file mode 100644 index 9e0a48b..0000000 --- a/homepage/redesign2018/markdownExperiment/npm-debug.log +++ /dev/null @@ -1,130 +0,0 @@ -0 info it worked if it ends with ok -1 verbose cli [ '/usr/bin/nodejs', -1 verbose cli '/usr/bin/npm', -1 verbose cli 'install', -1 verbose cli '-g', -1 verbose cli '@alexlafroscia/yaml-merge' ] -2 info using npm@1.4.21 -3 info using node@v0.10.29 -4 verbose cache add [ '@alexlafroscia/yaml-merge', null ] -5 verbose cache add name=undefined spec="@alexlafroscia/yaml-merge" args=["@alexlafroscia/yaml-merge",null] -6 verbose parsed url { protocol: null, -6 verbose parsed url slashes: null, -6 verbose parsed url auth: null, -6 verbose parsed url host: null, -6 verbose parsed url port: null, -6 verbose parsed url hostname: null, -6 verbose parsed url hash: null, -6 verbose parsed url search: null, -6 verbose parsed url query: null, -6 verbose parsed url pathname: '@alexlafroscia/yaml-merge', -6 verbose parsed url path: '@alexlafroscia/yaml-merge', -6 verbose parsed url href: '@alexlafroscia/yaml-merge' } -7 verbose cache add name="" spec="alexlafroscia/yaml-merge" args=["","alexlafroscia/yaml-merge"] -8 verbose parsed url { protocol: null, -8 verbose parsed url slashes: null, -8 verbose parsed url auth: null, -8 verbose parsed url host: null, -8 verbose parsed url port: null, -8 verbose parsed url hostname: null, -8 verbose parsed url hash: null, -8 verbose parsed url search: null, -8 verbose parsed url query: null, -8 verbose parsed url pathname: 'alexlafroscia/yaml-merge', -8 verbose parsed url path: 'alexlafroscia/yaml-merge', -8 verbose parsed url href: 'alexlafroscia/yaml-merge' } -9 silly lockFile 1d8d115d-alexlafroscia-yaml-merge alexlafroscia/yaml-merge -10 verbose lock alexlafroscia/yaml-merge /home/marko/.npm/1d8d115d-alexlafroscia-yaml-merge.lock -11 info maybeGithub Attempting alexlafroscia/yaml-merge from git://github.com/alexlafroscia/yaml-merge -12 silly lockFile 2d42cdf8-hub-com-alexlafroscia-yaml-merge git://github.com/alexlafroscia/yaml-merge -13 verbose lock git://github.com/alexlafroscia/yaml-merge /home/marko/.npm/2d42cdf8-hub-com-alexlafroscia-yaml-merge.lock -14 verbose addRemoteGit [ 'git://github.com/alexlafroscia/yaml-merge', 'master' ] -15 verbose git clone git://github.com/alexlafroscia/yaml-merge Klone in Bare-Repository '/home/marko/.npm/_git-remotes/git-github-com-alexlafroscia-yaml-merge-2d42cdf8'... -16 verbose git fetch -a origin (git://github.com/alexlafroscia/yaml-merge) -17 verbose git rev-list -n1 master 99a937c3172dc784c63d3d0ea3b6bc059d6c4f22 -18 verbose resolved git url git://github.com/alexlafroscia/yaml-merge#99a937c3172dc784c63d3d0ea3b6bc059d6c4f22 -19 verbose tar unpack /tmp/npm-28146-cGBw8kqs/1525539579830-0.6932127722539008/tmp.tgz -20 silly lockFile 78d48209--6932127722539008-tmp-tgz-unpack tar:///tmp/npm-28146-cGBw8kqs/1525539579830-0.6932127722539008/tmp.tgz-unpack -21 verbose lock tar:///tmp/npm-28146-cGBw8kqs/1525539579830-0.6932127722539008/tmp.tgz-unpack /home/marko/.npm/78d48209--6932127722539008-tmp-tgz-unpack.lock -22 silly lockFile 6af4c03c-79830-0-6932127722539008-tmp-tgz tar:///tmp/npm-28146-cGBw8kqs/1525539579830-0.6932127722539008/tmp.tgz -23 verbose lock tar:///tmp/npm-28146-cGBw8kqs/1525539579830-0.6932127722539008/tmp.tgz /home/marko/.npm/6af4c03c-79830-0-6932127722539008-tmp-tgz.lock -24 silly gunzTarPerm modes [ '755', '644' ] -25 silly gunzTarPerm extractEntry -26 silly gunzTarPerm modified mode [ '', 509, 493 ] -27 silly gunzTarPerm extractEntry .eslintrc.js -28 silly gunzTarPerm modified mode [ '.eslintrc.js', 436, 420 ] -29 silly gunzTarPerm extractEntry .travis.yml -30 silly gunzTarPerm modified mode [ '.travis.yml', 436, 420 ] -31 silly gunzTarPerm extractEntry README.md -32 silly gunzTarPerm modified mode [ 'README.md', 436, 420 ] -33 silly gunzTarPerm extractEntry bin/ -34 silly gunzTarPerm modified mode [ 'bin/', 509, 493 ] -35 silly gunzTarPerm extractEntry bin/yaml-merge -36 silly gunzTarPerm modified mode [ 'bin/yaml-merge', 509, 493 ] -37 silly gunzTarPerm extractEntry index.js -38 silly gunzTarPerm modified mode [ 'index.js', 436, 420 ] -39 silly gunzTarPerm extractEntry package.json -40 silly gunzTarPerm modified mode [ 'package.json', 436, 420 ] -41 silly gunzTarPerm extractEntry test/ -42 silly gunzTarPerm modified mode [ 'test/', 509, 493 ] -43 silly gunzTarPerm extractEntry test/fixtures/ -44 silly gunzTarPerm modified mode [ 'test/fixtures/', 509, 493 ] -45 silly gunzTarPerm extractEntry test/fixtures/basic/ -46 silly gunzTarPerm modified mode [ 'test/fixtures/basic/', 509, 493 ] -47 silly gunzTarPerm extractEntry test/fixtures/basic/a.yml -48 silly gunzTarPerm modified mode [ 'test/fixtures/basic/a.yml', 436, 420 ] -49 silly gunzTarPerm extractEntry test/fixtures/basic/b.yml -50 silly gunzTarPerm modified mode [ 'test/fixtures/basic/b.yml', 436, 420 ] -51 silly gunzTarPerm extractEntry test/fixtures/merge/ -52 silly gunzTarPerm modified mode [ 'test/fixtures/merge/', 509, 493 ] -53 silly gunzTarPerm extractEntry test/fixtures/merge/a.yml -54 silly gunzTarPerm modified mode [ 'test/fixtures/merge/a.yml', 436, 420 ] -55 silly gunzTarPerm extractEntry test/fixtures/merge/b.yml -56 silly gunzTarPerm modified mode [ 'test/fixtures/merge/b.yml', 436, 420 ] -57 silly gunzTarPerm extractEntry test/fixtures/overwrite/ -58 silly gunzTarPerm modified mode [ 'test/fixtures/overwrite/', 509, 493 ] -59 silly gunzTarPerm extractEntry test/fixtures/overwrite/a.yml -60 silly gunzTarPerm modified mode [ 'test/fixtures/overwrite/a.yml', 436, 420 ] -61 silly gunzTarPerm extractEntry test/fixtures/overwrite/b.yml -62 silly gunzTarPerm modified mode [ 'test/fixtures/overwrite/b.yml', 436, 420 ] -63 silly gunzTarPerm extractEntry test/fixtures/overwrite/c.yml -64 silly gunzTarPerm modified mode [ 'test/fixtures/overwrite/c.yml', 436, 420 ] -65 silly gunzTarPerm extractEntry test/lib-test.js -66 silly gunzTarPerm modified mode [ 'test/lib-test.js', 436, 420 ] -67 silly gunzTarPerm extractEntry yarn.lock -68 silly gunzTarPerm modified mode [ 'yarn.lock', 436, 420 ] -69 silly lockFile 78d48209--6932127722539008-tmp-tgz-unpack tar:///tmp/npm-28146-cGBw8kqs/1525539579830-0.6932127722539008/tmp.tgz-unpack -70 silly lockFile 78d48209--6932127722539008-tmp-tgz-unpack tar:///tmp/npm-28146-cGBw8kqs/1525539579830-0.6932127722539008/tmp.tgz-unpack -71 silly lockFile 6af4c03c-79830-0-6932127722539008-tmp-tgz tar:///tmp/npm-28146-cGBw8kqs/1525539579830-0.6932127722539008/tmp.tgz -72 silly lockFile 6af4c03c-79830-0-6932127722539008-tmp-tgz tar:///tmp/npm-28146-cGBw8kqs/1525539579830-0.6932127722539008/tmp.tgz -73 silly lockFile 2d42cdf8-hub-com-alexlafroscia-yaml-merge git://github.com/alexlafroscia/yaml-merge -74 silly lockFile 2d42cdf8-hub-com-alexlafroscia-yaml-merge git://github.com/alexlafroscia/yaml-merge -75 info maybeGithub Attempting alexlafroscia/yaml-merge from git+ssh://git@github.com:alexlafroscia/yaml-merge -76 silly lockFile 1b0cab5c-hub-com-alexlafroscia-yaml-merge git@github.com:alexlafroscia/yaml-merge -77 verbose lock git@github.com:alexlafroscia/yaml-merge /home/marko/.npm/1b0cab5c-hub-com-alexlafroscia-yaml-merge.lock -78 verbose addRemoteGit [ 'git@github.com:alexlafroscia/yaml-merge', 'master' ] -79 error git clone git@github.com:alexlafroscia/yaml-merge Klone in Bare-Repository '/home/marko/.npm/_git-remotes/git-github-com-alexlafroscia-yaml-merge-1b0cab5c'... -79 error git clone git@github.com:alexlafroscia/yaml-merge Warning: Permanently added 'github.com,192.30.253.113' (RSA) to the list of known hosts. -79 error git clone git@github.com:alexlafroscia/yaml-merge Permission denied (publickey). -79 error git clone git@github.com:alexlafroscia/yaml-merge fatal: Could not read from remote repository. -79 error git clone git@github.com:alexlafroscia/yaml-merge -79 error git clone git@github.com:alexlafroscia/yaml-merge Please make sure you have the correct access rights -79 error git clone git@github.com:alexlafroscia/yaml-merge and the repository exists. -80 silly lockFile 1b0cab5c-hub-com-alexlafroscia-yaml-merge git@github.com:alexlafroscia/yaml-merge -81 silly lockFile 1b0cab5c-hub-com-alexlafroscia-yaml-merge git@github.com:alexlafroscia/yaml-merge -82 silly lockFile 1d8d115d-alexlafroscia-yaml-merge alexlafroscia/yaml-merge -83 silly lockFile 1d8d115d-alexlafroscia-yaml-merge alexlafroscia/yaml-merge -84 error addLocal Could not install alexlafroscia/yaml-merge -85 error Error: ENOENT, stat 'alexlafroscia/yaml-merge' -86 error If you need help, you may report this *entire* log, -86 error including the npm and node versions, at: -86 error -87 error System Linux 4.0.5-antix.2-amd64-smp -88 error command "/usr/bin/nodejs" "/usr/bin/npm" "install" "-g" "@alexlafroscia/yaml-merge" -89 error cwd /home/marko/keeper/judo/homepage/redesign2018/markdownExperiment -90 error node -v v0.10.29 -91 error npm -v 1.4.21 -92 error path alexlafroscia/yaml-merge -93 error code ENOENT -94 error errno 34 -95 verbose exit [ 34, true ] diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php index c6da705..d18401f 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php @@ -267,7 +267,6 @@ function wkTableHtml(){ $siteData['errors'][] = "Error!: " . $db_error->getMessage(); } - // Abfrage der Wettkampfdaten der Einzelansicht if(!empty($_GET['wkId'])){ $wkInfo=getWk ($db_connection, array('wkId'=>$_GET['wkId']) ); @@ -280,25 +279,30 @@ function wkTableHtml(){ if( !empty($wkInfo) ){ foreach($wkInfo as $wk){ $siteData['mainContent'] .= - "

".$wk['Veranstaltung']."

". - "". - "". + "". "
"; } } diff --git a/homepage/redesign2018/markdownExperiment/yaml/images.yaml b/homepage/redesign2018/markdownExperiment/yaml/images.yaml index 3acecec..8221045 100644 --- a/homepage/redesign2018/markdownExperiment/yaml/images.yaml +++ b/homepage/redesign2018/markdownExperiment/yaml/images.yaml @@ -38,4 +38,9 @@ iconContact: &iconContact height: "943" alt: "Kontakt" src: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/contact4Ways.svg" +iconWikipediaW: &iconWikipediaW + width: "1700" + height: "1700" + alt: "Kontakt" + src: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/wikipediaW.svg" ... diff --git a/homepage/redesign2018/markdownExperiment/yaml/index.subNav.yaml b/homepage/redesign2018/markdownExperiment/yaml/index.subNav.yaml index 87c6628..0696814 100644 --- a/homepage/redesign2018/markdownExperiment/yaml/index.subNav.yaml +++ b/homepage/redesign2018/markdownExperiment/yaml/index.subNav.yaml @@ -5,5 +5,6 @@ subNav: - *wkParticipo - *galerien - *kontakt + - *judoWiki - {url: "/extras", caption: "Extras"} ... diff --git a/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml b/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml index 688ad85..d6704f3 100644 --- a/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml +++ b/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml @@ -4,6 +4,11 @@ home: &home url: "/" title: "Startseite" icon: *cwsvJudoLogoWappen +judoWiki: &judoWiki + caption: "JudoWiki" + url: "/JudoWiki" + title: "Lexikon über Judo in Form eines Wiki" + icon: *iconWikipediaW training: &training caption: "Trainings­zeiten" icon: *iconClockFriendly