Added user ID, description, languages and image link to the user details API call.

[rails.git] / app / views / site / _search.html.erb

diff --git a/app/views/site/_search.html.erb b/app/views/site/_search.html.erb
index b57a1f984f0381308322d9e78ccfb23119000cef..12b8bccc558e5d10b07e7c56f594cd7f81b32c5e 100644 (file)
--- a/app/views/site/_search.html.erb
+++ b/app/views/site/_search.html.erb
@@ -1,29 +1,19 @@
 <script type="text/javascript">
 <!--
   function startSearch() {
 <script type="text/javascript">
 <!--
   function startSearch() {

-    updateSidebar("Search Results", "<p class='search_results_entry'>Searching...<\/p>");
-
-    $("search_field").style.display = "none";
-    $("search_active").style.display = "inline";
-  }
-
-  function endSearch() {
-    $("search_field").style.display = "inline";
-    $("search_active").style.display = "none";
+    updateSidebar("<%= t 'site.sidebar.search_results' %>", "");

   }
 
   function describeLocation() {
     var position = getPosition();
 
     <%= remote_function(:loading => "startSearch()",
   }
 
   function describeLocation() {
     var position = getPosition();
 
     <%= remote_function(:loading => "startSearch()",

-                        :complete => "endSearch()",

                         :url => { :controller => :geocoder, :action => :description },
                         :with => "'lat=' + position.lat + '&lon=' + position.lon") %>
   }
 
   <% if params[:query] %>
   <%= remote_function(:loading => "startSearch()",
                         :url => { :controller => :geocoder, :action => :description },
                         :with => "'lat=' + position.lat + '&lon=' + position.lon") %>
   }
 
   <% if params[:query] %>
   <%= remote_function(:loading => "startSearch()",

-                      :complete => "endSearch()",

                       :url => { :controller => :geocoder, :action => :search, :query => h(params[:query]) }) %>
   <% end %>
 // -->
                       :url => { :controller => :geocoder, :action => :search, :query => h(params[:query]) }) %>
   <% end %>
 // -->


@@ -42,7 +32,6 @@
       <%= submit_tag t('site.search.submit_text') %>
     <% end %>
     </div>
       <%= submit_tag t('site.search.submit_text') %>
     <% end %>
     </div>

-    <p id="search_active"><%= t 'site.search.searching' %></p>

     </div>
     <p class="search_help">
       <%= t 'site.search.search_help' %>
     </div>
     <p class="search_help">
       <%= t 'site.search.search_help' %>