Download as
Browse Code »

Commit 79bea312055751bcd92421927f5ff51b22362d63

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

More informative Dashboard#projects page

Showing 2 changed files with 59 additions and 24 deletions   Show diff stats
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @79bea31
... ... @@ -94,6 +94,23 @@ ul.nav.nav-projects-tabs {
94 94 }
95 95 }
96 96  
  97 +.my-projects {
  98 + li {
  99 + .project-title {
  100 + font-size: 14px;
  101 + }
  102 +
  103 + .project-info {
  104 + margin-bottom: 10px;
  105 + }
  106 +
  107 + .access-icon i {
  108 + color: #AAA;
  109 + }
  110 + }
  111 +}
  112 +
  113 +
97 114 .public-clone {
98 115 background: #333;
99 116 color: #f5f5f5;
... ...
app/views/dashboard/projects.html.haml
  Diff comments   View file @79bea31
... ... @@ -2,13 +2,25 @@
2 2 .span3
3 3 %ul.nav.nav-pills.nav-stacked
4 4 = nav_tab :scope, nil do
5   - = link_to "All", projects_dashboard_path
  5 + = link_to projects_dashboard_path do
  6 + All
  7 + %span.pull-right
  8 + = current_user.authorized_projects.count
6 9 = nav_tab :scope, 'personal' do
7   - = link_to "Personal", projects_dashboard_path(scope: 'personal')
  10 + = link_to projects_dashboard_path(scope: 'personal') do
  11 + Personal
  12 + %span.pull-right
  13 + = current_user.personal_projects.count
8 14 = nav_tab :scope, 'joined' do
9   - = link_to "Joined", projects_dashboard_path(scope: 'joined')
  15 + = link_to projects_dashboard_path(scope: 'joined') do
  16 + Joined
  17 + %span.pull-right
  18 + = current_user.authorized_projects.joined(current_user).count
10 19 = nav_tab :scope, 'owned' do
11   - = link_to "Owned", projects_dashboard_path(scope: 'owned')
  20 + = link_to projects_dashboard_path(scope: 'owned') do
  21 + Owned
  22 + %span.pull-right
  23 + = current_user.owned_projects.count
12 24  
13 25 - if @labels.present?
14 26 %p.light Filter by label:
... ... @@ -19,29 +31,35 @@
19 31 %i.icon-tag
20 32 = label.name
21 33  
22   -
23 34 .span9
24   - .ui-box
25   - .title
26   - Projects (#{@projects.total_count})
27   - .pull-right.light
28   - %small Last activity
29   - %ul.well-list
30   - - @projects.each do |project|
31   - %li
32   - - if project.public
33   - = public_icon
34   - - else
35   - = private_icon
  35 + %ul.bordered-list.my-projects
  36 + - @projects.each do |project|
  37 + %li
  38 + %h4.project-title
  39 + %span.access-icon
  40 + - if project.public
  41 + = public_icon
  42 + - else
  43 + = private_icon
36 44 = link_to project_path(project), class: dom_class(project) do
37   - %strong
38   - = project.name_with_namespace
39   - - if project.description.present?
40   - %span.light
41   - = truncate project.description, length: 80
  45 + = project.name_with_namespace
42 46  
43   - .pull-right.light
44   - %small #{project_last_activity(project)}
  47 + - if project.forked_from_project
  48 + %small.pull-right
  49 + %i.icon-code-fork
  50 + Forked from:
  51 + = link_to project.forked_from_project.name_with_namespace, project_path(project.forked_from_project)
  52 + .project-info
  53 + .pull-right
  54 + - project.labels.each do |label|
  55 + %span.label.label-info
  56 + %i.icon-tag
  57 + = label.name
  58 + - if project.description.present?
  59 + %p= truncate project.description, length: 100
  60 + .last-activity
  61 + %span.light Last activity:
  62 + %span.date= project_last_activity(project)
45 63  
46 64 - if @projects.blank?
47 65 %li
... ...