per line comment fix
This commit is contained in:
parent
8c46123f99
commit
3d7b35a37d
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
- next
|
||||
|
||||
- full_line = html_escape(line.gsub(/\n/, ''))
|
||||
|
|
|
@ -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;
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue