Permalink
Browse files

Merge master.

  • Loading branch information...
2 parents b958b9c + 8ebbebf commit 9ba5d63a14fdcf6182012084d8de7efb8d6881df @polarblau polarblau committed Aug 7, 2012
Showing with 2,346 additions and 372 deletions.
  1. +4 −4 Gemfile
  2. +42 −45 Gemfile.lock
  3. +12 −23 Rakefile
  4. +8 −1 config.rb
  5. +84 −39 data/attendees.yml
  6. +12 −0 data/partners.yml
  7. +450 −0 data/speakers.yaml
  8. +97 −8 data/sponsors.yml
  9. +101 −0 data/team.yaml
  10. +13 −7 lib/custom_tag_helpers.rb
  11. +0 −40 source/blog/2012-07-09-pricing-details.html.haml
  12. +1 −1 source/blog/2012-07-10-about-sponsorship.html.markdown
  13. +32 −0 source/blog/2012-07-24-win-tickets-to-campus-party-eu.html.markdown
  14. +20 −0 source/blog/2012-07-30-main-ticket-sale-ended.html.markdown
  15. +71 −0 source/blog/2012-07-30-sponsor-scalarium.html.markdown
  16. +61 −0 source/blog/2012-08-03-last-minute-pricing-details.html.haml
  17. +37 −0 source/blog/2012-08-07-announcing-our-schedule.html.markdown
  18. +45 −0 source/blog/2012-08-07-workshops.html.markdown
  19. BIN source/images/content/partners/campuspartyeu.png
  20. BIN source/images/content/partners/railsgirls_bln.png
  21. BIN source/images/content/sponsors/6wunderkinder.png
  22. BIN source/images/content/sponsors/airbrake.png
  23. BIN source/images/content/sponsors/basho-logo.png
  24. BIN source/images/content/sponsors/bitcrowd.png
  25. BIN source/images/content/sponsors/innoq.png
  26. BIN source/images/content/sponsors/newrelic.png
  27. BIN source/images/content/sponsors/scalarium/scalarium_overview.png
  28. BIN source/images/content/sponsors/selleo.png
  29. BIN source/images/content/sponsors/soundcloud.png
  30. BIN source/images/content/sponsors/syseleven.png
  31. BIN source/images/content/sponsors/wooga.png
  32. BIN source/images/content/sponsors/workhub.png
  33. BIN source/images/content/team/acoles.jpg
  34. BIN source/images/content/team/akoppel.jpg
  35. BIN source/images/content/team/alang.jpg
  36. BIN source/images/content/team/crequena.jpg
  37. BIN source/images/content/team/fgilcher.jpg
  38. BIN source/images/content/team/fplank.jpg
  39. BIN source/images/content/team/gtirelli.jpg
  40. BIN source/images/content/team/jlelis.jpg
  41. BIN source/images/content/team/jvogel.jpg
  42. BIN source/images/content/team/mguenther.jpg
  43. BIN source/images/content/team/pgega.jpg
  44. BIN source/images/content/team/rschulze.jpg
  45. BIN source/images/content/team/tutke.jpg
  46. BIN source/images/layout/article/next.png
  47. BIN source/images/layout/article/prev.png
  48. BIN source/images/layout/header/logo-1024.png
  49. +18 −13 source/index.html.haml
  50. +1 −1 source/javascripts/application.js
  51. +43 −3 source/javascripts/initializer.coffee
  52. +0 −16 source/javascripts/lib/jquery.debounce.js
  53. +391 −0 source/javascripts/lib/jquery.hashchange.js
  54. +1 −1 source/javascripts/lib/jquery.responsive_images.js
  55. +15 −0 source/layouts/article.haml
  56. +2 −1 source/partials/_header.html.haml
  57. +1 −1 source/partials/_primary_navigation.html.haml
  58. +3 −1 source/partials/_prospectus_table.html.haml
  59. +1 −1 source/partials/_secondary_navigation.html.haml
  60. +4 −2 source/partials/_sponsors.html.haml
  61. +3 −0 source/policies.html.haml
  62. BIN source/sitemap1.xml.gz
  63. BIN source/sitemap_index.xml.gz
  64. +38 −9 source/speakers.html.haml
  65. +3 −1 source/sponsors.html.haml
  66. +99 −1 source/stylesheets/pages/_article.sass
  67. +18 −3 source/stylesheets/pages/_basic.sass
  68. +9 −2 source/stylesheets/pages/_index.sass
  69. +45 −1 source/stylesheets/pages/_policies.sass
  70. +1 −1 source/stylesheets/pages/_shared.sass
  71. +175 −0 source/stylesheets/pages/_speakers.sass
  72. +52 −24 source/stylesheets/pages/_sponsors.sass
  73. +83 −0 source/stylesheets/pages/_team.sass
  74. +28 −15 source/stylesheets/pages/_venue.sass
  75. +89 −57 source/stylesheets/pages/index/_sponsors.sass
  76. +1 −0 source/stylesheets/partials/_footer.sass
  77. +7 −36 source/stylesheets/partials/_header.sass
  78. +1 −0 source/stylesheets/partials/_helpers.sass
  79. +2 −0 source/stylesheets/screen.css.sass
  80. +23 −0 source/team.html.haml
  81. +99 −14 source/venue.html.haml
