9 files changed, 9 insertions, 11 deletions
diff --git a/app/views/admin_general/debug.rhtml b/app/views/admin_general/debug.rhtml
index 99488ba0c..b0749bedb 100644
--- a/app/views/admin_general/debug.rhtml
+++ b/app/views/admin_general/debug.rhtml
@@ -20,8 +20,6 @@ Rails::VERSION::STRING <%=h Rails::VERSION::STRING%>
 TMail::VERSION::STRING <%=h TMail::VERSION::STRING%>
 <br>
 Xapian::version_string <%=h Xapian::version_string%>
-<br>
-Spec::VERSION::STRING <%=h Spec::VERSION::STRING%>
 </p>
 
 <h2>Configuration</h2>
diff --git a/app/views/general/_frontpage_search_box.rhtml b/app/views/general/_frontpage_search_box.rhtml
index d2718b3a3..890602416 100644
--- a/app/views/general/_frontpage_search_box.rhtml
+++ b/app/views/general/_frontpage_search_box.rhtml
@@ -6,7 +6,7 @@
 </h2>
 <form id="search_form" method="post" action="<%= search_redirect_path %>">
   <div>
-    <input id="query" type="text" size="30" name="query">
+    <input id="query" type="text" size="30" name="query" title="type your search term here" >
     <input type="submit" value="<%= _('Search') %>">
   </div>
 </form>
diff --git a/app/views/general/exception_caught.rhtml b/app/views/general/exception_caught.rhtml
index 5f0dfe13d..f8fe4343b 100644
--- a/app/views/general/exception_caught.rhtml
+++ b/app/views/general/exception_caught.rhtml
@@ -7,8 +7,8 @@
   <ul>
   <li><%= _("Check for mistakes if you typed or copied the address.")%></li>
   <li><%= _("Search the site to find what you were looking for.")%>
-      <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "search_form"}) do %>
-             <%= text_field_tag 'query', params[:query], { :size => 30 } %>
+      <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "search_form" }) do %>
+             <%= text_field_tag 'query', params[:query], { :size => 30, :title => "type your search term here" } %>
              <%= submit_tag _("Search") %>
       <% end %>
   </li>
diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml
index 6df12d980..7d402b9b9 100644
--- a/app/views/general/search.rhtml
+++ b/app/views/general/search.rhtml
@@ -37,7 +37,7 @@
   <% else %>
     <% form_tag(request.url, {:method => "get", :id => "search_form"}) do %>
       <p>
-        <%= text_field_tag 'query', params[:query], { :size => 40 } %>
+        <%= text_field_tag 'query', params[:query], { :size => 40, :title => "type your search term here" } %>
         <%= hidden_field_tag 'sortby', @inputted_sortby %>
         <% if @bodies %>
           <%= hidden_field_tag 'bodies', 1 %>
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index 6ac7064a7..9eb967578 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -102,7 +102,7 @@
         <div id="navigation_search">
           <form id="navigation_search_form" method="post" action="<%= search_redirect_path %>">
              <p>
-                 <%= text_field_tag 'query', params[:query], { :size => 40, :id => "navigation_search_query" } %>
+                 <%= text_field_tag 'query', params[:query], { :size => 40, :id => "navigation_search_query", :title => "type your search term here" } %>
                  <input id="navigation_search_button" type="submit" value="search">
              </p>
            </form>
diff --git a/app/views/public_body/list.rhtml b/app/views/public_body/list.rhtml
index 94fbb759c..dd97b99fd 100644
--- a/app/views/public_body/list.rhtml
+++ b/app/views/public_body/list.rhtml
@@ -34,7 +34,7 @@
 
 <% form_tag(list_public_bodies_default_url, :method => "get", :id=>"search_form") do %>
  <div>
-  <%= text_field_tag(:public_body_query, params[:public_body_query]) %> 
+  <%= text_field_tag(:public_body_query, params[:public_body_query], { :title => "type your search term here" } ) %> 
   <%= submit_tag(_("Search")) %>
  </div>
 <% end %>
diff --git a/app/views/request/_sidebar.rhtml b/app/views/request/_sidebar.rhtml
index 5e0c6fd2d..884d4b2b1 100644
--- a/app/views/request/_sidebar.rhtml
+++ b/app/views/request/_sidebar.rhtml
@@ -4,7 +4,7 @@
 
     <% follower_count = TrackThing.count(:all, :conditions => ["info_request_id = ?", @info_request.id]) + 1 %>
     <p><%= n_("There is %d person following this request", "There are %d people following this request", follower_count) % follower_count %></p>
-     <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => @info_request.user == @user, :location => 'sidebar' } %>
+     <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => @info_request.user && @info_request.user == @user, :location => 'sidebar' } %>
    </div>
     <% if @info_request.described_state != "attention_requested" %>
     <h2><%= _('Offensive? Unsuitable?') %></h2>
diff --git a/app/views/request/select_authority.rhtml b/app/views/request/select_authority.rhtml
index 652c24da9..df0498d6a 100644
--- a/app/views/request/select_authority.rhtml
+++ b/app/views/request/select_authority.rhtml
@@ -37,7 +37,7 @@
            like information from. <strong>By law, they have to respond</strong>
            (<a href="%s#%s">why?</a>).') % [help_about_url, "whybother_them"]) %>
            </p>
-           <%= text_field_tag 'query', params[:query], { :size => 30 } %>
+           <%= text_field_tag 'query', params[:query], { :size => 30, :title => "type your search term here" } %>
            <%= hidden_field_tag 'bodies', 1 %>
            <%= submit_tag _('Search') %>
        </div>
diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml
index 31ea2a70b..9d8bf6f2f 100644
--- a/app/views/user/show.rhtml
+++ b/app/views/user/show.rhtml
@@ -109,7 +109,7 @@
 <div id="user_profile_search">
     <% form_tag(show_user_url, :method => "get", :id=>"search_form") do %>
     <div>
-        <%= text_field_tag(:user_query, params[:user_query]) %>
+        <%= text_field_tag(:user_query, params[:user_query], {:title => "type your search term here" }) %>
         <% if @is_you %>
             <%= submit_tag(_("Search your contributions")) %>
         <% else %>