Merge pull request #1851 from riyad/link-to-commit-authors-everywhere

Link to commit authors everywhere

Merge pull request #1851 from riyad/link-to-commit-authors-everywhere
Link to commit authors everywhere
Dmitriy Zaporozhets
2 parents ca524d8d 646bad43
Showing 6 changed files with 55 additions and 24 deletions Show diff stats
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/tree.scss
app/decorators/commit_decorator.rb
app/views/blame/show.html.haml
app/views/commits/_commit.html.haml
app/views/commits/_commit_box.html.haml
@@ -47,12 +47,15 @@
       padding-left: 32px;
     }
-    .author,
-    .committer {
+    .author a,
+    .committer a {
       font-size:14px;
       line-height:22px;
       text-shadow:0 1px 1px #fff;
       color:#777;
+      &:hover {
+        color: #999;
+      }
     }
     .avatar {
@@ -227,6 +230,9 @@
   .commit-author-name {
     color: #777;
+    &:hover {
+      color: #999;
+    }
   }
 }
@@ -72,6 +72,15 @@
       }
     }
   }
+
+  .blame {
+    img.avatar {
+      border: 0 none;
+      float: none;
+      margin: 0;
+      padding: 0;
+    }
+  }
 }
 .tree-btn-group {
@@ -47,21 +47,15 @@ class CommitDecorator &lt; ApplicationDecorator
   # Otherwise it will link to the author email as specified in the commit.
   #
   # options:
-  #  avatar: true   will prepend avatar image
-  def author_link(options)
-    text = if options[:avatar]
-            avatar = h.image_tag h.gravatar_icon(author_email), class: "avatar s16", width: 16
-            "#{avatar} #{author_name}"
-          else
-            author_name
-          end
-    team_member = @project.try(:team_member_by_name_or_email, author_name, author_email)
+  #  avatar: true will prepend the avatar image
+  #  size:   size of the avatar image in px
+  def author_link(options = {})
+    person_link(options.merge source: :author)
+  end
-    if team_member.nil?
-      h.mail_to author_email, text.html_safe, class: "commit-author-link"
-    else
-      h.link_to text, h.project_team_member_path(@project, team_member), class: "commit-author-link"
-    end
+  # Just like #author_link but for the committer.
+  def committer_link(options = {})
+    person_link(options.merge source: :committer)
   end
   protected
@@ -69,4 +63,30 @@ class CommitDecorator &lt; ApplicationDecorator
   def no_commit_message
     "--no commit message"
   end
+
+  # Private: Returns a link to a person. If the person has a matching user and
+  # is a member of the current @project it will link to the team member page.
+  # Otherwise it will link to the person email as specified in the commit.
+  #
+  # options:
+  #  source: one of :author or :committer
+  #  avatar: true will prepend the avatar image
+  #  size:   size of the avatar image in px
+  def person_link(options = {})
+    source_name = send "#{options[:source]}_name".to_sym
+    source_email = send "#{options[:source]}_email".to_sym
+    text = if options[:avatar]
+            avatar = h.image_tag h.gravatar_icon(source_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size]
+            %Q{#{avatar} <span class="commit-#{options[:source]}-name">#{source_name}</span>}
+          else
+            source_name
+          end
+    team_member = @project.try(:team_member_by_name_or_email, source_name, source_email)
+
+    if team_member.nil?
+      h.mail_to source_email, text.html_safe, class: "commit-#{options[:source]}-link"
+    else
+      h.link_to text, h.project_team_member_path(@project, team_member), class: "commit-#{options[:source]}-link"
+    end
+  end
 end
@@ -24,9 +24,7 @@
           - commit = Commit.new(commit)
           - commit = CommitDecorator.decorate(commit)
           %tr
-            %td.author
-              = image_tag gravatar_icon(commit.author_email, 16)
-              = commit.author_name
+            %td.author= commit.author_link avatar: true, size: 16
             %td.blame_commit
               &nbsp;
               %code= link_to commit.short_id, project_commit_path(@project, commit)
@@ -4,9 +4,8 @@
       %strong= link_to "Browse Code »", project_tree_path(@project, commit), class: "right"
   %p
     = link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id"
-    %strong.commit-author-name= commit.author_name
+    %strong= commit.author_link avatar: true, size: 24
     %span.dash &ndash;
-    = image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16
     = link_to_gfm truncate(commit.title, length: 50), project_commit_path(@project, commit.id), class: "row_title"
     %span.committed_ago
@@ -18,16 +18,15 @@
   .commit-info
     .row
       .span5
-        = image_tag gravatar_icon(@commit.author_email, 40), class: "avatar"
         .author
-          %strong= @commit.author_name
+          %strong= @commit.author_link avatar: true, size: 40
           authored
           %time{title: @commit.authored_date.stamp("Aug 21, 2011 9:23pm")}
             #{time_ago_in_words(@commit.authored_date)} ago
         - if @commit.different_committer?
           .committer
             &rarr;
-            %strong= @commit.committer_name
+            %strong= @commit.committer_link
             committed
             %time{title: @commit.committed_date.stamp("Aug 21, 2011 9:23pm")}
               #{time_ago_in_words(@commit.committed_date)} ago
	@@ -72,6 +72,15 @@		@@ -72,6 +72,15 @@
72	}	72	}
73	}	73	}
74	}	74	}
		75	+
		76	+ .blame {
		77	+ img.avatar {
		78	+ border: 0 none;
		79	+ float: none;
		80	+ margin: 0;
		81	+ padding: 0;
		82	+ }
		83	+ }
