Download as
Browse Code »

Commit 88974b500f18a9de32f778e407c8d6909095443f

Authored by Dmitriy Zaporozhets
1 parent 2fa4aadb
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

projects list on dashboard with commit links

Showing 3 changed files with 49 additions and 54 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @88974b5
... ... @@ -17,6 +17,11 @@ a {
17 17 &.lined {
18 18 text-decoration:underlined;
19 19 }
  20 +
  21 + &.gray {
  22 + color:gray;
  23 + }
  24 +
20 25 &.supp_diff_link {
21 26 text-align:center;
22 27 padding:20px 0;
... ... @@ -24,6 +29,10 @@ a {
24 29 width:100%;
25 30 float:left;
26 31 }
  32 +
  33 + &.neib {
  34 + margin-right:15px;
  35 + }
27 36 }
28 37  
29 38 .btn {
... ... @@ -46,10 +55,6 @@ a:focus {
46 55 color: $link_color !important;
47 56 }
48 57  
49   -.dlink {
50   -
51   -}
52   -
53 58 .pills a:hover {
54 59 background-color:#ccc;
55 60 }
... ... @@ -60,10 +65,6 @@ a:focus {
60 65  
61 66 .label {
62 67 background-color: #474D57;
63   -
64   - &.pushed {
65   - background-color: $link_color;
66   - }
67 68 }
68 69  
69 70 .pretty_label {
... ... @@ -873,26 +874,24 @@ p.time {
873 874 }
874 875  
875 876  
  877 +/**
  878 + * Dashboard page
  879 + *
  880 + */
876 881 .dashboard_category {
877 882 margin-bottom:30px;
878   -
879 883 h3 a {
880 884 color:#474D57;
881   -
882 885 &:hover {
883 886 text-decoration:underline;
884 887 }
885 888 }
886 889  
887 890 .dashboard_block {
888   - width:840px;
889   - margin:auto;
890   -
891 891 .dash_project_item {
892 892 margin-bottom:10px;
893 893 border:none;
894 894 padding:0px 5px;
895   -
896 895 .project_link {
897 896 color:#888;
898 897 &:hover {
... ... @@ -902,7 +901,6 @@ p.time {
902 901 }
903 902 }
904 903 }
905   -
906 904 h4 {
907 905 color:#666;
908 906 }
... ...
app/views/dashboard/_projects_feed.html.haml
  Diff comments   View file @88974b5
... ... @@ -10,4 +10,5 @@
10 10  
11 11 .right
12 12 %small
13   - %strong= link_to "Browse Code »", tree_project_ref_path(project, project.root_ref), :class => "vlink"
  13 + %strong= link_to "Browse Code »", tree_project_ref_path(project, project.root_ref), :class => "neib gray"
  14 + %strong= link_to "Commits »", project_commits_path(project), :class => "gray"
... ...
app/views/dashboard/index.html.haml
  Diff comments   View file @88974b5
... ... @@ -17,38 +17,37 @@
17 17 = link_to projects_path do
18 18 Projects list →
19 19 %hr
20   - .row
21   - .dashboard_block
22   - .row
23   - .span4.right
24   - %div.lborder.ipadded
25   - %h3
26   - = pluralize current_user.projects.count, "project", "projects"
27   - - if current_user.can_create_project?
28   - %hr
29   - %div
30   - You can create up to
31   - = current_user.projects_limit
32   - projects. Click on button below to add a new one
33   - .link_holder
34   - %br
35   - = link_to new_project_path, :class => "btn" do
36   - New Project »
37   - - else
38   - %hr
39   - %div
40   - You've reached project limit for your account.
41   - You cannot create new projects.
42   - .link_holder
43   - %br
44   - = link_to profile_path, :class => "btn" do
45   - Your Profile »
46   - .span10.left= render "dashboard/projects_feed", :projects => @active_projects
47   - - if @last_push && @last_push.valid_push?
48   - .padded.prepend-top-20
49   - %h5
50   - %small Latest push was to the #{@last_push.ref_name} #{@last_push.ref_type} of #{@last_push.project.name}:
51   - %ul.unstyled= render @last_push
  20 + .dashboard_block
  21 + .row
  22 + .span4.right
  23 + %div.lborder.ipadded
  24 + %h3
  25 + = pluralize current_user.projects.count, "project", "projects"
  26 + - if current_user.can_create_project?
  27 + %hr
  28 + %div
  29 + You can create up to
  30 + = current_user.projects_limit
  31 + projects. Click on button below to add a new one
  32 + .link_holder
  33 + %br
  34 + = link_to new_project_path, :class => "btn" do
  35 + New Project »
  36 + - else
  37 + %hr
  38 + %div
  39 + You've reached project limit for your account.
  40 + You cannot create new projects.
  41 + .link_holder
  42 + %br
  43 + = link_to profile_path, :class => "btn" do
  44 + Your Profile »
  45 + .span12.left= render "dashboard/projects_feed", :projects => @active_projects
  46 + - if @last_push && @last_push.valid_push?
  47 + .padded.prepend-top-20
  48 + %h5
  49 + %small Latest push was to the #{@last_push.ref_name} #{@last_push.ref_type} of #{@last_push.project.name}:
  50 + %ul.unstyled= render @last_push
52 51  
53 52 - if @merge_requests.any?
54 53 %div.dashboard_category
... ... @@ -60,8 +59,7 @@
60 59 = link_to dashboard_merge_requests_path do
61 60 Visit merge requests page →
62 61 %hr
63   - .row
64   - .dashboard_block= render "dashboard/merge_requests_feed"
  62 + .dashboard_block= render "dashboard/merge_requests_feed"
65 63  
66 64 - if @issues.any?
67 65 %div.dashboard_category
... ... @@ -72,8 +70,7 @@
72 70 = link_to dashboard_issues_path do
73 71 Visit issues page →
74 72 %hr
75   - .row
76   - .dashboard_block= render "dashboard/issues_feed"
  73 + .dashboard_block= render "dashboard/issues_feed"
77 74  
78 75 - if @events.any?
79 76 %div.dashboard_category
... ... @@ -82,5 +79,4 @@
82 79 = link_to "Activities" , "#activities", :id => "activities"
83 80  
84 81 %hr
85   - .row
86   - .dashboard_block= render @events
  82 + .dashboard_block= render @events
... ...