Don't cast object type and ID to string in case they are nil

[rails.git] / app / views / geocoder / results.html.erb

diff --git a/app/views/geocoder/results.html.erb b/app/views/geocoder/results.html.erb
index 61d28697d715f6caf99568ae9c3afcd0e2a9267f..f98f2abc9e3c490f7643c749c8bd1a9138a4a853 100644 (file)
--- a/app/views/geocoder/results.html.erb
+++ b/app/views/geocoder/results.html.erb
@@ -1,25 +1,17 @@
 <% if @results.empty? %>
-  <p class="search_results_entry"><%= t 'geocoder.results.no_results' %></p>
+  <p class="search_results_entry inner12"><%= t 'geocoder.results.no_results' %></p>
 <% else %>
+  <ul class='results-list'>
   <% @results.each do |result| %>
-    <p class="search_results_entry"><%= result_to_html(result) %></p>
+    <li><p class="inner12 search_results_entry"><%= result_to_html(result) %></p></li>
   <% end %>
+</ul>
   <% if @more_params %>
-    <div id="search_more_<%= @more_params.hash %>">
-      <p class="search_results_entry">
-        <%= link_to t('geocoder.results.more_results'), "#" %>
-      </p>
-      <%= image_tag "searching.gif", :class => "search_searching" %>
+    <div class="search_more">
+      <div class="inner12 search_results_entry">
+        <%= link_to t('geocoder.results.more_results'), url_for(@more_params), :class => "button" %>
+      </div>
+      <%= image_tag "searching.gif", :class => ["search_searching", "hidden"] %>
     </div>
-    <script type="text/javascript">
-    $("#search_more_<%= @more_params.hash %> .search_searching").hide();
-
-    $("#search_more_<%= @more_params.hash %> a").click(function () {
-      $("#search_more_<%= @more_params.hash %> .search_results_entry").hide();
-      $("#search_more_<%= @more_params.hash %> .search_searching").show();
-
-      $("#search_more_<%= @more_params.hash %>").load("<%= raw url_for(@more_params) %>");
-    });
-    </script>
   <% end %>
 <% end %>