Download as
Browse Code »

Commit 73176c9ead814e7bfe848daf2647f643b0290ef9

Authored by Dmitriy Zaporozhets
2 parents c359eadf 7c5e83c0
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #131 from randaalex/admin-panel-disign 

The simple update of design admin panel
Showing 12 changed files with 128 additions and 83 deletions   Show diff stats
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @73176c9
... ... @@ -54,6 +54,7 @@
54 54  
55 55 table.round-borders {
56 56 float:left;
  57 + text-align: left;
57 58 }
58 59  
59 60 a {
... ... @@ -207,7 +208,7 @@ input.ssh_project_url {
207 208 .lite_button {
208 209 display:block;
209 210 float:left;
210   - margin: 0px 5px;
  211 + margin: 0px 5px 0px 0px;
211 212 padding:5px 10px;
212 213  
213 214 font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;
... ...
app/assets/stylesheets/style.scss
  Diff comments   View file @73176c9
... ... @@ -11,8 +11,8 @@ html { font-size: 100%; overflow-y: scroll; -webkit-text-size-adjust: 100%; -ms-
11 11 body { margin: 0; font-size: 13px; line-height: 1.231; }
12 12 body, button, input, select, textarea { font-family: sans-serif; color: #222; }
13 13  
14   -::-moz-selection { background: #fe57a1; color: #fff; text-shadow: none; }
15   -::selection { background: #fe57a1; color: #fff; text-shadow: none; }
  14 +::-moz-selection { background: #79c3e0; color: #fff; text-shadow: none; }
  15 +::selection { background: #79c3e0; color: #fff; text-shadow: none; }
16 16  
17 17 a { color: #00e; }
18 18 a:hover { color: #06e; }
... ... @@ -315,6 +315,19 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%}
315 315 }
316 316 /* eo Errors */
317 317  
  318 +/* Notices */
  319 +#notice{background: #dfffe1; padding: 20px; margin-bottom: 20px; border-radius: 5px; color: green; font-size: 1.3em;}
  320 +/* eo Notices */
  321 +
  322 +/* InfoBlock */
  323 +#infoblock{
  324 + background: #eeeeee;
  325 + padding: 20px;
  326 + margin-bottom: 20px;
  327 + border-radius: 5px;
  328 +}
  329 +/* eo InfoBlock */
  330 +
318 331 /* General */
319 332 #container{background-color: white; overflow: hidden; }
320 333 body.collapsed #container{margin: auto; width: 980px; border: 1px solid rgba(0,0,0,.22); border-top: 0; box-shadow: 0 0 0px 4px rgba(0,0,0,.04)}
... ... @@ -588,7 +601,7 @@ body.project-page h2.icon .project-name i.arrow{float: right;
588 601 }
589 602  
590 603 body.project-page h2.icon span{ background-position: -78px -68px; }
591   -body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; }
  604 +body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; padding-bottom: 10px;}
592 605 body.project-page .page-title{margin-bottom: 0}
593 606 body.project-page .project-sidebar {width: 220px; left: 0; top: 0; height: 100%; bottom: 0; position: absolute; background-color: #f7f7f7; float: left; display: inline-block; background: #f7f7f7; padding: 20px 0 20px 2%; margin: 0; }
594 607  
... ...
app/views/admin/projects/_form.html.haml
  Diff comments   View file @73176c9
... ... @@ -29,6 +29,7 @@
29 29 %br
30 30 = f.text_area :description
31 31 .clear
  32 + %hr
32 33 .actions
33 34 = f.submit 'Save', :class => "lbutton"
34 35  
... ...
app/views/admin/projects/edit.html.haml
  Diff comments   View file @73176c9
  1 +%h2= @admin_project.name
1 2 = render 'form'
2 3  
3   -= link_to 'Show', [:admin, @admin_project]
4   -\|
5   -= link_to 'Back', admin_projects_path
  4 += link_to 'Back', admin_projects_path, :class => "right lbutton"
  5 += link_to 'Show', [:admin, @admin_project], :class => "right lbutton"
6 6 \ No newline at end of file
... ...
app/views/admin/projects/index.html.haml
  Diff comments   View file @73176c9
... ... @@ -20,7 +20,5 @@
20 20 %td= link_to 'Edit', edit_admin_project_path(project), :id => "edit_#{dom_id(project)}"
21 21 %td= link_to 'Destroy', [:admin, project], :confirm => 'Are you sure?', :method => :delete
22 22  
23   -%br
24   -
25 23 = paginate @admin_projects
26   -= link_to 'New Project', new_admin_project_path
  24 += link_to 'New Project', new_admin_project_path, :class => "lbutton"
... ...
app/views/admin/projects/new.html.haml
  Diff comments   View file @73176c9
... ... @@ -2,4 +2,4 @@
2 2  
3 3 = render 'form'
4 4  
5   -= link_to 'Back', admin_projects_path
  5 += link_to 'Back', admin_projects_path, :class => 'right lbutton'
6 6 \ No newline at end of file
... ...
app/views/admin/projects/show.html.haml
  Diff comments   View file @73176c9
1   -%p#notice= notice
2   -
3   -.span-8.colborder
4   - %h2= @admin_project.name
5   -
6   - %p
7   - %b Name:
8   - = @admin_project.name
9   - %p
10   - %b Code:
11   - = @admin_project.code
12   - %p
13   - %b Path:
14   - = @admin_project.path
15   - %p
16   - %b Description:
17   - = @admin_project.description
18   -
19   - = link_to 'Edit', edit_admin_project_path(@admin_project)
20   - \|
21   - = link_to 'Back', admin_projects_path
  1 +- unless notice.nil?
  2 + %p#notice= notice
  3 +
  4 +
  5 +%h2= @admin_project.name
  6 +
  7 +%table.round-borders
  8 + %tr
  9 + %td
  10 + %b
  11 + Name:
  12 + %td
  13 + = @admin_project.name
  14 + %tr
  15 + %td
  16 + %b
  17 + Code:
  18 + %td
  19 + = @admin_project.code
  20 + %tr
  21 + %td
  22 + %b
  23 + Path:
  24 + %td
  25 + = @admin_project.path
  26 + %tr
  27 + %td
  28 + %b
  29 + Description:
  30 + %td
  31 + = @admin_project.description
  32 + %tr
  33 + %td{:colspan => 2}
  34 + = link_to 'Edit', edit_admin_project_path(@admin_project), :class => "lbutton"
  35 + = link_to 'Back', admin_projects_path, :class => "right lbutton"
  36 +
22 37  
23 38 .span-14
24 39  
25 40 %h2 Team
26 41  
27 42 %table.round-borders
28   - %tr
29   - %th Name
30   - %th Added
31   - %th Web
32   - %th Git
33   - %th Admin
34   - %th
  43 + %thead
  44 + %tr
  45 + %th Name
  46 + %th Added
  47 + %th Web
  48 + %th Git
  49 + %th Admin
  50 + %th
35 51  
36 52 - @admin_project.users_projects.each do |tm|
37 53 %tr
... ... @@ -42,4 +58,4 @@
42 58 %td.span-2= check_box_tag "admin", 1, @admin_project.admins.include?(tm.user), :disabled => :disabled
43 59 %td= link_to 'Destroy', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
44 60  
45   - = link_to 'New Team Member', new_admin_team_member_path(:team_member => {:project_id => @admin_project.id})
  61 + = link_to 'New Team Member', new_admin_team_member_path(:team_member => {:project_id => @admin_project.id}), :class => "lbutton"
... ...
app/views/admin/team_members/show.html.haml
  Diff comments   View file @73176c9
1 1 %p#notice= notice
2 2  
3   -.span-10
  3 +#infoblock
4 4 %p
5 5 %b Name:
6 6 = @admin_team_member.user_name
... ... @@ -11,7 +11,7 @@
11 11 %b Since:
12 12 = @admin_team_member.updated_at
13 13  
14   -.span-10
  14 +#infoblock
15 15 .span-6
16 16 %b Access:
17 17 .span-8
... ...
app/views/admin/users/_form.html.haml
  Diff comments   View file @73176c9
... ... @@ -44,6 +44,6 @@
44 44 %br
45 45 = f.text_field :twitter
46 46 .clear
47   - %br
  47 + %hr
48 48 .actions
49 49 = f.submit 'Save', :class => "lbutton"
... ...
app/views/admin/users/edit.html.haml
  Diff comments   View file @73176c9
1 1 = render 'form'
2 2  
3   -= link_to 'Show', [:admin, @admin_user], :class => "right lbutton"
4 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 @73176c9
... ... @@ -18,8 +18,5 @@
18 18 %td= link_to 'Edit', edit_admin_user_path(user), :id => "edit_#{dom_id(user)}"
19 19 %td= link_to 'Destroy', [:admin, user], :confirm => 'Are you sure?', :method => :delete
20 20  
21   -%br
22   -
23 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 @73176c9
1   -%p#notice= notice
  1 +- unless notice.nil?
  2 + %p#notice= notice
2 3  
3   -.span-8.colborder
4   - %p
5   - %b Name:
6   - = @admin_user.name
7   - %p
8   - %b Email:
9   - = @admin_user.email
10   - %p
11   - %b Admin:
12   - = @admin_user.admin
13   - %p
14   - %b Projects limit:
15   - = @admin_user.projects_limit
  4 +%h2= @admin_user.name
16 5  
17   - %p
18   - %b Skype:
19   - = @admin_user.skype
20   - %p
21   - %b LinkedIn:
22   - = @admin_user.linkedin
23   - %p
24   - %b Twitter:
25   - = @admin_user.twitter
26   -
27   - .clear
28   - = link_to 'Edit', edit_admin_user_path(@admin_user)
29   - \|
30   - = 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"
31 49  
32 50 .span-14
33 51 %h2 Projects
34 52  
35 53 %table.round-borders
36 54 %tr
37   - %th Name
38   - %th Added
39   - %th Web
40   - %th Git
41   - %th Admin
42   - %th
  55 + %thead
  56 + %th Name
  57 + %th Added
  58 + %th Web
  59 + %th Git
  60 + %th Admin
  61 + %th
43 62  
44 63 - @admin_user.users_projects.each do |tm|
45 64 - project = tm.project
... ... @@ -52,4 +71,4 @@
52 71 %td= link_to 'Edit', edit_admin_team_member_path(tm)
53 72 %td= link_to 'Cancel', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
54 73  
55   - = 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"
... ...