Move a chunk of non-markup ruby code from a view to the controller

[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 f6273a828a849b0dc3d77fafbe167ee80538b56b..0952c901bb8b9976f863addb7281019dc4504da7 100644 (file)
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -10,7 +10,7 @@
     </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>
@@ -35,30 +35,11 @@
   </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 ) { 
+  function setLocation( e ) {
     closeMapPopup();
 
     var lonlat = getEventPosition(e);
@@ -77,8 +58,8 @@
     $("#map").show();
     $("#usemap").hide();
 
-    var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
-    var zoom = <%= zoom %>;
+    var centre = new OpenLayers.LonLat(<%= @lon %>, <%= @lat %>);
+    var zoom = <%= @zoom %>;
 
     var map = createMap("map");