From 7f8cda139a37b80ab5e96449d6a03f7bd26018c7 Mon Sep 17 00:00:00 2001
From: Matt Stratton <matt.stratton@gmail.com>
Date: Fri, 20 Nov 2015 02:02:33 -0600
Subject: [PATCH 1/5] Update date format

---
 data/events/chicago2015.toml         | 4 ++--
 data/events/kiel2016.toml            | 4 ++--
 themes/devopsdays/layouts/index.html | 9 +++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/data/events/chicago2015.toml b/data/events/chicago2015.toml
index 571111dde5d..aee29430c60 100644
--- a/data/events/chicago2015.toml
+++ b/data/events/chicago2015.toml
@@ -2,8 +2,8 @@ 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"
+startdate = 2015-08-25T23:29:49Z
+enddate = 2015-08-26T23:29:49Z
 t1sponsortitle = "Platinum"
 t2sponsortitle = "Gold"
 t3sponsortitle = "Silver"
diff --git a/data/events/kiel2016.toml b/data/events/kiel2016.toml
index d2dc763f2ec..70c5a0c56bb 100644
--- a/data/events/kiel2016.toml
+++ b/data/events/kiel2016.toml
@@ -1,8 +1,8 @@
 name = "kiel2016"
 year = "2016"
 city = "Kiel"
-startdate = "2016-05-12T23:29:49-06:00"
-enddate = "2016-05-13T23:29:49-06:00"
+startdate = 2016-05-12T23:29:49Z
+enddate = 2016-05-13T23:29:49Z
 coordinates = "47.609895, -122.330259"
 friendly = "2016-kiel"
 t1sponsortitle = "Gold"
diff --git a/themes/devopsdays/layouts/index.html b/themes/devopsdays/layouts/index.html
index f66160f6e38..fc6a05d6b33 100644
--- a/themes/devopsdays/layouts/index.html
+++ b/themes/devopsdays/layouts/index.html
@@ -10,6 +10,15 @@ <h1>Upcoming DevOpsDays Events</h1>
       <!-- end map -->
       {{ partial "maps" . }}
 
+      <h2> List of upcoming events</h2>
+      {{ range $e := $.Site.Data.events }}
+        {{ if ge $e.startdate .Now }}
+          {{ .city }} {{ .startdate }}<br />
+        {{ end }}
+      {{ end }}
+      current date {{ .Now }}
+
+
     </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>

From 12bf6c3afce7f9076bbc3117f246363e96c61352 Mon Sep 17 00:00:00 2001
From: Matt Stratton <matt.stratton@gmail.com>
Date: Fri, 20 Nov 2015 14:16:16 -0600
Subject: [PATCH 2/5] Add Warsaw

---
 data/events/warsaw.toml      | 21 +++++++++++++++++++++
 data/sponsors/allegro.yml    |  2 ++
 data/sponsors/codersmill.yml |  2 ++
 data/sponsors/connectis.yml  |  2 ++
 data/sponsors/eventory.yml   |  2 ++
 data/sponsors/kainos.yml     |  2 ++
 data/sponsors/kamea.yml      |  2 ++
 data/sponsors/teetbee.yml    |  2 ++
 data/sponsors/uniteam.yml    |  2 ++
 9 files changed, 37 insertions(+)
 create mode 100644 data/events/warsaw.toml
 create mode 100644 data/sponsors/allegro.yml
 create mode 100644 data/sponsors/codersmill.yml
 create mode 100644 data/sponsors/connectis.yml
 create mode 100644 data/sponsors/eventory.yml
 create mode 100644 data/sponsors/kainos.yml
 create mode 100644 data/sponsors/kamea.yml
 create mode 100644 data/sponsors/teetbee.yml
 create mode 100644 data/sponsors/uniteam.yml

diff --git a/data/events/warsaw.toml b/data/events/warsaw.toml
new file mode 100644
index 00000000000..6b7f6c58af0
--- /dev/null
+++ b/data/events/warsaw.toml
@@ -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"]
diff --git a/data/sponsors/allegro.yml b/data/sponsors/allegro.yml
new file mode 100644
index 00000000000..dc507a707dd
--- /dev/null
+++ b/data/sponsors/allegro.yml
@@ -0,0 +1,2 @@
+name: "wobe-systems GmbH"
+url: "http://www.wobe-team.com/"
diff --git a/data/sponsors/codersmill.yml b/data/sponsors/codersmill.yml
new file mode 100644
index 00000000000..dc507a707dd
--- /dev/null
+++ b/data/sponsors/codersmill.yml
@@ -0,0 +1,2 @@
+name: "wobe-systems GmbH"
+url: "http://www.wobe-team.com/"
diff --git a/data/sponsors/connectis.yml b/data/sponsors/connectis.yml
new file mode 100644
index 00000000000..dc507a707dd
--- /dev/null
+++ b/data/sponsors/connectis.yml
@@ -0,0 +1,2 @@
+name: "wobe-systems GmbH"
+url: "http://www.wobe-team.com/"
diff --git a/data/sponsors/eventory.yml b/data/sponsors/eventory.yml
new file mode 100644
index 00000000000..dc507a707dd
--- /dev/null
+++ b/data/sponsors/eventory.yml
@@ -0,0 +1,2 @@
+name: "wobe-systems GmbH"
+url: "http://www.wobe-team.com/"
diff --git a/data/sponsors/kainos.yml b/data/sponsors/kainos.yml
new file mode 100644
index 00000000000..dc507a707dd
--- /dev/null
+++ b/data/sponsors/kainos.yml
@@ -0,0 +1,2 @@
+name: "wobe-systems GmbH"
+url: "http://www.wobe-team.com/"
diff --git a/data/sponsors/kamea.yml b/data/sponsors/kamea.yml
new file mode 100644
index 00000000000..dc507a707dd
--- /dev/null
+++ b/data/sponsors/kamea.yml
@@ -0,0 +1,2 @@
+name: "wobe-systems GmbH"
+url: "http://www.wobe-team.com/"
diff --git a/data/sponsors/teetbee.yml b/data/sponsors/teetbee.yml
new file mode 100644
index 00000000000..dc507a707dd
--- /dev/null
+++ b/data/sponsors/teetbee.yml
@@ -0,0 +1,2 @@
+name: "wobe-systems GmbH"
+url: "http://www.wobe-team.com/"
diff --git a/data/sponsors/uniteam.yml b/data/sponsors/uniteam.yml
new file mode 100644
index 00000000000..dc507a707dd
--- /dev/null
+++ b/data/sponsors/uniteam.yml
@@ -0,0 +1,2 @@
+name: "wobe-systems GmbH"
+url: "http://www.wobe-team.com/"

