changing admin disign for users finish

3 files changed, 54 insertions, 39 deletions

diff --git a/app/views/admin/users/edit.html.haml b/app/views/admin/users/edit.html.haml
index fac995175fe..a9ae7986da2 100644
--- a/app/views/admin/users/edit.html.haml
+++ b/app/views/admin/users/edit.html.haml
@@ -1,4 +1,4 @@
 = render 'form'
 
-= link_to 'Show', [:admin, @admin_user], :class => "right lbutton"
 = link_to 'Back', admin_users_path, :class => "right lbutton"
+= link_to 'Show', [:admin, @admin_user], :class => "right lbutton"
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index e12cfc7763b..78e84398fd5 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -18,8 +18,5 @@
       %td= link_to 'Edit', edit_admin_user_path(user), :id => "edit_#{dom_id(user)}"
       %td= link_to 'Destroy', [:admin, user], :confirm => 'Are you sure?', :method => :delete
 
-%br
-
 = paginate @admin_users
-
-= link_to 'New User', new_admin_user_path
+= link_to 'New User', new_admin_user_path, :class => "lbutton"
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 4605fcb91aa..2437a01a150 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -1,46 +1,64 @@
 - unless notice.nil?
   %p#notice= notice
 
-#infoblock
-  %p
-    %b Name:
-    = @admin_user.name
-  %p
-    %b Email:
-    = @admin_user.email
-  %p
-    %b Admin:
-    = @admin_user.admin
-  %p
-    %b Projects limit:
-    = @admin_user.projects_limit
+%h2= @admin_user.name
 
-  %p
-    %b Skype:
-    = @admin_user.skype
-  %p
-    %b LinkedIn:
-    = @admin_user.linkedin
-  %p
-    %b Twitter:
-    = @admin_user.twitter
-
-  .clear
-  = link_to 'Edit', edit_admin_user_path(@admin_user)
-  \|
-  = link_to 'Back', admin_users_path
+%table.round-borders
+  %tr
+    %td
+      %b
+        Email:
+    %td
+      = @admin_user.email
+  %tr
+    %td
+      %b
+        Admin:
+        %td= check_box_tag "admin", 1, @admin_user.admin, :disabled => :disabled
+  %tr
+    %td
+      %b
+        Projects limit:
+    %td
+      = @admin_user.projects_limit
+  - unless @admin_user.skype.empty?
+    %tr
+      %td
+        %b
+          Skype:
+      %td
+        = @admin_user.skype
+  - unless @admin_user.linkedin.empty?
+    %tr
+      %td
+        %b
+          Linkedin:
+      %td
+        = @admin_user.linkedin
+  - unless @admin_user.twitter.empty?
+    %tr
+      %td
+        %b
+          Twitter:
+      %td
+        = @admin_user.twitter
+  %tr
+    %td{:colspan => 2}
+      = link_to 'Edit', edit_admin_user_path(@admin_user), :class => "lbutton"
+      = link_to 'Back', admin_users_path, :class => "right lbutton"
 
 .span-14
   %h2 Projects
 
   %table.round-borders
     %tr
-      %th Name
-      %th Added
-      %th Web
-      %th Git
-      %th Admin
-      %th
+      %thead
+        %th Name
+        %th Added
+        %th Web
+        %th Git
+        %th Admin
+        %th
 
     - @admin_user.users_projects.each do |tm|
       - project = tm.project
@@ -53,4 +71,4 @@
         %td= link_to 'Edit', edit_admin_team_member_path(tm)
         %td= link_to 'Cancel', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
 
-  = link_to 'Add To Another Project', new_admin_team_member_path(:team_member => {:user_id => @admin_user.id})
+  = link_to 'Add To Another Project', new_admin_team_member_path(:team_member => {:user_id => @admin_user.id}), :class => "lbutton"