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

Remove almost all dependencies on "friendly" field #171

Merged
merged 1 commit into from
May 2, 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
2 changes: 1 addition & 1 deletion data/events/2009ghent.yml → data/events/2009-ghent.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2009ghent
name: 2009-ghent
year: 2009
city: Ghent
friendly: 2009-ghent
Expand Down
2 changes: 1 addition & 1 deletion data/events/2010boston.yml → data/events/2010-boston.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2010boston
name: 2010-boston
year: 2010
city: Boston
friendly: 2010-boston
Expand Down
2 changes: 1 addition & 1 deletion data/events/2010sydney.yml → data/events/2010-sydney.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2010sydney
name: 2010-sydney
year: 2010
city: Sydney
friendly: 2010-sydney
Expand Down
2 changes: 1 addition & 1 deletion data/events/2012austin.yml → data/events/2012-austin.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2012austin
name: 2012-austin
year: 2012
city: Austin
friendly: 2012-austin
Expand Down
2 changes: 1 addition & 1 deletion data/events/2013london.yml → data/events/2013-london.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2013london
name: 2013-london
year: 2013
city: London
friendly: 2013-london
Expand Down
2 changes: 1 addition & 1 deletion data/events/2014austin.yml → data/events/2014-austin.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2014austin
name: 2014-austin
year: 2014
city: Austin
friendly: 2014-austin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2015chicago
name: 2015-chicago
year: "2015"
city: "Chicago"
friendly: "2015-chicago"
Expand Down
2 changes: 1 addition & 1 deletion data/events/2015warsaw.yml → data/events/2015-warsaw.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2015warsaw
name: 2015-warsaw
year: "2015"
city: "Warsaw"
friendly: "2015-warsaw"
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-amsterdam.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: amsterdam2016 # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: amsterdam-2016 # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Amsterdam" # The city name of the event. Capitalize it.
friendly: "2016-amsterdam" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-atlanta.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016atlanta # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-atlanta # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Atlanta" # The city name of the event. Capitalize it.
friendly: "2016-atlanta" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-austin.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016austin # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-austin # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Austin" # The city name of the event. Capitalize it.
friendly: "2016-austin" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-chicago.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016chicago
name: 2016-chicago
year: "2016"
city: "Chicago"
friendly: "2016-chicago"
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-dallas.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016dallas # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-dallas # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Dallas" # The city name of the event. Capitalize it.
friendly: "2016-dallas" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-denver.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016denver # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-denver # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Denver" # The city name of the event. Capitalize it.
friendly: "2016-denver" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-detroit.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016detroit # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-detroit # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Detroit" # The city name of the event. Capitalize it.
friendly: "2016-detroit" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-istanbul.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016istanbul # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-istanbul # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Istanbul" # The city name of the event. Capitalize it.
friendly: "2016-istanbul" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-kiel.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016kiel
name: 2016-kiel
year: "2016"
city: "Kiel"
friendly: "2016-kiel"
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-london.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016london # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-london # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "London" # The city name of the event. Capitalize it.
friendly: "2016-london" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-minneapolis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016minneapolis # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-minneapolis # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Minneapolis" # The city name of the event. Capitalize it.
friendly: "2016-minneapolis" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-newyork.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016newyork # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-newyork # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "New York" # The city name of the event. Capitalize it.
friendly: "2016-newyork" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-philadelphia.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016philadelphia # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-philadelphia # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Philadelphia" # The city name of the event. Capitalize it.
friendly: "2016-philadelphia" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-portland.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016portland # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-portland # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Portland" # The city name of the event. Capitalize it.
friendly: "2016-portland" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-raleigh.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016raleigh# The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-raleigh # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Raleigh" # The city name of the event. Capitalize it.
friendly: "2016-raleigh" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-saltlakecity.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016saltlakecity # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-saltlakecity # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Salt Lake City" # The city name of the event. Capitalize it.
friendly: "2016-saltlakecity" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-seattle.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016seattle # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-seattle # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Seattle" # The city name of the event. Capitalize it.
friendly: "2016-seattle" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-singapore.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016singapore # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-singapore # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Singapore" # The city name of the event. Capitalize it.
friendly: "2016-singapore" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
4 changes: 2 additions & 2 deletions data/events/2016-toronto.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016toronto # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-toronto # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Toronto" # The city name of the event. Capitalize it.
friendly: "2016-toronto" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand All @@ -21,7 +21,7 @@ sponsors: # List all of your sponsors here along with what level of sponsorship
level: gold
- id: pivotal
level: gold
- id: blendedperspectives
- id: blendedperspectives
level: gold
- id: pagerduty
level: gold
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-vancouver.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016vancouver # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-vancouver # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Vancouver" # The city name of the event. Capitalize it.
friendly: "2016-vancouver" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-washington-dc.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 2016washingtondc # The name of the event. Four digit year with the city name in lower-case, with no spaces.
name: 2016-washingtondc # The name of the event. Four digit year with the city name in lower-case, with no spaces.
year: "2016" # The year of the event. Make sure it is in quotes.
city: "Washington, D.C. " # The city name of the event. Capitalize it.
friendly: "2016-washington-dc" # Four digit year and the city name in lower-case. Don't forget the dash!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h2>{{ .label }} Sponsors</h2>
{{ end }}
{{ end }}
<div class = "sponsor-cta">
<a href = "/events/{{ $e.friendly }}/sponsor">Become a {{ .label }} Sponsor!</a>
<a href = "/events/{{ $e.name }}/sponsor">Become a {{ .label }} Sponsor!</a>
</div>
{{ end }}

