Skip to content

Commit

Permalink
added Mathias
Browse files Browse the repository at this point in the history
  • Loading branch information
Piotr Gega (pietia) committed Aug 15, 2012
1 parent e3ada5b commit 82ab714
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 11 deletions.
12 changes: 12 additions & 0 deletions data/speakers.yaml
Expand Up @@ -787,3 +787,15 @@
even in large projects is possible and this workshop will give a few ideas
on how to keep the work on the GUI fun.
-
name: Mathias Meyer
twitter: roidrage
image: mmeyer.jpg
url: http://paperplanes.de
track: outdoor_activities

This comment has been minimized.

Copy link
@myabc

myabc Aug 15, 2012

Member

@polarblau if you could make us a nice label, that would be great ;)

@roidrage Hope this looks ok!

This comment has been minimized.

Copy link
@roidrage

roidrage Aug 16, 2012

👍

This comment has been minimized.

Copy link
@polarblau

polarblau Aug 16, 2012

Member

What do you have in mind?

This comment has been minimized.

Copy link
@pietia

pietia Aug 16, 2012

Contributor

Basically, we need to display similar "label" https://skitch.com/piotrgega/ec6w8/speakers-eurucamp for talk_type=="outdoor_activities" entries

This comment has been minimized.

Copy link
@polarblau

polarblau Aug 16, 2012

Member

Would this be enough? — 9b02707

This comment has been minimized.

Copy link
@pietia

pietia via email Aug 16, 2012

Contributor

This comment has been minimized.

Copy link
@polarblau

polarblau Aug 16, 2012

Member

Yep, will do.

bio: |
Mathias is the author of the Riak Handbook and the Infrastructure
Head Honcho at Travis CI.
talk_type: outdoor_activities
Binary file added source/images/content/speakers/mmeyer.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 14 additions & 11 deletions source/speakers.html.haml
Expand Up @@ -10,14 +10,15 @@ body_class: speakers
= wrapped :aside do
%nav
%ul
- data.speakers.select{ |s| s.track == 'main' || s.track == 'advanced_workshops' }.sort{ |a,b| a.name <=> b.name }.each do |speaker|

- data.speakers.select{ |s| %w(main advanced_workshops outdoor_activities).include?(s.track) }.sort{ |a,b| a.name <=> b.name }.each do |speaker|
%li
%a(href="##{speaker.name.parameterize}" title="Jump to #{speaker.name}")
= speaker.name

= wrapped :section do
%ul
- data.speakers.select{ |s| s.track == 'main' || s.track == 'advanced_workshops' }.sort{ |a,b| a.name <=> b.name }.each_with_index do |speaker, index|
- data.speakers.select{ |s| %w(main advanced_workshops outdoor_activities).include?(s.track) }.sort{ |a,b| a.name <=> b.name }.each_with_index do |speaker, index|
%li(id="#{speaker.name.parameterize}" class="#{index % 2 == 0 ? "odd" : "even"}")
= wrapped :div, :class => 'column info' do
%img(src="/images/content/speakers/#{speaker.image}" alt="Portrait: #{speaker.name}")
Expand All @@ -32,12 +33,14 @@ body_class: speakers
= vimeo speaker.videos.info if speaker.videos && speaker.videos.info
= md2html speaker.bio

= wrapped :div, :class => 'column talk' do
%h4
= speaker.talk_title
- if speaker.track.include? 'workshop'
%br
%span= speaker.track.humanize.singularize
= vimeo speaker.videos.talk if speaker.videos && speaker.videos.talk
%div
= md2html speaker.talk_summary
- unless speaker.track == 'outdoor_activities'
= wrapped :div, :class => 'column talk' do
%h4
= speaker.talk_title
- if speaker.track.include? 'workshop'
%br
%span= speaker.track.humanize.singularize
= vimeo speaker.videos.talk if speaker.videos && speaker.videos.talk
%div
= md2html speaker.talk_summary

0 comments on commit 82ab714

Please sign in to comment.