diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/public_body_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/general/search.rhtml | 2 | ||||
| -rw-r--r-- | app/views/public_body/list.rhtml | 2 | ||||
| -rw-r--r-- | app/views/public_body/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/request/new.rhtml | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index 830f37855..ab66dff9d 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -112,7 +112,9 @@ class PublicBodyController < ApplicationController and has_tag_string_tags.model = \'PublicBody\' and has_tag_string_tags.name = ?) > 0', @query, @query, @locale, @tag] end - if @tag.size == 1 + if @tag == "all" + @description = "" + elsif @tag.size == 1 @description = _("beginning with") + " '" + @tag + "'" else @description = PublicBodyCategories::CATEGORIES_BY_TAG[@tag] diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index cc89c28cd..5e21bc318 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -28,7 +28,7 @@ <% if @bodies %> <%= hidden_field_tag 'bodies', 1 %> <% end %> - <%= image_submit_tag 'button-search.png', :title=>"Search" %> + <%= submit_tag _("Search") %> <%= link_to _('Simple search'), search_redirect_path %> </p> <% end %> diff --git a/app/views/public_body/list.rhtml b/app/views/public_body/list.rhtml index e5ccb4fd9..aa82ba429 100644 --- a/app/views/public_body/list.rhtml +++ b/app/views/public_body/list.rhtml @@ -37,7 +37,7 @@ <h1>Public authorities</h1> <h2 class="publicbody_results"><%= _('Found {{count}} public bodies {{description}}', :count=>@public_bodies.size, :description=>@description) %></h2> -<% form_tag(request.url, :method => "get") do %> +<% form_tag(list_public_bodies_default_url, :method => "get") do %> <div> <%= label_tag(:public_body_query, _("Search:")) %> <%= text_field_tag(:public_body_query, params[:public_body_query]) %> diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index ef554c35c..85506a1bd 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -49,7 +49,7 @@ <% else %> Make a new <strong>Freedom of Information</strong> request <% end %> - <%= _(' <a class="link_button_green" href="{{url}}">{{text}}</a>', :url=>new_request_to_body_url(:url_name => @public_body.url_name), :text=>_("Start"))%> + <%= _('<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? %> <%= @public_body.notes_as_html %> <% elsif @public_body.not_requestable_reason == 'not_apply' %> diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml index 9538065ed..8f7d00d47 100644 --- a/app/views/request/new.rhtml +++ b/app/views/request/new.rhtml @@ -31,7 +31,7 @@ <p> <%= text_field_tag 'q', params[:q], { :size => 20 } %> <%= hidden_field_tag 'as_sitesearch', @info_request.public_body.calculated_home_page %> - <%= submit_tag _("Search") %> + <%= submit_tag _("Search"), :class=>"small" %> </p> <% end %> ... <%= _('to check that the info isn\'t already published.') %> |