From f4d9059b7e2d1750abbe3ff9a41d3e854df68ffb Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sun, 9 Dec 2012 10:56:15 +0200 Subject: [PATCH] Show project with namespace in feeds --- app/assets/stylesheets/gitlab_bootstrap/common.scss | 1 + app/helpers/projects_helper.rb | 12 ++++++++++-- app/views/dashboard/_groups.html.haml | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss index d6089cea6dc..dca558df000 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss @@ -30,6 +30,7 @@ .borders { border: 1px solid #ccc; @include shade; } .hint { font-style: italic; color: #999; } .light { color: #888 } +.tiny { font-weight: normal } /** PILLS & TABS**/ .nav-pills a:hover { background-color: #888; } diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 7c302ef4176..4690a452e25 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -8,11 +8,19 @@ module ProjectsHelper end def link_to_project project - link_to project.name, project + link_to project do + title = content_tag(:strong, project.name) + + if project.namespace + namespace = content_tag(:span, "#{project.namespace.human_name} / ", class: 'tiny') + title = namespace + title + end + + title + end end def tm_path team_member project_team_member_path(@project, team_member) end end - diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml index 8f66742098a..0ef054155b6 100644 --- a/app/views/dashboard/_groups.html.haml +++ b/app/views/dashboard/_groups.html.haml @@ -12,7 +12,7 @@ - groups.each do |group| %li.wll = link_to group_path(id: group.path), class: dom_class(group) do - %strong.group_name= truncate(group.name, length: 25) + %strong.group_name= truncate(group.name, length: 35) %span.arrow → %span.last_activity -- GitLab