Fix double escaping of date markup in note feed

[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 8c5bd8b804903ad391ee65869c338f872ae17cd1..c074a49a30804082ff6c1d5fbe8e07abf3eb423d 100644 (file)
--- a/app/views/site/_search.html.erb
+++ b/app/views/site/_search.html.erb
@@ -1,85 +1,31 @@
 <script type="text/javascript">
 <!--
   function describeLocation() {
 <script type="text/javascript">
 <!--
   function describeLocation() {

-    var args = getArgs($("viewanchor").href);
-
-    <%= remote_function(:loading => "startSearch()",
-                        :url => { :controller => :geocoder, :action => :description },
-                        :with => "'lat=' + args['lat'] + '&lon=' + args['lon'] + '&zoom=' + args['zoom']") %>
-  }
-
-  function setSearchViewbox() {
-    <% if params[:action] == 'index' %>
-    var extent = getMapExtent();
-
-    var minlon = document.createElement("input");
-    minlon.type = "hidden";
-    minlon.id = "minlon";
-    minlon.name = "minlon";
-    minlon.value = extent.left;
-    $("search_form").appendChild(minlon);
-
-    var minlat = document.createElement("input");
-    minlat.type = "hidden";
-    minlat.id = "minlat";
-    minlat.name = "minlat";
-    minlat.value = extent.bottom;
-    $("search_form").appendChild(minlat);
-
-    var maxlon = document.createElement("input");
-    maxlon.type = "hidden";
-    maxlon.id = "maxlon";
-    maxlon.name = "maxlon";
-    maxlon.value = extent.left;
-    $("search_form").appendChild(maxlon);
-
-    var maxlat = document.createElement("input");
-    maxlat.type = "hidden";
-    maxlat.id = "maxlat";
-    maxlat.name = "maxlat";
-    maxlat.value = extent.bottom;
-    $("search_form").appendChild(maxlat);
-    <% end %>
-  }
-
-  function startSearch() {
-    updateSidebar("<%= t 'site.sidebar.search_results' %>", "");
+    var args = getArgs($("#viewanchor").attr("href"));
+
+    $("#sidebar_title").html("<%= t 'site.sidebar.search_results' %>");
+    $("#sidebar_content").load("<%= url_for :controller => :geocoder, :action => :description %>", {
+      lat: args["lat"],
+      lon: args["lon"],
+      zoom: args["zoom"]
+    }, openSidebar);

   }
   }

-
-  function endSearch() {
-    <% if params[:action] == 'index' %>
-    $("minlon").remove();
-    $("minlat").remove();
-    $("maxlon").remove();
-    $("maxlat").remove();
-    <% end %>
-  }
-
-  <% if params[:query] %>
-  <%= remote_function(:loading => "startSearch()",
-                      :url => { :controller => :geocoder, :action => :search, :query => h(params[:query]) }) %>
-  <% end %>

 // -->
 </script>
 
 // -->
 </script>
 

-<% content_for "optionals" do %>
+<% content_for :optionals do %>

   <div class="optionalbox">
   <div class="optionalbox">

-    <span class="whereami"><a href="javascript:describeLocation()" title="<%= t 'site.search.where_am_i_title' %>"><%= t 'site.search.where_am_i' %></a></span>
-    <h1><%= t 'site.search.search' %></h1>

     <div class="search_container">
     <div id="search_field">
     <div class="search_container">
     <div id="search_field">

-    <% form_remote_tag(:before => "setSearchViewbox()",
-                       :loading => "startSearch()",
-                       :complete => "endSearch()",
-                       :url => { :controller => :geocoder, :action => :search },
-                       :html => { :id => "search_form", :method => "get", :action => url_for(:action => "index") }) do %>
-      <%= text_field_tag :query, h(params[:query]), :tabindex => "1" %>
+    <%= form_tag url_for(:controller => :geocoder, :action => :search), :id => "search_form" do %>

       <%= submit_tag t('site.search.submit_text') %>
       <%= submit_tag t('site.search.submit_text') %>

+      <%= text_field_tag :query, h(params[:query]), :tabindex => "1", :placeholder => t('site.search.search'), :autofocus => "autofocus" %>

     <% end %>
     </div>
     </div>
     <% end %>
     </div>
     </div>

-    <p class="search_help">
-      <%= t 'site.search.search_help' %>
+    <p class='search_help deemphasize'>
+      <%= raw(t 'site.search.search_help') %>
+      <span class="whereami"><a href="javascript:describeLocation()" title="<%= t 'site.search.where_am_i_title' %>"><%= t 'site.search.where_am_i' %></a></span>

     </p>
   </div>
 <% end %>
     </p>
   </div>
 <% end %>