Skip to content

Commit 0c6ea5b

Browse files
mk1012mk1012
committed
Merge branch 'master' of github.com:coderdojoka/coderdojoka.github.io
2 parents c2f81df + 63e9700 commit 0c6ea5b

File tree

5 files changed

+216
-85
lines changed

5 files changed

+216
-85
lines changed

‎css/coderdojoka.css‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -521,12 +521,17 @@ body {
521521

522522
#timeline .timeline-badge span.timeline-balloon-date-day {
523523
font-size: 1.4em;
524+
display: inline-block;
525+
width: 50px;
524526
}
525527

526528
#timeline .timeline-badge span.timeline-balloon-date-month {
527529
font-size: .7em;
528530
position: relative;
529531
top: -10px;
532+
text-transform: uppercase;
533+
display: inline-block;
534+
width: 50px;
530535
}
531536

532537
#timeline .timeline-badge.timeline-filter-movement {
@@ -760,27 +765,27 @@ body {
760765
}
761766

762767
.neues{
763-
764-
width: 80%;
765-
margin: 100px auto;
766-
768+
769+
width: 80%;
770+
margin: 100px auto;
771+
767772
}
768773

769774
.neues p{
770-
text-align: left;
771-
margin: 60px auto 30px auto;
775+
text-align: left;
776+
margin: 60px auto 30px auto;
772777

773778
}
774779

775780
.le{
776-
float: left;
781+
float: left;
777782
}
778783
.ri{
779-
float: right;
784+
float: right;
780785
}
781786

782787
#balken{
783-
margin: 60px auto;
788+
margin: 60px auto;
784789
}
785790

786791
#float_neu{
@@ -790,19 +795,19 @@ body {
790795

791796
.sichtbar_halb{
792797

793-
display: none;
798+
display: none;
794799

795800
}
796801

797802
#float_neu:after{
798-
content:'';
803+
content:'';
799804
display:block;
800805
clear: both;
801806
}
802807
@media (min-width:650px){
803808
.sichtbar_halb{
804809

805-
display: block;
810+
display: block;
806811

807812
}
808813
}

Teilnahmebedingungen.pdf renamed to doc/Teilnahmebedingungen.pdf

File renamed without changes.

‎index.html‎

Lines changed: 46 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
type="text/css">
3030
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
3131

32+
<!-- AngularJS base and data scripts -->
33+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular.min.js"></script>
34+
<script src="js-data/webApp.js"></script>
35+
<script src="js-data/eventController.js"></script>
36+
3237
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
3338
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
3439
<!--[if lt IE 9]>
@@ -54,7 +59,7 @@
5459
</script>
5560
</head>
5661

57-
<body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
62+
<body data-ng-app="webApp" id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
5863

5964
<!-- Navigation -->
6065
<nav class="navbar navbar-custom navbar-fixed-top" role="navigation">
@@ -94,11 +99,7 @@
9499
<a href="neues.html">Neues</a>
95100
</li>
96101

97-
98-
99-
100-
101-
<li class="dropdown hidden-xs">
102+
<li class="dropdown hidden-xs">
102103
<a class="dropdown-toggle" href="#about">Informationen</a>
103104
<ul class="dropdown-menu">
104105
<li>
@@ -113,20 +114,18 @@
113114
</ul>
114115
</li>
115116

116-
117-
118-
119-
120117
<li>
121118
<a class="page-scroll" href="#events">Termine</a>
122119
</li>
123120

124121
<li>
125122
<a class="" href="mentoren.html">Mentoren</a>
126123
</li>
124+
127125
<li class="visible-xs">
128126
<a href="/material.html">Material</a>
129127
</li>
128+
130129
<li class="dropdown hidden-xs">
131130
<a class="dropdown-toggle" href="/material.html">Material</a>
132131
<ul class="dropdown-menu">
@@ -144,9 +143,11 @@
144143
</li>
145144
</ul>
146145
</li>
146+
147147
<li>
148148
<a class="page-scroll" href="#contact">Kontakt</a>
149149
</li>
150+
150151
</ul>
151152
</div>
152153
<!-- /.navbar-collapse -->
@@ -184,7 +185,9 @@ <h2 class="brand-heading">Karlsruhe</h2>
184185
<div class="triangle_right"></div>
185186
</div>
186187
</td>
187-
<td><a href="#events" style="font-size: 1.2em">29. Juli</a></td>
188+
<td data-ng-controller="eventController" >
189+
<a href="#events" style="font-size: 1.2em">{{nextEvent.displayDay}}. {{nextEvent.displayMonthTextShort}}</a>
190+
</td>
188191
</tr>
189192
<tr>
190193
<td>
@@ -309,7 +312,7 @@ <h2>Wie mache ich mit?</h2>
309312
eine Lösung gefunden werden, sofern wir schon in der Anmeldungsmail Bescheid bekommen.</p>
310313

