diff options
| author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-01-20 11:51:48 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-01-20 11:51:48 +0400 |
| commit | 3d7b35a37d30365088947de0cf85cc7d4af79162 (patch) | |
| tree | 6824f72f50b36a54dc9dfe4e1ebb4c19d67a6971 /app/views | |
| parent | 8c46123f9902cfb173e0bdc80c3e111eba1b1841 (diff) | |
per line comment fix
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/commits/_text_file.html.haml | 4 | ||||
| -rw-r--r-- | app/views/notes/_per_line_form.html.haml | 18 |
2 files changed, 13 insertions, 9 deletions
diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml index c61d82d31cf..1456257ce3d 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 - 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 1381811336e..02bbecd0637 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; + }); + }); |