app/views/notes/_note.html.haml in artfully_ose-1.2.0 vs app/views/notes/_note.html.haml in artfully_ose-1.3.0.pre1

@@ -5,17 +5,17 @@
     .view
       .truncated
         = truncate(note.text, :length => 100, :separator => ' ', :omission => '...')
       .not-truncated{:style => 'display:none;'}
         = simple_format note.text
-        %p.muted= l note.created_at, :format => :short unless note.created_at.nil?
-        %p
-          = link_to("Edit", edit_person_note_path(note.person, note, :format => :html), :class => "btn btn-mini edit-note-link")
+        = link_to("Edit", edit_person_note_path(note.person, note, :format => :html), :class => "btn btn-mini edit-note-link")
 
   %td.person-inline-form.edit-note-form{:style => 'display:none;', :colspan => 2}
     %h4 Edit Note
     = form_for [note.person, note] do |form|
+      = form.text_field :occurred_at, :value => l(note.occurred_at_local_to_organization, :format => :datetime_for_input), :readonly => true, :class => [:datetimepicker, 'input-medium'], :id => "datetimepicker_#{note.id}"
       = form.text_area :text, :size => "125x5", :class => 'input-xxlarge'
+      %p= "Creator: #{note.user || 'System'}"
       = link_to "delete", "#delete-confirm-note-#{note.id}", :class => "delete-confirm-link delete-with-trash", "data-toggle" => "modal"
       = form.submit "Save", :class => "btn btn-primary"
       = link_to 'Cancel', '#', :onclick => "$(this).parents('tr').find('td').show(); $(this).parents('tr').find('.edit-note-form').hide()", :class => 'btn'
 
   .modal{:id => "delete-confirm-note-#{note.id}"}