autocomplete (not compiled for now) and start of tile support

[rails.git] / app / views / diary_entry / new.rhtml

diff --git a/app/views/diary_entry/new.rhtml b/app/views/diary_entry/new.rhtml
index 69995d00e14e3f34f08b25f0118243ed5a9d3c12..7ee1eeaede5f1d6991583bd7547ad7c685333986 100644 (file)
--- a/app/views/diary_entry/new.rhtml
+++ b/app/views/diary_entry/new.rhtml
@@ -23,16 +23,17 @@
 <% end %>
 
 <% if @user.home_lat.nil? or @user.home_lon.nil? %>
 <% end %>
 
 <% if @user.home_lat.nil? or @user.home_lon.nil? %>

-  <% lon =  params['lon'] || '-0.1' %>
-  <% lat =  params['lat'] || '51.5' %>
-  <% zoom =  params['zoom'] || '4' %> 
+  <% lon = h(params['lon'] || '-0.1') %>
+  <% lat = h(params['lat'] || '51.5') %>
+  <% zoom = h(params['zoom'] || '4') %> 

 <% else %>
 <% else %>

-  <% lon =  @user.home_lon %>
-  <% lat =  @user.home_lat %>
-  <% zoom =  '12' %>
+  <% lon = @user.home_lon %>
+  <% lat = @user.home_lat %>
+  <% zoom = '12' %>

 <% end %>
 
 <% end %>
 

-<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>

 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">


@@ -68,4 +69,4 @@
 
   window.onload = init;
 // -->
 
   window.onload = init;
 // -->

-</script>
\ No newline at end of file
+</script>