From 8c373eb6de6458f9c8f96244b5518a01508d2ae9 Mon Sep 17 00:00:00 2001
From: Matt Stratton <matt.stratton@gmail.com>
Date: Fri, 20 Nov 2015 14:16:31 -0600
Subject: [PATCH 3/5] Add fields to Chicago

---
 data/events/chicago2015.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/events/chicago2015.toml b/data/events/chicago2015.toml
index aee29430c60..69948af87fa 100644
--- a/data/events/chicago2015.toml
+++ b/data/events/chicago2015.toml
@@ -2,8 +2,10 @@ name = "chicago2015"
 year = "2015"
 city = "Chicago"
 friendly = "2015-chicago"
+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"

From a21a28274d2f98f69d6e7ca8c9b46d272e4b3091 Mon Sep 17 00:00:00 2001
From: Matt Stratton <matt.stratton@gmail.com>
Date: Fri, 20 Nov 2015 14:16:42 -0600
Subject: [PATCH 4/5] Add filter field to Kiel

---
 data/events/kiel2016.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/events/kiel2016.toml b/data/events/kiel2016.toml
index 70c5a0c56bb..853b0a66b38 100644
--- a/data/events/kiel2016.toml
+++ b/data/events/kiel2016.toml
@@ -1,10 +1,11 @@
 name = "kiel2016"
 year = "2016"
 city = "Kiel"
+friendly = "2016-kiel"
+status = "current"
 startdate = 2016-05-12T23:29:49Z
 enddate = 2016-05-13T23:29:49Z
 coordinates = "47.609895, -122.330259"
-friendly = "2016-kiel"
 t1sponsortitle = "Gold"
 t2sponsortitle = "Host"
 t3sponsortitle = "Special"

From d8f74a107b161abd19427ca0ffca9e2a3f123820 Mon Sep 17 00:00:00 2001
From: Matt Stratton <matt.stratton@gmail.com>
Date: Fri, 20 Nov 2015 14:16:56 -0600
Subject: [PATCH 5/5] Filter for event status

---
 themes/devopsdays/layouts/index.html          | 29 ++++++++++++-------
 .../devopsdays/layouts/partials/header.html   |  2 +-
 themes/devopsdays/layouts/partials/maps.html  | 15 ++++------
 themes/devopsdays/static/css/style.css        | 14 +++------
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/themes/devopsdays/layouts/index.html b/themes/devopsdays/layouts/index.html
index fc6a05d6b33..ecc5e82df20 100644
--- a/themes/devopsdays/layouts/index.html
+++ b/themes/devopsdays/layouts/index.html
@@ -2,23 +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> List of upcoming events</h2>
-      {{ range $e := $.Site.Data.events }}
-        {{ if ge $e.startdate .Now }}
-          {{ .city }} {{ .startdate }}<br />
+      <h2>Past</h2>
+      <ul>
+        {{ range $.Site.Data.events }}
+          {{ if eq .status "past" }}
+            <li><a href = "/events/{{ .friendly }}/welcome">{{ .city }}</a></li>
+          {{ end }}
         {{ end }}
-      {{ end }}
-      current date {{ .Now }}
-
-
+      </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>
diff --git a/themes/devopsdays/layouts/partials/header.html b/themes/devopsdays/layouts/partials/header.html
index e5f4f352a75..3afa8b308e6 100644
--- a/themes/devopsdays/layouts/partials/header.html
+++ b/themes/devopsdays/layouts/partials/header.html
@@ -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>
diff --git a/themes/devopsdays/layouts/partials/maps.html b/themes/devopsdays/layouts/partials/maps.html
index ac246a55a2e..2a7b20533be 100644
--- a/themes/devopsdays/layouts/partials/maps.html
+++ b/themes/devopsdays/layouts/partials/maps.html
@@ -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');
@@ -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
diff --git a/themes/devopsdays/static/css/style.css b/themes/devopsdays/static/css/style.css
index 60452a9ec77..35bb029b4e6 100755
--- a/themes/devopsdays/static/css/style.css
+++ b/themes/devopsdays/static/css/style.css
@@ -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;
@@ -70,3 +60,7 @@
     width: 100%;
     height: 100%;
 }
+
+.event-list-header {
+  background-color: #d7d7d7;
+}