> a {
padding: 8px 20px;
margin-right: 7px;
- line-height: 19px;
+ line-height: 20px;
border-color: #EEE;
color: #888;
border-bottom: 1px solid #ddd;
.note-last-update {
font-style: italic;
}
- .note-author {
+ .author {
color: $style_color;
font-weight: bold;
&:hover {
end
end
- def link_to_member(project, author)
+ def link_to_member(project, author, opts = {})
+ default_opts = { avatar: true }
+ opts = default_opts.merge(opts)
+
return "(deleted)" unless author
+ author_html = ""
+
# Build avatar image tag
- avatar = image_tag(gravatar_icon(author.try(:email)), width: 16, class: "lil_av")
+ author_html << image_tag(gravatar_icon(author.try(:email)), width: 16, class: "lil_av") if opts[:avatar]
# Build name span tag
- name = content_tag :span, author.name, class: 'author'
+ author_html << content_tag(:span, sanitize(author.name), class: 'author')
- author_html = avatar + name
+ author_html = author_html.html_safe
tm = project.team_member_by_id(author)
link_to author_html, project_team_member_path(project, tm), class: "author_link"
else
author_html
- end
+ end.html_safe
end
def tm_path team_member
Show discussion
= image_tag gravatar_icon(note.author.email), class: "avatar s32"
%div
- = link_to note.author_name, project_team_member_path(@project, @project.team_member_by_id(note.author)), class: "note-author"
+ = link_to_member(@project, note.author, avatar: false)
- if note.for_merge_request?
- if note.diff
started a discussion on this merge request diff
%div
- last_note = discussion_notes.last
last updated by
- = link_to last_note.author_name, project_team_member_path(@project, @project.team_member_by_id(last_note.author)), class: "note-author"
+ = link_to_member(@project, last_note.author, avatar: false)
%span.discussion-last-update
= time_ago_in_words(last_note.updated_at)
ago
= link_to project_note_path(@project, note), title: "Remove comment", method: :delete, confirm: 'Are you sure you want to remove comment?', remote: true, class: "danger js-note-delete" do
%i.icon-trash.cred
= image_tag gravatar_icon(note.author.email), class: "avatar s32"
- = link_to note.author_name, project_team_member_path(@project, @project.team_member_by_id(note.author)), class: "note-author"
+ = link_to_member(@project, note.author, avatar: false)
%span.note-last-update
= time_ago_in_words(note.updated_at)
ago