Rename diff note partials

Riyad Preukschas
1 parent 534bd5a2
Showing 17 changed files with 80 additions and 80 deletions Show diff stats
app/views/commit/show.html.haml
app/views/commits/_text_file.html.haml
app/views/merge_requests/_show.html.haml
app/views/notes/_create_diff_note.js.haml
app/views/notes/_create_per_line_note.js.haml
app/views/notes/_diff_note.html.haml
app/views/notes/_diff_note_form.html.haml
app/views/notes/_diff_note_link.html.haml
app/views/notes/_diff_notes_reply_button.html.haml
app/views/notes/_diff_notes_with_reply.html.haml
app/views/notes/_discussion_diff.html.haml
app/views/notes/_per_line_form.html.haml
app/views/notes/_per_line_note.html.haml
app/views/notes/_per_line_note_link.html.haml
app/views/notes/_per_line_notes_with_reply.html.haml
app/views/notes/_per_line_reply_button.html.haml
app/views/notes/create.js.haml
 = render "commits/commit_box"
 = render "commits/diffs", diffs: @commit.diffs
 = render "notes/notes_with_form", tid: @commit.id, tt: "commit"
-= render "notes/per_line_form"
+= render "notes/diff_note_form"
 :javascript
@@ -13,11 +13,11 @@
         %td.old_line
           = link_to raw(type == "new" ? "&nbsp;" : line_old), "##{line_code}", id: line_code
           - if @comments_allowed
-            = render "notes/per_line_note_link", line_code: line_code
+            = render "notes/diff_note_link", line_code: line_code
         %td.new_line= link_to raw(type == "old" ? "&nbsp;" : line_new) , "##{line_code}", id: line_code
         %td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line} &nbsp;"
         - if @reply_allowed
           - comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at)
           - unless comments.empty?
-            = render "notes/per_line_notes_with_reply", notes: comments
+            = render "notes/diff_notes_with_reply", notes: comments
@@ -21,7 +21,7 @@
   = render "merge_requests/show/diffs" if @diffs
 .status
