Download as
Browse Code »

Commit 22be0785bdf76987de57fa4f912c5e1b11d40144

Authored by Alexander Randa
1 parent f950d788
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

changing admin disign for users finish

Showing 3 changed files with 54 additions and 39 deletions   Show diff stats
app/views/admin/users/edit.html.haml
  Diff comments   View file @22be078
1 = render 'form' 1 = render 'form'
2 2
3 -= link_to 'Show', [:admin, @admin_user], :class => "right lbutton"  
4 = link_to 'Back', admin_users_path, :class => "right lbutton" 3 = link_to 'Back', admin_users_path, :class => "right lbutton"
  4 += link_to 'Show', [:admin, @admin_user], :class => "right lbutton"
app/views/admin/users/index.html.haml
  Diff comments   View file @22be078
@@ -18,8 +18,5 @@ @@ -18,8 +18,5 @@
18 %td= link_to 'Edit', edit_admin_user_path(user), :id => "edit_#{dom_id(user)}" 18 %td= link_to 'Edit', edit_admin_user_path(user), :id => "edit_#{dom_id(user)}"
19 %td= link_to 'Destroy', [:admin, user], :confirm => 'Are you sure?', :method => :delete 19 %td= link_to 'Destroy', [:admin, user], :confirm => 'Are you sure?', :method => :delete
20 20
21 -%br  
22 -  
23 = paginate @admin_users 21 = paginate @admin_users
24 -  
25 -= link_to 'New User', new_admin_user_path 22 += link_to 'New User', new_admin_user_path, :class => "lbutton"
app/views/admin/users/show.html.haml
  Diff comments   View file @22be078
1 - unless notice.nil? 1 - unless notice.nil?
2 %p#notice= notice 2 %p#notice= notice
3 3
4 -#infoblock  
5 - %p  
6 - %b Name:  
7 - = @admin_user.name  
8 - %p  
9 - %b Email:  
10 - = @admin_user.email  
11 - %p  
12 - %b Admin:  
13 - = @admin_user.admin  
14 - %p  
15 - %b Projects limit:  
16 - = @admin_user.projects_limit 4 +%h2= @admin_user.name
17 5
18 - %p  
19 - %b Skype:  
20 - = @admin_user.skype  
21 - %p  
22 - %b LinkedIn:  
23 - = @admin_user.linkedin  
24 - %p  
25 - %b Twitter:  
26 - = @admin_user.twitter  
27 -  
28 - .clear  
29 - = link_to 'Edit', edit_admin_user_path(@admin_user)  
30 - \|  
31 - = link_to 'Back', admin_users_path 6 +%table.round-borders
  7 + %tr
  8 + %td
  9 + %b
  10 + Email:
  11 + %td
  12 + = @admin_user.email
  13 + %tr
  14 + %td
  15 + %b
  16 + Admin:
  17 + %td= check_box_tag "admin", 1, @admin_user.admin, :disabled => :disabled
  18 + %tr
  19 + %td
  20 + %b
  21 + Projects limit:
  22 + %td
  23 + = @admin_user.projects_limit
  24 + - unless @admin_user.skype.empty?
  25 + %tr
  26 + %td
  27 + %b
  28 + Skype:
  29 + %td
  30 + = @admin_user.skype
  31 + - unless @admin_user.linkedin.empty?
  32 + %tr
  33 + %td
  34 + %b
  35 + Linkedin:
  36 + %td
  37 + = @admin_user.linkedin
  38 + - unless @admin_user.twitter.empty?
  39 + %tr
  40 + %td
  41 + %b
  42 + Twitter:
  43 + %td
  44 + = @admin_user.twitter
  45 + %tr
  46 + %td{:colspan => 2}
  47 + = link_to 'Edit', edit_admin_user_path(@admin_user), :class => "lbutton"
  48 + = link_to 'Back', admin_users_path, :class => "right lbutton"
32 49
33 .span-14 50 .span-14
34 %h2 Projects 51 %h2 Projects
35 52
36 %table.round-borders 53 %table.round-borders
37 %tr 54 %tr
38 - %th Name  
39 - %th Added  
40 - %th Web  
41 - %th Git  
42 - %th Admin  
43 - %th 55 + %thead
  56 + %th Name
  57 + %th Added
  58 + %th Web
  59 + %th Git
  60 + %th Admin
  61 + %th
44 62
45 - @admin_user.users_projects.each do |tm| 63 - @admin_user.users_projects.each do |tm|
46 - project = tm.project 64 - project = tm.project
@@ -53,4 +71,4 @@ @@ -53,4 +71,4 @@
53 %td= link_to 'Edit', edit_admin_team_member_path(tm) 71 %td= link_to 'Edit', edit_admin_team_member_path(tm)
54 %td= link_to 'Cancel', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete 72 %td= link_to 'Cancel', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
55 73
56 - = link_to 'Add To Another Project', new_admin_team_member_path(:team_member => {:user_id => @admin_user.id}) 74 + = link_to 'Add To Another Project', new_admin_team_member_path(:team_member => {:user_id => @admin_user.id}), :class => "lbutton"