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

Mattstratton/fix map #69

Merged
merged 3 commits into from
Mar 4, 2016
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
1 change: 1 addition & 0 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ canonifyurls = false
dataDir = "data"
archetypedir = "archetypes"
PaginatePath = "blog"
buildDrafts = false

[permalinks]
page = "/:filename/"
Expand Down
57 changes: 57 additions & 0 deletions content/events/2016-chicago/welcome.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
+++
City = "Chicago"
Description = ""
Year = "2016"
date = "2016-03-04T17:36:05-06:00"
event = "2016chicago"
title = "welcome"
type = "event"
aliases = ["/events/2016-chicago"]

+++

## Tuesday, August 30 and Wednesday, August 31

Welcome! The group that brought you DevOpsDays Chicago 2015 is back together and planning the 2016 event. We're encouraged by the feedback from last year's event and are determined to bring an improved experience and continue the DevOps conversation this August in Chicago.

<div style="text-align:center;">
<img alt="DevOpsDays Chicago 2016" src="./logo.png"/>
</div>

<table>
<tr>
<td><b>Date</b></td>
<td><%= render(:partial => "/#{@eventhome}/_target_date") -%></td>
</tr>
<tr>
<td><b>Location</b></td>
<td><a href="/location/">Summit West</a></td>
</tr>
<!-- <tr>
<td><b>Participants</b></td>
<td><a href="/registration/">Register to attend the event!</a></td>
</tr> -->
<!--<tr>
<td><b>Speakers</b></td>
<td>Check out the <a href="/program/">program</a>.</td>
</tr>
-->
<tr>
<td><b>Sponsors</b></td>
<td><a href="/sponsor/">Sponsor the event!</a> It's a great way to attract new talent and promote your organization.</td>
</tr>
<tr>
<td><b>Contact</b></td>
<td><a href="/contact/">Get in touch with the Organizers</a>.</td>
</tr>
<tr>
<td></td>
<td><a href="https://twitter.com/devopsdaysChi" class="twitter-follow-button" data-show-count="false">Follow @devopsdaysChi</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</td>
</tr>
</table>

If you're interested in volunteering during the event, please <a href="mailto:<%= render(:partial => "/#{@eventhome}/_email_organizers") %>?subject=DevOpsDays 2016 Volunteering">send us an email</a> or tweet at <a href="https://twitter.com/devopsdaysChi">@devopsdaysChi</a>. We can always use an extra hand and it can be quite exciting behind the scenes. :)

We hope to see you in Chicago in August!
12 changes: 5 additions & 7 deletions data/events/2016chicago.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,22 @@ friendly: "2016-chicago"
status: "current"
startdate: 2016-08-30
enddate: 2016-08-31
coordinates: "47.609895, -122.330259"
coordinates: "41.882219, -87.640530"
navigationelements: ["welcome", "contact","location", "conduct","sponsor"]
sponsors:
- id: chef
level: platinum
level: gold
- id: datadog
level: gold
- id: arresteddevops
level: media
level: community

sponsor_levels:
- id: platinum
label: Platinum
- id: gold
label: Gold
- id: silver
label: Silver
- id: bronze
label: Bronze
- id: media
label: Media
- id: community
label: Community
7 changes: 5 additions & 2 deletions themes/devopsdays-legacy/layouts/partials/map.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
var markers = [
{{ range $.Site.Data.events }}
{{ if eq .status "current" }}
['{{ .city}}', {{ .coordinates | safeJS }}, '{{ .startdate }}'],
['{{ .city}}', {{ .coordinates | safeJS }}, '{{ .startdate }}', '/events/{{ .friendly }}'],
{{ end }}
{{ end }}
];

// Display multiple markers on a map
var infoWindow = new google.maps.InfoWindow(), marker, i;
// var infoWindow = new google.maps.InfoWindow(), marker, i;

// Loop through our array of markers & place each one on the map
for( i = 0; i < markers.length; i++ ) {
Expand All @@ -43,6 +43,9 @@
labelClass: "labels",
labelStyle: { opacity: 1 }
});
// cityLink = markers[i][4]
// This isn't working right now btw
// google.maps.event.addListener(marker, "click", function (e) { location.href=cityLink});

// refocus
map.fitBounds(bounds);
Expand Down