bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Fix for broadster

Browse Source
This commit is contained in:
Godwin 2015-09-25 18:44:55 -07:00
parent 3998a9ed4f
commit 34e72144cc
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mailers/user_mailer.rb
View File

@ -67,7 +67,7 @@ class UserMailer < ActionMailer::Base
def broadcast(host, subject, content, user, conference) def broadcast(host, subject, content, user, conference)
@host = host @host = host
@content = content @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 if user && user.email
mail to: user.email, subject: "[#{conference ? conference.title : 'Bike!Bike!'}] #{subject}" mail to: user.email, subject: "[#{conference ? conference.title : 'Bike!Bike!'}] #{subject}"
end end

2
app/views/application/home.html.haml
View File

@ -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." %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 - if @conference.workshops
%ul.workshop-list %ul.workshop-list
- @conference.workshops.each do |w| - @conference.workshops.sort_by{|w| w.title}.each do |w|
%li %li
%h4=w.title %h4=w.title
.workshop-interest .workshop-interest

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

@ -1 +1 @@
=markdown @message =markdown @content