X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/edaddbedaec78a252e988e2271962407e64483fd..9e2132b83dbf479c5ee2ef176b74d7a3c1082da0:/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 46d107907..c0a231ab2 100644 --- a/app/views/diary_entry/edit.html.erb +++ b/app/views/diary_entry/edit.html.erb @@ -2,8 +2,8 @@ <%= error_messages_for 'diary_entry' %> -<% form_for :diary_entry do |f| %> - +<%= form_for :diary_entry do |f| %> +
@@ -14,12 +14,12 @@ - +
<%= t 'diary_entry.edit.subject' -%> <%= f.text_field :title, :size => 60 %>
<%= t 'diary_entry.edit.language' -%><%= f.collection_select :language_code, Language.find(:all, :order => :english_name), :code, :name %><%= f.collection_select :language_code, Language.order(:english_name), :code, :name %>
<%= t 'diary_entry.edit.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" %> <%= t 'diary_entry.edit.use_map_link' -%>

@@ -28,14 +28,18 @@
- <%= submit_tag t('diary_entry.edit.save_button') %> - <%# TODO: button should say 'publish' or 'save changes' depending on new/edit state %> + <%= submit_tag t('diary_entry.edit.save_button') %> + <%# TODO: button should say 'publish' or 'save changes' depending on new/edit state %>
<% end %> -<% if @user.home_lat.nil? or @user.home_lon.nil? %> +<% 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') %> @@ -55,24 +59,13 @@ OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>"); - function init() { - var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>); - var zoom = <%= zoom %>; - - var map = createMap("map"); - - setMapCenter(centre, zoom); - - map.events.register("click", map, setLocation); - } - function setLocation( e ) { closeMapPopup(); var lonlat = getEventPosition(e); - document.getElementById('latitude').value = lonlat.lat; - document.getElementById('longitude').value = lonlat.lon; + $("latitude").value = lonlat.lat; + $("longitude").value = lonlat.lon; if (marker) { removeMarkerFromMap(marker); @@ -84,8 +77,19 @@ function openMap() { $("map").style.display = "block"; $("usemap").style.display = "none"; - } - window.onload = init; + var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>); + var zoom = <%= zoom %>; + + var map = createMap("map"); + + setMapCenter(centre, zoom); + + <% if @diary_entry.latitude and @diary_entry.longitude %> + marker = addMarkerToMap(centre, null, "<%= t 'diary_entry.edit.marker_text' -%>"); + <% end %> + + map.events.register("click", map, setLocation); + } // -->