deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Show gravatar icon on tooltip.

Browse source
This commit is contained in:
Sato Hiroyuki 2013-02-28 14:56:27 +09:00
parent 00d0e57e85
commit 2a687dd562
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/branch-graph.js
View file

@ -320,15 +320,16 @@
}(this); }(this);
Raphael.fn.commitTooltip = function(x, y, commit){ Raphael.fn.commitTooltip = function(x, y, commit){
var nameText, idText, messageText var icon, nameText, idText, messageText
, boxWidth = 300 , boxWidth = 300
, boxHeight = 200; , boxHeight = 200;
nameText = this.text(x, y + 10, commit.author.name); icon = this.image(commit.author.icon, x, y, 20, 20);
nameText = this.text(x + 25, y + 10, commit.author.name);
idText = this.text(x, y + 35, commit.id); idText = this.text(x, y + 35, commit.id);
messageText = this.text(x, y + 50, commit.message); messageText = this.text(x, y + 50, commit.message);
textSet = this.set(nameText, idText, messageText).attr({ textSet = this.set(icon, nameText, idText, messageText).attr({
"text-anchor": "start", "text-anchor": "start",
"font": "12px Monaco, monospace" "font": "12px Monaco, monospace"
}); });

4
app/controllers/graph_controller.rb
View file

@ -1,5 +1,6 @@
class GraphController < ProjectResourceController class GraphController < ProjectResourceController
include ExtractsPath include ExtractsPath
include ApplicationHelper
# Authorize # Authorize
before_filter :authorize_read_project! before_filter :authorize_read_project!
@ -21,6 +22,9 @@ class GraphController < ProjectResourceController
format.html format.html
format.json do format.json do
graph = Graph::JsonBuilder.new(project, @ref, @commit) graph = Graph::JsonBuilder.new(project, @ref, @commit)
graph.commits.each do |c|
c.icon = gravatar_icon(c.author.email)
end
render :json => graph.to_json render :json => graph.to_json
end end
end end

7
app/models/graph/commit.rb
View file

@ -4,7 +4,7 @@ module Graph
class Commit class Commit
include ActionView::Helpers::TagHelper include ActionView::Helpers::TagHelper
attr_accessor :time, :spaces, :refs, :parent_spaces attr_accessor :time, :spaces, :refs, :parent_spaces, :icon
def initialize(commit) def initialize(commit)
@_commit = commit @_commit = commit
@ -23,8 +23,9 @@ module Graph
[p.id,0,0] [p.id,0,0]
end end
h[:author] = { h[:author] = {
name: author.name, name: author.name,
email: author.email email: author.email,
icon: icon
} }
h[:time] = time h[:time] = time
h[:space] = spaces.first h[:space] = spaces.first