X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/edaddbedaec78a252e988e2271962407e64483fd..7377cb63939f8743ca31e67ea3965c2b15d20057:/app/views/diary_entry/edit.html.erb?ds=inline diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb index 46d107907..d408938e5 100644 --- a/app/views/diary_entry/edit.html.erb +++ b/app/views/diary_entry/edit.html.erb @@ -1,91 +1,51 @@ -

<%= @title %>

- -<%= error_messages_for 'diary_entry' %> - -<% form_for :diary_entry do |f| %> - - - - - - - - - - - - - - - - - - - - - -
<%= t 'diary_entry.edit.subject' -%><%= f.text_field :title, :size => 60 %>
<%= t 'diary_entry.edit.body' -%><%= f.text_area :body, :cols => 80 %>
<%= t 'diary_entry.edit.language' -%><%= f.collection_select :language_code, Language.find(:all, :order => :english_name), :code, :name %>
<%= t 'diary_entry.edit.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" %> - <%= t 'diary_entry.edit.use_map_link' -%> -

-
- <%= submit_tag t('diary_entry.edit.save_button') %> - <%# TODO: button should say 'publish' or 'save changes' depending on new/edit state %> -
+<% content_for :head do %> + <%= javascript_include_tag "diary_entry" %> <% 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' %> +<% content_for :heading do %> +

<%= @title %>

<% end %> -<%= javascript_include_tag '/openlayers/OpenLayers.js' %> -<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %> -<%= javascript_include_tag 'map.js' %> - - +<%= form_for :diary_entry do |f| %> +
+
+
+ + <%= f.text_field :title, :class => "richtext_title" %> +
+
+ + <%= richtext_area :diary_entry, :body, :cols => 80, :rows => 20, :format => @diary_entry.body_format %> +
+
+ + <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %> +
+
+
+ + <%= content_tag "div", "", :id => "map", :data => {:lat => @lat, :lon => @lon, :zoom => @zoom} %> +
+
+ + <%= f.text_field :latitude, :size => 20, :id => "latitude" %> +
+
+ + <%= f.text_field :longitude, :size => 20, :id => "longitude" %> +
+ +
+
+ + <% if action_name == 'new' %> + <%= submit_tag t('diary_entry.new.publish_button') %> + <% else %> + <%= submit_tag t('.save_button') %> + <% end %> +
+<% end %>