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.

Sign up for GitHub

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

fixes #58 & #35 #59

Merged
merged 1 commit into from
Nov 28, 2015
+5 −10
Merged

fixes #58 & #35 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This is the website for DevOpsDays.org

Here are the steps to follow to get going as an DevOpsDays content contributor (or heck, even a code contributor)

1. Install [Hugo](http://gohugo.io)
1. Install [Hugo v0.15+](http://gohugo.io)
2. Fork this repo
3. If you want to fire up a local copy to see your changes as you go, enter this command `hugo server -w --baseUrl="http://localhost:1313"`
4. The `--baseUrl` flag is kind of flaky, so a good solution is to change the `config.toml` file to point to `localhost` before starting `hugo server -w`. DO NOT COMMIT THIS CHANGED FILE BACK TO GITHUB. Just exclude it for now. We don't add it to `.gitignore` because we might need to muck with that file...although once everything is stable we might do this for safety.
Expand Down
2 changes: 1 addition & 1 deletion data/events/2015warsaw.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ friendly: "2015-warsaw"
status: "current"
startdate: 2015-11-24
enddate: 2015-11-25
coordinates: "47.609895, -122.330259"
coordinates: "52.1800879, 20.9788363"
navigationelements: ["welcome", "location", "register", "program", "ignites", "partners", "contact", "conduct"]
sponsors:
- id: allegro
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016kiel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ friendly: "2016-kiel"
status: "current"
startdate: 2016-05-12
enddate: 2016-05-13
coordinates: "47.609895, -122.330259"
coordinates: "54.3233, 10.1228"
navigationelements: ["welcome", "propose", "location", "registration", "sponsor", "contact", "conduct"]
sponsors:
- id: kiwi
Expand Down
7 changes: 1 addition & 6 deletions themes/devopsdays/layouts/partials/maps.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,7 @@
var markers = [
{{ range $.Site.Data.events }}
{{ if eq .status "current" }}
['Denver: April 21 & 22', 39.739236, -104.990251],
['Minneapolis: Jul 20 & 21', 44.9726428,-93.2752562],
['Warsaw: Nov 24 & 25', 52.1800879, 20.9788363],
['Washington D.C.: June 8 & 9', 38.8011545,-77.0659376],
['Kiel: May 12 & 13', 54.34208,10.121949],
['Seattle: May 12 & 13', 47.609895, -122.330259],
['{{ .city}}', {{ .coordinates | safeJS }}],
{{ end }}
{{ end }}
];
Expand Down
2 changes: 1 addition & 1 deletion wercker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ box: wercker/default
build:
steps:
- arjen/hugo-build:
version: "0.14"
version: "0.15"
theme: devopsdays
flags: --buildDrafts=true

Expand Down