311314
<p>Außerdem müssen bei der ersten Teilnahme die <a
312-
href="Teilnahmebedingungen.pdf">Teilnahmebedingungen</a>
315+
href="doc/Teilnahmebedingungen.pdf">Teilnahmebedingungen</a>
313316
ausgedruckt, ausgefüllt und unterschrieben mitgebracht werden.</p>
314317

315318

@@ -328,114 +331,84 @@ <h2>Wie mache ich mit?</h2>
328331

329332

330333
<!-- Events Section -->
331-
<section id="events" class="content-section text-center">
334+
<section data-ng-controller="eventController" id="events" class="content-section text-center">
332335
<div class="container">
333336
<div class="row">
334337
<div class="col-lg-8 col-lg-offset-2">
335338
<h2>Termine</h2>
336339

337-
<p>Das nächste Treffen findet am Freitag, dem 29.07.2016 von 17.00 Uhr bis 19:00 Uhr im
338-
Seminarraum 236 der Fakultät für Informatik im Gebäude 50.34 am KIT statt.</p>
340+
<p>Das nächste Treffen findet am Freitag, dem
341+
{{nextEvent.displayDay}}.{{nextEvent.displayMonth}}.{{nextEvent.displayYear}}
342+
von {{nextEvent.displayStartTime}} Uhr bis {{nextEvent.displayEndTime}} Uhr
343+
im {{nextEvent.location}} der Fakultät für Informatik im Gebäude 50.34 am KIT statt.</p>
339344

340345
<p>Die unten aufgelisteten Termine finden alle im Gebäude 50.34 des KIT statt. Es gehört zur Fakultät
341346
für
342347
Informatik, die uns den Seminarraum für unsere Treffen zur Verfügung stellt.</p>
343348

344349
<div id="timeline">
345350

346-
<!-- Dojo Event -->
347-
<div class="row timeline-movement">
348-
<a class="page-scroll" href="#join">
349-
<div class="timeline-badge">
350-
<span class="timeline-balloon-date-day">03</span>
351-
<span class="timeline-balloon-date-month">JUNI</span>
352-
</div>
353-
</a>
354-
<div class="col-sm-6 timeline-item timeline-item-first">
355-
<span class="question">Wo?</span>
356-
<a href="#map" class="page-scroll">Seminarraum 236</a>
357-
<br>
358-
<a href="#join" class="join_data">Einstiegstermin</a>
359-
</div>
360-
<div class="col-sm-6 timeline-item timeline-item-last">
361-
<span class="question">Wann?</span>17:00 - 19:00
362-
</div>
363-
</div>
364-
365-
<!-- Dojo Event -->
366-
<div class="row timeline-movement">
351+
<!-- Past Dojo Events -->
352+
<div data-ng-repeat="x in pastEventList" class="row timeline-movement">
367353
<a class="page-scroll" href="#join">
368354
<div class="timeline-badge">
369-
<span class="timeline-balloon-date-day">17</span>
370-
<span class="timeline-balloon-date-month">JUNI</span>
355+
<span class="timeline-balloon-date-day">{{x.displayDay}}</span>
356+
<span class="timeline-balloon-date-month">{{x.displayMonthTextShort}}</span>
371357
</div>
372358
</a>
373359
<div class="col-sm-6 timeline-item timeline-item-first">
374360
<span class="question">Wo?</span>
375-
<a href="#map" class="page-scroll">Seminarraum 236</a>
361+
<a href="#map" class="page-scroll">{{x.location}}</a>
362+
<br data-ng-if="x.isIntroEvent" />
363+
<a data-ng-if="x.isIntroEvent" href="#join" class="join_data">Einstiegstermin</a>
376364
</div>
377365
<div class="col-sm-6 timeline-item timeline-item-last">
378-
<span class="question">Wann?</span>17:00 - 19:00
366+
<span class="question">Wann?</span>{{x.displayStartTime}} - {{x.displayEndTime}}
379367
</div>
380368
</div>
381369