View
@@ -4,15 +4,15 @@ gem 'rake', '~> 0.9.2'
gem 'sass', :git => 'https://github.com/nex3/sass.git',
:ref => '8a93d8c65baabeb6f3251d560095ff83b52308bf'
-gem 'middleman', :git => 'git://github.com/pietia/middleman.git',
- :ref => 'a5a2e1568b9c69ee8dbc9d623e73a4da361956da'
-gem 'middleman-blog', :git => 'git://github.com/pietia/middleman-blog.git',
- :ref => '15d15d80646e24b6e7729a6199ed59e71ae406e0'
+gem 'middleman', '~> 3.0.0'
+gem 'middleman-blog', '~> 3.0.0'
gem 'builder'
gem 'sitemap_generator'
gem 'coffee-script'
gem 'bourbon'
gem 'nokogiri'
+gem 'redcarpet'
+gem 'pygments.rb'
gem 'html5-boilerplate', :require => 'html5-boilerplate',
:git => 'git://github.com/edenspiekermann/compass-html5-boilerplate.git',
View
@@ -7,45 +7,6 @@ GIT
compass (>= 0.11.1)
GIT
- remote: git://github.com/pietia/middleman-blog.git
- revision: 15d15d80646e24b6e7729a6199ed59e71ae406e0
- ref: 15d15d80646e24b6e7729a6199ed59e71ae406e0
- specs:
- middleman-blog (3.0.0.rc.3)
- maruku (~> 0.6.0)
- middleman-core (= 3.0.0.rc.3)
-
-GIT
- remote: git://github.com/pietia/middleman.git
- revision: a5a2e1568b9c69ee8dbc9d623e73a4da361956da
- ref: a5a2e1568b9c69ee8dbc9d623e73a4da361956da
- specs:
- middleman (3.0.0.rc.3)
- middleman-core (= 3.0.0.rc.3)
- middleman-more (= 3.0.0.rc.3)
- middleman-sprockets (= 3.0.0.rc.3)
- middleman-core (3.0.0.rc.3)
- activesupport (~> 3.2.6)
- bundler (~> 1.1)
- listen (~> 0.4.7)
- rack (~> 1.4.1)
- rack-test (~> 0.6.1)
- thor (~> 0.15.4)
- tilt (~> 1.3.1)
- middleman-more (3.0.0.rc.3)
- coffee-script (~> 2.2.0)
- coffee-script-source (~> 1.3.3)
- compass (>= 0.12.2)
- execjs (~> 1.3.2)
- haml (>= 3.1.6)
- i18n (~> 0.6.0)
- maruku (~> 0.6.0)
- middleman-core (= 3.0.0.rc.3)
- padrino-helpers (= 0.10.7)
- sass (>= 3.1.20)
- uglifier (~> 1.2.6)
-
-GIT
remote: https://github.com/nex3/sass.git
revision: 8a93d8c65baabeb6f3251d560095ff83b52308bf
ref: 8a93d8c65baabeb6f3251d560095ff83b52308bf
@@ -59,6 +20,7 @@ GEM
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.8)
+ blankslate (2.1.2.4)
bourbon (2.1.1)
sass (>= 3.1)
builder (3.0.0)
@@ -72,7 +34,7 @@ GEM
fssm (>= 0.2.7)
sass (~> 3.1)
excon (0.14.2)
- execjs (1.3.2)
+ execjs (1.4.0)
multi_json (~> 1.0)
ffi (1.0.11)
fssm (0.2.9)
@@ -103,8 +65,35 @@ GEM
rb-inotify (~> 0.8.8)
maruku (0.6.0)
syntax (>= 1.0.0)
- middleman-sprockets (3.0.0.rc.3)
- middleman-more (= 3.0.0.rc.3)
+ middleman (3.0.0)
+ middleman-core (= 3.0.0)
+ middleman-more (= 3.0.0)
+ middleman-sprockets (= 3.0.0)
+ middleman-blog (3.0.0)
+ maruku (~> 0.6.0)
+ middleman-core (~> 3.0.0)
+ middleman-core (3.0.0)
+ activesupport (~> 3.2.6)
+ bundler (~> 1.1)
+ listen (~> 0.4.7)
+ rack (~> 1.4.1)
+ rack-test (~> 0.6.1)
+ thor (~> 0.15.4)
+ tilt (~> 1.3.1)
+ middleman-more (3.0.0)
+ coffee-script (~> 2.2.0)
+ coffee-script-source (~> 1.3.3)
+ compass (>= 0.12.2)
+ execjs (~> 1.4.0)
+ haml (>= 3.1.6)
+ i18n (~> 0.6.0)
+ maruku (~> 0.6.0)
+ middleman-core (= 3.0.0)
+ padrino-helpers (= 0.10.7)
+ sass (>= 3.1.20)
+ uglifier (~> 1.2.6)
+ middleman-sprockets (3.0.0)
+ middleman-more (= 3.0.0)
sprockets (~> 2.1)
sprockets-sass (~> 0.8.0)
mime-types (1.19)
@@ -120,6 +109,8 @@ GEM
padrino-helpers (0.10.7)
i18n (~> 0.6)
padrino-core (= 0.10.7)
+ pygments.rb (0.2.13)
+ rubypython (~> 0.5.3)
rack (1.4.1)
rack-contrib (1.1.0)
rack (>= 0.9.1)
@@ -134,16 +125,20 @@ GEM
rb-fsevent (0.9.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
+ redcarpet (2.1.1)
rest-client (1.6.7)
mime-types (>= 1.16)
+ rubypython (0.5.3)
+ blankslate (>= 2.1.2.3)
+ ffi (~> 1.0.7)
rubyzip (0.9.9)
sinatra (1.3.2)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
sitemap_generator (3.1.1)
builder
- sprockets (2.4.4)
+ sprockets (2.4.5)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
@@ -170,11 +165,13 @@ DEPENDENCIES
heroku (= 2.26.6)
heroku_san (= 3.0.2)
html5-boilerplate!
- middleman!
- middleman-blog!
+ middleman (~> 3.0.0)
+ middleman-blog (~> 3.0.0)
nokogiri
+ pygments.rb
rack-contrib
rack-rewrite
rake (~> 0.9.2)
+ redcarpet
sass!
sitemap_generator
View
@@ -40,6 +40,8 @@ namespace :utils do
add '/schedule', :changefreq => 'daily', :priority => 0.8
add '/venue', :changefreq => 'daily'
add '/sponsors', :changefreq => 'daily'
+ add '/speakers', :changefreq => 'daily'
+ add '/team', :changefreq => 'daily'
add '/blog', :changefreq => 'hourly', :priority => 0.9
Dir["source/blog/*"].each do |blog_entry_file|
@@ -54,31 +56,18 @@ namespace :utils do
# scrapes eurucamp page on lanyrd.com and returns
# array of Twitter names
def lanyrd_attendees
- base_url = 'http://lanyrd.com/2012/eurucamp/attendees/'
- profile_selector = '.primary .mini-profile .meta a'
- first_page = Nokogiri::HTML(open(base_url))
- attendees = first_page.css(profile_selector).map {|a| a.content.gsub('@', '') }
+ profile_selector = '.primary .mini-profile .name a'.freeze
+ pagination_selector = '.pagination li a'.freeze
+ base_url = 'http://lanyrd.com'.freeze
+ first_page_path = '/2012/eurucamp/attendees/'.freeze
- other_pages_selector = '.pagination li a'
- other_pages = first_page.css(other_pages_selector).map do |a|
- 'http://lanyrd.com' + a[:href]
- end
-
- other_pages.each do |page|
- page = Nokogiri::HTML(open(page))
- attendees += page.css(profile_selector).map {|a| a.content.gsub('@', '') }
- end
-
- attendees.each do |id|
- image_uri = "https://api.twitter.com/1/users/profile_image/#{id}"
- image_path = "source/images/content/attendees/#{id.tr('_', '')}.jpg"
- unless File.exists?(image_path)
- File.open(image_path, 'w') {|f| f.write(open(image_uri).read) }
- end
- end
-
- attendees
+ first_page = Nokogiri::HTML(open(base_url + first_page_path))
+ other_pages_paths = first_page.css(pagination_selector).map { |a| a[:href] }
+ (other_pages_paths << first_page_path).map do |relative_path|
+ page = Nokogiri::HTML(open(base_url + relative_path))
+ page.css(profile_selector).map {|a| a['href'].gsub(/^\/profile\/|\/$/,'') }
+ end.flatten.sort
end
end
View
@@ -4,6 +4,8 @@
require 'active_support/core_ext/string'
require 'app/helpers/html5_boilerplate_helper'
+set :markdown_engine, :redcarpet
+
###
# Blog settings
###
@@ -30,8 +32,13 @@ def url_without_extension
end
Middleman::Blog::BlogData.class_eval do
+ alias :all_articles :articles
+ def articles
+ published_articles
+ end
+
def published_articles
- articles.select &:published?
+ all_articles.select &:published?
end
end
View
@@ -1,64 +1,109 @@
---
-- myabc
+- 54nd3r
+- _solnic_
+- aaronwalker
+- adman65
+- agnoster
+- allolex
+- andrzejkrzywda
+- aofner
+- apotonick
+- argorak
- arsduo
+- asaaki
+- balepcdev
- bamb00zzle
+- basiszwo
+- beanieboi
+- bfirsh
+- bitboxer
+- captainhagbard
+- chastell
- chrisberkhout
+- cnicolaou
+- coffeejunk
- crissantamarina
+- cs3b
+- dasgib
- davidpiegza
-- dennisreimann
- dbussink
-- DASGiB
-- sferik
-- Argorak
-- hanke
+- ddengler
+- deepflame
+- dennisreimann
+- dira_geek_girl
+- donv70
+- doomhz
+- drkreso
+- elfpavlik
- fbandov
+- feyeleanor
+- fnordfish
+- freaklikeme
- galfert
+- gidogeek
- gkarekinian
-- shime_rb
-- dira_geek_girl
-- agnoster
-- jkwebs
-- jcoglan
+- hanke
+- hasclass
+- higrow
+- iconara
- jan
-- rbjl
- janacharlotte
-- xijo
+- jasiek_
+- jayeff
+- jcoglan
+- jkwebs
+- jng5
- jweiss
-- txustice
+- kaapa
- konstantinhaase
+- langalex
- lrz
-- methodmissing
+- lstoll
+- lucapette
+- m_breit
+- maddesigns
- manukall
-- wikimatze
+- martinploeger
- matthiasjakel
+- maxigs
+- mediafinger
+- methodmissing
- mikeburns
-- mvbehr
-- m_breit
-- apotonick
-- poteland
-- zynisch
-- kaapa
-- _solnic_
-- chastell
-- fnordfish
-- skddc
-- porras
-- steveklabnik
-- sven_kr
-- iconara
-- freaklikeme
+- mirouhh
- mistertim
-- captainhagbard
- mortice
-- beanieboi
-- langalex
-- lucapette
-- martinploeger
-- maxigs
+- mvbehr
+- myabc
+- neektza
- nicsnet
+- nuc
- onionblossom
+- optikfluffel
+- owolf
- piotrgega
- polarblau
-- hasclass
+- porras
+- poteland
+- rbjl
+- rjung
+- rkallensee
+- rubiii
+- saramic
+- sferik
+- shime_rb
+- skddc
+- solux
- srdan
-- asaaki
+- steveklabnik
+- sven_kr
+- thejspr
+- tomislavcapan
+- tow8ie
+- txustice
+- udojuettner
+- valakirka
+- wiederspielwert
+- wikimatze
+- xijo
+- yaph
+- zynisch
Oops, something went wrong.

0 comments on commit 9ba5d63

Please sign in to comment.