# HG changeset patch
# User Nattee Niparnan <nattee@gmail.com>
# Date 2015-02-05 17:27:42
# Node ID 48aa6e78d5d1f99f9ed2da7107a8abd041b4ef6f
# Parent  57abe5ce338d4e54ac2bf49bb53c030f58c4bd86
# Parent  4fed4beab7f7de9e5a05ae958acb25f27b7752e2

merge with dae again

diff --git a/app/views/user_admin/_form.html.erb b/app/views/user_admin/_form.html.erb
--- a/app/views/user_admin/_form.html.erb
+++ b/app/views/user_admin/_form.html.erb
@@ -18,5 +18,8 @@
 
 <p><label for="user_alias">Alias</label><br/>
 <%= text_field 'user', 'alias'  %></p>
+
+<p><label for="user_remark">Remark</label><br/>
+<%= text_field 'user', 'remark'  %></p>
 <!--[eoform:user]-->
 
diff --git a/app/views/user_admin/edit.html.erb b/app/views/user_admin/edit.html.erb
deleted file mode 100644
--- a/app/views/user_admin/edit.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<h1>Editing user</h1>
-
-<%= form_tag :action => 'update', :id => @user do %>
-  <%= render :partial => 'form' %>
-  <%= submit_tag 'Edit' %>
-<% end %>
-
-<%= link_to 'Show', :action => 'show', :id => @user %> |
-<%= link_to 'Back', :action => 'list' %>
diff --git a/app/views/user_admin/edit.html.haml b/app/views/user_admin/edit.html.haml
new file mode 100644
--- /dev/null
+++ b/app/views/user_admin/edit.html.haml
@@ -0,0 +1,11 @@
+%h1 Editing user
+
+= form_tag :action => 'update', :id => @user do
+  = error_messages_for 'user'
+  = render partial: "form"
+  = submit_tag "Edit"
+
+
+= link_to 'Show', :action => 'show', :id => @user 
+|
+= link_to 'Back', :action => 'list'