Show gravatar icon on tooltip.
This commit is contained in:
parent
00d0e57e85
commit
2a687dd562
3 changed files with 12 additions and 6 deletions
|
@ -320,15 +320,16 @@
|
|||
|
||||
}(this);
|
||||
Raphael.fn.commitTooltip = function(x, y, commit){
|
||||
var nameText, idText, messageText
|
||||
var icon, nameText, idText, messageText
|
||||
, boxWidth = 300
|
||||
, 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);
|
||||
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",
|
||||
"font": "12px Monaco, monospace"
|
||||
});
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
class GraphController < ProjectResourceController
|
||||
include ExtractsPath
|
||||
include ApplicationHelper
|
||||
|
||||
# Authorize
|
||||
before_filter :authorize_read_project!
|
||||
|
@ -21,6 +22,9 @@ class GraphController < ProjectResourceController
|
|||
format.html
|
||||
format.json do
|
||||
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
|
||||
end
|
||||
end
|
||||
|
|
|
@ -4,7 +4,7 @@ module Graph
|
|||
class Commit
|
||||
include ActionView::Helpers::TagHelper
|
||||
|
||||
attr_accessor :time, :spaces, :refs, :parent_spaces
|
||||
attr_accessor :time, :spaces, :refs, :parent_spaces, :icon
|
||||
|
||||
def initialize(commit)
|
||||
@_commit = commit
|
||||
|
@ -23,8 +23,9 @@ module Graph
|
|||
[p.id,0,0]
|
||||
end
|
||||
h[:author] = {
|
||||
name: author.name,
|
||||
email: author.email
|
||||
name: author.name,
|
||||
email: author.email,
|
||||
icon: icon
|
||||
}
|
||||
h[:time] = time
|
||||
h[:space] = spaces.first
|
||||
|
|
Loading…
Reference in a new issue