From f87f0201f0e3386d1e0408a217650b545f57029a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sun, 6 Nov 2011 22:21:48 +0200 Subject: [PATCH] link to author on tree view item --- app/assets/stylesheets/projects.css.scss | 9 +++++++++ app/helpers/application_helper.rb | 4 ++++ app/views/commits/_commits.html.haml | 2 +- app/views/projects/_tree_item.html.haml | 7 +++++-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index c31f795a..7dfd8b29 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -667,6 +667,15 @@ table.highlighttable pre{ .cred { color:#D12F19; } .cgreen { color:#44aa22; } +body.project-page table .commit { + a.tree-commit-link { + color:gray; + &:hover { + text-decoration:underline; + } + } +} + body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} body.project-page #notes-list .note img{float: left; margin-right: 10px;} diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 70984804..70047c41 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -4,6 +4,10 @@ module ApplicationHelper "http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(user_email)}?s=40&d=identicon" end + def fixed_mode? + @view_mode == :fixed + end + def body_class(default_class = nil) main = content_for(:body_class).blank? ? default_class : diff --git a/app/views/commits/_commits.html.haml b/app/views/commits/_commits.html.haml index 2d393993..f47252ab 100644 --- a/app/views/commits/_commits.html.haml +++ b/app/views/commits/_commits.html.haml @@ -17,7 +17,7 @@ = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;" %span.commit-title %strong - = truncate(commit.safe_message, :length => 60) + = truncate(commit.safe_message, :length => fixed_mode? ? 60 : 120) %span.commit-author %strong= commit.author_name = time_ago_in_words(commit.committed_date) diff --git a/app/views/projects/_tree_item.html.haml b/app/views/projects/_tree_item.html.haml index 53c05d5a..d15c379b 100644 --- a/app/views/projects/_tree_item.html.haml +++ b/app/views/projects/_tree_item.html.haml @@ -11,5 +11,8 @@ %td = time_ago_in_words(content_commit.committed_date) ago - %td - = link_to truncate(content_commit.safe_message, :length => 40), project_commit_path(@project, content_commit) + %td.commit + = link_to truncate(content_commit.safe_message, :length => fixed_mode? ? 40 : 80), project_commit_path(@project, content_commit), :class => "tree-commit-link" + - user = @project.users.find_by_email(content_commit.author_email) + - if user + = link_to "[#{user.name}]", project_team_member_path(@project, @project.users_projects.find_by_user_id(user.id))