From 867ef48633daf4dfdbf265f95a75acd602d25fab Mon Sep 17 00:00:00 2001 From: Matt Stratton Date: Mon, 2 May 2016 09:01:17 -0500 Subject: [PATCH] Remove almost all dependencies on "friendly" field There is still a use of the "friendly" data field in the `future.html` partial. We will need to fix this later, but for now we still need the "friendly" field. Additionally, I have gone through and updated all `name` fields to use the dashes, etc. --- data/events/{2009ghent.yml => 2009-ghent.yml} | 2 +- data/events/{2010boston.yml => 2010-boston.yml} | 2 +- data/events/{2010sydney.yml => 2010-sydney.yml} | 2 +- data/events/{2012austin.yml => 2012-austin.yml} | 2 +- data/events/{2013london.yml => 2013-london.yml} | 2 +- data/events/{2014austin.yml => 2014-austin.yml} | 2 +- data/events/{2015chicago.yml => 2015-chicago.yml} | 2 +- data/events/{2015warsaw.yml => 2015-warsaw.yml} | 2 +- data/events/2016-amsterdam.yml | 2 +- data/events/2016-atlanta.yml | 2 +- data/events/2016-austin.yml | 2 +- data/events/2016-chicago.yml | 2 +- data/events/2016-dallas.yml | 2 +- data/events/2016-denver.yml | 2 +- data/events/2016-detroit.yml | 2 +- data/events/2016-istanbul.yml | 2 +- data/events/2016-kiel.yml | 2 +- data/events/2016-london.yml | 2 +- data/events/2016-minneapolis.yml | 2 +- data/events/2016-newyork.yml | 2 +- data/events/2016-philadelphia.yml | 2 +- data/events/2016-portland.yml | 2 +- data/events/2016-raleigh.yml | 2 +- data/events/2016-saltlakecity.yml | 2 +- data/events/2016-seattle.yml | 2 +- data/events/2016-singapore.yml | 2 +- data/events/2016-toronto.yml | 4 ++-- data/events/2016-vancouver.yml | 2 +- data/events/2016-washington-dc.yml | 2 +- themes/devopsdays-legacy/layouts/partials/event_footer.html | 2 +- themes/devopsdays-legacy/layouts/partials/future.html | 2 +- themes/devopsdays-legacy/layouts/partials/map.html | 2 +- .../devopsdays-legacy/layouts/partials/upcoming_headline.html | 2 +- themes/devopsdays/layouts/blog/single.html | 2 +- themes/devopsdays/layouts/event/single.html | 2 +- themes/devopsdays/layouts/index.html | 2 +- themes/devopsdays/section/blog.html | 2 +- 37 files changed, 38 insertions(+), 38 deletions(-) rename data/events/{2009ghent.yml => 2009-ghent.yml} (96%) rename data/events/{2010boston.yml => 2010-boston.yml} (96%) rename data/events/{2010sydney.yml => 2010-sydney.yml} (96%) rename data/events/{2012austin.yml => 2012-austin.yml} (96%) rename data/events/{2013london.yml => 2013-london.yml} (96%) rename data/events/{2014austin.yml => 2014-austin.yml} (96%) rename data/events/{2015chicago.yml => 2015-chicago.yml} (96%) rename data/events/{2015warsaw.yml => 2015-warsaw.yml} (96%) diff --git a/data/events/2009ghent.yml b/data/events/2009-ghent.yml similarity index 96% rename from data/events/2009ghent.yml rename to data/events/2009-ghent.yml index 2cc1c9be8de..312e97e82b2 100644 --- a/data/events/2009ghent.yml +++ b/data/events/2009-ghent.yml @@ -1,4 +1,4 @@ -name: 2009ghent +name: 2009-ghent year: 2009 city: Ghent friendly: 2009-ghent diff --git a/data/events/2010boston.yml b/data/events/2010-boston.yml similarity index 96% rename from data/events/2010boston.yml rename to data/events/2010-boston.yml index f30e451dee4..e61b93fbd78 100644 --- a/data/events/2010boston.yml +++ b/data/events/2010-boston.yml @@ -1,4 +1,4 @@ -name: 2010boston +name: 2010-boston year: 2010 city: Boston friendly: 2010-boston diff --git a/data/events/2010sydney.yml b/data/events/2010-sydney.yml similarity index 96% rename from data/events/2010sydney.yml rename to data/events/2010-sydney.yml index b74c11568ff..75ef4dc2425 100644 --- a/data/events/2010sydney.yml +++ b/data/events/2010-sydney.yml @@ -1,4 +1,4 @@ -name: 2010sydney +name: 2010-sydney year: 2010 city: Sydney friendly: 2010-sydney diff --git a/data/events/2012austin.yml b/data/events/2012-austin.yml similarity index 96% rename from data/events/2012austin.yml rename to data/events/2012-austin.yml index 6c7e01781a9..dcaca8e228f 100644 --- a/data/events/2012austin.yml +++ b/data/events/2012-austin.yml @@ -1,4 +1,4 @@ -name: 2012austin +name: 2012-austin year: 2012 city: Austin friendly: 2012-austin diff --git a/data/events/2013london.yml b/data/events/2013-london.yml similarity index 96% rename from data/events/2013london.yml rename to data/events/2013-london.yml index c604a107a5e..ec8f906f0df 100644 --- a/data/events/2013london.yml +++ b/data/events/2013-london.yml @@ -1,4 +1,4 @@ -name: 2013london +name: 2013-london year: 2013 city: London friendly: 2013-london diff --git a/data/events/2014austin.yml b/data/events/2014-austin.yml similarity index 96% rename from data/events/2014austin.yml rename to data/events/2014-austin.yml index be9553bb217..7d47bc6cedd 100644 --- a/data/events/2014austin.yml +++ b/data/events/2014-austin.yml @@ -1,4 +1,4 @@ -name: 2014austin +name: 2014-austin year: 2014 city: Austin friendly: 2014-austin diff --git a/data/events/2015chicago.yml b/data/events/2015-chicago.yml similarity index 96% rename from data/events/2015chicago.yml rename to data/events/2015-chicago.yml index 550f12175a6..eb0911dcf1b 100644 --- a/data/events/2015chicago.yml +++ b/data/events/2015-chicago.yml @@ -1,4 +1,4 @@ -name: 2015chicago +name: 2015-chicago year: "2015" city: "Chicago" friendly: "2015-chicago" diff --git a/data/events/2015warsaw.yml b/data/events/2015-warsaw.yml similarity index 96% rename from data/events/2015warsaw.yml rename to data/events/2015-warsaw.yml index 2bc03e633b6..6593207f31f 100644 --- a/data/events/2015warsaw.yml +++ b/data/events/2015-warsaw.yml @@ -1,4 +1,4 @@ -name: 2015warsaw +name: 2015-warsaw year: "2015" city: "Warsaw" friendly: "2015-warsaw" diff --git a/data/events/2016-amsterdam.yml b/data/events/2016-amsterdam.yml index e6ac5d768cf..543eea88af1 100644 --- a/data/events/2016-amsterdam.yml +++ b/data/events/2016-amsterdam.yml @@ -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! diff --git a/data/events/2016-atlanta.yml b/data/events/2016-atlanta.yml index bcf08a653f7..3c458fc42a1 100644 --- a/data/events/2016-atlanta.yml +++ b/data/events/2016-atlanta.yml @@ -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! diff --git a/data/events/2016-austin.yml b/data/events/2016-austin.yml index 0a3e9ea4b60..32f25e6ea48 100644 --- a/data/events/2016-austin.yml +++ b/data/events/2016-austin.yml @@ -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! diff --git a/data/events/2016-chicago.yml b/data/events/2016-chicago.yml index dc33cb0325f..61f9d7c4776 100644 --- a/data/events/2016-chicago.yml +++ b/data/events/2016-chicago.yml @@ -1,4 +1,4 @@ -name: 2016chicago +name: 2016-chicago year: "2016" city: "Chicago" friendly: "2016-chicago" diff --git a/data/events/2016-dallas.yml b/data/events/2016-dallas.yml index 2539b5f51a1..20c60cc9296 100644 --- a/data/events/2016-dallas.yml +++ b/data/events/2016-dallas.yml @@ -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! diff --git a/data/events/2016-denver.yml b/data/events/2016-denver.yml index cd0d43def86..6cad49ca5a7 100644 --- a/data/events/2016-denver.yml +++ b/data/events/2016-denver.yml @@ -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! diff --git a/data/events/2016-detroit.yml b/data/events/2016-detroit.yml index 12b68426617..7ccbae6ce39 100644 --- a/data/events/2016-detroit.yml +++ b/data/events/2016-detroit.yml @@ -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! diff --git a/data/events/2016-istanbul.yml b/data/events/2016-istanbul.yml index 49cca322e1c..0d405459cc9 100644 --- a/data/events/2016-istanbul.yml +++ b/data/events/2016-istanbul.yml @@ -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! diff --git a/data/events/2016-kiel.yml b/data/events/2016-kiel.yml index 3afba2c1a61..033910211e0 100644 --- a/data/events/2016-kiel.yml +++ b/data/events/2016-kiel.yml @@ -1,4 +1,4 @@ -name: 2016kiel +name: 2016-kiel year: "2016" city: "Kiel" friendly: "2016-kiel" diff --git a/data/events/2016-london.yml b/data/events/2016-london.yml index 63adef71b38..004911193dc 100644 --- a/data/events/2016-london.yml +++ b/data/events/2016-london.yml @@ -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! diff --git a/data/events/2016-minneapolis.yml b/data/events/2016-minneapolis.yml index 125605eb3c4..67047373d44 100644 --- a/data/events/2016-minneapolis.yml +++ b/data/events/2016-minneapolis.yml @@ -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! diff --git a/data/events/2016-newyork.yml b/data/events/2016-newyork.yml index aaea4399be0..dbd139401a0 100644 --- a/data/events/2016-newyork.yml +++ b/data/events/2016-newyork.yml @@ -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! diff --git a/data/events/2016-philadelphia.yml b/data/events/2016-philadelphia.yml index 7051a2cffb1..e4c4bb71e5c 100644 --- a/data/events/2016-philadelphia.yml +++ b/data/events/2016-philadelphia.yml @@ -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! diff --git a/data/events/2016-portland.yml b/data/events/2016-portland.yml index 186cd7fbc23..daa6142f66f 100644 --- a/data/events/2016-portland.yml +++ b/data/events/2016-portland.yml @@ -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! diff --git a/data/events/2016-raleigh.yml b/data/events/2016-raleigh.yml index 4b240ba90bc..7522bc02ea9 100644 --- a/data/events/2016-raleigh.yml +++ b/data/events/2016-raleigh.yml @@ -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! diff --git a/data/events/2016-saltlakecity.yml b/data/events/2016-saltlakecity.yml index 05cb4994bff..f43d736b1dc 100644 --- a/data/events/2016-saltlakecity.yml +++ b/data/events/2016-saltlakecity.yml @@ -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! diff --git a/data/events/2016-seattle.yml b/data/events/2016-seattle.yml index 7ecd40f5fef..ffc89511d78 100644 --- a/data/events/2016-seattle.yml +++ b/data/events/2016-seattle.yml @@ -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! diff --git a/data/events/2016-singapore.yml b/data/events/2016-singapore.yml index bd0c018e075..248caba31bb 100644 --- a/data/events/2016-singapore.yml +++ b/data/events/2016-singapore.yml @@ -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! diff --git a/data/events/2016-toronto.yml b/data/events/2016-toronto.yml index 021fb69329a..f276cd82e6f 100644 --- a/data/events/2016-toronto.yml +++ b/data/events/2016-toronto.yml @@ -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! @@ -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 diff --git a/data/events/2016-vancouver.yml b/data/events/2016-vancouver.yml index 0c287d88c23..cffbb40f10f 100644 --- a/data/events/2016-vancouver.yml +++ b/data/events/2016-vancouver.yml @@ -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! diff --git a/data/events/2016-washington-dc.yml b/data/events/2016-washington-dc.yml index 3c299dc63c8..07306854d69 100644 --- a/data/events/2016-washington-dc.yml +++ b/data/events/2016-washington-dc.yml @@ -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! diff --git a/themes/devopsdays-legacy/layouts/partials/event_footer.html b/themes/devopsdays-legacy/layouts/partials/event_footer.html index 38edf9f3b2d..4d0d4c83b45 100644 --- a/themes/devopsdays-legacy/layouts/partials/event_footer.html +++ b/themes/devopsdays-legacy/layouts/partials/event_footer.html @@ -18,7 +18,7 @@

{{ .label }} Sponsors

{{ end }} {{ end }} {{ end }} diff --git a/themes/devopsdays-legacy/layouts/partials/future.html b/themes/devopsdays-legacy/layouts/partials/future.html index 2c8b645cb85..500cacad1e4 100644 --- a/themes/devopsdays-legacy/layouts/partials/future.html +++ b/themes/devopsdays-legacy/layouts/partials/future.html @@ -33,7 +33,7 @@

Future

{{ . }}
{{ range ($.Scratch.GetSortedMapValues (print "future" .)) }} {{ $c_event := (index $.Site.Data.events .) }} - {{ $c_event.city }}: {{ dateFormat "Jan 2" $c_event.startdate }} - {{ dateFormat "Jan 2" $c_event.enddate }}
+ {{ $c_event.city }}: {{ dateFormat "Jan 2" $c_event.startdate }} - {{ dateFormat "Jan 2" $c_event.enddate }}
{{ end }} {{ end }} diff --git a/themes/devopsdays-legacy/layouts/partials/map.html b/themes/devopsdays-legacy/layouts/partials/map.html index 02fdeb8c5dd..30e3146c3dd 100644 --- a/themes/devopsdays-legacy/layouts/partials/map.html +++ b/themes/devopsdays-legacy/layouts/partials/map.html @@ -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 }} ]; diff --git a/themes/devopsdays-legacy/layouts/partials/upcoming_headline.html b/themes/devopsdays-legacy/layouts/partials/upcoming_headline.html index c1d58baa600..000bed9ef6b 100644 --- a/themes/devopsdays-legacy/layouts/partials/upcoming_headline.html +++ b/themes/devopsdays-legacy/layouts/partials/upcoming_headline.html @@ -3,7 +3,7 @@

