Fix lists in rich text to display properly

[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 b4bbdc267f40e4bd2f3983ef07f4b2b0f3b18822..7fd21775ec81264df6393a9f4f614824770e3f8a 100644 (file)
--- a/app/views/geocoder/results.html.erb
+++ b/app/views/geocoder/results.html.erb
@@ -1,17 +1,26 @@
 <% if @results.empty? %>
 <% 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 %>
 <% else %>

+  <ul class='results-list'>

   <% @results.each do |result| %>
   <% @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 %>
   <% end %>

+</ul>

   <% if @more_params %>
     <div id="search_more_<%= @more_params.hash %>">
   <% if @more_params %>
     <div id="search_more_<%= @more_params.hash %>">

-      <p class="search_results_entry"><%=
-        link_to_function(t('geocoder.results.more_results')) do |page|
-          page.replace_html "search_more_#{@more_params.hash}", image_tag("searching.gif", :class => "search_searching")
-          page << remote_function(:update => "search_more_#{@more_params.hash}", :url => raw(url_for(@more_params)))
-        end
-      %></p>
+      <div class="inner12 search_results_entry">
+        <%= link_to t('geocoder.results.more_results'), "#", :class => "button" %>
+      </div>
+      <%= image_tag "searching.gif", :class => "search_searching" %>

     </div>
     </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 %>
   <% end %>
 <% end %>