show project description in project listing on dashboard

Dmitriy Zaporozhets
1 parent aa5327a5
Showing 2 changed files with 25 additions and 24 deletions Show diff stats
app/views/dashboard/projects.html.haml
app/views/projects/_project_head.html.haml
@@ -31,26 +31,33 @@
     %ul.well-list
       - @projects.each do |project|
         %li.clearfix
-          .left
-            = link_to project_path(project), class: dom_class(project) do
-              - if project.namespace
-                = project.namespace.human_name
-                \/
-              %strong.well-title
-                = truncate(project.name, length: 25)
-            %br
-            %small.light
-              %strong Last activity:
-              %span= project_last_activity(project)
-          .pull-right.light
-            - if project.owner == current_user
-              %i.icon-wrench
-            - tm = project.team.get_tm(current_user.id)
-            - if tm
-              = tm.project_access_human
+          .clearfix
+            %h5
+              = link_to project_path(project), class: dom_class(project) do
+                - if project.namespace
+                  = project.namespace.human_name
+                  \/
+                %strong
+                  = truncate(project.name, length: 45)
+              .pull-right.light
+                - if project.owner == current_user
+                  %i.icon-wrench
+                - tm = project.team.get_tm(current_user.id)
+                - if tm
+                  %strong= tm.project_access_human
+          .clearfix
+            .left
+              - if project.description.present?
+                %span.light= project.description
+
+            .pull-right.light
+              %small.light
+                Last activity #{project_last_activity(project)}
  
       - if @projects.blank?
         %li
           %h3.nothing_here_message There are no projects here.
-    .bottom= paginate @projects, theme: "gitlab"
+    .bottom
+      %hr
+      = paginate @projects, theme: "gitlab"
  
@@ -19,9 +19,3 @@
     = link_to project_services_path(@project) do
       %span
       Services
-
-  -#= nav_link(path: 'projects#files') do
-    -#= link_to 'Attachments', files_project_path(@project), class: "files-tab tab"
-  -#= nav_link(controller: :snippets) do
-    -#= link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab"
-
...	...	@@ -31,26 +31,33 @@
31	31	%ul.well-list
32	32	- @projects.each do \|project\|
33	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	57	- if @projects.blank?
53	58	%li
54	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
...	...
...	...	@@ -19,9 +19,3 @@
19	19	= link_to project_services_path(@project) do
20	20	%span
21	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		-
...	...