aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/views/info_request_batch/_batch_sent.html.erb69
-rw-r--r--app/views/request/new.html.erb4
2 files changed, 56 insertions, 17 deletions
diff --git a/app/views/info_request_batch/_batch_sent.html.erb b/app/views/info_request_batch/_batch_sent.html.erb
index eed93916d..b7d54d75c 100644
--- a/app/views/info_request_batch/_batch_sent.html.erb
+++ b/app/views/info_request_batch/_batch_sent.html.erb
@@ -1,18 +1,57 @@
-<div id="notice">
- <p>
- <%= _("Your requests will be <strong>sent</strong> shortly!") %>
- </p>
+<div id="content">
+ <div class="request-sent-message" id="notice">
+ <h1>
+ <%= _("Your requests will be <strong>sent</strong> shortly!") %>
+ </h1>
+ <div class="request-sent-message__row">
+ <div class="request-sent-message__column-1">
+ <p class="subtitle">
+ <%= _("<strong>We will email you</strong> when they have been sent. " \
+ "We will also email you when there is a response to any of them, or " \
+ "after {{late_number_of_days}} working days if the authorities still " \
+ "haven't replied by then.",
+ :late_number_of_days => AlaveteliConfiguration::reply_late_after_days) %>
+ </p>
- <p>
- <%= _("<strong>We will email you</strong> when they have been sent. " \
- "We will also email you when there is a response to any of them, or " \
- "after {{late_number_of_days}} working days if the authorities still " \
- "haven't replied by then.",
- :late_number_of_days => AlaveteliConfiguration::reply_late_after_days) %>
- </p>
+ <h2><%= _("Share your batch request") %></h2>
- <p>
- <%= _("If you write about these requests (for example in a forum or a blog) " \
- "please link to this page.") %>
- </p>
+ <%= link_to image_tag("next-step-twitter.png",
+ :alt => _("Tweet it"),
+ :width => "120",
+ :height => "37"),
+ "https://twitter.com/intent/tweet?" << {
+ :url => request.url,
+ :via => AlaveteliConfiguration.twitter_username,
+ :text => "'#{ @info_request_batch.title }'",
+ :related => _('alaveteli_foi:The software that runs {{site_name}}', :site_name => site_name)
+ }.to_query, :class => 'share-link' %>
+
+ <%= link_to image_tag("next-step-facebook.png",
+ :alt => _("Share on Facebook"),
+ :width => "120",
+ :height => "37"),
+ "https://www.facebook.com/sharer/sharer.php?" << {
+ :u => request.url
+ }.to_query, :class => 'share-link' %>
+
+ <h2><%= _("Keep your requests up to date") %></h2>
+ <p>
+ <%= _('If you write about these requests ' \
+ '(for example in a forum or a blog) ' \
+ 'please link to this page.') %>
+ </p>
+ </div>
+ <div class="request-sent-message__column-2">
+ <div class="what-next">
+ <h2><%= _("What next?") %></h2>
+ <ul class="what-next__list">
+ <li>
+ <%= link_to _("Help us classify requests that haven't " \
+ "been updated"), categorise_play_path %>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
diff --git a/app/views/request/new.html.erb b/app/views/request/new.html.erb
index cbcf5a0a5..486a89d45 100644
--- a/app/views/request/new.html.erb
+++ b/app/views/request/new.html.erb
@@ -70,9 +70,9 @@
<%= foi_error_messages_for :info_request, :outgoing_message %>
- <% if @info_request.public_body.override_request_email %>
+ <% if !AlaveteliConfiguration::override_all_public_body_request_emails.blank? %>
<div class="warning">
- <%= _("<strong>Note:</strong> Because we're testing, requests are being sent to {{email}} rather than to the actual authority.", :email => @info_request.public_body.override_request_email) %>
+ <%= _("<strong>Note:</strong> Because we're testing, requests are being sent to {{email}} rather than to the actual authority.", :email => AlaveteliConfiguration::override_all_public_body_request_emails) %>
</div>
<% end %>