Expand Down
2 changes: 1 addition & 1 deletion themes/devopsdays-legacy/layouts/partials/future.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h1>Future</h1>
<strong>{{ . }}</strong><br/>
{{ range ($.Scratch.GetSortedMapValues (print "future" .)) }}
{{ $c_event := (index $.Site.Data.events .) }}
<a href="/events/{{ $c_event.friendly }}">{{ $c_event.city }}: {{ dateFormat "Jan 2" $c_event.startdate }} - {{ dateFormat "Jan 2" $c_event.enddate }}</a><br />
<a href="/events/{{ $c_event.name }}">{{ $c_event.city }}: {{ dateFormat "Jan 2" $c_event.startdate }} - {{ dateFormat "Jan 2" $c_event.enddate }}</a><br />
{{ end }}
{{ end }}
</div>
Expand Down
2 changes: 1 addition & 1 deletion themes/devopsdays-legacy/layouts/partials/map.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
var markers = [
{{ range $.Site.Data.events }}
{{ if and (eq .status "current") ( .startdate ) }}
['{{ .city}}', {{ .coordinates | safeJS }}, '{{ dateFormat "Jan 2" .startdate }}', '/events/{{ .friendly }}'],
['{{ .city}}', {{ .coordinates | safeJS }}, '{{ dateFormat "Jan 2" .startdate }}', '/events/{{ .name }}'],
{{ end }}
{{ end }}
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ <h3>
{{ range sort $.Site.Data.events "startdate" }}
{{ if eq .status "current" }}
{{ $.Scratch.Add "events" "<a href = '/events/" }}
{{ $.Scratch.Add "events" .friendly }}
{{ $.Scratch.Add "events" .name }}
{{ $.Scratch.Add "events" "/welcome'>" }}
{{ $.Scratch.Add "events" .city }}
{{ $.Scratch.Add "events" "</a> - " }}
Expand Down
2 changes: 1 addition & 1 deletion themes/devopsdays/layouts/blog/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h3>
{{ range $.Site.Data.events }}
{{ if eq .status "current" }}
{{ $.Scratch.Add "events" "<a href = '/events/" }}
{{ $.Scratch.Add "events" .friendly }}
{{ $.Scratch.Add "events" .name }}
{{ $.Scratch.Add "events" "/welcome'>" }}
{{ $.Scratch.Add "events" .city }}
{{ $.Scratch.Add "events" "</a> - " }}
Expand Down
2 changes: 1 addition & 1 deletion themes/devopsdays/layouts/event/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h1> {{ $e.city }} - {{ title .Title }} </h1>
<!-- Main navigation -->
<ul class="nav nav-tabs">
{{ range $navigation := $e.navigationelements}}
<li role="presentation"><a href="/events/{{ $e.friendly }}/{{ $navigation}}">{{ $navigation }}</a></li>
<li role="presentation"><a href="/events/{{ $e.name }}/{{ $navigation}}">{{ $navigation }}</a></li>
{{ end }}
</ul>

Expand Down
2 changes: 1 addition & 1 deletion themes/devopsdays/layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h3>
{{ range $.Site.Data.events }}
{{ if eq .status "current" }}
{{ $.Scratch.Add "events" "<a href = '/events/" }}
{{ $.Scratch.Add "events" .friendly }}
{{ $.Scratch.Add "events" .name }}
{{ $.Scratch.Add "events" "/welcome'>" }}
{{ $.Scratch.Add "events" .city }}
{{ $.Scratch.Add "events" "</a> - " }}
Expand Down
2 changes: 1 addition & 1 deletion themes/devopsdays/section/blog.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h3>
{{ range $.Site.Data.events }}
{{ if eq .status "current" }}
{{ $.Scratch.Add "events" "<a href = '/events/" }}
{{ $.Scratch.Add "events" .friendly }}
{{ $.Scratch.Add "events" .name }}
{{ $.Scratch.Add "events" "/welcome'>" }}
{{ $.Scratch.Add "events" .city }}
{{ $.Scratch.Add "events" "</a> - " }}
Expand Down