diff options
Diffstat (limited to 'app/views/notes')
-rw-r--r-- | app/views/notes/_form.html.haml | 4 | ||||
-rw-r--r-- | app/views/notes/_notes.html.haml | 17 | ||||
-rw-r--r-- | app/views/notes/_show.html.haml | 12 | ||||
-rw-r--r-- | app/views/notes/create.js.haml | 2 |
4 files changed, 16 insertions, 19 deletions
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml index 8eaf968c803..ca56a2450a0 100644 --- a/app/views/notes/_form.html.haml +++ b/app/views/notes/_form.html.haml @@ -12,9 +12,9 @@ = f.label :note %cite (255 symbols only) %br - = f.text_area :note, :style => "width:97%;height:100px", :size => 255 + = f.text_area :note, :size => 255 - %div + %div.attach_holder = f.label :attachment %cite (less than 10 MB) %br diff --git a/app/views/notes/_notes.html.haml b/app/views/notes/_notes.html.haml index c93a47239fb..2d110162eca 100644 --- a/app/views/notes/_notes.html.haml +++ b/app/views/notes/_notes.html.haml @@ -1,9 +1,12 @@ -%ul#notes-list= render "notes/notes_list" +- if controller.action_name == "wall" + %ul#notes-list= render "notes/notes_list" -%br -%br -- if can? current_user, :write_note, @project - = render "notes/form" +- else + %ul#notes-list= render "notes/notes_list" + %br + %br + - if can? current_user, :write_note, @project + = render "notes/form" :javascript $('.delete-note').live('ajax:success', function() { @@ -23,7 +26,3 @@ $(function(){ var int =self.setInterval("updatePage()", 20000); }); - - function updatePage(){ - $.ajax({type: "GET", url: location.href, dataType: "script"}); - } diff --git a/app/views/notes/_show.html.haml b/app/views/notes/_show.html.haml index 2b0a6d2ebcd..ee9f9ffaa4b 100644 --- a/app/views/notes/_show.html.haml +++ b/app/views/notes/_show.html.haml @@ -1,19 +1,17 @@ %li{:id => dom_id(note)} %div.note_author = image_tag gravatar_icon(note.author.email), :class => "left", :width => 40, :style => "padding-right:5px;" - %div.note_content + %div.note_content.left = simple_format(html_escape(note.note)) - if note.attachment.url Attachment: - = link_to note.attachment_identifier, note.attachment.url + = link_to note.attachment_identifier, note.attachment.url, :target => "_blank" %br - %span - %span - [ #{note.author.name} ] - + %span.author= note.author.name + %cite.ago = time_ago_in_words(note.updated_at) ago - %br + %br - if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project) = link_to 'Remove', [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "lbutton delete-note right negative" .clear diff --git a/app/views/notes/create.js.haml b/app/views/notes/create.js.haml index 0af548ff855..15371dbce2b 100644 --- a/app/views/notes/create.js.haml +++ b/app/views/notes/create.js.haml @@ -1,7 +1,7 @@ - if @note.valid? :plain $("#new_note .errors").remove(); - $("#notes-list").append("#{escape_javascript(render(:partial => 'show', :locals => {:note => @note} ))}"); + updatePage(); $('#note_note').val(""); - else :plain |