diff --git a/README.md b/README.md index a8fa2562..a8c97def 100644 --- a/README.md +++ b/README.md @@ -133,6 +133,19 @@ Bitcoin v0.3.24 is now available for download at * `title: ...` will be used as the title * `src: ...` (optional) link to full annoucement +### Events + +Events should be placed in `_events/YYYY-MM-DD-SHORTTITLE.md` and adhere to this format: + +``` +--- +title: "Bitcoin 2013 The future of payments" +city: "San Jose" +country: "United States" +link: "http://bitcoin2013.com/" +--- +``` + ### Aliases for contributors Aliases for contributors are defined in ```_config.yml```. diff --git a/_events/2013-07-02-bitcoinlondon.md b/_events/2013-07-02-bitcoinlondon.md new file mode 100644 index 00000000..9af501bc --- /dev/null +++ b/_events/2013-07-02-bitcoinlondon.md @@ -0,0 +1,6 @@ +--- +title: "Bitcoin London" +city: "London" +country: "United Kingdom" +link: "http://btclondon.com/" +--- diff --git a/_events/2013-07-30-insidebitcoins.md b/_events/2013-07-30-insidebitcoins.md new file mode 100644 index 00000000..20b5b6b1 --- /dev/null +++ b/_events/2013-07-30-insidebitcoins.md @@ -0,0 +1,6 @@ +--- +title: "Inside Bitcoins, the future of virtual currency" +city: "New York" +country: "United States" +link: "http://www.mediabistro.com/insidebitcoins/" +--- diff --git a/_events/2013-09-27-europeanconvention.md b/_events/2013-09-27-europeanconvention.md new file mode 100644 index 00000000..71589711 --- /dev/null +++ b/_events/2013-09-27-europeanconvention.md @@ -0,0 +1,6 @@ +--- +title: "The European Bitcoin convention" +city: "Amsterdam" +country: "Netherlands" +link: "http://theconference.eu/" +--- diff --git a/_events/2013-11-01-unsystem.md b/_events/2013-11-01-unsystem.md new file mode 100644 index 00000000..32ffc494 --- /dev/null +++ b/_events/2013-11-01-unsystem.md @@ -0,0 +1,6 @@ +--- +title: "Bitcoin 2013: unSYSTEM" +city: "Vienna" +country: "Austria" +link: "https://unsystem.net/" +--- diff --git a/_events/2013-11-30-bitcoinexpo.md b/_events/2013-11-30-bitcoinexpo.md new file mode 100644 index 00000000..a53fd97a --- /dev/null +++ b/_events/2013-11-30-bitcoinexpo.md @@ -0,0 +1,6 @@ +--- +title: "BitcoinExpo 2013" +city: "London" +country: "United Kingdom" +link: "http://bitcoinexpo.co.uk/" +--- diff --git a/_layouts/base.html b/_layouts/base.html index 5cbb2a60..0804c0d7 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -80,6 +80,7 @@ menu: {% translate menu-resources layout %} {% translate menu-community layout %} {% translate menu-development layout %} + {% case page.lang %}{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'it' or 'nl' or 'pl' or 'ru' %}{% else %}{% translate menu-events layout %}{% endcase %} {% case page.lang %}{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'it' or 'nl' or 'pl' or 'ru' %}{% else %}{% translate menu-press layout %}{% endcase %} diff --git a/_layouts/events.html b/_layouts/events.html deleted file mode 100644 index d712f940..00000000 --- a/_layouts/events.html +++ /dev/null @@ -1,6 +0,0 @@ ---- -layout: base -lang: en ---- -

{{ page.title }}
{{ page.date | date:"%e %B %Y" }}

