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

Move diff notes into the actual diff content column

Browse source
This commit is contained in:
Riyad Preukschas 2012-11-18 00:41:30 +01:00
parent 4d2278e7c6
commit 39834ec640
9 changed files with 68 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/views/notes/_diff_notes_with_reply.html.haml
View file

@ -1,15 +1,18 @@
- notes.each do |note|
= render "notes/diff_note", note: note
%tr.notes_holder
%td.notes_line{ colspan: 2 }
%span.btn.disabled
%i.icon-comment
= notes.count
%td.notes_content
%ul.notes
= render notes
-# reply button
- note = notes.first # example note
%tr.line_notes_row.reply
%td{colspan: 3}
= link_to "javascript:;",
class: "line_note_reply_link js-note-add-to-diff-line",
-# reply button
- note = notes.first # example note
%button{ class: "btn comment-btn js-note-add-to-diff-line",
data: { line_code: note.line_code,
noteable_type: note.noteable_type,
noteable_id: note.noteable_id },
title: "Add a comment to this line" do
title: "Add a comment to this line" }
%i.icon-comment
Reply