3 files changed, 20 insertions, 13 deletions

diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index 8117bcd..ddb7afd 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -7,13 +7,10 @@
     <%= link_to "edit", edit_user_path(user) %>
   </td>
   <td>
-    <%= link_to(
-          "destroy",
-          user_path(user),
-          :method => :delete,
-          :confirm => "Do you really want to delete user #{user.login}?"
-        ) %>
+    <%= button_to "destroy", user_path(user),
+          method: :delete,
+          form: { data: { confirm: "Do you really want to delete user #{user.login}?" } } %>
   </td>
   <% end %>
 </tr>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 226e821..df1005b 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -1,8 +1,13 @@
 <h1>Edit existing user</h1>
 
-<%= error_messages_for :user %>
+<% if @user.errors.any? %>
+  <div class="error_messages">
+    <ul><% @user.errors.full_messages.each do |msg| %><li><%= msg.gsub("Slug", "Title") %></li><% end %></ul>
+  </div>
+<% end %>
 
-<% form_for @user do |f| %>
+
+<%= form_for @user do |f| %>
 <table id="new_node">
   <tr>
     <td class="description">Login</td>
@@ -31,4 +36,4 @@
     <td class="right"><%= f.submit "Update" %></td>
   </tr>
 </table>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 6990c27..6beda4f 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,8 +1,13 @@
 <h1>Create new user</h1>
 
-<%= error_messages_for :user %>
+<% if @user.errors.any? %>
+  <div class="error_messages">
+    <ul><% @user.errors.full_messages.each do |msg| %><li><%= msg.gsub("Slug", "Title") %></li><% end %></ul>
+  </div>
+<% end %>
 
-<% form_for @user do |f| %>
+
+<%= form_for @user do |f| %>
 <table id="new_node">
   <tr>
     <td class="description">Login</td>
@@ -29,4 +34,4 @@
     <td class="right"><%= f.submit "Create" %></td>
   </tr>
 </table>
-<% end %>
\ No newline at end of file
+<% end %>