Commit 3d7b35a3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

per line comment fix

parent 8c46123f
...@@ -78,7 +78,7 @@ body.project-page.commits-page .commits-date a.commit span.commit-author strong{ ...@@ -78,7 +78,7 @@ body.project-page.commits-page .commits-date a.commit span.commit-author strong{
padding:0px; padding:0px;
border:none; border:none;
background:#F7F7F7; background:#F7F7F7;
color:#333; color:#aaa;
padding: 0px 5px; padding: 0px 5px;
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
text-align:right; text-align:right;
...@@ -89,7 +89,7 @@ body.project-page.commits-page .commits-date a.commit span.commit-author strong{ ...@@ -89,7 +89,7 @@ body.project-page.commits-page .commits-date a.commit span.commit-author strong{
float:left; float:left;
width:35px; width:35px;
font-weight:normal; font-weight:normal;
color:#888; color:#aaa;
&:hover { &:hover {
text-decoration:underline; text-decoration:underline;
} }
...@@ -146,3 +146,18 @@ ul.bordered-list li:last-child { border:none } ...@@ -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;
}
}
...@@ -52,6 +52,10 @@ class Note < ActiveRecord::Base ...@@ -52,6 +52,10 @@ class Note < ActiveRecord::Base
else else
noteable noteable
end end
# Temp fix to prevent app crash
# if note commit id doesnt exist
rescue
nil
end end
def line_file_id def line_file_id
......
...@@ -10,6 +10,10 @@ ...@@ -10,6 +10,10 @@
- if line.match(/^@@ -/) - if line.match(/^@@ -/)
- line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0 - line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0
- line_new = 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 - next
- full_line = html_escape(line.gsub(/\n/, '')) - full_line = html_escape(line.gsub(/\n/, ''))
......
...@@ -19,16 +19,16 @@ ...@@ -19,16 +19,16 @@
%br %br
= f.text_area :note, :size => 255 = 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 .clear
%br %br
= f.submit 'Add note', :class => "grey-button", :id => "submit_note" = 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;
});
});
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