X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/72e33046c80bddc0ca9b1336786dcb4b349137f7..e0b175d3bd3ef655a20273dc2b7f04a8a34bb5f6:/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 b5abd667b..d408938e5 100644
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -1,95 +1,51 @@
-<h1><%= @title %></h1>
-
-<%= error_messages_for 'diary_entry' %>
-
-<% form_for :diary_entry do |f| %>
-  <table class="diary_entry">
-    <tr valign="top">
-      <td class="fieldName"><%= t 'diary_entry.edit.subject' -%></td>
-      <td><%= f.text_field :title, :size => 60 %></td>
-    </tr>
-    <tr valign="top">
-      <td class="fieldName"><%= t 'diary_entry.edit.body' -%></td>
-      <td><%= f.text_area :body, :cols => 80 %></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>
-    </tr>
-    <tr valign="top">
-      <td class="fieldName"><%= t 'diary_entry.edit.location' -%></td>
-      <td>
-        <div id="map"></div>
-        <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>
-        <br/><br/>
-      </td>
-    </tr>
-    <tr>
-      <td></td>
-      <td>
-        <%= submit_tag t('diary_entry.edit.save_button') %>
-        <%# TODO: button should say 'publish' or 'save changes' depending on new/edit state %>
-      </td>
-    </tr>
-  </table>
+<% content_for :head do %>
+  <%= javascript_include_tag "diary_entry" %>
 <% 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' %>
+<% content_for :heading do %>
+  <h1><%= @title %></h1>
 <% 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);
+<%= error_messages_for 'diary_entry' %>
 
-    <% if @diary_entry.latitude and @diary_entry.longitude %>
-    marker = addMarkerToMap(centre, null, "<%= t 'diary_entry.edit.marker_text' -%>");
+<%= form_for :diary_entry do |f| %>
+  <div class="diary_entry standard-form">
+    <fieldset>
+      <div class='form-row'>
+        <label class="standard-label"><%= t '.subject' -%></label>
+        <%= f.text_field :title, :class => "richtext_title" %>
+      </div>
+      <div class='form-row'>
+        <label class="standard-label"><%= t '.body' -%></label>
+        <%= richtext_area :diary_entry, :body, :cols => 80, :rows => 20, :format => @diary_entry.body_format %>
+      </div>
+      <div class='form-row'>
+        <label class="standard-label"><%= t '.language' -%></label>
+        <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %>
+    </div>
+    </fieldset>
+    <fieldset class='location'>
+      <label class="standard-label"><%= t '.location' -%></label>
+      <%= content_tag "div", "", :id => "map", :data => {:lat => @lat, :lon => @lon, :zoom => @zoom} %>
+      <div class='form-row clearfix'>
+        <div class='form-column'>
+          <label class="secondary standard-label"><%= t '.latitude' -%></label>
+          <%= f.text_field :latitude, :size => 20, :id => "latitude" %>
+        </div>
+        <div class='form-column'>
+          <label class="secondary standard-label"><%= t '.longitude' -%></label>
+          <%= f.text_field :longitude, :size => 20, :id => "longitude" %>
+        </div>
+        <div class='form-column'>
+          <a href="#" id="usemap"><%= t '.use_map_link' -%></a>
+        </div>
+      </div>
+    </fieldset>
+
+    <% if action_name == 'new' %>
+      <%= submit_tag t('diary_entry.new.publish_button') %>
+    <% else %>
+      <%= submit_tag t('.save_button') %>
     <% end %>
-
-    map.events.register("click", map, setLocation);
-  }
-// -->
-</script>
+  </div>
+<% end %>