Resolve conflict

[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 940389c8367facad3fe9641c6a5a96acbbf63062..4021eaa4d30bf515cd14f2353dc8f88d512b9f75 100644 (file)
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -11,30 +11,37 @@
 <%= form_for :diary_entry do |f| %>
   <div class="diary_entry standard-form">
     <fieldset>
-      <label class="standard-label"><%= t 'diary_entry.edit.subject' -%></label>
-      <%= f.text_field :title, :size => 60 %>
-    </fieldset>
-    <fieldset>
-      <label class="standard-label"><%= t 'diary_entry.edit.body' -%></label>
-      <%= richtext_area :diary_entry, :body, :cols => 80, :format => @diary_entry.body_format %>
-    </fieldset>
-    <fieldset>
-      <label class="standard-label"><%= t 'diary_entry.edit.language' -%></label>
-      <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %>
+      <div class='form-row'>
+        <label class="standard-label"><%= t 'diary_entry.edit.subject' -%></label>
+        <%= f.text_field :title, :class => "richtext_title" %>
+      </div>
+      <div class='form-row'>
+        <label class="standard-label"><%= t 'diary_entry.edit.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 'diary_entry.edit.language' -%></label>
+        <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %>
+    </div>
     </fieldset>
-    <div class="location">
-      <p class="form-help"><%= t 'diary_entry.edit.location' -%></p>
+    <fieldset class='location'>
+      <label class="standard-label"><%= t 'diary_entry.edit.location' -%></label>
       <%= content_tag "div", "", :id => "map", :data => {:lat => @lat, :lon => @lon, :zoom => @zoom} %>
-      <fieldset>
-        <label class="standard-label"><%= t 'diary_entry.edit.latitude' -%></label>
-        <%= f.text_field :latitude, :size => 20, :id => "latitude" %>
-      </fieldset>
-      <fieldset>
-        <label class="standard-label"><%= t 'diary_entry.edit.longitude' -%></label>
-        <%= f.text_field :longitude, :size => 20, :id => "longitude" %>
-      </fieldset>
-      <p class="form-help"><a href="#" id="usemap"><%= t 'diary_entry.edit.use_map_link' -%></a></p>
-    </div>
+      <div class='form-row clearfix'>
+        <div class='form-column'>
+          <label class="secondary standard-label"><%= t 'diary_entry.edit.latitude' -%></label>
+          <%= f.text_field :latitude, :size => 20, :id => "latitude" %>
+        </div>
+        <div class='form-column'>
+          <label class="secondary standard-label"><%= t 'diary_entry.edit.longitude' -%></label>
+          <%= f.text_field :longitude, :size => 20, :id => "longitude" %>
+        </div>
+        <div class='form-column'>
+          <a href="#" id="usemap"><%= t 'diary_entry.edit.use_map_link' -%></a>
+        </div>
+      </div>
+    </fieldset>
+
     <%= submit_tag t('diary_entry.edit.save_button') %>
     <%# TODO: button should say 'publish' or 'save changes' depending on new/edit state %>
   </div>