Use custom events to resize the map on sidebar open/close

[rails.git] / app / views / diary_entry / edit.html.erb

diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb
index 6b4d9c177935f9d665df20a7685ea198629dafd2..0952c901bb8b9976f863addb7281019dc4504da7 100644 (file)
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -35,30 +35,11 @@
   </table>
 <% end %>
 
   </table>
 <% end %>
 

-<% if @diary_entry.latitude and @diary_entry.longitude %>
-  <% lon = @diary_entry.longitude %>
-  <% lat = @diary_entry.latitude %>
-  <% zoom = '12' %>
-<% elsif @user.home_lat.nil? or @user.home_lon.nil? %>
-  <% lon = h(params['lon'] || '-0.1') %>
-  <% lat = h(params['lat'] || '51.5') %>
-  <% zoom = h(params['zoom'] || '4') %> 
-<% else %>
-  <% lon = @user.home_lon %>
-  <% lat = @user.home_lat %>
-  <% zoom = '12' %>
-<% end %>
-
-<%= javascript_include_tag 'openlayers.js' %>
-<%= javascript_include_tag 'map.js' %>
-

 <script type="text/javascript">
   <!--
   var marker;
 
 <script type="text/javascript">
   <!--
   var marker;
 

-  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-
-  function setLocation( e ) { 
+  function setLocation( e ) {

     closeMapPopup();
 
     var lonlat = getEventPosition(e);
     closeMapPopup();
 
     var lonlat = getEventPosition(e);


@@ -77,8 +58,8 @@
     $("#map").show();
     $("#usemap").hide();
 
     $("#map").show();
     $("#usemap").hide();
 

-    var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
-    var zoom = <%= zoom %>;
+    var centre = new OpenLayers.LonLat(<%= @lon %>, <%= @lat %>);
+    var zoom = <%= @zoom %>;

 
     var map = createMap("map");
 
 
     var map = createMap("map");