X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2047f7cc9b85686e1f4598e60dd241c04ef2989c..3da2a95cea6b5efa760b378b45d9223d4b76657d:/app/views/diary_entry/edit.html.erb?ds=sidebyside

diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb
index 122c4e434..0c83ef4ce 100644
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -1,8 +1,14 @@
-<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' %>
 
-<% form_for :diary_entry do |f| %>
+<%= form_for :diary_entry do |f| %>
   <table class="diary_entry">
     <tr valign="top">
       <td class="fieldName"><%= t 'diary_entry.edit.subject' -%></td>
@@ -10,18 +16,18 @@
     </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>
-      <td><%= f.collection_select :language_code, Language.find(:all, :order => :english_name), :code, :name %></td>
+      <td><%= f.collection_select :language_code, Language.order(:english_name), :code, :name %></td>
     </tr>
     <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>
@@ -34,54 +40,3 @@
     </tr>
   </table>
 <% end %>
-
-<% if @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' %>
-
-<script type="text/javascript">
-  <!--
-  var marker;
-
-  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-
-  function setLocation( e ) { 
-    closeMapPopup();
-
-    var lonlat = getEventPosition(e);
-
-    $("latitude").value = lonlat.lat;
-    $("longitude").value = lonlat.lon;
-
-    if (marker) {
-      removeMarkerFromMap(marker);
-    }
-
-    marker = addMarkerToMap(lonlat, null, "<%= t 'diary_entry.edit.marker_text' -%>");
-  }
-
-  function openMap() {
-    $("map").style.display = "block";
-    $("usemap").style.display = "none";
-
-    var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
-    var zoom = <%= zoom %>;
-
-    var map = createMap("map");
-
-    setMapCenter(centre, zoom);
-
-    map.events.register("click", map, setLocation);
-  }
-// -->
-</script>