75	}	84	}
76		85
77	.tree-btn-group {	86	.tree-btn-group {
	@@ -47,21 +47,15 @@ class CommitDecorator < ApplicationDecorator		@@ -47,21 +47,15 @@ class CommitDecorator < ApplicationDecorator
47	# Otherwise it will link to the author email as specified in the commit.	47	# Otherwise it will link to the author email as specified in the commit.
48	#	48	#
49	# options:	49	# options:
50	- # avatar: true will prepend avatar image
51	- def author_link(options)
52	- text = if options[:avatar]
53	- avatar = h.image_tag h.gravatar_icon(author_email), class: "avatar s16", width: 16
54	- "#{avatar} #{author_name}"
55	- else
56	- author_name
57	- end
58	- team_member = @project.try(:team_member_by_name_or_email, author_name, author_email)	50	+ # avatar: true will prepend the avatar image
		51	+ # size: size of the avatar image in px
		52	+ def author_link(options = {})
		53	+ person_link(options.merge source: :author)
		54	+ end
59		55
60	- if team_member.nil?
61	- h.mail_to author_email, text.html_safe, class: "commit-author-link"
62	- else
63	- h.link_to text, h.project_team_member_path(@project, team_member), class: "commit-author-link"
64	- end	56	+ # Just like #author_link but for the committer.
		57	+ def committer_link(options = {})
		58	+ person_link(options.merge source: :committer)
65	end	59	end
66		60
67	protected	61	protected
	@@ -69,4 +63,30 @@ class CommitDecorator < ApplicationDecorator		@@ -69,4 +63,30 @@ class CommitDecorator < ApplicationDecorator
69	def no_commit_message	63	def no_commit_message
70	"--no commit message"	64	"--no commit message"
71	end	65	end
		66	+
		67	+ # Private: Returns a link to a person. If the person has a matching user and
		68	+ # is a member of the current @project it will link to the team member page.
		69	+ # Otherwise it will link to the person email as specified in the commit.
		70	+ #
		71	+ # options:
		72	+ # source: one of :author or :committer
		73	+ # avatar: true will prepend the avatar image
		74	+ # size: size of the avatar image in px
		75	+ def person_link(options = {})
		76	+ source_name = send "#{options[:source]}_name".to_sym
		77	+ source_email = send "#{options[:source]}_email".to_sym
		78	+ text = if options[:avatar]
		79	+ avatar = h.image_tag h.gravatar_icon(source_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size]
		80	+ %Q{#{avatar} <span class="commit-#{options[:source]}-name">#{source_name}</span>}
		81	+ else
		82	+ source_name
		83	+ end
		84	+ team_member = @project.try(:team_member_by_name_or_email, source_name, source_email)
		85	+
		86	+ if team_member.nil?
		87	+ h.mail_to source_email, text.html_safe, class: "commit-#{options[:source]}-link"
		88	+ else
		89	+ h.link_to text, h.project_team_member_path(@project, team_member), class: "commit-#{options[:source]}-link"
		90	+ end
		91	+ end
72	end	92	end