render note with attachment for event

diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss
index ff81014..df8fd8d 100644 (file)
--- a/app/assets/stylesheets/sections/events.scss
+++ b/app/assets/stylesheets/sections/events.scss
@@ -52,6 +52,15 @@
       padding-left: 5px;
       display: inline-block;
       color: #555;
+
+      .note-file-attach {
+        margin-left: -25px;
+        float: left;
+        .note-image-attach {
+          margin-left: 0px;
+          max-width: 200px;
+        }
+      }
     }
     .event-note-icon {
       color: #777;

diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss
index 648cb21..1f92a3a 100644 (file)
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -273,6 +273,7 @@ ul.notes {
 }
 
 
+
 .note-form-actions {
   background: #F9F9F9;
   height: 45px;

diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml
index ef5035f..ac380a9 100644 (file)
--- a/app/views/events/event/_note.html.haml
+++ b/app/views/events/event/_note.html.haml
@@ -24,3 +24,10 @@
   %i.icon-comment-alt.event-note-icon
   %span.event-note
     = markdown truncate(event.target.note, length: 70)
+    - note = event.target
+    = link_to note.attachment.url, target: "_blank", class: 'note-file-attach' do
+      - if note.attachment.image?
+        = image_tag note.attachment.url, class: 'note-image-attach'
+      - else
+        %i.icon-paper-clip
+        = note.attachment_identifier