Browse Source

Fix for broadster

development
Godwin 9 years ago
parent
commit
34e72144cc
  1. 2
      app/mailers/user_mailer.rb
  2. 2
      app/views/application/home.html.haml
  3. 2
      app/views/user_mailer/broadcast.html.haml

2
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

2
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

2
app/views/user_mailer/broadcast.html.haml

@ -1 +1 @@
=markdown @message
=markdown @content
Loading…
Cancel
Save