Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

added Mathias

  • Loading branch information...
commit 82ab7143e3ca0fa5fb82ea2922b85634da860e6c 1 parent e3ada5b
@pietia pietia authored
View
12 data/speakers.yaml
@@ -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
@myabc Owner
myabc added a note

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

@roidrage Hope this looks ok!

What do you have in mind?

@pietia
pietia added a note

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

Would this be enough? — 9b02707

@pietia
pietia added a note

Yep, will do.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+ bio: |
+ Mathias is the author of the Riak Handbook and the Infrastructure
+ Head Honcho at Travis CI.
+ talk_type: outdoor_activities
View
BIN  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.
View
25 source/speakers.html.haml
@@ -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}")
@@ -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
+
@myabc

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

@roidrage Hope this looks ok!

@polarblau

What do you have in mind?

@pietia

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

@polarblau

Would this be enough? — 9b02707

@pietia
@polarblau

Yep, will do.

Please sign in to comment.
Something went wrong with that request. Please try again.