X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b25a468e3c0aeb868f46ea758d4cf33ad7890bcb..5fe5777a58751e3626f645d57dafb0dd854586ec:/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 8728427be..0cdd3b098 100644
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -1,3 +1,7 @@
+<% content_for :head do %>
+ <%= javascript_include_tag "diary_entry" %>
+<% end %>
+
<%= @title %>
<%= error_messages_for 'diary_entry' %>
@@ -10,18 +14,18 @@
<%= t 'diary_entry.edit.body' -%> |
- <%= f.text_area :body, :cols => 80 %> |
+ <%= richtext_area :diary_entry, :body, :cols => 80, :format => @diary_entry.body_format %> |
<%= 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' -%> |
-
+ <%= content_tag "div", "", :id => "map", :data => {:lat => @lat, :lon => @lon, :zoom => @zoom} %>
<%= 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' -%>
+ <%= t 'diary_entry.edit.use_map_link' -%>
|
@@ -34,62 +38,3 @@
<% 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/OpenLayers.js' %>
-<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
-<%= javascript_include_tag 'map.js' %>
-
-