aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/controllers/public_body_controller.rb1
-rw-r--r--app/views/general/blog.rhtml2
-rw-r--r--app/views/general/search.rhtml5
-rw-r--r--app/views/layouts/default.rhtml2
-rw-r--r--app/views/user/show.rhtml3
-rw-r--r--app/views/user/sign.rhtml2
6 files changed, 7 insertions, 8 deletions
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb
index 1a46cb62f..378dd58e3 100644
--- a/app/controllers/public_body_controller.rb
+++ b/app/controllers/public_body_controller.rb
@@ -90,6 +90,7 @@ class PublicBodyController < ApplicationController
@query = "%#{params[:public_body_query].nil? ? "" : params[:public_body_query]}%"
@tag = params[:tag]
@locale = self.locale_from_params()
+
locale_condition = "(upper(public_body_translations.name) LIKE upper(?) OR upper(public_body_translations.notes) LIKE upper (?)) AND public_body_translations.locale = ?"
if @tag.nil? or @tag == "all"
@tag = "all"
diff --git a/app/views/general/blog.rhtml b/app/views/general/blog.rhtml
index 4bc23832d..4ff408e52 100644
--- a/app/views/general/blog.rhtml
+++ b/app/views/general/blog.rhtml
@@ -4,7 +4,7 @@
<div id="right_column">
<div class="act_link">
<h2>Stay up to date</h2>
- <img src="/images/twitter-16.png" alt="twitter icon" valign="middle"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">Follow us on twitter</a><br/><br/>
+ <img src="/images/twitter-16.png" alt="twitter icon" class="twitter-icon"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">Follow us on twitter</a><br/><br/>
<img src="/images/feed-16.png" alt="RSS icon" valign="middle"> <a href="<%= MySociety::Config.get('BLOG_FEED') %>">Subscribe to blog</a>
</div>
<div id="twitter">
diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml
index f0c5f1576..fe6a49393 100644
--- a/app/views/general/search.rhtml
+++ b/app/views/general/search.rhtml
@@ -109,9 +109,10 @@
<%= text_field_tag(:request_date_before, params[:request_date_before], {:class => "use-datepicker", :size => 10}) %>
</div>
</div>
-<br/>
<% end %>
+<div>
<%= submit_tag("Filter") if @variety_postfix == "requests"%>
+</div>
<% end %>
<p><%= link_to(_("Advanced search"), advanced_search_url) %></p>
<% end %>
@@ -191,7 +192,7 @@
<% if @xapian_requests_hits == 1 && @page == 1 %>
<h2 class="foi_results"><%= _("One FOI request found") %></h2>
<% else %>
- <h2 class="foi_results"><%= _("FOI requests {{start_count}} to {{end_count}} of {{total_count}}", :start_count => ((@page-1)*@requests_per_page+1).to_s, :end_count => [@page*@requests_per_page, @xapian_requests.matches_estimated].min.to_s, :total_count => @xapian_requests.matches_estimated.to_s) %></h2>
+ <h2 class="foi_results"><%= _("FOI requests {{start_count}} to {{end_count}} of {{total_count}}", :start_count => ((@page-1)*@requests_per_page+1).to_s, :end_count => [@page*@requests_per_page, @xapian_requests.matches_estimated].min.to_s, :total_count => @xapian_requests.matches_estimated.to_s) %></h2>
<% end %>
<div class="results_block">
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index 049447320..f5fed2a8f 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -125,7 +125,7 @@
<div id="footer">
<%= link_to _("Contact {{site_name}}", :site_name => site_name), help_contact_url %>
- | <img src="/images/twitter-16.png" alt="twitter icon" valign="middle"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">Follow us on twitter</a>
+ | <img src="/images/twitter-16.png" alt="twitter icon" class="twitter-icon"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">Follow us on twitter</a>
<%= render :partial => 'general/credits' %>
</div>
<div class="after-footer">&nbsp;</div>
diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml
index 17fc0c46d..e3dd74332 100644
--- a/app/views/user/show.rhtml
+++ b/app/views/user/show.rhtml
@@ -213,6 +213,3 @@
<% end %>
<% end %>
<% end %>
-
-</div>
-
diff --git a/app/views/user/sign.rhtml b/app/views/user/sign.rhtml
index 1140d961a..76732c09a 100644
--- a/app/views/user/sign.rhtml
+++ b/app/views/user/sign.rhtml
@@ -37,7 +37,7 @@
- or -
</div>
<div id="right_half">
- <h1>Sign up</h2>
+ <h1>Sign up</h1>
<%= render :partial => 'signup' %>
</div>
<div style="clear:both"></div>