12 files changed, 63 insertions, 16 deletions

@@ -42,9 +42,13 @@
   .details-module.image-uploads
     %h4 Images
     - f.object.images.each do |image|
-      = image_tag image.variant(:thumb)
-      = f.hidden_field :images, multiple: true, value: image.signed_id
-      %pre= rails_blob_url(image)
+      - if image.representable?
+        = image_tag image.variant(:thumb)
+      - else
+        = image.filename.to_s
+      - unless image.new_record?
+        = f.hidden_field :images, multiple: true, value: image.signed_id
+        %pre= rails_blob_url(image)
       %hr
     = f.file_field :images, multiple: true
   .details-module= f.submit
@@ -1,3 +1,3 @@
 - title "Editing #{@stream.title}"
-= form_for @stream, url: admin_stream_url(@stream), html: { id: "entry-form" } do |f|
+= form_for @stream, url: admin_stream_url(@stream.id), html: { id: "entry-form" } do |f|
   = render partial: "form", locals: { f: f }
@@ -10,5 +10,5 @@
       %td= stream.created_at.strftime("%B %d, %Y, %l:%M%P")
       %td
         %ul.admin-actions
-          %li= link_to "Edit", edit_admin_stream_url(stream)
-          %li= link_to "Add Update", new_admin_stream_update_url(stream)
+          %li= link_to "Edit", edit_admin_stream_url(stream.id)
+          %li= link_to "Add Update", new_admin_stream_update_url(stream.id)
@@ -1,3 +1,3 @@
 - title "Editing stream update"
-= form_for @update, url: admin_stream_update_url(@stream, @update), html: { id: "entry-form" } do |f|
+= form_for @update, url: admin_stream_update_url(@stream.id, @update), html: { id: "entry-form" } do |f|
   = render partial: "form", locals: { f: f }
@@ -24,6 +24,9 @@
     .comment-website-field.comment-field
       .comment-field-label= f.label :website, "Website (Optional)"
       .comment-field-input= f.text_field :website, type: :url
+    .comment-website-field.comment-field
+      .comment-field-label
+      .comment-field-input= recaptcha_tags
     .comment-submit-button.comment-field
       .comment-field-label
       .comment-field-input= f.submit "Post"
@@ -9,15 +9,16 @@
     %link{rel: "me", href: "mailto:fefferburbia+thoughts@gmail.com"}
     %link{rel: "webmention", href: webmentions_url}
     %link{rel: "alternate", type: "application/atom+xml", href: blogs_url(format: :atom)}
+    %meta{name: "viewport", content: "width=device-width, initial-scale=1.0"}
   %body#main-body
     - if flash[:alert]
       %div#flash.flash-alert= flash[:alert]
     - if flash[:notice]
       %div#flash.flash-notice= flash[:notice]
     #container
-      #page-header
-        %header#banner
-          %h1= link_to "Four Island", root_url
+      %header#banner
+        %h1 Four Island
+        = link_to image_tag("fourisland_header.png"), root_url
       #page-body
         #sidebar
           .sidebar-module
@@ -53,6 +54,14 @@
                     = link_to link[:title], link[:url], link.include?(:extra) ? link[:extra] : {}
           .sidebar-module.fun-links
             .bubble.rounded
+              %h2 Friends
+              %ul
+                - friends_sidebar().each do |link|
+                  %li
+                    = image_tag "tag_#{cycle("blue", "green", "orange", "pink", "purple", "red", "yellow")}.png"
+                    = link_to link[:title], link[:url], link.include?(:extra) ? link[:extra] : {}
+          .sidebar-module.fun-links
+            .bubble.rounded
               %h2 Blog links
               %ul
                 %li
@@ -25,6 +25,7 @@
           - if user_signed_in?
             %li= link_to_unless_current "Submit", new_quote_url
           %li= link_to_unless_current "Tags", tags_quotes_url
+          %li= link_to_unless_current "Search", search_form_quotes_url
           %li= link_to_unless_current "Stats", stats_quotes_url
           %li= link_to_unless_current "Feed", latest_quotes_url(:atom)
           - if user_signed_in?
@@ -0,0 +1,6 @@
+%h3 Search
+= search_form_for @q, url: search_quotes_url do |f|
+  .form-field
+    = f.label :content_or_notes_cont, "Query:"
+    = f.search_field :content_or_notes_cont
+  .form-field= f.submit
@@ -1,6 +1,8 @@
 %article#stream-post
   %h2#stream-title= stream.title
   - unless stream.body.blank?
-    %header#stream-intro.entry-content= stream.body.html_safe
-  - unless stream.updates.empty?
-    = render stream.updates
+    %header#stream-intro.entry-content= markdown(stream.body)
+  = will_paginate @updates
+  - unless @updates.empty?
+    = render @updates
+  = will_paginate @updates
@@ -0,0 +1,19 @@
+%table#streams-index
+  %tr#streams-index-header-row
+    %th Stream Topic
+    %th Updates
+    %th Last Post
+  - @streams.each do |stream|
+    %tr
+      %td
+        = link_to stream.title, stream, class: "stream-link"
+        %br
+        %time= stream.created_at.strftime("%B #{stream.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+      %td= stream.updates.size
+      %td
+        - unless stream.updates.empty?
+          - latest_post = stream.updates.order(created_at: :desc).first
+          = link_to (stripped_markdown(latest_post.body)[0, 30] + "..."), stream
+          %br
+          %time= latest_post.created_at.strftime("%B #{latest_post.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+= will_paginate @streams
@@ -1,3 +1,3 @@
 - title @stream.title
-.breadcrumb= link_to "← Back to home page", root_path
+.breadcrumb= link_to "← Back to streams", streams_path
 = render @stream
@@ -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.id, update), :class => "update-edit-link"
+  = markdown(update.body)