-{{ content }} diff --git a/_plugins/events.rb b/_plugins/events.rb new file mode 100644 index 00000000..53ffc0d3 --- /dev/null +++ b/_plugins/events.rb @@ -0,0 +1,32 @@ +require 'yaml' + +module Jekyll + + class EventPage < Page + def initialize(site, base, srcdir, src, dstdir, dst, date) + @site = site + @base = base + @dir = '/'+dstdir + @name = dst + self.process(dst) + self.read_yaml(File.join(base, srcdir), src) + self.data['date'] = date + self.data['category'] = 'event' + end + end + + class EventPageGenerator < Generator + def generate(site) + #generate each event page + Dir.foreach('_events') do |file| + next if file == '.' or file == '..' + date = file.split('-') + next if date.length < 4 + date = date[0] + '-' + date[1] + '-' + date[2] + next if !/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/.match(date) + site.pages << EventPage.new(site, site.source, '_events', file, 'event', file, date) + end + end + end + +end diff --git a/_plugins/sitemap.rb b/_plugins/sitemap.rb index 8d7b80c9..edc8b3e7 100644 --- a/_plugins/sitemap.rb +++ b/_plugins/sitemap.rb @@ -106,12 +106,6 @@ module Jekyll sitemap.puts ' http://bitcoin.org/en/release/'+file.gsub('.md','').gsub('.html','')+'' sitemap.puts '' end - #Add posts - site.posts.each do |post| - sitemap.puts '' - sitemap.puts ' http://bitcoin.org'+post.url.gsub('.html','')+'' - sitemap.puts '' - end #Close sitemap sitemap.puts '' end diff --git a/_posts/events/2011-10-24-prague.md b/_posts/events/2011-10-24-prague.md deleted file mode 100644 index 16938d40..00000000 --- a/_posts/events/2011-10-24-prague.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -layout: events -title: European Conference -category: events ---- - -The Bitcoin European Conference (Nov 25—27) will bring together diverse people -from across the spectrum to discuss the state of bitcoin and plot future -goals. This 3-day conference covers the cutting-edge of developments and -innovation through sessions that encourage interaction and discussion between -professionals across the fields of technology, politics, finance and -economics. - -If you are interested in speaking, feel free to [contact the organisers](mailto:conference@bitgroups.org) -as the call for papers is still open. Attendees can register for the conference by following the -instructions on the conference website. Visit for more information. diff --git a/_posts/events/2012-06-27-berlin.md b/_posts/events/2012-06-27-berlin.md deleted file mode 100644 index d76fc241..00000000 --- a/_posts/events/2012-06-27-berlin.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -layout: events -title: Berlin Hackathon -category: events ---- - -[Berlin Bitcoin Hackathon](http://bitcoin-hackathon.com/), 13-15 July: hackers will gather in Berlin geekdom for a weekend of intense coding and collaboration. Sunday we party at [room77](http://www.npr.org/2012/06/01/154140277/berlin-restaurant-experiments-with-virtual-currency): the restaurant at the end of capitalism. Participants are coming in from Switzerland, Austria and Finland. The event is free. - -Important: this event is for the general public, and not only programmers. We actively welcome people with diverse skills like media or activism. There are many [interesting non-programmer](http://bitcoin-hackathon.com/index.php/Main_Page#Ideas) projects like a street marketing campaign, or graffiti designs for the guerilla artist. - -Refreshments and food are sponsored. Best three teams win prizes and free meals. Sponsors and questions to [jeremias.kangas@kangasbros.fi](mailto:jeremias.kangas@kangasbros.fi). - diff --git a/_posts/events/2012-07-16-london.md b/_posts/events/2012-07-16-london.md deleted file mode 100644 index fb3eb42f..00000000 --- a/_posts/events/2012-07-16-london.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -layout: events -title: Bitcoin Conference (London) -category: events ---- - -[Bitcoin Conference](http://bitcoin2012.com/), London Sept 15-16. [Ticket price](https://sites.google.com/a/bitcoin2012.com/homepage/tickets) is €70 (Bitcoin accepted). We have a prestigious venue in central London with max capacity for 700 people. - -We want something for all parts of the community by having very in depth talks from experts about Bitcoin in: development, economics, law, finance, social, ethics. - -Our [first conference](http://bitgroups.org/) was about planning the future. This conference will be bringing Bitcoin to the mainstream. We will reach out to the general public with primer talks and workshops. We hope for this conference to bring greater opportunities to the community by promoting upcoming talent, and bringing investment to this fledgling economy. - -Confirmed speakers include [Richard Stallman](http://en.wikipedia.org/wiki/Richard_stallman), [Max Keiser](http://en.wikipedia.org/wiki/Max_keiser), [Birgitta Jónsdóttir](http://en.wikipedia.org/wiki/Birgitta_J%C3%B3nsd%C3%B3ttir) and others. For the full list of this year's speakers please visit the [speakers list](https://sites.google.com/a/bitcoin2012.com/homepage/speakers). - -If you are interested in speaking, feel free to contact [genjix@bitcoin2012.com](mailto:genjix@bitcoin2012.com) as the call for papers is open. - diff --git a/_templates/events.html b/_templates/events.html new file mode 100644 index 00000000..50be7e35 --- /dev/null +++ b/_templates/events.html @@ -0,0 +1,21 @@ +--- +layout: base +id: events +--- + +
+

{% translate pagetitle %}rss

+

{% translate pagedesc %}

+
    + {% filter_for p in site.pages sort_by:date category:event %} +
  • + {{ p.date | date:"%Y-%m-%d" }} - {{ p.title }} - {{ p.city }}, {{ p.country }} +
    • + {% endfilter_for %} +
+
    +
  • {% translate meetupbitcointalk %}
    • +
  • {% translate meetupwiki %}
    • +
  • {% translate meetupgroup %}
    • +
+
diff --git a/_translations/en.yml b/_translations/en.yml index 04f67988..8c58b31c 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -159,6 +159,13 @@ en: versionhistory: "Show version history" notelicense: "Bitcoin-Qt is a community-driven free open-source project, released under the MIT license." notesync: "Note : Bitcoin-Qt initial sync can take a day to complete. You should make sure that you have enough bandwidth and storage for the full blockchain size." + events: + title: "Conference and events - Bitcoin" + pagetitle: "Conferences and events" + pagedesc: "Find interesting worldwide events and conferences held by different organizers." + meetupbitcointalk: "Bitcoin meetups on BitcoinTalk" + meetupwiki: "Bitcoin meetups on the Wiki" + meetupgroup: "Bitcoin meetup groups" foundation: title: "Bitcoin Foundation - Bitcoin" pagetitle: "Bitcoin Foundation" @@ -468,6 +475,7 @@ en: menu-vocabulary: Vocabulary menu-community: Community menu-development: Development + menu-events: Events menu-press: Press menu-innovation: Innovation menu-foundation: Foundation @@ -487,6 +495,7 @@ en: community: community development: development download: download + events: events foundation: foundation how-it-works: how-it-works innovation: innovation diff --git a/en/rss/events.rss b/en/rss/events.rss new file mode 100644 index 00000000..5ceca3d9 --- /dev/null +++ b/en/rss/events.rss @@ -0,0 +1,21 @@ +--- +--- + + + + Bitcoin conferences and events + http://bitcoin.org/en/events + This RSS feed allows to follow Bitcoin events and conferences. + + http://bitcoin.org/img/logo_rss.png + http://bitcoin.org/en/events + + {% filter_for p in site.pages sort_by:date category:event %} + + {{ p.title }}, {{ p.city }} - {{ p.country }} + {{ p.link }} + {{ p.date | date: "%a, %d %b %Y" }} + + {% endfilter_for %} + +