commit.short_id as model method. Styled inline comment form

app/views/commits/_commit_box.html.haml

@@ -1,4 +1,4 @@
-.commit-box{class: @commit.parents.count > 1 ? "merge-commit" : ""}
+.commit-box{class: @commit.parents_count > 1 ? "merge-commit" : ""}
   .commit-head
     .right
       - if @notes_count > 0

app/views/notes/_form.html.haml

@@ -1,5 +1,5 @@
 = form_for [@project, @note], :remote => "true", :multipart => true do |f|
-  %h3 Leave a comment
+  %h3.page_title Leave a comment
   -if @note.errors.any?
     .alert-message.block-message.error
       - @note.errors.full_messages.each do |msg|

app/views/notes/_per_line_form.html.haml

@@ -2,7 +2,7 @@
   %tr.per_line_form
     %td{:colspan => 3 }
       = form_for [@project, @note], :remote => "true", :multipart => true do |f|
-        %h3 Leave a note
+        %h3.page_title Leave a note
         %div.span10
           -if @note.errors.any?
             .alert-message.block-message.error
@@ -13,19 +13,21 @@
           = f.hidden_field :noteable_type
           = f.hidden_field :line_code
           = f.text_area :note,  :size => 255
-          %h5 Notify via email:
-          .clearfix
-            = label_tag :notify do
-              = check_box_tag :notify, 1, @note.noteable_type != "Commit"
-              %span Project team
+          .note_actions
+            .buttons
+              = f.submit 'Add note', :class => "btn primary submit_note", :id => "submit_note"
+              = link_to "Cancel", "#", :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
-          .actions
-            = f.submit 'Add note', :class => "btn primary submit_note", :id => "submit_note"
-            = link_to "Close", "#", :class => "btn hide-button"
+                - 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
 
 :javascript
   $(function(){