Add geoip_database key to example configuration

[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 0c83ef4ce3dcd75018579dde245a71dd0b1f4ccc..f29dc30ffec2edce53a397ad78d0a51237c712bb 100644 (file)
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -9,34 +9,43 @@
 <%= error_messages_for 'diary_entry' %>
 
 <%= form_for :diary_entry do |f| %>
 <%= 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><%= 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.order(:english_name), :code, :name %></td>
-    </tr>
-    <tr valign="top">
-      <td class="fieldName"><%= t 'diary_entry.edit.location' -%></td>
-      <td>
-        <%= 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="#" 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>
+  <div class="diary_entry standard-form">
+    <fieldset>
+      <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>
+    <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} %>
+      <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>
+
+    <% if action_name == 'new' %>
+      <%= submit_tag t('diary_entry.new.publish_button') %>
+    <% else %>
+      <%= submit_tag t('diary_entry.edit.save_button') %>
+    <% end %>
+  </div>

 <% end %>
 <% end %>