-= render "notes/per_line_form"
+= render "notes/diff_note_form"
 :javascript
   $(function(){
@@ -0,0 +1,19 @@
+- if note.valid?
+  :plain
+    // hide and reset the form
+    $(".per_line_form").hide();
+    $('.line-note-form-holder textarea').val("");
+
+    // find the reply button for this line
+    // (might not be there if this is the first note)
+    var trRpl = $("a.line_note_reply_link[data-noteable-type='#{note.noteable_type}'][data-noteable-id='#{note.noteable_id}'][data-line-code='#{note.line_code}']").closest("tr");
+    if (trRpl.size() == 0) {
+      // find the commented line ...
+      var trEl = $(".#{note.line_code}").parent();
+      // ... and insert the note and the reply button after it
+      trEl.after("#{escape_javascript(render "notes/diff_notes_reply_button", note: note)}");
+      trEl.after("#{escape_javascript(render "notes/diff_note", note: note)}");
+    } else {
+      // instert new note before reply button
+      trRpl.before("#{escape_javascript(render "notes/diff_note", note: note)}");
+    }
@@ -1,19 +0,0 @@
-- if note.valid?
-  :plain
-    // hide and reset the form
-    $(".per_line_form").hide();
-    $('.line-note-form-holder textarea').val("");
-
-    // find the reply button for this line
-    // (might not be there if this is the first note)
-    var trRpl = $("a.line_note_reply_link[data-noteable-type='#{note.noteable_type}'][data-noteable-id='#{note.noteable_id}'][data-line-code='#{note.line_code}']").closest("tr");
-    if (trRpl.size() == 0) {
-      // find the commented line ...
-      var trEl = $(".#{note.line_code}").parent();
-      // ... and insert the note and the reply button after it
-      trEl.after("#{escape_javascript(render "notes/per_line_reply_button", note: note)}");
-      trEl.after("#{escape_javascript(render "notes/per_line_note", note: note)}");
-    } else {
-      // instert new note before reply button
-      trRpl.before("#{escape_javascript(render "notes/per_line_note", note: note)}");
-    }
@@ -0,0 +1,5 @@
+%tr.line_notes_row
+  %td{colspan: 3}
+    %ul
+      = render "notes/note", note: note
+
@@ -0,0 +1,31 @@
+%table{style: "display:none;"}
+  %tr.per_line_form
+    %td{colspan: 3 }
+      .line-note-form-holder
+        = form_for [@project, @note], remote: "true", multipart: true do |f|
+          %h3.page_title Leave a comment
+          %div.span10
+            -if @note.errors.any?
+              .alert-message.block-message.error
+                - @note.errors.full_messages.each do |msg|
+                  %div= msg
+
+            = f.hidden_field :noteable_id
+            = f.hidden_field :noteable_type
+            = f.hidden_field :line_code
+            = f.text_area :note,  size: 255, class: 'line-note-text js-gfm-input'
+            .note_actions
+              .buttons
+                = f.submit 'Add Comment', class: "btn save-btn submit_note submit_inline_note", id: "submit_note"
+                = link_to "Cancel", "javascript:;", class: "btn hide-button"
+              .options
+                %h6.left Notify via email:
+                .labels
+                  = label_tag :notify do
+                    = check_box_tag :notify, 1, @note.noteable_type != "Commit"
+                    %span Project team
+
+                  - if @note.notify_only_author?(current_user)
+                    = label_tag :notify_author do
+                      = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
+                      %span Commit author
@@ -0,0 +1,6 @@
+= link_to "",
+          "#",
+          id: "add-diff-line-note-#{line_code}",
+          class: "line_note_link js-note-add-to-diff-line",
+          data: @comments_target.merge({ line_code: line_code }),
+          title: "Add a comment to this line"
@@ -0,0 +1,10 @@
+%tr.line_notes_row.reply
+  %td{colspan: 3}
+    = link_to "javascript:;",
+              class: "line_note_reply_link 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
+      %i.icon-comment
+      Reply
@@ -0,0 +1,3 @@
+- notes.each do |note|
+  = render "notes/diff_note", note: note
+= render "notes/diff_notes_reply_button", note: notes.first
@@ -20,5 +20,5 @@
           %td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line} &nbsp;"
           - if line_code == note.line_code
-            = render "notes/per_line_notes_with_reply", notes: discussion_notes
+            = render "notes/diff_notes_with_reply", notes: discussion_notes
             - break # cut off diff after notes
@@ -1,31 +0,0 @@
-%table{style: "display:none;"}
-  %tr.per_line_form
-    %td{colspan: 3 }
-      .line-note-form-holder
-        = form_for [@project, @note], remote: "true", multipart: true do |f|
-          %h3.page_title Leave a comment
-          %div.span10
-            -if @note.errors.any?
-              .alert-message.block-message.error
-                - @note.errors.full_messages.each do |msg|
-                  %div= msg
-
-            = f.hidden_field :noteable_id
-            = f.hidden_field :noteable_type
-            = f.hidden_field :line_code
-            = f.text_area :note,  size: 255, class: 'line-note-text js-gfm-input'
-            .note_actions
-              .buttons
-                = f.submit 'Add Comment', class: "btn save-btn submit_note submit_inline_note", id: "submit_note"
-                = link_to "Cancel", "javascript:;", class: "btn hide-button"
-              .options
-                %h6.left Notify via email:
-                .labels
-                  = label_tag :notify do
-                    = check_box_tag :notify, 1, @note.noteable_type != "Commit"
-                    %span Project team
-
-                  - if @note.notify_only_author?(current_user)
-                    = label_tag :notify_author do
-                      = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
-                      %span Commit author
@@ -1,5 +0,0 @@
-%tr.line_notes_row
-  %td{colspan: 3}
-    %ul
-      = render "notes/note", note: note
-
@@ -1,6 +0,0 @@
-= link_to "",
-          "#",
-          id: "add-diff-line-note-#{line_code}",
-          class: "line_note_link js-note-add-to-diff-line",
-          data: @comments_target.merge({ line_code: line_code }),
-          title: "Add a comment to this line"
@@ -1,3 +0,0 @@
-- notes.each do |note|
-  = render "notes/per_line_note", note: note
-= render "notes/per_line_reply_button", note: notes.first
@@ -1,10 +0,0 @@
-%tr.line_notes_row.reply
-  %td{colspan: 3}
-    = link_to "javascript:;",
-              class: "line_note_reply_link 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
-      %i.icon-comment
-      Reply
 - if @note.line_code
-  = render "create_per_line_note", note: @note
+  = render "create_diff_note", note: @note
 - else
   = render "create_common_note", note: @note
1	= render "commits/commit_box"	1	= render "commits/commit_box"
2	= render "commits/diffs", diffs: @commit.diffs	2	= render "commits/diffs", diffs: @commit.diffs
3	= render "notes/notes_with_form", tid: @commit.id, tt: "commit"	3	= render "notes/notes_with_form", tid: @commit.id, tt: "commit"
4	-= render "notes/per_line_form"	4	+= render "notes/diff_note_form"
5		5
6		6
7	:javascript	7	:javascript
	@@ -13,11 +13,11 @@		@@ -13,11 +13,11 @@
13	%td.old_line	13	%td.old_line
14	= link_to raw(type == "new" ? " " : line_old), "##{line_code}", id: line_code	14	= link_to raw(type == "new" ? " " : line_old), "##{line_code}", id: line_code
15	- if @comments_allowed	15	- if @comments_allowed
16	- = render "notes/per_line_note_link", line_code: line_code	16	+ = render "notes/diff_note_link", line_code: line_code
17	%td.new_line= link_to raw(type == "old" ? " " : line_new) , "##{line_code}", id: line_code	17	%td.new_line= link_to raw(type == "old" ? " " : line_new) , "##{line_code}", id: line_code
18	%td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line}  "	18	%td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line}  "
19		19
20	- if @reply_allowed	20	- if @reply_allowed
21	- comments = @line_notes.select { \|n\| n.line_code == line_code }.sort_by(&:created_at)	21	- comments = @line_notes.select { \|n\| n.line_code == line_code }.sort_by(&:created_at)
22	- unless comments.empty?	22	- unless comments.empty?
23	- = render "notes/per_line_notes_with_reply", notes: comments	23	+ = render "notes/diff_notes_with_reply", notes: comments
	@@ -21,7 +21,7 @@		@@ -21,7 +21,7 @@
