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

- das temporäre Verzeichnis ignorieren

Browse Source 
geändert:       .gitignore
- den judoWiki-Link in der homeSeite hinzugefügt
	geändert:       yaml/images.yaml
	geändert:       yaml/index.subNav.yaml
	geändert:       yaml/navTargets.yaml
	geändert:       css/cwsvJudo-2018-subNav.css
- überflüssiges entfernt
	gelöscht:       md/indexTest.md
	gelöscht:       npm-debug.log
- etwas an der Einzelansicht gefeilt
	geändert:       phpLib/cwsvJudo/wkKalender.php
This commit is contained in:
marko
2018-07-08 11:41:18 +02:00
parent 09fc579fd8
commit 4394153c12
8 changed files with 34 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

9
homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-subNav.css
View File

@@ -13,7 +13,7 @@
.subNav > a { .subNav > a {
color: #34495e; color: #34495e;
text-decoration: none; text-decoration: none;
padding: 10px 15px; padding: .25em .5em;
text-transform: uppercase; text-transform: uppercase;
text-align: center; text-align: center;
display: block; display: block;
@@ -27,8 +27,9 @@
max-width: 1em; max-width: 1em;
} }
.subNav > a > img{ .subNav > a > img{
height: 1em; height: 1.75em;
width: auto; width: auto;
display: block;
} }
.subNav > a > span{ .subNav > a > span{
@@ -41,15 +42,11 @@
} }
/* ================================= /* =================================
Media Queries Media Queries
==================================== */ ==================================== */
@media (min-width: 640px) { @media (min-width: 640px) {
.subNav { .subNav {
display: flex; display: flex;

36
homepage/redesign2018/markdownExperiment/md/indexTest.md
View File

@@ -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
<?php $options['limit']=6; echoNewsTableHtml( $options );?>
[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"

130
homepage/redesign2018/markdownExperiment/npm-debug.log
View File

@@ -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 <http://github.com/npm/npm/issues>
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 ]

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

@@ -267,7 +267,6 @@ function wkTableHtml(){
$siteData['errors'][] = "Error!: " . $db_error->getMessage(); $siteData['errors'][] = "Error!: " . $db_error->getMessage();
} }
// Abfrage der Wettkampfdaten der Einzelansicht // Abfrage der Wettkampfdaten der Einzelansicht
if(!empty($_GET['wkId'])){ if(!empty($_GET['wkId'])){
$wkInfo=getWk ($db_connection, array('wkId'=>$_GET['wkId']) ); $wkInfo=getWk ($db_connection, array('wkId'=>$_GET['wkId']) );
@@ -280,25 +279,30 @@ function wkTableHtml(){
if( !empty($wkInfo) ){ if( !empty($wkInfo) ){
foreach($wkInfo as $wk){ foreach($wkInfo as $wk){
$siteData['mainContent'] .= $siteData['mainContent'] .=
"<h2>".$wk['Veranstaltung']."</h2>". "<h1>Einzelansicht</h1>".
"<ul>". "<div class\"wkInfoBox\">".
"<li>Datum: <time datetime=".$wk['Datum'].">".strftime("%a, %d. %B %Y", strtotime($wk['Datum']))."</time></li>". "<h2>".$wk['Veranstaltung']."</h2>".
"<li>Altersklassen: ".$wk['Altersklassen']."</li>". "<h3>Veranstaltungsdaten</h3>".
"<li>Ort: <a href=\"".$wk['Routenplaner']."\">".$wk['Ort']."</a></li>".
"</ul>".
"<nav>".
"<ul>". "<ul>".
"<li><a href =\"".$wk['Ausschreibung']."\"><div>Link zur Ausschreibung</div></a></li>". "<li>Datum: <time datetime=".$wk['Datum'].">".strftime("%a, %d. %B %Y", strtotime($wk['Datum']))."</time></li>".
"<li><a href =\"".$wk['Routenplaner'] ."\"><div>Link zum Routenplaner</div></a></li>". "<li>Altersklassen: ".$wk['Altersklassen']."</li>".
"<li><a href =\"/ressourcen/phpLib/calendar.php?wkID=".$wk['lfdeNr']."\"><div>Termin in Kalender übernehmen</div></a></li>"; "<li>Ort: <a href=\"".$wk['Routenplaner']."\">".$wk['Ort']."</a></li>".
"</ul>".
"<nav>".
"<ul>".
"<li><a href =\"".$wk['Ausschreibung']."\"><div>Link zur Ausschreibung</div></a></li>".
"<li><a href =\"".$wk['Routenplaner'] ."\"><div>Link zum Routenplaner</div></a></li>".
"<li><a href =\"/ressourcen/phpLib/calendar.php?wkID=".$wk['lfdeNr']."\"><div>Termin in Kalender übernehmen</div></a></li>";
if( !empty($wkGals) ){ if( !empty($wkGals) ){
foreach($wkGals as $wkGal){ foreach($wkGals as $wkGal){
$siteData['mainContent'] .= "<li><a href=\"".$wkGal['url']."\">".$wkGal['typ']."galerie</a></li>"; $siteData['mainContent'] .=
"<li><a href=\"".$wkGal['url']."\">".$wkGal['typ']."galerie</a></li>";
} }
} }
$siteData['mainContent'] .= $siteData['mainContent'] .=
"</ul>". "</ul>".
"</nav>". "</nav>".
"</div>".
"<hr />"; "<hr />";
} }
} }

5
homepage/redesign2018/markdownExperiment/yaml/images.yaml
View File

@@ -38,4 +38,9 @@ iconContact: &iconContact
height: "943" height: "943"
alt: "Kontakt" alt: "Kontakt"
src: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/contact4Ways.svg" 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"
... ...

1
homepage/redesign2018/markdownExperiment/yaml/index.subNav.yaml
View File

@@ -5,5 +5,6 @@ subNav:
- *wkParticipo - *wkParticipo
- *galerien - *galerien
- *kontakt - *kontakt
- *judoWiki
- {url: "/extras", caption: "Extras"} - {url: "/extras", caption: "Extras"}
... ...

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

@@ -4,6 +4,11 @@ home: &home
url: "/" url: "/"
title: "Startseite" title: "Startseite"
icon: *cwsvJudoLogoWappen icon: *cwsvJudoLogoWappen
judoWiki: &judoWiki
caption: "JudoWiki"
url: "/JudoWiki"
title: "Lexikon über Judo in Form eines Wiki"
icon: *iconWikipediaW
training: &training training: &training
caption: "Trainings&#173;zeiten" caption: "Trainings&#173;zeiten"
icon: *iconClockFriendly icon: *iconClockFriendly