+<% content_for :head do %>
+ <%= javascript_include_tag "diary_entry" %>
+<% end %>
+
<h1><%= @title %></h1>
<%= error_messages_for 'diary_entry' %>
</tr>
<tr valign="top">
<td class="fieldName"><%= t 'diary_entry.edit.body' -%></td>
- <td><%= f.text_area :body, :cols => 80 %></td>
+ <td><%= richtext_area :diary_entry, :body, :cols => 80, :format => @diary_entry.body_format %></td>
</tr>
<tr valign="top">
<td class="fieldName"><%= t 'diary_entry.edit.language' -%></td>
<tr valign="top">
<td class="fieldName"><%= t 'diary_entry.edit.location' -%></td>
<td>
- <div id="map"></div>
+ <%= 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>
</tr>
</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;
-
- OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-
- function setLocation( e ) {
- closeMapPopup();
-
- var lonlat = getEventPosition(e);
-
- $("#latitude").val(lonlat.lat);
- $("#longitude").val(lonlat.lon);
-
- if (marker) {
- removeMarkerFromMap(marker);
- }
-
- marker = addMarkerToMap(lonlat, null, "<%= t 'diary_entry.edit.marker_text' -%>");
- }
-
- function openMap() {
- $("#map").show();
- $("#usemap").hide();
-
- 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);
- }
-// -->
-</script>