21	= render "merge_requests/show/diffs" if @diffs	21	= render "merge_requests/show/diffs" if @diffs
22	.status	22	.status
23		23
24	-= render "notes/per_line_form"	24	+= render "notes/diff_note_form"
25		25
26	:javascript	26	:javascript
27	$(function(){	27	$(function(){
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+- if note.valid?
	2	+ :plain
	3	+ // hide and reset the form
	4	+ $(".per_line_form").hide();
	5	+ $('.line-note-form-holder textarea').val("");
	6	+
	7	+ // find the reply button for this line
	8	+ // (might not be there if this is the first note)
	9	+ var trRpl = $("a.line_note_reply_link[data-noteable-type='#{note.noteable_type}'][data-noteable-id='#{note.noteable_id}'][data-line-code='#{note.line_code}']").closest("tr");
	10	+ if (trRpl.size() == 0) {
	11	+ // find the commented line ...
	12	+ var trEl = $(".#{note.line_code}").parent();
	13	+ // ... and insert the note and the reply button after it
	14	+ trEl.after("#{escape_javascript(render "notes/diff_notes_reply_button", note: note)}");
	15	+ trEl.after("#{escape_javascript(render "notes/diff_note", note: note)}");
	16	+ } else {
	17	+ // instert new note before reply button
	18	+ trRpl.before("#{escape_javascript(render "notes/diff_note", note: note)}");
	19	+ }
	@@ -1,19 +0,0 @@	@@ -1,19 +0,0 @@
1	-- if note.valid?
2	- :plain
3	- // hide and reset the form
4	- $(".per_line_form").hide();
5	- $('.line-note-form-holder textarea').val("");
6	-
7	- // find the reply button for this line
8	- // (might not be there if this is the first note)
9	- var trRpl = $("a.line_note_reply_link[data-noteable-type='#{note.noteable_type}'][data-noteable-id='#{note.noteable_id}'][data-line-code='#{note.line_code}']").closest("tr");
10	- if (trRpl.size() == 0) {
11	- // find the commented line ...
12	- var trEl = $(".#{note.line_code}").parent();
13	- // ... and insert the note and the reply button after it
14	- trEl.after("#{escape_javascript(render "notes/per_line_reply_button", note: note)}");
15	- trEl.after("#{escape_javascript(render "notes/per_line_note", note: note)}");
16	- } else {
17	- // instert new note before reply button
18	- trRpl.before("#{escape_javascript(render "notes/per_line_note", note: note)}");
19	- }
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+%tr.line_notes_row
	2	+ %td{colspan: 3}
	3	+ %ul
	4	+ = render "notes/note", note: note
	5	+
@@ -0,0 +1,31 @@		@@ -0,0 +1,31 @@
	1	+%table{style: "display:none;"}
	2	+ %tr.per_line_form
	3	+ %td{colspan: 3 }
	4	+ .line-note-form-holder
	5	+ = form_for [@project, @note], remote: "true", multipart: true do \|f\|
	6	+ %h3.page_title Leave a comment
	7	+ %div.span10
	8	+ -if @note.errors.any?
	9	+ .alert-message.block-message.error
	10	+ - @note.errors.full_messages.each do \|msg\|
	11	+ %div= msg
	12	+
	13	+ = f.hidden_field :noteable_id
	14	+ = f.hidden_field :noteable_type
	15	+ = f.hidden_field :line_code
	16	+ = f.text_area :note, size: 255, class: 'line-note-text js-gfm-input'
	17	+ .note_actions
	18	+ .buttons
	19	+ = f.submit 'Add Comment', class: "btn save-btn submit_note submit_inline_note", id: "submit_note"
	20	+ = link_to "Cancel", "javascript:;", class: "btn hide-button"
	21	+ .options
	22	+ %h6.left Notify via email:
	23	+ .labels
	24	+ = label_tag :notify do
	25	+ = check_box_tag :notify, 1, @note.noteable_type != "Commit"
	26	+ %span Project team
	27	+
	28	+ - if @note.notify_only_author?(current_user)
	29	+ = label_tag :notify_author do
	30	+ = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
	31	+ %span Commit author
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+= link_to "",
	2	+ "#",
	3	+ id: "add-diff-line-note-#{line_code}",
	4	+ class: "line_note_link js-note-add-to-diff-line",
	5	+ data: @comments_target.merge({ line_code: line_code }),
	6	+ title: "Add a comment to this line"
@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
	1	+%tr.line_notes_row.reply
	2	+ %td{colspan: 3}
	3	+ = link_to "javascript:;",
	4	+ class: "line_note_reply_link js-note-add-to-diff-line",
	5	+ data: { line_code: note.line_code,
	6	+ noteable_type: note.noteable_type,
	7	+ noteable_id: note.noteable_id },
	8	+ title: "Add a comment to this line" do
	9	+ %i.icon-comment
	10	+ Reply
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+- notes.each do \|note\|
	2	+ = render "notes/diff_note", note: note
	3	+= render "notes/diff_notes_reply_button", note: notes.first