{{ range sort $.Site.Data.events "startdate" }} {{ if eq .status "current" }} {{ $.Scratch.Add "events" "" }} {{ $.Scratch.Add "events" .city }} {{ $.Scratch.Add "events" " - " }} diff --git a/themes/devopsdays/layouts/blog/single.html b/themes/devopsdays/layouts/blog/single.html index fbb3ce2b998..a7fea5075cc 100644 --- a/themes/devopsdays/layouts/blog/single.html +++ b/themes/devopsdays/layouts/blog/single.html @@ -9,7 +9,7 @@

{{ range $.Site.Data.events }} {{ if eq .status "current" }} {{ $.Scratch.Add "events" "" }} {{ $.Scratch.Add "events" .city }} {{ $.Scratch.Add "events" " - " }} diff --git a/themes/devopsdays/layouts/event/single.html b/themes/devopsdays/layouts/event/single.html index 318daa932a1..f964f4d727b 100644 --- a/themes/devopsdays/layouts/event/single.html +++ b/themes/devopsdays/layouts/event/single.html @@ -9,7 +9,7 @@

{{ $e.city }} - {{ title .Title }}

diff --git a/themes/devopsdays/layouts/index.html b/themes/devopsdays/layouts/index.html index 06dde9647dc..198b1db6043 100644 --- a/themes/devopsdays/layouts/index.html +++ b/themes/devopsdays/layouts/index.html @@ -9,7 +9,7 @@

{{ range $.Site.Data.events }} {{ if eq .status "current" }} {{ $.Scratch.Add "events" "" }} {{ $.Scratch.Add "events" .city }} {{ $.Scratch.Add "events" " - " }} diff --git a/themes/devopsdays/section/blog.html b/themes/devopsdays/section/blog.html index bc30c807d92..0c97a9db799 100644 --- a/themes/devopsdays/section/blog.html +++ b/themes/devopsdays/section/blog.html @@ -9,7 +9,7 @@

{{ range $.Site.Data.events }} {{ if eq .status "current" }} {{ $.Scratch.Add "events" "" }} {{ $.Scratch.Add "events" .city }} {{ $.Scratch.Add "events" " - " }}