3 files changed, 66 insertions, 6 deletions

diff --git a/app/views/events/edit.html.erb b/app/views/events/edit.html.erb
index f3bf5339..7c855760 100644
--- a/app/views/events/edit.html.erb
+++ b/app/views/events/edit.html.erb
@@ -1,6 +1,6 @@
 <h1><%= t(".title") %></h1>
 
-<div class="node_action_bar standalone_action_bar">
+<div class="node_action_bar">
   <%= link_to t("admin.common.back"), safe_return_to(params[:return_to] || events_path) %>
   <%= button_to event_path(@event), method: :delete,
         form: { data: { confirm: t("events.confirm_delete") }, class: 'button_to destructive' } do %>
@@ -13,7 +13,7 @@
   <%= form_error_messages(f) %>
 
   <div id="admin_layout">
-    <div id="content">
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:node) %> </div>
       <div class="layout_row_content">
         <% if @event.node %>
@@ -31,39 +31,59 @@
         <% end %>
         <%= f.hidden_field :node_id %>
       </div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:start_time) %></div>
       <div class="layout_row_content"><%= f.datetime_select :start_time %></div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:end_time) %></div>
       <div class="layout_row_content"><%= f.datetime_select :end_time %></div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= t("events.form.recurrence") %></div>
       <div class="layout_row_content">
         <%= render "rrule_builder", f: f %>
       </div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:title) %></div>
       <div class="layout_row_content">
         <%= f.text_field :title %>
         <span id="event_title_hint" class="field_hint"><%= t("events.form.title_hint") %></span>
       </div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:tags) %></div>
       <div class="layout_row_content"><%= f.text_field :tag_list %></div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:allday) %></div>
       <div class="layout_row_content"><%= f.check_box :allday %></div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:url) %></div>
       <div class="layout_row_content"><%= f.text_field :url %></div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:latitude) %></div>
       <div class="layout_row_content"><%= f.text_field :latitude %></div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:longitude) %></div>
       <div class="layout_row_content"><%= f.text_field :longitude %></div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"></div>
       <div class="layout_row_content"><%= f.submit t("admin.common.update") %></div>
     </div>
diff --git a/app/views/events/new.html.erb b/app/views/events/new.html.erb
index 3eaf7e7d..5cc47b69 100644
--- a/app/views/events/new.html.erb
+++ b/app/views/events/new.html.erb
@@ -6,7 +6,7 @@
   <%= form_error_messages(f) %>
 
   <div id="admin_layout">
-    <div id="content">
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:node) %></div>
       <div class="layout_row_content">
         <%= text_field_tag :event_node_search_term %>
@@ -14,40 +14,62 @@
         <%= f.hidden_field :node_id %>
         <span class="field_hint"><%= t("events.form.node_hint") %></span>
       </div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:start_time) %></div>
       <div class="layout_row_content"><%= f.datetime_select :start_time %></div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:end_time) %></div>
       <div class="layout_row_content"><%= f.datetime_select :end_time %></div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= t("events.form.recurrence") %></div>
       <div class="layout_row_content"><%= render "rrule_builder", f: f %></div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:title) %></div>
       <div class="layout_row_content">
         <%= f.text_field :title %>
         <span id="event_title_hint" class="field_hint"><%= t("events.form.title_hint") %></span>
       </div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:tag_list) %></div>
       <div class="layout_row_content"><%= f.text_field :tag_list %></div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:allday) %></div>
       <div class="layout_row_content"><%= f.check_box :allday %></div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:url) %></div>
       <div class="layout_row_content"><%= f.text_field :url %></div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:latitude) %></div>
       <div class="layout_row_content"><%= f.text_field :latitude %></div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"><%= Event.human_attribute_name(:longitude) %></div>
       <div class="layout_row_content"><%= f.text_field :longitude %></div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"></div>
       <div class="layout_row_content"><%= hidden_field_tag :return_to, params[:return_to] %></div>
+    </div>
 
+    <div class="layout_row">
       <div class="layout_row_label"></div>
       <div class="layout_row_content"><%= f.submit t("admin.common.create") %></div>
     </div>
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index d77f770e..2f3d315d 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -1,7 +1,7 @@
 <div id="admin_layout" class="show_node">
   <h1><%= @event.node ? t(".title_for_node", :path => @event.node.unique_name) : t(".title") %></h1>
 
-  <div id="content">
+  <div class="layout_row">
     <div class="layout_row_label"><%= t("admin.columns.actions") %></div>
     <div class="layout_row_content info_group">
       <div class="info_group_items">
@@ -22,33 +22,51 @@
         </div>
       </div>
     </div>
+  </div>
 
+  <div class="layout_row">
     <div class="layout_row_label"><%= Event.human_attribute_name(:start_time) %></div>
     <div class="layout_row_content"><%= admin_datetime(@event.start_time) %></div>
+  </div>
 
+  <div class="layout_row">
     <div class="layout_row_label"><%= Event.human_attribute_name(:end_time) %></div>
     <div class="layout_row_content"><%= admin_datetime(@event.end_time) %></div>
+  </div>
 
+  <div class="layout_row">
     <div class="layout_row_label"><%= Event.human_attribute_name(:rrule) %></div>
     <div class="layout_row_content"><%=h @event.rrule %></div>
+  </div>
 
-    <% if (human = @event.humanize_rrule(I18n.locale)) %>
+  <% if (human = @event.humanize_rrule(I18n.locale)) %>
+    <div class="layout_row">
       <div class="layout_row_label"><%= t(".recurrence") %></div>
       <div class="layout_row_content"><em><%= human %></em></div>
-    <% end %>
+    </div>
+  <% end %>
 
+  <div class="layout_row">
     <div class="layout_row_label"><%= Event.human_attribute_name(:tag_list) %></div>
     <div class="layout_row_content"><%=h @event.tag_list %></div>
+  </div>
 
+  <div class="layout_row">
     <div class="layout_row_label"><%= Event.human_attribute_name(:allday) %></div>
     <div class="layout_row_content"><%= @event.allday ? t("admin.common.yes") : t("admin.common.no") %></div>
+  </div>
 
+  <div class="layout_row">
     <div class="layout_row_label"><%= Event.human_attribute_name(:url) %></div>
     <div class="layout_row_content"><%=h @event.url %></div>
+  </div>
 
+  <div class="layout_row">
     <div class="layout_row_label"><%= Event.human_attribute_name(:latitude) %></div>
     <div class="layout_row_content"><%=h @event.latitude %></div>
+  </div>
 
+  <div class="layout_row">
     <div class="layout_row_label"><%= Event.human_attribute_name(:longitude) %></div>
     <div class="layout_row_content"><%=h @event.longitude %></div>
   </div>