Commit 8290c9a6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Use proper classes for sdiff content

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 58634dfb
...@@ -36,21 +36,17 @@ ...@@ -36,21 +36,17 @@
.discussion-body .discussion-body
- if note.for_diff_line? - if note.for_diff_line?
- if note.active? - if note.active?
.content = render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
.file= render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
- else - else
= link_to 'show outdated discussion', '#', class: 'js-show-outdated-discussion' = link_to 'show outdated discussion', '#', class: 'js-show-outdated-discussion'
%div.hide.outdated-discussion %div.hide.outdated-discussion
.content .notes{ rel: discussion_notes.first.discussion_id }
.notes{ rel: discussion_notes.first.discussion_id } = render discussion_notes
= render discussion_notes
- else - else
.content .notes{ rel: discussion_notes.first.discussion_id }
.notes{ rel: discussion_notes.first.discussion_id } = render discussion_notes
= render discussion_notes = render "projects/notes/discussion_reply_button", note: discussion_notes.first
= render "projects/notes/discussion_reply_button", note: discussion_notes.first
-# will be shown when the other one is hidden -# will be shown when the other one is hidden
.discussion-hidden.content.hide .discussion-hidden.content.hide
...@@ -59,4 +55,3 @@ ...@@ -59,4 +55,3 @@
= link_to "javascript:;", class: "js-details-target js-toggler-target" do = link_to "javascript:;", class: "js-details-target js-toggler-target" do
%i.icon-eye-open %i.icon-eye-open
Show Show
- diff = note.diff - diff = note.diff
.header .diff-file
- if diff.deleted_file .diff-header
%span= diff.old_path - if diff.deleted_file
- else %span= diff.old_path
%span= diff.new_path - else
- if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode %span= diff.new_path
%span.file-mode= "#{diff.a_mode}#{diff.b_mode}" - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
%br/ %span.file-mode= "#{diff.a_mode}#{diff.b_mode}"
.content %br/
%table .diff-content
- each_diff_line_near(diff, note.diff_file_index, note.line_code) do |line, type, line_code, line_new, line_old| %table
%tr.line_holder{ id: line_code } - each_diff_line_near(diff, note.diff_file_index, note.line_code) do |line, type, line_code, line_new, line_old|
- if type == "match" %tr.line_holder{ id: line_code }
%td.old_line= "..." - if type == "match"
%td.new_line= "..." %td.old_line= "..."
%td.line_content.matched= line %td.new_line= "..."
- else %td.line_content.matched= line
%td.old_line= raw(type == "new" ? "&nbsp;" : line_old) - else
%td.new_line= raw(type == "old" ? "&nbsp;" : line_new) %td.old_line= raw(type == "new" ? "&nbsp;" : line_old)
%td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line} &nbsp;" %td.new_line= raw(type == "old" ? "&nbsp;" : line_new)
%td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line} &nbsp;"
- if line_code == note.line_code - if line_code == note.line_code
= render "projects/notes/diff_notes_with_reply", notes: discussion_notes = render "projects/notes/diff_notes_with_reply", notes: discussion_notes
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment