aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/public_body/show.rhtml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/public_body/show.rhtml')
-rw-r--r--app/views/public_body/show.rhtml23
1 files changed, 16 insertions, 7 deletions
diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml
index 2aab549b6..b6e0c68b2 100644
--- a/app/views/public_body/show.rhtml
+++ b/app/views/public_body/show.rhtml
@@ -27,6 +27,7 @@
</div>
<div id="header_left">
+ <p class="public-body-name-prefix">Freedom of information requests to</p>
<h1><%=h(@public_body.name)%></h1>
<p class="subtitle">
@@ -51,7 +52,7 @@
<% if @public_body.eir_only? %>
Make a new <strong>Environmental Information</strong> request
<% else %>
- Make a new <strong>Freedom of Information</strong> request
+ Make a new <strong>Freedom of Information</strong> request to <%=h(@public_body.name)%>
<% end %>
&nbsp;<%= _('<a class="link_button_green" href="{{url}}">{{text}}</a>', :url=>new_request_to_body_url(:url_name => @public_body.url_name), :text=>_("Start"))%>
<% elsif @public_body.has_notes? %>
@@ -66,9 +67,7 @@
<% end %>
</div>
</div>
-</div>
-<div style="clear:both">&nbsp;</div>
-<% if !@xapian_requests.nil? %>
+
<% if @public_body.info_requests.size == 0 %>
<% if @public_body.eir_only? %>
<h2><%= _('Environmental Information Regulations requests made using this site') %></h2>
@@ -79,15 +78,26 @@
<% end %>
<% else %>
<h2 class="foi_results">
+
<% if @public_body.eir_only? %>
<%= pluralize(@public_body.info_requests.size, "Environmental Information Regulations request made using this site") %>
<% else %>
- <%= n_('%d Freedom of Information request made using this site', '%d Freedom of Information requests made using this site', @public_body.info_requests.size) % @public_body.info_requests.size %>
+ <% if @public_body.info_requests.size > 1 %>
+ <%= n_('Search within the %d Freedom of Information requests to %s', 'Search within the %d Freedom of Information requests made to %s', @public_body.info_requests.size) % [@public_body.info_requests.size, @public_body.name] %>
+ <% else %>
+ <%= n_('%d Freedom of Information request to %s', '%d Freedom of Information requests to %s', @public_body.info_requests.size) % [@public_body.info_requests.size, @public_body.name] %>
+ <% end %>
<% end %>
<%= @page_desc %>
</h2>
+ <% if @public_body.info_requests.size > 1 %>
+ <%= render :partial => 'request/request_filter_form' %>
+ <% end %>
+ <% end %>
- <%= render :partial => 'request/request_filter_form' %>
+</div>
+<div style="clear:both">&nbsp;</div>
+<% if !@xapian_requests.nil? %>
<% for result in @xapian_requests.results %>
<%= render :partial => 'request/request_listing_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %>
@@ -101,7 +111,6 @@
<p> <%= _('Only requests made using {{site_name}} are shown.', :site_name => site_name) %></p>
<% end %>
- <% end %>
<% else %>
<% if @public_body.eir_only? %>
<h2><%= _('Environmental Information Regulations requests made') %></h2>