From c02e3f2104d9dbb1bca01935fe7c0dfeacf53baf Mon Sep 17 00:00:00 2001
From: Riyad Preukschas <riyad@informatik.uni-bremen.de>
Date: Fri, 14 Sep 2012 05:08:40 +0200
Subject: [PATCH] Rename 'notes/form' partial to 'notes/common_form'

---
 app/views/notes/_common_form.html.haml     | 39 +++++++++++++++++++++++++++++++++++++++
 app/views/notes/_form.html.haml            | 39 ---------------------------------------
 app/views/notes/_notes_with_form.html.haml |  2 +-
 3 files changed, 40 insertions(+), 40 deletions(-)
 create mode 100644 app/views/notes/_common_form.html.haml
 delete mode 100644 app/views/notes/_form.html.haml

diff --git a/app/views/notes/_common_form.html.haml b/app/views/notes/_common_form.html.haml
new file mode 100644
index 0000000..6d559cf
--- /dev/null
+++ b/app/views/notes/_common_form.html.haml
@@ -0,0 +1,39 @@
+.note-form-holder
+  = form_for [@project, @note], remote: "true", multipart: true do |f|
+    %h3.page_title Leave a comment
+    -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.text_area :note, size: 255, class: 'note-text'
+    #preview-note.preview_note.hide
+    .hint
+      .right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
+      .clearfix
+
+    .row.note_advanced_opts.hide
+      .span3
+        = f.submit 'Add Comment', class: "btn success submit_note grouped", id: "submit_note"
+        = link_to 'Preview', preview_project_notes_path(@project), class: 'btn grouped', id: 'preview-link'
+      .span4.notify_opts
+        %h6.left Notify via email:
+        = 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
+      .span5.attachments
+        %h6.left Attachment:
+        %span.file_name File name...
+
+        .input.input_file
+          %a.file_upload.btn.small Upload File
+          = f.file_field :attachment, class: "input-file"
+        %span.hint Any file less than 10 MB
+
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
deleted file mode 100644
index 6d559cf..0000000
--- a/app/views/notes/_form.html.haml
+++ /dev/null
@@ -1,39 +0,0 @@
-.note-form-holder
-  = form_for [@project, @note], remote: "true", multipart: true do |f|
-    %h3.page_title Leave a comment
-    -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.text_area :note, size: 255, class: 'note-text'
-    #preview-note.preview_note.hide
-    .hint
-      .right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
-      .clearfix
-
-    .row.note_advanced_opts.hide
-      .span3
-        = f.submit 'Add Comment', class: "btn success submit_note grouped", id: "submit_note"
-        = link_to 'Preview', preview_project_notes_path(@project), class: 'btn grouped', id: 'preview-link'
-      .span4.notify_opts
-        %h6.left Notify via email:
-        = 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
-      .span5.attachments
-        %h6.left Attachment:
-        %span.file_name File name...
-
-        .input.input_file
-          %a.file_upload.btn.small Upload File
-          = f.file_field :attachment, class: "input-file"
-        %span.hint Any file less than 10 MB
-
diff --git a/app/views/notes/_notes_with_form.html.haml b/app/views/notes/_notes_with_form.html.haml
index 14e1e84..53716c1 100644
--- a/app/views/notes/_notes_with_form.html.haml
+++ b/app/views/notes/_notes_with_form.html.haml
@@ -3,7 +3,7 @@
 .notes-status
 
 - if can? current_user, :write_note, @project
-  = render "notes/form"
+  = render "notes/common_form"
 
 :javascript
   $(function(){
--
libgit2 0.21.2