links

3 files changed, 10 insertions, 7 deletions

diff --git a/app/helpers/nodes_helper.rb b/app/helpers/nodes_helper.rb
index 9bee8d8..615a0ee 100644
--- a/app/helpers/nodes_helper.rb
+++ b/app/helpers/nodes_helper.rb
@@ -15,7 +15,9 @@ module NodesHelper
   
   def event_information
     if @node.event
-      "#{@node.event.start_time} - #{@node.event.end_time} > #{link_to 'edit', edit_event_path(@node.event)}"
+      "#{@node.event.start_time} - #{@node.event.end_time} > " \
+      "#{link_to 'show', event_path(@node.event)} " \
+      "#{link_to 'edit', edit_event_path(@node.event)}"
     else
       "no event attached > #{link_to 'add', new_event_path(:event_node_id => @node.id)}"
     end
diff --git a/app/views/events/edit.html.erb b/app/views/events/edit.html.erb
index 2bd08eb..524eae4 100644
--- a/app/views/events/edit.html.erb
+++ b/app/views/events/edit.html.erb
@@ -1,5 +1,5 @@
 <% content_for :subnavigation do %>
-  <%= link_to 'back to node', edit_node_path(@event.node) %>
+  <%= link_to 'back', edit_node_path(@event.node) %>
 <% end %>
 
 
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index 699765d..0a77513 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -1,3 +1,8 @@
+<% content_for :subnavigation do %>
+  <%= link_to 'back', edit_node_path(@event.node) %>
+  <%= link_to 'edit', edit_event_path(@event) %>
+<% end %>
+
 <p>
   <b>Start time:</b>
   <%=h @event.start_time %>
@@ -41,8 +46,4 @@
 <p>
   <b>Node:</b>
   <%=h @event.node_id %>
-</p>
-
-
-<%= link_to 'Edit', edit_event_path(@event) %> |
-<%= link_to 'Back', events_path %>
\ No newline at end of file
+</p>
\ No newline at end of file