Commit f4d9059b7e2d1750abbe3ff9a41d3e854df68ffb

Authored by Dmitriy Zaporozhets
1 parent 8a08fdcd

Show project with namespace in feeds

app/assets/stylesheets/gitlab_bootstrap/common.scss
... ... @@ -30,6 +30,7 @@
30 30 .borders { border: 1px solid #ccc; @include shade; }
31 31 .hint { font-style: italic; color: #999; }
32 32 .light { color: #888 }
  33 +.tiny { font-weight: normal }
33 34  
34 35 /** PILLS & TABS**/
35 36 .nav-pills a:hover { background-color: #888; }
... ...
app/helpers/projects_helper.rb
... ... @@ -8,11 +8,19 @@ module ProjectsHelper
8 8 end
9 9  
10 10 def link_to_project project
11   - link_to project.name, project
  11 + link_to project do
  12 + title = content_tag(:strong, project.name)
  13 +
  14 + if project.namespace
  15 + namespace = content_tag(:span, "#{project.namespace.human_name} / ", class: 'tiny')
  16 + title = namespace + title
  17 + end
  18 +
  19 + title
  20 + end
12 21 end
13 22  
14 23 def tm_path team_member
15 24 project_team_member_path(@project, team_member)
16 25 end
17 26 end
18   -
... ...
app/views/dashboard/_groups.html.haml
... ... @@ -12,7 +12,7 @@
12 12 - groups.each do |group|
13 13 %li.wll
14 14 = link_to group_path(id: group.path), class: dom_class(group) do
15   - %strong.group_name= truncate(group.name, length: 25)
  15 + %strong.group_name= truncate(group.name, length: 35)
16 16 %span.arrow
17 17 →
18 18 %span.last_activity
... ...