diff options
| -rw-r--r-- | app/views/admin_public_body/show.rhtml | 7 | ||||
| -rw-r--r-- | app/views/body/show.rhtml | 15 | ||||
| -rw-r--r-- | app/views/request/new.rhtml | 10 | ||||
| -rw-r--r-- | todo.txt | 1 |
4 files changed, 16 insertions, 17 deletions
diff --git a/app/views/admin_public_body/show.rhtml b/app/views/admin_public_body/show.rhtml index eac38cfa8..4d7c26a38 100644 --- a/app/views/admin_public_body/show.rhtml +++ b/app/views/admin_public_body/show.rhtml @@ -7,7 +7,12 @@ <b><%= column.human_name %>:</b> <%=h @public_body.send(column.name) %> <br/> <% end %> -<b>Calculated home page:</b> <%= link_to(h(@public_body.calculated_home_page), @public_body.calculated_home_page) %> +<b>Calculated home page:</b> +<% if !@public_body.calculated_home_page.nil? %> + <%= link_to(h(@public_body.calculated_home_page), @public_body.calculated_home_page) %> +<% else %> + *unknown* +<% end %> <br/><b>Tags:</b> <%=h @public_body.tag_string %> <br/> </p> diff --git a/app/views/body/show.rhtml b/app/views/body/show.rhtml index 6eb63d8c1..0969c7d8d 100644 --- a/app/views/body/show.rhtml +++ b/app/views/body/show.rhtml @@ -9,7 +9,9 @@ <p class="subtitle"> <%=@public_body.type_of_authority(true)%> in the UK<% if not @public_body.short_name.empty? %>, also called <%= h(@public_body.short_name) %><% end %> -(<%= link_to "home page", @public_body.calculated_home_page %>) +<% if !@public_body.calculated_home_page.nil? %> + (<%= link_to "home page", @public_body.calculated_home_page %>) +<% end %> <% if !@user.nil? && @user.admin_page_links? %> (<%= link_to "admin", public_body_admin_url(@public_body) %>) <% end %> @@ -23,17 +25,6 @@ <p>You can only request information about the environment from this authority.</p> <% end %> -<!-- -<% form_tag("http://www.google.co.uk/search", {:id => "search_body_website_form", :method => "get"} ) do %> - <p> - <strong>Search the authority's <%= link_to "web site", @public_body.calculated_home_page %>:</strong> - <%= text_field_tag 'q', params[:q], { :size => 20 } %> - <%= hidden_field_tag 'as_sitesearch', @public_body.calculated_home_page %> - <%= submit_tag "Search" %> - </p> -<% end %> ---> - <p> <% if @public_body.eir_only? %> <%= link_to "Make a new EIR request to " + h(@public_body.name), new_request_to_body_url(:public_body_id => @public_body.id.to_s)%> diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml index ff5e402e0..a35d2addc 100644 --- a/app/views/request/new.rhtml +++ b/app/views/request/new.rhtml @@ -20,10 +20,12 @@ <% form_tag("http://www.google.co.uk/search", {:id => "search_body_website_form", :method => "get"} ) do %> <p> <strong>First, search</strong> the authority's web site ... - <br> - <%= text_field_tag 'q', params[:q], { :size => 20 } %> - <%= hidden_field_tag 'as_sitesearch', @info_request.public_body.calculated_home_page %> - <%= submit_tag "Search" %> + <% if !@info_request.public_body.calculated_home_page.nil? %> + <br> + <%= text_field_tag 'q', params[:q], { :size => 20 } %> + <%= hidden_field_tag 'as_sitesearch', @info_request.public_body.calculated_home_page %> + <%= submit_tag "Search" %> + <% end %> <br> ... to check that the info isn't already published. </p> @@ -253,6 +253,7 @@ Quoting fixing TODO: http://www.whatdotheyknow.com/request/public_inspection_periods_for_lo_2#outgoing-1707 # square bracket in link http://www.whatdotheyknow.com/request/digital_tv_switchover_in_local_a#incoming-4931 + http://www.whatdotheyknow.com/request/local_government_ombudsman_58#incoming-5763 http://www.whatdotheyknow.com/request/415/response/1041/attach/3/CONF%20FOI%209508%20Ian%20Holton.doc |