3 files changed, 8 insertions, 8 deletions

diff --git a/app/views/events/edit.html.erb b/app/views/events/edit.html.erb
index 17b6980..824cd66 100644
--- a/app/views/events/edit.html.erb
+++ b/app/views/events/edit.html.erb
@@ -6,8 +6,8 @@
 
 <h1>Editing event</h1>
 
-<% form_for(@event) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@event) do |f| %>
+  <%= form_error_messages(f) %>
 
   <p>
     <%= f.label :start_time %><br />
@@ -47,4 +47,4 @@
   <p>
     <%= f.submit 'Update' %>
   </p>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index c1b5b48..19b21ce 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -26,11 +26,11 @@
     <td><%=h event.node_id %></td>
     <td><%= link_to 'Show', event %></td>
     <td><%= link_to 'Edit', edit_event_path(event) %></td>
-    <td><%= link_to 'Destroy', event, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= button_to 'Destroy', event, method: :delete, form: { data: { confirm: 'Are you sure?' } } %></td>
   </tr>
 <% end %>
 </table>
 
 <br />
 
-<%= link_to 'New event', new_event_path %>
\ No newline at end of file
+<%= link_to 'New event', new_event_path %>
diff --git a/app/views/events/new.html.erb b/app/views/events/new.html.erb
index 8c9812e..cd892c5 100644
--- a/app/views/events/new.html.erb
+++ b/app/views/events/new.html.erb
@@ -1,7 +1,7 @@
 <h1>New event</h1>
 
-<% form_for(@event) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@event) do |f| %>
+  <%= form_error_messages(f) %>
 
   <p>
     <%= f.label :start_time %><br />
@@ -43,4 +43,4 @@
   </p>
 <% end %>
 
-<%= link_to 'Back', events_path %>
\ No newline at end of file
+<%= link_to 'Back', events_path %>