Permalink
Browse files

updated branding

  • Loading branch information...
1 parent eba8e30 commit 7e5dfa6d8e7a8e3879d07141b6ca486d9fbbde18 ECUK Pairing Machine committed Apr 20, 2012
Showing with 8 additions and 12 deletions.
  1. +2 −2 app/mailers/presenter_mailer.rb
  2. +1 −1 app/views/layouts/application.html.erb
  3. +2 −2 config/initializers/mail.rb
  4. +3 −7 doc/email.md
View
4 app/mailers/presenter_mailer.rb
@@ -1,8 +1,8 @@
class PresenterMailer < ActionMailer::Base
- default from: "conference@scottishrubyconference.com"
+ default from: "admin@scotlandjs.com"
def email_about_proposal(proposal, subject, body)
presenter = proposal.presenter
- mail(:to => presenter.email,
+ mail(:to => presenter.email,
:subject=>substitute(proposal, subject),
:body=>substitute(proposal, body))
end
View
2 app/views/layouts/application.html.erb
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>Scottish Ruby Conference - Review</title>
+ <title>Scotland JS Conference - Review</title>
<%= stylesheet_link_tag 'reset-fonts-grids', 'jquery.tooltip', 'application', 'tablesort'%>
<%= stylesheet_link_tag 'application', 'print', :media => "print"%>
<%= javascript_include_tag 'application' %>
View
4 config/initializers/mail.rb
@@ -3,9 +3,9 @@
:address => 'smtp.sendgrid.net',
:port => '587',
:authentication => :plain,
- :user_name => 'conference@scottishrubyconference.com',
+ :user_name => 'admin@scotlandjs.com',
:password => 'is-oas-jeb-yac',
- :domain => 'scottishrubyconference.com'
+ :domain => 'scotlandjs.com'
}
ActionMailer::Base.delivery_method = :smtp
end
View
10 doc/email.md
@@ -1,17 +1,13 @@
Hi NAME,
-We would love to include your proposal "PRESENTATION" in the Scottish Ruby Conference programme for 2012. Thanks for submitting!
+We would love to include your proposal "PRESENTATION" in the Scotland JS Conference programme for 2012. Thanks for submitting!
Please can you confirm that you will be presenting, as soon as you can? Then we can start getting our schedule together and letting delegates know about the talk.
-We are sorry that we can not offer expenses for speaking: there are just too many tracks to make it practical. If a company (your employer, for instance) is funding your attendance, we would be happy to put their logo up in a "Speaker Sponsor" section of the site.
+We are sorry that we can not offer expenses for speaking. If a company (your employer, for instance) is funding your attendance, we would be happy to put their logo up in a "Speaker Sponsor" section of the site.
If you have already bought a ticket for the conference, then we owe you a refund. Please let us know, and we will arrange that.
Looking forward to hearing from you,
---
-Paul, Graeme, Alan
-
-PS If you are into Javascript you might want to kill two birds with one stone, and submit to ScotlandJS[1] as well. It's on the Tuesday of the same week as SRC. (You may find the CFP app somewhat familiar.)
-
-[1] http://cfp.scotlandjs.com
+Peter

0 comments on commit 7e5dfa6

Please sign in to comment.