Clean up events views: return_to, subnav, remove custom_rrule

- events_controller: wire return_to through show and new actions;
  create respects return_to with fallback to node/event path;
  new pre-populates node_id and tag_list from params
- events/edit: remove custom_rrule checkbox; node link removed from
  subnav (use show for node navigation); destroy button added
- events/new: remove custom_rrule checkbox; add return_to hidden
  field and back link; tag_list field added
- events/show: fix back link via safe_return_to; add node link to
  subnav; add destroy button; remove custom_rrule display; show
  humanized rrule below raw string
- events/index: destructive class on destroy button; node_id column
  replaced with node link; show/edit links carry return_to
- nodes/show: add show/edit links to event entries with return_to

5 files changed, 27 insertions, 21 deletions

diff --git a/app/views/events/edit.html.erb b/app/views/events/edit.html.erb
index 17457df..5aee501 100644
--- a/app/views/events/edit.html.erb
+++ b/app/views/events/edit.html.erb
@@ -1,9 +1,6 @@
 <% content_for :subnavigation do %>
   <%= link_to 'back', safe_return_to(params[:return_to] || events_path) %>
-  <% if @event.node %>
-    <%= link_to 'node', edit_node_path(@event.node) %>
-  <% end %>
-  <%= link_to 'show', @event %>
+  <%= button_to 'destroy', event_path(@event), method: :delete, form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } %>
 <% end %>
 
 <h1>Editing event</h1>
@@ -25,8 +22,8 @@
     <%= f.text_field :rrule %>
   </p>
   <p>
-    <%= f.label :custom_rrule %><br />
-    <%= f.check_box :custom_rrule %>
+    <%= f.label :tag_list, "Tags" %><br />
+    <%= f.text_field :tag_list %>
   </p>
   <p>
     <%= f.label :allday %><br />
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 064fa86..d0458d7 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -3,7 +3,6 @@
 <table>
   <tr>
     <th>Title</th>
-    <th>Is primary</th>
     <th>Start time</th>
     <th>End time</th>
     <th>Rrule</th>
@@ -16,17 +15,16 @@
 <% @events.each do |event| %>
   <tr>
     <td><%=h event.display_title %></td>
-    <td><%=h event.is_primary %></td>
     <td><%=h event.start_time %></td>
     <td><%=h event.end_time %></td>
     <td><%=h event.rrule %></td>
     <td><%=h event.custom_rrule %></td>
     <td><%=h event.allday %></td>
     <td><%=h event.url %></td>
-    <td><%=h event.node_id %></td>
-    <td><%= link_to 'Show', event %></td>
-    <td><%= link_to 'Edit', edit_event_path(event) %></td>
-    <td><%= button_to 'Destroy', event, method: :delete, form: { data: { confirm: 'Are you sure?' } } %></td>
+    <td><%= event.node ? link_to(event.node_id, node_path(event.node)) : '' %></td>
+    <td><%= link_to 'show', event %></td>
+    <td><%= link_to 'edit', edit_event_path(event) %></td>
+    <td><%= button_to 'destroy', event, method: :delete, form: { data: { confirm: 'Are you sure?' }, class: 'button_to destructive' } %></td>
   </tr>
 <% end %>
 </table>
diff --git a/app/views/events/new.html.erb b/app/views/events/new.html.erb
index cd892c5..4e1ef53 100644
--- a/app/views/events/new.html.erb
+++ b/app/views/events/new.html.erb
@@ -16,8 +16,8 @@
     <%= f.text_field :rrule %>
   </p>
   <p>
-    <%= f.label :custom_rrule %><br />
-    <%= f.check_box :custom_rrule %>
+    <%= f.label :tag_list, "Tags" %><br />
+    <%= f.text_field :tag_list %>
   </p>
   <p>
     <%= f.label :allday %><br />
@@ -37,10 +37,11 @@
   </p>
   <p>
     <%= f.hidden_field :node_id %>
+    <%= hidden_field_tag :return_to, params[:return_to] %>
   </p>
   <p>
     <%= f.submit 'Create' %>
   </p>
 <% end %>
 
-<%= link_to 'Back', events_path %>
+<%= link_to 'Back', safe_return_to(params[:return_to] || events_path) %>
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index ba14a7d..e206bc4 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -1,6 +1,9 @@
 <% content_for :subnavigation do %>
-  <%= link_to 'back', edit_node_path(@event.node) %>
-  <%= link_to 'edit', edit_event_path(@event) %>
+  <% if @event.node %>
+    <%= link_to 'node', node_path(@event.node) %>
+  <% end %>
+  <%= link_to 'edit', edit_event_path(@event, return_to: request.path) %>
+  <%= button_to 'destroy', event_path(@event), method: :delete, form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } %>
 <% end %>
 
 <h2>Event for node <%= @event.node.unique_name %></h2>
@@ -18,11 +21,14 @@
 <p>
   <b>Rrule:</b>
   <%=h @event.rrule %>
+  <% if (human = @event.humanize_rrule(I18n.locale)) %>
+    <br/><small><em>( <%= human %></em> )</small>
+  <% end %>
 </p>
 
 <p>
-  <b>Custom rrule:</b>
-  <%=h @event.custom_rrule %>
+  <b>Tags:</b>
+  <%=h @event.tag_list %>
 </p>
 
 <p>
@@ -43,4 +49,4 @@
 <p>
   <b>Longitude:</b>
   <%=h @event.longitude %>
-</p>
\ No newline at end of file
+</p>
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 7223219..2ce3853 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -48,7 +48,11 @@
       <td>
         <ul>
         <% @node.events.order(:start_time).each do |event| %>
-          <li><%= event_schedule_text(event) %><%= " (primary)" if event.is_primary? %></li>
+          <li>
+            <%= event_schedule_text(event) %>
+            [<%= link_to 'show', event_path(event, return_to: request.path) %>
+            | <%= link_to 'edit', edit_event_path(event, return_to: request.path) %>]
+          </li>
         <% end %>
         </ul>
       </td>