Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Filter upcoming events #36

Merged
merged 5 commits into from
Nov 20, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions data/events/chicago2015.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ name = "chicago2015"
year = "2015"
city = "Chicago"
friendly = "2015-chicago"
startdate = "2015-08-25T23:29:49-06:00"
enddate = "2015-08-26T23:29:49-06:00"
status = "past"
startdate = 2015-08-25T23:29:49Z
enddate = 2015-08-26T23:29:49Z
coordinates = "47.609895, -122.330259"
t1sponsortitle = "Platinum"
t2sponsortitle = "Gold"
t3sponsortitle = "Silver"
Expand Down
7 changes: 4 additions & 3 deletions data/events/kiel2016.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
name = "kiel2016"
year = "2016"
city = "Kiel"
startdate = "2016-05-12T23:29:49-06:00"
enddate = "2016-05-13T23:29:49-06:00"
coordinates = "47.609895, -122.330259"
friendly = "2016-kiel"
status = "current"
startdate = 2016-05-12T23:29:49Z
enddate = 2016-05-13T23:29:49Z
coordinates = "47.609895, -122.330259"
t1sponsortitle = "Gold"
t2sponsortitle = "Host"
t3sponsortitle = "Special"
Expand Down
21 changes: 21 additions & 0 deletions data/events/warsaw.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name = "warsaw2015"
year = "2015"
city = "Warsaw"
friendly = "2015-warsaw"
status = "current"
startdate = 2015-11-24T23:29:49Z
enddate = 2015-11-25T23:29:49Z
coordinates = "47.609895, -122.330259"
t1sponsortitle = "Main"
t2sponsortitle = "Platinum"
t3sponsortitle = "Gold"
t4sponsortitle = "Regeneration Zone"
t5sponsortitle = "Sponsor"
t6sponsortitle = "Partners"
t1sponsors = ["allegro"]
t2sponsors = ["uniteam"]
t3sponsors = ["kainos"]
t4sponsors = ["connectis"]
t5sponsors = ["codersmill"]
t6sponsors = ["eventory", "kamea", "teetbee"]
navigationelements = ["welcome", "location", "register", "program", "ignites", "partners", "contact", "conduct"]
2 changes: 2 additions & 0 deletions data/sponsors/allegro.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: "wobe-systems GmbH"
url: "http://www.wobe-team.com/"
2 changes: 2 additions & 0 deletions data/sponsors/codersmill.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: "wobe-systems GmbH"
url: "http://www.wobe-team.com/"
2 changes: 2 additions & 0 deletions data/sponsors/connectis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: "wobe-systems GmbH"
url: "http://www.wobe-team.com/"
2 changes: 2 additions & 0 deletions data/sponsors/eventory.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: "wobe-systems GmbH"
url: "http://www.wobe-team.com/"
2 changes: 2 additions & 0 deletions data/sponsors/kainos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: "wobe-systems GmbH"
url: "http://www.wobe-team.com/"
2 changes: 2 additions & 0 deletions data/sponsors/kamea.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: "wobe-systems GmbH"
url: "http://www.wobe-team.com/"
2 changes: 2 additions & 0 deletions data/sponsors/teetbee.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: "wobe-systems GmbH"
url: "http://www.wobe-team.com/"
2 changes: 2 additions & 0 deletions data/sponsors/uniteam.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: "wobe-systems GmbH"
url: "http://www.wobe-team.com/"
22 changes: 20 additions & 2 deletions themes/devopsdays/layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,32 @@
<div class = "container-fluid">
<div class = "row">
<div class="col-md-8">
<h1>Upcoming DevOpsDays Events</h1>
<h2>Upcoming devopsdays events</h2>
<div class = "event-list-header">
<div class="container">
<h3>
{{ range $.Site.Data.events }}
{{ if eq .status "current" }}
<a href = "/events/{{ .friendly }}/welcome">{{ .city }}</a> -
{{ end }}
{{ end }}
</h3>
</div>
</div>
<!--map-->
<div id="map_wrapper">
<div id="map_canvas" class="mapping"></div>
</div>
<!-- end map -->
{{ partial "maps" . }}

<h2>Past</h2>
<ul>
{{ range $.Site.Data.events }}
{{ if eq .status "past" }}
<li><a href = "/events/{{ .friendly }}/welcome">{{ .city }}</a></li>
{{ end }}
{{ end }}
</ul>
</div>
<div class = "col-md-3">
<a class="twitter-timeline" data-dnt="true" href="https://twitter.com/search?q=devopsdays%20OR%20devopsday%20OR%20%23devopsday%20OR%20%23devopsdays" data-widget-id="667543157886816256">Tweets about devopsdays OR devopsday OR #devopsday OR #devopsdays</a>
Expand Down
2 changes: 1 addition & 1 deletion themes/devopsdays/layouts/partials/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@
<div class="container">

<div class="row row-offcanvas row-offcanvas-right">
<img src = "/img/devopsdays-banner.png" class = "image-responsive">
<div class = "col-md-12"><img src = "/img/devopsdays-banner.png" class = "img-responsive"></div>
15 changes: 6 additions & 9 deletions themes/devopsdays/layouts/partials/maps.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script type="text/javascript">
<script>
jQuery(function($) {
// Asynchronously Load the map API
var script = document.createElement('script');
Expand All @@ -20,14 +20,11 @@

// Multiple Markers
var markers = [
['Kiel', 54.34208,10.121949],
['Seattle', 47.609895, -122.330259],
['Minneapolis', 44.9726428,-93.2752562],
['Ohio', 39.9833, -82.9833],
['Warsaw', 52.1800879, 20.9788363],
['Washington D.C.', 38.8011545,-77.0659376],


{{ range $.Site.Data.events }}
{{ if eq .status "current" }}
['{{ .city }}', {{ .coordinates | safeHTML }}],
{{ end }}
{{ end }}
];

// Info Window Content
Expand Down
14 changes: 4 additions & 10 deletions themes/devopsdays/static/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,6 @@
font-size: larger;
}

.episode-list {
/*background-color: grey;*/
margin-top: 15px;
}

.episode-list-header {
background-color: black;
color: white;
}

.sidebar {
display: inline-block;
vertical-align: middle;
Expand Down Expand Up @@ -70,3 +60,7 @@
width: 100%;
height: 100%;
}

.event-list-header {
background-color: #d7d7d7;
}