diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 7e8b225..b4784c1 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -67,7 +67,7 @@ class UserMailer < ActionMailer::Base def broadcast(host, subject, content, user, conference) @host = host @content = content - @banner = (@host || 'http://localhost/') + (conference ? (conference.poster.preview.url || '') : image_url('logo.png')) + #@banner = (@host || 'http://localhost/') + (conference ? (conference.poster.preview.url || '') : image_url('logo.png')) if user && user.email mail to: user.email, subject: "[#{conference ? conference.title : 'Bike!Bike!'}] #{subject}" end diff --git a/app/views/application/home.html.haml b/app/views/application/home.html.haml index f4c0828..a3fa192 100644 --- a/app/views/application/home.html.haml +++ b/app/views/application/home.html.haml @@ -8,7 +8,7 @@ %p=_'articles.workshops.paragraphs.Proposed_Workshops', "Would you like to facilitate your own workshop? Simply register and visit the workshops page. If you have already registered you can access the page by restarting the registration process." - if @conference.workshops %ul.workshop-list - - @conference.workshops.each do |w| + - @conference.workshops.sort_by{|w| w.title}.each do |w| %li %h4=w.title .workshop-interest diff --git a/app/views/user_mailer/broadcast.html.haml b/app/views/user_mailer/broadcast.html.haml index 6783480..0463213 100644 --- a/app/views/user_mailer/broadcast.html.haml +++ b/app/views/user_mailer/broadcast.html.haml @@ -1 +1 @@ -=markdown @message \ No newline at end of file +=markdown @content \ No newline at end of file