Guard against non-numeric lat and lons in nodes and notes

[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 33e4d2719ba5d2c3caaa6e5df45eb71230866c66..0c83ef4ce3dcd75018579dde245a71dd0b1f4ccc 100644 (file)
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -1,4 +1,10 @@
-<h1><%= @title %></h1>
+<% content_for :head do %>
+  <%= javascript_include_tag "diary_entry" %>
+<% end %>
+
+<% content_for :heading do %>
+  <h1><%= @title %></h1>
+<% end %>
 
 <%= error_messages_for 'diary_entry' %>
 
@@ -21,7 +27,7 @@
       <td>
         <%= content_tag "div", "", :id => "map", :data => {:lat => @lat, :lon => @lon, :zoom => @zoom} %>
         <span class="location"><%= t 'diary_entry.edit.latitude' -%> <%= f.text_field :latitude, :size => 20, :id => "latitude" %> <%= t 'diary_entry.edit.longitude' -%> <%= f.text_field :longitude, :size => 20, :id => "longitude" %></span>
-        <a href="javascript:openMap()" id="usemap"><%= t 'diary_entry.edit.use_map_link' -%></a>
+        <a href="#" id="usemap"><%= t 'diary_entry.edit.use_map_link' -%></a>
         <br/><br/>
       </td>
     </tr>
@@ -34,41 +40,3 @@
     </tr>
   </table>
 <% end %>
-
-<script type="text/javascript">
-  <!--
-  var marker;
-
-  function setLocation( e ) {
-    closeMapPopup();
-
-    var lonlat = getEventPosition(e);
-
-    $("#latitude").val(lonlat.lat);
-    $("#longitude").val(lonlat.lon);
-
-    if (marker) {
-      removeMarkerFromMap(marker);
-    }
-
-    marker = addMarkerToMap(lonlat, null, I18n.t('diary_entry.edit.marker_text'));
-  }
-
-  function openMap() {
-    $("#map").show();
-    $("#usemap").hide();
-
-    var params = $("#map").data();
-    var centre = new OpenLayers.LonLat(params.lon, params.lat);
-    var map = createMap("map");
-
-    setMapCenter(centre, params.zoom);
-
-    if ($("#latitude").val() && $("#longitude").val()) {
-      marker = addMarkerToMap(centre, null, I18n.t('diary_entry.edit.marker_text'));
-    }
-
-    map.events.register("click", map, setLocation);
-  }
-// -->
-</script>