Update author info in tree view
This commit is contained in:
parent
aef2031ad6
commit
4fd73683d9
4 changed files with 23 additions and 13 deletions
|
@ -52,14 +52,26 @@
|
|||
}
|
||||
}
|
||||
|
||||
.tree-commit-link {
|
||||
color:#333;
|
||||
.tree_author {
|
||||
padding-right: 8px;
|
||||
|
||||
img.avatar {
|
||||
border: 0 none;
|
||||
float: none;
|
||||
margin-right: 0;
|
||||
padding: 0;
|
||||
width: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
a.tree-commit-link {
|
||||
color: #666;
|
||||
&:hover {
|
||||
text-decoration: underline;
|
||||
.tree_commit {
|
||||
color: gray;
|
||||
|
||||
.tree-commit-link {
|
||||
color: #444;
|
||||
&:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
- @logs.each do |content_data|
|
||||
- file_name = content_data[:file_name]
|
||||
- content_commit = content_data[:commit]
|
||||
- tm = @project.team_member_by_name_or_email(content_commit.author_email, content_commit.author_name)
|
||||
- commit = content_data[:commit]
|
||||
|
||||
:plain
|
||||
var row = $("table.table_#{@hex_path} tr.file_#{hexdigest(file_name)}");
|
||||
row.find("td.tree_time_ago").html('#{escape_javascript(time_ago_in_words(content_commit.committed_date))} ago');
|
||||
row.find("td.tree_commit").html('#{escape_javascript(render("tree/tree_commit", tm: tm, content_commit: content_commit))}');
|
||||
row.find("td.tree_time_ago").html('#{escape_javascript time_ago_in_words(commit.committed_date)} ago');
|
||||
row.find("td.tree_commit").html('#{escape_javascript render("tree/tree_commit_column", commit: commit)}');
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
- if tm
|
||||
= link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)
|
||||
= link_to_gfm truncate(content_commit.title, length: tm ? 30 : 50), project_commit_path(@project, content_commit.id), class: "tree-commit-link"
|
2
app/views/tree/_tree_commit_column.html.haml
Normal file
2
app/views/tree/_tree_commit_column.html.haml
Normal file
|
@ -0,0 +1,2 @@
|
|||
%span.tree_author= commit.author_link avatar: true
|
||||
= link_to_gfm truncate(commit.title, length: 80), project_commit_path(@project, commit.id), class: "tree-commit-link"
|
Loading…
Reference in a new issue