382-
<!-- Dojo Event -->
370+
<!-- Clock Sign -->
383371
<div class="row timeline-movement">
384-
<a class="page-scroll" href="#join">
385-
<div class="timeline-badge">
386-
<span class="timeline-balloon-date-day">01</span>
387-
<span class="timeline-balloon-date-month">JULI</span>
388-
</div>
389-
</a>
390-
<div class="col-sm-6 timeline-item timeline-item-first">
391-
<span class="question">Wo?</span>
392-
<a href="#map" class="page-scroll">Ausnahme: Seminarraum 301!</a>
393-
<br>
394-
<a href="#join" class="join_data">Einstiegstermin</a>
395-
</div>
396-
<div class="col-sm-6 timeline-item timeline-item-last"><span class="question">Wann?</span>17:00
397-
- 19:00
372+
<div class="timeline-badge timeline-filter-movement">
373+
<span class="glyphicon glyphicon-time"></span>
398374
</div>
399375
</div>
400376

401-
<!-- Dojo Event -->
377+
<!-- Next Dojo Event -->
402378
<div class="row timeline-movement">
403379
<a class="page-scroll" href="#join">
404380
<div class="timeline-badge">
405-
<span class="timeline-balloon-date-day">15</span>
406-
<span class="timeline-balloon-date-month">JULI</span>
381+
<span class="timeline-balloon-date-day">{{nextEvent.displayDay}}</span>
382+
<span class="timeline-balloon-date-month">{{nextEvent.displayMonthTextShort}}</span>
407383
</div>
408384
</a>
409385
<div class="col-sm-6 timeline-item timeline-item-first">
410386
<span class="question">Wo?</span>
411-
<a href="#map" class="page-scroll">Seminarraum 236</a>
387+
<a href="#map" class="page-scroll">{{nextEvent.location}}</a>
388+
<br data-ng-if="nextEvent.isIntroEvent" />
389+
<a data-ng-if="nextEvent.isIntroEvent" href="#join" class="join_data">Einstiegstermin</a>
412390
</div>
413391
<div class="col-sm-6 timeline-item timeline-item-last">
414-
<span class="question">Wann?</span>17:00 - 19:00
392+
<span class="question">Wann?</span>{{nextEvent.displayStartTime}} - {{nextEvent.displayEndTime}}
415393
</div>
416394
</div>
417395

418-
<!-- Clock Sign -->
419-
<div class="row timeline-movement">
420-
<div class="timeline-badge timeline-filter-movement">
421-
<span class="glyphicon glyphicon-time"></span>
422-
</div>
423-
</div>
424-
425-
<!-- Dojo Event -->
426-
<div class="row timeline-movement">
396+
<!-- Future Dojo Events -->
397+
<div data-ng-repeat="x in futureEventList" class="row timeline-movement">
427398
<a class="page-scroll" href="#join">
428399
<div class="timeline-badge">
429-
<span class="timeline-balloon-date-day">29</span>
430-
<span class="timeline-balloon-date-month">JULI</span>
400+
<span class="timeline-balloon-date-day">{{x.displayDay}}</span>
401+
<span class="timeline-balloon-date-month">{{x.displayMonthTextShort}}</span>
431402
</div>
432403
</a>
433404
<div class="col-sm-6 timeline-item timeline-item-first">
434405
<span class="question">Wo?</span>
435-
<a href="#map" class="page-scroll">Seminarraum 236</a>
406+
<a href="#map" class="page-scroll">{{x.location}}</a>
407+
<br data-ng-if="x.isIntroEvent" />
408+
<a data-ng-if="x.isIntroEvent" href="#join" class="join_data">Einstiegstermin</a>
436409
</div>
437410
<div class="col-sm-6 timeline-item timeline-item-last">
438-
<span class="question">Wann?</span>17:00 - 19:00
411+
<span class="question">Wann?</span>{{x.displayStartTime}} - {{x.displayEndTime}}
439412
</div>
440413
</div>
441414

0 commit comments

Comments
 (0)