Merge pull request #171 from devopsdays/mattstratton/remove-dep-on-fr…

…iendly

Remove almost all dependencies on "friendly" field

data/events/2009ghent.yml → data/events/2009-ghent.yml

@@ -1,4 +1,4 @@
-name: 2009ghent
+name: 2009-ghent
 year: 2009
 city: Ghent
 friendly: 2009-ghent

data/events/2010boston.yml → data/events/2010-boston.yml

@@ -1,4 +1,4 @@
-name: 2010boston
+name: 2010-boston
 year: 2010
 city: Boston
 friendly: 2010-boston

data/events/2010sydney.yml → data/events/2010-sydney.yml

@@ -1,4 +1,4 @@
-name: 2010sydney
+name: 2010-sydney
 year: 2010
 city: Sydney
 friendly: 2010-sydney

data/events/2012austin.yml → data/events/2012-austin.yml

@@ -1,4 +1,4 @@
-name: 2012austin
+name: 2012-austin
 year: 2012
 city: Austin
 friendly: 2012-austin

data/events/2013london.yml → data/events/2013-london.yml

@@ -1,4 +1,4 @@
-name: 2013london
+name: 2013-london
 year: 2013
 city: London
 friendly: 2013-london

data/events/2014austin.yml → data/events/2014-austin.yml

@@ -1,4 +1,4 @@
-name: 2014austin
+name: 2014-austin
 year: 2014
 city: Austin
 friendly: 2014-austin

data/events/2015chicago.yml → data/events/2015-chicago.yml

@@ -1,4 +1,4 @@
-name: 2015chicago
+name: 2015-chicago
 year: "2015"
 city: "Chicago"
 friendly: "2015-chicago"

data/events/2015warsaw.yml → data/events/2015-warsaw.yml

@@ -1,4 +1,4 @@
-name: 2015warsaw
+name: 2015-warsaw
 year: "2015"
 city: "Warsaw"
 friendly: "2015-warsaw"

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!

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!

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!

data/events/2016-chicago.yml

@@ -1,4 +1,4 @@
-name: 2016chicago
+name: 2016-chicago
 year: "2016"
 city: "Chicago"
 friendly: "2016-chicago"

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!

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!

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!

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!

data/events/2016-kiel.yml

@@ -1,4 +1,4 @@
-name: 2016kiel
+name: 2016-kiel
 year: "2016"
 city: "Kiel"
 friendly: "2016-kiel"

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!

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!

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!

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!

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!

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!

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!

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!

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!

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

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!

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!

themes/devopsdays-legacy/layouts/partials/event_footer.html

@@ -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 }}
 

themes/devopsdays-legacy/layouts/partials/future.html

@@ -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>

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 }}
     ];

themes/devopsdays-legacy/layouts/partials/upcoming_headline.html

@@ -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> - " }}

themes/devopsdays/layouts/blog/single.html

@@ -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> - " }}

themes/devopsdays/layouts/event/single.html

@@ -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>
 

themes/devopsdays/layouts/index.html

@@ -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> - " }}

themes/devopsdays/section/blog.html

@@ -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> - " }}