From 3d7b35a37d30365088947de0cf85cc7d4af79162 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Date: Fri, 20 Jan 2012 09:51:48 +0200
Subject: [PATCH] per line comment fix

---
 app/assets/stylesheets/commits.css.scss  | 19 +++++++++++++++++--
 app/models/note.rb                       |  4 ++++
 app/views/commits/_text_file.html.haml   |  4 ++++
 app/views/notes/_per_line_form.html.haml | 18 +++++++++---------
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/commits.css.scss b/app/assets/stylesheets/commits.css.scss
index 90e3b901..b78088f7 100644
--- a/app/assets/stylesheets/commits.css.scss
+++ b/app/assets/stylesheets/commits.css.scss
@@ -78,7 +78,7 @@ body.project-page.commits-page .commits-date a.commit span.commit-author strong{
     padding:0px;
     border:none;
     background:#F7F7F7;
-    color:#333;
+    color:#aaa;
     padding: 0px 5px;
     border-right: 1px solid #ccc;
     text-align:right;
@@ -89,7 +89,7 @@ body.project-page.commits-page .commits-date a.commit span.commit-author strong{
       float:left;
       width:35px;
       font-weight:normal;
-      color:#888;
+      color:#aaa;
       &:hover { 
         text-decoration:underline;
       }
@@ -146,3 +146,18 @@ ul.bordered-list li:last-child { border:none }
     }
   }
 }
+
+.per_line_form { 
+  background: #79C3E0;
+
+  form { 
+    width: 743px;
+    border: 1px solid #CCC;
+    padding: 20px;
+    background: white;
+  }
+
+  .hide-button { 
+    color:#c33;
+  }
+}
diff --git a/app/models/note.rb b/app/models/note.rb
index 48cc2d80..689b620d 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -52,6 +52,10 @@ class Note < ActiveRecord::Base
     else 
       noteable
     end
+  # Temp fix to prevent app crash
+  # if note commit id doesnt exist
+  rescue 
+    nil
   end
 
   def line_file_id
diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml
index c61d82d3..1456257c 100644
--- a/app/views/commits/_text_file.html.haml
+++ b/app/views/commits/_text_file.html.haml
@@ -10,6 +10,10 @@
     - if line.match(/^@@ -/)
       - line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0
       - line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0
+      %tr.line_holder
+        %td.old_line= "..."
+        %td.new_line= "..."
+        %td.line_content &nbsp;
       - next
 
     - full_line = html_escape(line.gsub(/\n/, ''))
diff --git a/app/views/notes/_per_line_form.html.haml b/app/views/notes/_per_line_form.html.haml
index 13818113..02bbecd0 100644
--- a/app/views/notes/_per_line_form.html.haml
+++ b/app/views/notes/_per_line_form.html.haml
@@ -18,17 +18,17 @@
             %br
             %br
             = f.text_area :note,  :size => 255
-            
-            %p.notify_controls
-              %span Notify:
-              = check_box_tag :notify, 1, @note.noteable_type != "Commit"
-              = label_tag :notify, "Project team"
-
-              -if @note.noteable_type == "Commit"
-                = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
-                = label_tag :notify_author, "Commit author"
 
           .clear
           %br
           = f.submit 'Add note', :class => "grey-button", :id => "submit_note"
+          .right
+            = link_to "remove", "#", :class => "hide-button"
 
+:javascript 
+  $(function(){
+    $(".per_line_form .hide-button").bind("click", function(){
+      $('.per_line_form').hide();
+      return false;
+    });
+  });