diff --git a/README.md b/README.md index b2db1b16..66dce4ab 100644 --- a/README.md +++ b/README.md @@ -111,10 +111,12 @@ Events should be placed in `_events/YYYY-MM-DD-SHORTTITLE.md` and adhere to this ``` --- -title: "Bitcoin 2013 The future of payments" -city: "San Jose" +title: "2014 Texas Bitcoin Conference" +venue: "Circuit of the Americas™ - Technology and Conference Center" +address: "9201 Circuit of the Americas Blvd" +city: "Austin, TX" country: "United States" -link: "http://bitcoin2013.com/" +link: "http://texasbitcoinconference.com/" --- ``` diff --git a/_events/2014-02-12-insidebitcoinsberlin2014.md b/_events/2014-02-12-insidebitcoinsberlin2014.md index ad35e4e0..88201c68 100644 --- a/_events/2014-02-12-insidebitcoinsberlin2014.md +++ b/_events/2014-02-12-insidebitcoinsberlin2014.md @@ -1,5 +1,7 @@ --- title: "Inside Bitcoins Berlin" +venue: "Kalkscheune" +address: "Johannisstr. 2 10117" city: "Berlin" country: "Germany" link: "http://insidebitcoins.de/?c=bcoinbebcorg/" diff --git a/_events/2014-02-21-berlintexas.md b/_events/2014-02-21-berlintexas.md index a6e3dafe..3781932a 100644 --- a/_events/2014-02-21-berlintexas.md +++ b/_events/2014-02-21-berlintexas.md @@ -1,5 +1,7 @@ --- title: "Berlin, Texas: Bitcoin hackathon" +venue: "c-base Raumstation" +address: "Rungestraße 20, 10179" city: "Berlin" country: "Germany" link: "https://www.eventbrite.com/e/berlin-texas-bitcoin-hackathon-decentralise-everything-tickets-10509228385" diff --git a/_events/2014-03-06-texasbitcoinconference.md b/_events/2014-03-06-texasbitcoinconference.md index 939d6eb9..be046ff7 100644 --- a/_events/2014-03-06-texasbitcoinconference.md +++ b/_events/2014-03-06-texasbitcoinconference.md @@ -1,5 +1,7 @@ --- title: "2014 Texas Bitcoin Conference" +venue: "Circuit of the Americas™ - Technology and Conference Center" +address: "9201 Circuit of the Americas Blvd" city: "Austin, TX" country: "United States" link: "http://texasbitcoinconference.com/" diff --git a/_events/2014-03-20-commercism.md b/_events/2014-03-20-commercism.md index 0a7bd770..bff39b59 100644 --- a/_events/2014-03-20-commercism.md +++ b/_events/2014-03-20-commercism.md @@ -1,5 +1,7 @@ --- title: "Commercism Bitcoinference" +venue: "Microsoft Conference Center" +address: "1065 La Avenida Street, Building 1" city: "Mountain View, CA" country: "United States" link: "http://commercism.co/bitcoin" diff --git a/_events/2014-03-25-coinsummit.md b/_events/2014-03-25-coinsummit.md index 6a671604..de3751e5 100644 --- a/_events/2014-03-25-coinsummit.md +++ b/_events/2014-03-25-coinsummit.md @@ -1,5 +1,7 @@ --- title: "CoinSummit" +venue: "Yerba Buena Center for the Arts" +address: "701 Mission Street" city: "San Francisco, CA" country: "United States" link: "http://www.coinsumm.it/" diff --git a/_events/2014-04-07-insidebitcoinsnyc2014 b/_events/2014-04-07-insidebitcoinsnyc2014 index 0ec656fb..c03b3275 100644 --- a/_events/2014-04-07-insidebitcoinsnyc2014 +++ b/_events/2014-04-07-insidebitcoinsnyc2014 @@ -1,5 +1,7 @@ --- title: "Inside Bitcoins NYC" +venue: "Javits Convention Center" +address: "655 West 34th Street" city: "New York, NY" country: "United States" link: "http://www.mediabistro.com/insidebitcoins/new-york/?c=bcoinnybcorg" diff --git a/_events/2014-04-11-expo.md b/_events/2014-04-11-expo.md index 26b8c0db..c90ce7d4 100644 --- a/_events/2014-04-11-expo.md +++ b/_events/2014-04-11-expo.md @@ -1,5 +1,7 @@ --- title: "Bitcoin Expo 2014" +venue: "Metro Toronto Convention Centre" +address: "255 Front St W" city: "Toronto, ON" country: "Canada" link: "http://www.bitcoinexpo.ca/" diff --git a/_events/2014-05-15-bitcoin2014 b/_events/2014-05-15-bitcoin2014 index e18a2bef..7d42daf4 100644 --- a/_events/2014-05-15-bitcoin2014 +++ b/_events/2014-05-15-bitcoin2014 @@ -1,5 +1,7 @@ --- title: "Bitcoin Foundation Bitcoin 2014" +venue: "Passenger Terminal" +address: "Piet Heinkade 271019 BR" city: "Amsterdam" country: "Netherlands" link: "http://www.bitcoin2014.com/" diff --git a/_events/2014-06-20-beltway.md b/_events/2014-06-20-beltway.md index 9d26a060..013cd775 100644 --- a/_events/2014-06-20-beltway.md +++ b/_events/2014-06-20-beltway.md @@ -1,5 +1,7 @@ --- title: "Bitcoin in the Beltway" +venue: "Marriott Renaissance Downtown" +address: "999 9th St NW" city: "Washington, DC" country: "United States" link: "http://www.bitcoinbeltway.com/" diff --git a/_events/2014-08-25-campbitcoin.md b/_events/2014-08-25-campbitcoin.md index 7a3c82e7..1250c481 100644 --- a/_events/2014-08-25-campbitcoin.md +++ b/_events/2014-08-25-campbitcoin.md @@ -1,5 +1,7 @@ --- title: "Camp Bitcoin" +venue: "The Burning Man camp" +address: "" city: "Black Rock City, NV" country: "United States" link: "http://campbitcoin.hivewallet.com/" diff --git a/_less/screen.less b/_less/screen.less index 5115a791..11b0ffa5 100644 --- a/_less/screen.less +++ b/_less/screen.less @@ -1064,6 +1064,10 @@ h2 .rssicon{ margin-top:4px; } +.eventmap{ + height:400px; +} + .summary{ font-size:125%; margin-bottom:40px; @@ -1546,6 +1550,9 @@ h2 .rssicon{ .downloadbox>p:first-child{ display:none; } + .eventmap{ + height:200px; + } } /* Deprecated styles (should be removed when translations are updated) */ diff --git a/_plugins/events.rb b/_plugins/events.rb index e5699064..1e40a64c 100644 --- a/_plugins/events.rb +++ b/_plugins/events.rb @@ -6,6 +6,7 @@ #on the events RSS file and translated events pages. require 'yaml' +require 'cgi' module Jekyll @@ -19,6 +20,13 @@ module Jekyll self.read_yaml(File.join(base, srcdir), src) self.data['date'] = date self.data['category'] = 'event' + # Get longitude / latitude from Google Geocoding API + self.data['geoloc'] = 'false' + address = CGI::escape(self.data['address'] + ', ' +self.data['city'] + ', ' + self.data['country']) + geoloc = JSON.parse(open("https://maps.googleapis.com/maps/api/geocode/json?address=" + address + "&sensor=false","User-Agent"=>"Ruby/#{RUBY_VERSION}").read) + if geoloc['status'] == 'OK' + self.data['geoloc'] = geoloc['results'][0]['geometry']['location']['lat'].to_s + ", " + geoloc['results'][0]['geometry']['location']['lng'].to_s + end end end diff --git a/_templates/events.html b/_templates/events.html index f6db15f6..bec18b1c 100644 --- a/_templates/events.html +++ b/_templates/events.html @@ -5,6 +5,29 @@ id: events

{% translate pagetitle %}rss

{% translate pagedesc %}

+ + + + + + +
+ + +