diff --git a/exampleSite/data/events/2017-amsterdam.yml b/exampleSite/data/events/2017-amsterdam.yml index 9208b34c1..317ab5b42 100644 --- a/exampleSite/data/events/2017-amsterdam.yml +++ b/exampleSite/data/events/2017-amsterdam.yml @@ -10,7 +10,8 @@ enddate: 2017-06-30 cfp_date_start: 2017-01-15 # start accepting talk proposals. cfp_date_end: 2017-04-01 # close your call for proposals. cfp_date_announce: 2017-05-15 # inform proposers of status -homepage_image: 'logo-square.jpg' +event_logo_square: 'logo-square.jpg' + # Location diff --git a/exampleSite/data/events/2017-atlanta.yml b/exampleSite/data/events/2017-atlanta.yml index 1cd5fb742..750d84ff3 100644 --- a/exampleSite/data/events/2017-atlanta.yml +++ b/exampleSite/data/events/2017-atlanta.yml @@ -10,7 +10,8 @@ enddate: 2017-04-19 cfp_date_start: 2017-01-05 cfp_date_end: 2017-02-27 cfp_date_announce: 2017-03-01 -homepage_image: 'logo-square.jpg' +event_logo_square: 'logo-square.jpg' + # Location diff --git a/exampleSite/data/events/2017-austin.yml b/exampleSite/data/events/2017-austin.yml index 69172a40d..4951b984d 100644 --- a/exampleSite/data/events/2017-austin.yml +++ b/exampleSite/data/events/2017-austin.yml @@ -9,7 +9,8 @@ enddate: 2017-05-05 cfp_date_start: 2017-01-23 cfp_date_end: 2017-02-14 cfp_date_announce: 2017-03-01 -homepage_image: 'logo-square.jpg' +event_logo_square: 'logo-square.jpg' + # Location diff --git a/exampleSite/data/events/2017-baltimore.yml b/exampleSite/data/events/2017-baltimore.yml index 9f427bacc..1c964d63d 100644 --- a/exampleSite/data/events/2017-baltimore.yml +++ b/exampleSite/data/events/2017-baltimore.yml @@ -10,7 +10,8 @@ enddate: 2017-03-08 cfp_date_start: 2016-05-26 cfp_date_end: 2016-12-09 cfp_date_announce: 2017-01-06 -homepage_image: 'logo-square.png' +event_logo_square: 'logo-square.png' + # Location coordinates: "39.286400, -76.605606" # The coordinates of your city. Get Latitude and Longitude of a Point: http://itouchmap.com/latlong.html diff --git a/exampleSite/data/events/2017-beijing.yml b/exampleSite/data/events/2017-beijing.yml index e3daf4753..bb8ef7921 100644 --- a/exampleSite/data/events/2017-beijing.yml +++ b/exampleSite/data/events/2017-beijing.yml @@ -10,7 +10,8 @@ enddate: 2017-03-18 # The end date of your event. Leave blank if you don't have cfp_date_start: # start accepting talk proposals. cfp_date_end: # close your call for proposals. cfp_date_announce: # inform proposers of status -homepage_image: 'logo-square.jpg' +event_logo_square: 'logo-square.jpg' + # Location diff --git a/exampleSite/data/events/2017-cape-town.yml b/exampleSite/data/events/2017-cape-town.yml index 4a4d0a8e6..c6c76d31f 100644 --- a/exampleSite/data/events/2017-cape-town.yml +++ b/exampleSite/data/events/2017-cape-town.yml @@ -11,7 +11,8 @@ enddate: 2017-11-07 cfp_date_start: 2017-02-01 # start accepting talk proposals. cfp_date_end: 2017-04-30 # close your call for proposals. cfp_date_announce: 2017-05-07 # inform proposers of status -homepage_image: "" +event_logo_square: "" + # Location diff --git a/exampleSite/data/events/2017-charlotte.yml b/exampleSite/data/events/2017-charlotte.yml index fd5ae9604..e625b6a0d 100644 --- a/exampleSite/data/events/2017-charlotte.yml +++ b/exampleSite/data/events/2017-charlotte.yml @@ -10,7 +10,8 @@ enddate: 2017-02-07 # The end date of your event. Leave blank if you don't have cfp_date_start: # start accepting talk proposals. cfp_date_end: # close your call for proposals. cfp_date_announce: # inform proposers of status -homepage_image: 'logo-square.png' +event_logo_square: 'logo-square.png' + # Location diff --git a/exampleSite/data/events/2017-chicago.yml b/exampleSite/data/events/2017-chicago.yml index 76670983f..743ecc641 100644 --- a/exampleSite/data/events/2017-chicago.yml +++ b/exampleSite/data/events/2017-chicago.yml @@ -10,7 +10,8 @@ enddate: # The end date of your event. Leave blank if you don't have a venue re cfp_date_start: # start accepting talk proposals. cfp_date_end: # close your call for proposals. cfp_date_announce: # inform proposers of status -homepage_image: 'logo-square.jpg' +event_logo_square: 'logo-square.jpg' + # Location diff --git a/exampleSite/data/events/2017-denver.yml b/exampleSite/data/events/2017-denver.yml index 4d0469a30..752431f32 100644 --- a/exampleSite/data/events/2017-denver.yml +++ b/exampleSite/data/events/2017-denver.yml @@ -10,7 +10,8 @@ cfp_date_end: 2017-02-17 cfp_date_announce: 2017-03-01 coordinates: "39.739236, -104.990251" # The corrodinates of your venue. Get Latitude and Longitude of a Point: http://itouchmap.com/latlong.html location: "Denver" # The name of your location -homepage_image: 'logo-square.jpg' +event_logo_square: 'logo-square.jpg' + nav_elements: # List of pages you want to show up in the navigation of your page. diff --git a/exampleSite/data/events/2017-detroit.yml b/exampleSite/data/events/2017-detroit.yml index 56e7b02b7..3fc395cb3 100644 --- a/exampleSite/data/events/2017-detroit.yml +++ b/exampleSite/data/events/2017-detroit.yml @@ -11,7 +11,8 @@ enddate: 2017-09-28 cfp_date_start: # start accepting talk proposals. cfp_date_end: # close your call for proposals. cfp_date_announce: # inform proposers of status -homepage_image: 'logo-square.jpg' +event_logo_square: 'logo-square.jpg' + # Location diff --git a/exampleSite/data/events/2017-hoofington.yml b/exampleSite/data/events/2017-hoofington.yml index e778e81eb..3a8c0ede2 100644 --- a/exampleSite/data/events/2017-hoofington.yml +++ b/exampleSite/data/events/2017-hoofington.yml @@ -10,7 +10,8 @@ cfp_date_end: 2016-12-30 cfp_date_announce: 2017-01-01 coordinates: "-22.242517, 25.859375" location: "Hoofington Palace" -homepage_image: 'logo-square.png' +event_logo_square: 'logo-square.png' + newnav: "yes" # navigationelements: ["welcome", "contact", "location", "program", "propose", "proposals", "conduct", "sponsor"] nav_elements: diff --git a/exampleSite/data/events/2017-minneapolis.yml b/exampleSite/data/events/2017-minneapolis.yml index c5bb9b97f..2effcf863 100644 --- a/exampleSite/data/events/2017-minneapolis.yml +++ b/exampleSite/data/events/2017-minneapolis.yml @@ -8,7 +8,8 @@ enddate: 2017-07-26 cfp_date_start: 2016-12-22 cfp_date_end: 2017-04-09 cfp_date_announce: 2017-05-07 -homepage_image: 'logo-square.jpg' +event_logo_square: 'logo-square.jpg' + coordinates: "44.972610,-93.272960" diff --git a/exampleSite/data/events/2017-moscow.yml b/exampleSite/data/events/2017-moscow.yml index 58c572ea6..20a327fe3 100644 --- a/exampleSite/data/events/2017-moscow.yml +++ b/exampleSite/data/events/2017-moscow.yml @@ -10,7 +10,8 @@ enddate: 2017-03-11 # The end date of your event. Leave blank if you don't have cfp_date_start: 2016-12-01 # start accepting talk proposals. cfp_date_end: 2017-02-17 # close your call for proposals. cfp_date_announce: 2017-02-17 # inform proposers of status -homepage_image: 'logo-square.png' +event_logo_square: 'logo-square.png' + # Location diff --git a/exampleSite/data/events/2017-ponyville.yml b/exampleSite/data/events/2017-ponyville.yml index 1f0676743..fe7f3fea5 100644 --- a/exampleSite/data/events/2017-ponyville.yml +++ b/exampleSite/data/events/2017-ponyville.yml @@ -11,7 +11,8 @@ cfp_date_announce: 2017-01-01 coordinates: "41.882219, -87.640530" location: "Applejack House" newnav: "yes" -homepage_image: 'logo-square.jpg' +event_logo_square: 'logo-square.jpg' + # navigationelements: ["welcome", "contact", "location", "program", "propose", "proposals", "conduct", "sponsor"] nav_elements: - name: welcome diff --git a/exampleSite/data/events/2017-salt-lake-city.yml b/exampleSite/data/events/2017-salt-lake-city.yml index 7a93df1da..c1d7bff8f 100644 --- a/exampleSite/data/events/2017-salt-lake-city.yml +++ b/exampleSite/data/events/2017-salt-lake-city.yml @@ -10,7 +10,8 @@ enddate: 2017-05-17 # The end date of your event. Leave blank if you don't have cfp_date_start: 2016-12-14 # start accepting talk proposals. cfp_date_end: 2017-02-15 # close your call for proposals. cfp_date_announce: 2017-03-01 # inform proposers of status -homepage_image: 'logo-square.jpg' +event_logo_square: 'logo-square.jpg' + # Location diff --git a/exampleSite/data/events/2017-seattle.yml b/exampleSite/data/events/2017-seattle.yml index 4b8b7bc05..2d9b23611 100644 --- a/exampleSite/data/events/2017-seattle.yml +++ b/exampleSite/data/events/2017-seattle.yml @@ -10,7 +10,8 @@ enddate: 2017-04-27 # The end date of your event. Leave blank if you don't have cfp_date_start: 2016-10-24 # start accepting talk proposals. cfp_date_end: 2017-01-24 # close your call for proposals. cfp_date_announce: 2017-02-07 # inform proposers of status -homepage_image: 'logo-square.jpg' +event_logo_square: 'logo-square.jpg' + # Location diff --git a/exampleSite/data/events/2017-stockholm.yml b/exampleSite/data/events/2017-stockholm.yml index 0af9faa58..dbe230282 100644 --- a/exampleSite/data/events/2017-stockholm.yml +++ b/exampleSite/data/events/2017-stockholm.yml @@ -10,7 +10,8 @@ enddate: 2017-05-09 # The end date of your event. Leave blank if you don't have cfp_date_start: # start accepting talk proposals. cfp_date_end: # close your call for proposals. cfp_date_announce: # inform proposers of status -homepage_image: 'logo-square.jpg' +event_logo_square: 'logo-square.jpg' + # Location diff --git a/exampleSite/data/events/2017-toronto.yml b/exampleSite/data/events/2017-toronto.yml index fd817fab3..5f555513f 100644 --- a/exampleSite/data/events/2017-toronto.yml +++ b/exampleSite/data/events/2017-toronto.yml @@ -10,7 +10,8 @@ enddate: 2017-05-26 # The end date of your event. Leave blank if you don't have cfp_date_start: 2016-12-21 # start accepting talk proposals. cfp_date_end: 2017-01-31 # close your call for proposals. cfp_date_announce: 2017-02-28 # inform proposers of status -homepage_image: 'logo-square.jpg' +event_logo_square: 'logo-square.jpg' + # Location diff --git a/exampleSite/data/events/2017-vancouver.yml b/exampleSite/data/events/2017-vancouver.yml index 532738dc3..4585217af 100644 --- a/exampleSite/data/events/2017-vancouver.yml +++ b/exampleSite/data/events/2017-vancouver.yml @@ -11,7 +11,8 @@ enddate: 2017-04-01 # The end date of your event. Leave blank if you don't have cfp_date_start: 2016-12-01 # start accepting talk proposals. cfp_date_end: 2017-02-01 # close your call for proposals. cfp_date_announce: 2017-02-11 # inform proposers of status -homepage_image: 'logo-square.jpg' +event_logo_square: 'logo-square.jpg' + # Location diff --git a/exampleSite/data/events/2017-zurich.yml b/exampleSite/data/events/2017-zurich.yml index 982b4ee79..eb9281976 100644 --- a/exampleSite/data/events/2017-zurich.yml +++ b/exampleSite/data/events/2017-zurich.yml @@ -10,7 +10,8 @@ enddate: 2017-05-04 cfp_date_start: 2016-11-01 # start accepting talk proposals. cfp_date_end: 2017-02-01 # close your call for proposals. cfp_date_announce: 2017-04-01 # inform proposers of status -homepage_image: 'logo-square.jpg' +event_logo_square: 'logo-square.jpg' + # Location diff --git a/layouts/index.html b/layouts/index.html index c32911e01..4871e3fd4 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -15,9 +15,10 @@ {{- if ge (dateFormat "2006-01-02" .startdate) (dateFormat "2006-01-02" ($.Now.Format "2006-01-02")) -}}
- {{- if .homepage_image }} - {{- if ne .homepage_image "" }} - + {{- if .event_logo_square }} + {{- if ne .event_logo_square "" }} + + {{- end -}} {{- else -}}