# HG changeset patch
# User Nattee Niparnan <nattee@gmail.com>
# Date 2017-09-11 15:57:46
# Node ID 35025e5d85ac3fc8942aabe73c601c037ed5099b
# Parent  99c14e3328233163c1ad3f3016e6e8f824658432

beautify user edit

diff --git a/app/views/user_admin/_form.html.haml b/app/views/user_admin/_form.html.haml
--- a/app/views/user_admin/_form.html.haml
+++ b/app/views/user_admin/_form.html.haml
@@ -5,7 +5,7 @@
   .col-md-4
     = text_field 'user', 'login', class: 'form-control'
 .form-group
-  %label.col-md-2.control-label{for: :full_name} Login
+  %label.col-md-2.control-label{for: :full_name} Full name
   .col-md-4
     = text_field 'user', 'full_name', class: 'form-control'
 .form-group
diff --git a/app/views/user_admin/edit.html.haml b/app/views/user_admin/edit.html.haml
--- a/app/views/user_admin/edit.html.haml
+++ b/app/views/user_admin/edit.html.haml
@@ -3,7 +3,9 @@
 = form_tag( {:action => 'update', :id => @user}, {class: 'form-horizontal'}) do
   = error_messages_for 'user'
   = render partial: "form"
-  = submit_tag "Edit", class: 'btn btn-primary'
+  .form-group
+    .col-md-offset-2.col-md-4
+      = submit_tag "Edit", class: 'btn btn-primary'
 
 
 = link_to 'Show', :action => 'show', :id => @user 
diff --git a/app/views/user_admin/show.html.erb b/app/views/user_admin/show.html.erb
deleted file mode 100644
--- a/app/views/user_admin/show.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<h1>User information</h1>
-
-<% for column in User.content_columns %>
-<p>
-  <b><%= column.human_name %>:</b> <%=h @user.send(column.name) %>
-</p>
-<% end %>
-
-<%= link_to 'Edit', :action => 'edit', :id => @user %> |
-<%= link_to 'Back', :action => 'index' %>
diff --git a/app/views/user_admin/show.html.haml b/app/views/user_admin/show.html.haml
new file mode 100644
--- /dev/null
+++ b/app/views/user_admin/show.html.haml
@@ -0,0 +1,14 @@
+%h1 User information
+- for column in User.content_columns
+  %p
+    %b
+      = column.human_name
+      \:
+    = h @user.send(column.name)
+%p
+  %strong Group
+  \:
+  = @user.groups.map{ |x| link_to(x.name,group_path(x)).html_safe}.join(', ').html_safe
+= link_to 'Edit', :action => 'edit', :id => @user
+|
+= link_to 'Back', :action => 'index'