Merge branch 'basic-responsive-stylesheet' into develop

4 files changed, 9 insertions, 3 deletions

diff --git a/lib/views/general/_before_head_end.html.erb b/lib/views/general/_before_head_end.html.erb
index 9f8f339..19a54a0 100644
--- a/lib/views/general/_before_head_end.html.erb
+++ b/lib/views/general/_before_head_end.html.erb
@@ -1 +1 @@
-<%= stylesheet_link_tag "application" %>
+ <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Roboto+Slab:400,700&subset=latin,latin-ext,cyrillic,cyrillic-ext">
diff --git a/lib/views/general/_orglink.html.erb b/lib/views/general/_orglink.html.erb
index 2b91e73..b22d123 100644
--- a/lib/views/general/_orglink.html.erb
+++ b/lib/views/general/_orglink.html.erb
@@ -1 +1 @@
-<%= link_to image_tag('logo.png'), frontpage_url, :id=>'logo' %>
+<%= link_to image_tag('old-logo.png', :alt => 'Alaveteli logo'), frontpage_url, :id=>'logo' %>
diff --git a/lib/views/help/requesting.html.erb b/lib/views/help/requesting.html.erb
index 7787d15..28e55fd 100644
--- a/lib/views/help/requesting.html.erb
+++ b/lib/views/help/requesting.html.erb
@@ -31,7 +31,7 @@ wrong, they ought to advise you who to make the request to instead.
 <dt id="missing_body">You're missing the public authority that I want to request from! <a href="#missing_body">#</a> </dt>
 
 <dd>
-<p>Please <a href="/help/contact">contact us</a> with the name of the public authority and,
+<p>Please <a href="<%= new_change_request_path %>">contact us</a> with the name of the public authority and,
 if you can find it, their contact email address for Freedom of Information requests.
 </p>
 <p>If you'd like to help add a whole category of public authority to the site, we'd love
diff --git a/lib/views/outgoing_mailer/initial_request.text.erb b/lib/views/outgoing_mailer/initial_request.text.erb
index f927ad2..f755e39 100644
--- a/lib/views/outgoing_mailer/initial_request.text.erb
+++ b/lib/views/outgoing_mailer/initial_request.text.erb
@@ -4,6 +4,12 @@
 
 <%= _('This is an FOI request done via the {{site_name}} website. This footer has been overriden by the sample Alaveteli theme.', :site_name => site_name) %>
 
+<%= _('Please use this email address for all replies to this request:')%>
+<%= @info_request.incoming_email %>
+
+<%= _('Is {{email_address}} the wrong address for {{type_of_request}} requests to {{public_body_name}}? If so, please contact us using this form:', :email_address => @info_request.public_body.request_email, :type_of_request =>  @info_request.law_used_full, :public_body_name => @info_request.public_body.name)%>
+<%= new_change_request_url(:body => @info_request.public_body.url_name) %>
+
 <%= render :partial => 'followup_footer' %>
 
 -------------------------------------------------------------------