3 files changed, 16 insertions, 4 deletions

@@ -153,7 +153,6 @@
 
     .update-posted {
       display: block;
-      font-style: italic;
       background-color: #EAADEA;
       font-size: 16px;
       margin: .5em -20px;
@@ -161,6 +160,16 @@
       border-width: 1px 0 1px 0;
       border-style: solid;
       border-color: #DB70DB;
+
+      time {
+        font-style: italic;
+      }
+
+      .update-edit-link {
+        float: right;
+        color: blue;
+        font-weight: normal;
+      }
     }
   }
 }
@@ -1,6 +1,6 @@
 %article#stream-post
   %h2#stream-title= stream.title
   - unless stream.body.blank?
-    %header#stream-intro.entry-content= stream.body.html_safe
+    %header#stream-intro.entry-content= markdown(stream.body)
   - unless stream.updates.empty?
     = render stream.updates
@@ -1,3 +1,6 @@
 %section.stream-update.entry-content{ id: "update-#{update.id}" }
-  %time.update-posted= update.created_at.strftime("%B #{update.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
-  = update.body.html_safe
+  %header.update-posted
+    %time= update.created_at.strftime("%B #{update.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+    - if user_signed_in? and !update.new_record?
+      = link_to "Edit", edit_admin_stream_update_path(update.stream, update), :class => "update-edit-link"
+  = markdown(update.body)