Download as
Browse Code »

Commit 0eccc08015681f882561581d4603466512037f6c

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

show project description in project listing on dashboard

Showing 2 changed files with 25 additions and 24 deletions   Show diff stats
app/views/dashboard/projects.html.haml
  Diff comments   View file @0eccc08
@@ -31,26 +31,33 @@ @@ -31,26 +31,33 @@
31 %ul.well-list 31 %ul.well-list
32 - @projects.each do |project| 32 - @projects.each do |project|
33 %li.clearfix 33 %li.clearfix
34 - .left  
35 - = link_to project_path(project), class: dom_class(project) do  
36 - - if project.namespace  
37 - = project.namespace.human_name  
38 - \/  
39 - %strong.well-title  
40 - = truncate(project.name, length: 25)  
41 - %br  
42 - %small.light  
43 - %strong Last activity:  
44 - %span= project_last_activity(project)  
45 - .pull-right.light  
46 - - if project.owner == current_user  
47 - %i.icon-wrench  
48 - - tm = project.team.get_tm(current_user.id)  
49 - - if tm  
50 - = tm.project_access_human 34 + .clearfix
  35 + %h5
  36 + = link_to project_path(project), class: dom_class(project) do
  37 + - if project.namespace
  38 + = project.namespace.human_name
  39 + \/
  40 + %strong
  41 + = truncate(project.name, length: 45)
  42 + .pull-right.light
  43 + - if project.owner == current_user
  44 + %i.icon-wrench
  45 + - tm = project.team.get_tm(current_user.id)
  46 + - if tm
  47 + %strong= tm.project_access_human
  48 + .clearfix
  49 + .left
  50 + - if project.description.present?
  51 + %span.light= project.description
  52 +
  53 + .pull-right.light
  54 + %small.light
  55 + Last activity #{project_last_activity(project)}
51 56
52 - if @projects.blank? 57 - if @projects.blank?
53 %li 58 %li
54 %h3.nothing_here_message There are no projects here. 59 %h3.nothing_here_message There are no projects here.
55 - .bottom= paginate @projects, theme: "gitlab" 60 + .bottom
  61 + %hr
  62 + = paginate @projects, theme: "gitlab"
56 63
app/views/projects/_project_head.html.haml
  Diff comments   View file @0eccc08
@@ -19,9 +19,3 @@ @@ -19,9 +19,3 @@
19 = link_to project_services_path(@project) do 19 = link_to project_services_path(@project) do
20 %span 20 %span
21 Services 21 Services
22 -  
23 - -#= nav_link(path: 'projects#files') do  
24 - -#= link_to 'Attachments', files_project_path(@project), class: "files-tab tab"  
25 - -#= nav_link(controller: :snippets) do  
26 - -#= link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab"  
27 -