79 files changed, 951 insertions, 57 deletions

@@ -7,7 +7,7 @@
     = f.text_field :slug, placeholder: "insert-slug-here"
   .body-field
     = f.label :body
-    = f.cktext_area :body
+    = f.text_area :body
 %fieldset#details
   - if f.object.errors.any?
     #errors.details-module
@@ -20,11 +20,18 @@
       - if f.object.published
         = link_to "View post", blog_url(f.object.slug_was), target: "entry-preview"
       - else
-        = link_to "Preview post", admin_blog_url(f.object), target: "entry-preview"
+        = link_to "Preview post", admin_blog_url(f.object.id), target: "entry-preview"
+  .details-module
+    .tags-field
+      = f.label :tag_list, "Tags"
+      = f.text_field :tag_list, type: :tags, value: f.object.tag_list.join(",")
   .details-module
     .published-field
       = f.check_box :published
       = f.label :published
+    .datetime-field
+      = f.label :published_at
+      = f.text_field :published_at
   .details-module
     = f.fields_for :records, Record.new do |builder|
       .should-create-record-field
@@ -32,4 +39,16 @@
         = builder.label :_destroy, "Create record?"
       .record-description-field
         = builder.text_area :description, placeholder: "record text"
+  .details-module.image-uploads
+    %h4 Images
+    - f.object.images.each do |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,4 @@
+- title "Blog drafts"
 %table#entries
   %tr
     %th Title
@@ -9,5 +10,5 @@
       %td= blog.updated_at.strftime("%B %d, %Y, %l:%M%P")
       %td
         %ul.admin-actions
-          %li= link_to "Preview", admin_blog_url(blog)
-          %li= link_to "Edit", edit_admin_blog_url(blog)
+          %li= link_to "Preview", admin_blog_url(blog.id)
+          %li= link_to "Edit", edit_admin_blog_url(blog.id)
@@ -1,2 +1,3 @@
-= form_for @blog, url: admin_blog_url(@blog), html: { id: "entry-form" } do |f|
+- title "Editing #{@blog.title}"
+= form_for @blog, url: admin_blog_url(@blog.id), html: { id: "entry-form" } do |f|
   = render partial: "form", locals: { f: f }
@@ -1,3 +1,4 @@
+- title "Blogs"
 %table#entries
   %tr
     %th Title
@@ -9,5 +10,5 @@
       %td= blog.published_at.strftime("%B %d, %Y, %l:%M%P")
       %td
         %ul.admin-actions
-          %li= link_to "View", blog_url(blog.slug)
-          %li= link_to "Edit", edit_admin_blog_url(blog)
+          %li= link_to "View", blog
+          %li= link_to "Edit", edit_admin_blog_url(blog.id)
@@ -1,2 +1,3 @@
+- title "New blog"
 = form_for @blog, url: admin_blogs_url, html: { id: "entry-form" } do |f|
   = render partial: "form", locals: { f: f }
@@ -1,4 +1,5 @@
-= render partial: "blogs/blog", object: @blog
+- title "Previewing #{@blog.title}"
+= render "blogs/blog", blog: @blog, short: false
 %footer#blog-footer
   This draft was last updated on
   = succeed "." do
@@ -0,0 +1,25 @@
+- title "Comments"
+= will_paginate @comments
+%table#entries
+  %tr
+    %th Text
+    %th Author
+    %th Blog post
+    %th Date published
+    %th
+  - @comments.each do |comment|
+    %tr{ class: cycle("even", "odd") }
+      %td= comment.body
+      %td
+        %ul
+          %li= comment.username
+          %li= comment.email
+          - unless comment.website.empty?
+            %li= comment.website
+      %td= link_to comment.blog.title, comment.blog
+      %td= comment.published_at.strftime("%B %d, %Y, %l:%M%P")
+      %td
+        %ul.admin-actions
+          %li= link_to "View", blog_url(comment.blog, anchor: "comment-#{comment.id}")
+          %li= link_to "Delete", admin_comment_url(comment), method: :delete, data: { confirm: "Are you sure?" }
+= will_paginate @comments
@@ -0,0 +1,32 @@
+- title "Pending Comments"
+= will_paginate @comments
+= form_tag mass_admin_comments_url, method: :post do
+  #action-box
+    = select_tag "mass_action", options_for_select(["Delete", "Mark Spam"]), include_blank: true
+    = submit_tag "Mass action", data: { confirm: "Are you sure you want to do this action?" }
+  %table#entries
+    %tr
+      %th= check_box_tag "check_all"
+      %th Text
+      %th Author
+      %th Blog post
+      %th Date updated
+      %th
+    - @comments.each do |comment|
+      %tr{ class: cycle("even", "odd") }
+        %td= check_box_tag "comment_ids[]", comment.id, class: "comment_ids"
+        %td= comment.body
+        %td
+          %ul
+            %li= comment.username
+            %li= comment.email
+            - unless comment.website.empty?
+              %li= comment.website
+        %td= link_to comment.blog.title, comment.blog
+        %td= comment.created_at.strftime("%B %d, %Y, %l:%M%P")
+        %td
+          %ul.admin-actions
+            %li= link_to "Accept", accept_admin_comment_url(comment), method: :post, data: { confirm: "Are you sure you want to accept this comment?" }
+            %li= link_to "Reject", reject_admin_comment_url(comment), method: :post, data: { confirm: "Are you sure you want to reject this comment?" }
+            %li= link_to "Mark Spam", mark_spam_admin_comment_url(comment), method: :post, data: { confirm: "Are you sure you want to mark this comment as spam?" }
+= will_paginate @comments
@@ -1 +1,19 @@
-Welcome to the the ubiquitous administration panel!
+%p Welcome to the the ubiquitous administration panel!
+%p Stats:
+%ul
+  %li
+    %strong Blog posts:
+    = Blog.count
+  %li
+    %strong Approved comments:
+    = Comment.where(status: :published).count
+  %li
+    %strong Filtered comments:
+    = Global.get_filtered_comments
+  %li
+    %strong Quotes:
+    = Quote.count
+  %li
+    %strong Votes:
+    = Vote.count
+    (+#{Vote.where(upvote: true).count} / -#{Vote.where(upvote: false).count})
@@ -0,0 +1,35 @@
+%fieldset#content
+  .title-field
+    = f.label :title
+    = f.text_field :title, placeholder: "Title"
+  .description-field
+    = f.label :description
+    = f.text_area :description
+%fieldset#details
+  - if f.object.errors.any?
+    #errors.details-module
+      %h3 Error!
+      %ul
+        - f.object.errors.full_messages.each do |error|
+          %li= error
+  .details-module
+    .progress-field
+      = f.label :progress
+      = f.text_area :progress
+  .details-module
+    .score-field
+      = f.label :score
+      = f.select :score, 1..10, include_blank: true
+  .details-module
+    .started-field
+      = f.label :started_on
+      = f.text_field :started_on, class: "datepicker"
+  .details-module
+    .finished-field
+      = f.label :finished_on
+      = f.text_field :finished_on, class: "datepicker"
+  .details-module
+    .status-field
+      = f.select :status, options_for_select(Game.status.values, f.object.status)
+      = f.label :status
+  .details-module= f.submit
@@ -0,0 +1,3 @@
+- title "Editing #{@game.title}"
+= form_for @game, url: admin_game_url(@game), html: { id: "entry-form" } do |f|
+  = render partial: "form", locals: { f: f }
@@ -0,0 +1,13 @@
+- title "Games"
+%table#entries
+  %tr
+    %th Title
+    %th Date published
+    %th
+  - @games.each do |game|
+    %tr{ class: cycle("even", "odd") }
+      %td= game.title
+      %td= game.created_at.strftime("%B %d, %Y, %l:%M%P")
+      %td
+        %ul.admin-actions
+          %li= link_to "Edit", edit_admin_game_url(game)
@@ -0,0 +1,3 @@
+- title "New game"
+= form_for @game, url: admin_games_url, html: { id: "entry-form" } do |f|
+  = render partial: "form", locals: { f: f }
@@ -0,0 +1,26 @@
+%fieldset#content
+  .title-field
+    = f.label :title
+    = f.text_field :title, placeholder: "Title"
+  .url-field
+    = f.label :url
+    = f.text_field :url, placeholder: "URL"
+%fieldset#details
+  - if f.object.errors.any?
+    #errors.details-module
+      %h3 Error!
+      %ul
+        - f.object.errors.full_messages.each do |error|
+          %li= error
+  .details-module
+    .tags-field
+      = f.label :tag_list, "Tags"
+      = f.text_field :tag_list, type: :tags, value: f.object.tag_list.join(",")
+  .details-module
+    = f.fields_for :records, Record.new do |builder|
+      .should-create-record-field
+        = builder.check_box :_destroy, {checked: false}, "0", "1"
+        = builder.label :_destroy, "Create record?"
+      .record-description-field
+        = builder.text_area :description, placeholder: "record text"
+  .details-module= f.submit
@@ -0,0 +1,3 @@
+- title "Editing #{@link.title}"
+= form_for @link, url: admin_link_url(@link), html: { id: "entry-form" } do |f|
+  = render partial: "form", locals: { f: f }
@@ -0,0 +1,14 @@
+- title "Links"
+%table#entries
+  %tr
+    %th Title
+    %th Date created
+    %th
+  - @links.each do |link|
+    %tr{ class: cycle("even", "odd") }
+      %td= link.title
+      %td= link.created_at.strftime("%B %d, %Y, %l:%M%P")
+      %td
+        %ul.admin-actions
+          %li= link_to "Edit", edit_admin_link_url(link)
+          %li= link_to "Show", link.url
@@ -0,0 +1,3 @@
+- title "New link"
+= form_for @link, url: admin_links_url, html: { id: "entry-form" } do |f|
+  = render partial: "form", locals: { f: f }
@@ -0,0 +1,32 @@
+%fieldset#content
+  %h2 Quote ##{f.object.id}
+  .halfbody-field
+    = f.label :content
+    = f.text_area :content
+  %h3 Notes
+  .halfbody-field
+    = f.label :notes
+    = f.text_area :notes
+%fieldset#details
+  - if f.object.errors.any?
+    #errors.details-module
+      %h3 Error!
+      %ul
+        - f.object.errors.full_messages.each do |error|
+          %li= error
+  - unless f.object.new_record?
+    #entry-preview-link.details-module= link_to "View quote", quote_url(f.object.id), target: "entry-preview"
+  .details-module
+    .tags-field
+      = f.label :tag_list, "Tags"
+      = f.text_field :tag_list, type: :tags, value: f.object.tag_list.join(",")
+  .details-module
+    .published-field
+      = f.label :state
+      = f.select :state, Quote.state.options
+  .details-module.image-uploads
+    %h4 Audio
+    - if f.object.audio.attached?
+      = audio_tag(rails_blob_url(f.object.audio), controls: true)
+    = f.file_field :audio
+  .details-module= f.submit
@@ -0,0 +1,3 @@
+- title "Editing Quote \##{@quote.id}"
+= form_for @quote, url: admin_quote_url(@quote.id), html: { id: "entry-form" } do |f|
+  = render partial: "form", locals: { f: f }
@@ -0,0 +1,21 @@
+- title "Quotes"
+= will_paginate @quotes
+%table#entries
+  %tr
+    %th ID
+    %th Content
+    %th Submitter
+    %th Date submitted
+    %th
+  - @quotes.each do |quote|
+    %tr{ class: cycle("even", "odd") }
+      %td= quote.id
+      %td= quote_format(quote.content)
+      %td= quote.submitter
+      %td= quote.created_at.strftime("%B %d, %Y, %l:%M%P")
+      %td
+        %ul.admin-actions
+          %li= link_to "View", quote
+          %li= link_to "Edit", edit_admin_quote_url(quote)
+          %li= link_to "Delete", admin_quote_url(quote), method: :delete, data: { confirm: "Are you sure?" }
+= will_paginate @quotes
@@ -0,0 +1,21 @@
+- title "Pending Quotes"
+= will_paginate @quotes
+%table#entries
+  %tr
+    %th ID
+    %th Content
+    %th Submitter
+    %th Date submitted
+    %th
+  - @quotes.each do |quote|
+    %tr{ class: cycle("even", "odd") }
+      %td= quote.id
+      %td= quote_format(quote.content)
+      %td= quote.submitter
+      %td= quote.created_at.strftime("%B %d, %Y, %l:%M%P")
+      %td
+        %ul.admin-actions
+          %li= link_to "Edit", edit_admin_quote_url(quote)
+          %li= link_to "Accept", accept_admin_quote_url(quote), method: :post, data: { confirm: "Are you sure you want to accept this quote?" }
+          %li= link_to "Reject", admin_quote_url(quote), method: :delete, data: { confirm: "Are you sure you want to reject this quote?" }
+= will_paginate @quotes
@@ -7,7 +7,7 @@
     = f.text_field :slug, placeholder: "insert-slug-here"
   .body-field
     = f.label :body
-    = f.cktext_area :body
+    = f.text_area :body
 %fieldset#details
   - if f.object.errors.any?
     #errors.details-module
@@ -16,6 +16,10 @@
         - f.object.errors.full_messages.each do |error|
           %li= error
   .details-module
+    .tags-field
+      = f.label :tag_list, "Tags"
+      = f.text_field :tag_list, type: :tags, value: f.object.tag_list.join(",")
+  .details-module
     = f.fields_for :records, Record.new do |builder|
       .should-create-record-field
         = builder.check_box :_destroy, {checked: false}, "0", "1"
@@ -1,2 +1,3 @@
-= form_for @stream, url: admin_stream_url(@stream), html: { id: "entry-form" } do |f|
+- title "Editing #{@stream.title}"
+= form_for @stream, url: admin_stream_url(@stream.id), html: { id: "entry-form" } do |f|
   = render partial: "form", locals: { f: f }
@@ -1,3 +1,4 @@
+- title "Streams"
 %table#entries
   %tr
     %th Title
@@ -9,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,2 +1,3 @@
+- title "New stream"
 = form_for @stream, url: admin_streams_url, html: { id: "entry-form" } do |f|
   = render partial: "form", locals: { f: f }
@@ -4,7 +4,7 @@
     = f.text_field :title, value: @stream.title, readonly: true
   .body-field
     = f.label :body
-    = f.cktext_area :body
+    = f.text_area :body
 %fieldset#details
   - if f.object.errors.any?
     #errors.details-module
@@ -1,2 +1,3 @@
-= form_for @update, url: admin_stream_update_url(@stream, @update), html: { id: "entry-form" } do |f|
+- title "Editing stream update"
+= form_for @update, url: admin_stream_update_url(@stream.id, @update), html: { id: "entry-form" } do |f|
   = render partial: "form", locals: { f: f }
@@ -1,2 +1,3 @@
+- title "New stream update"
 = form_for @update, url: admin_stream_updates_url(@stream), html: { id: "entry-form" } do |f|
   = render partial: "form", locals: { f: f }
@@ -1,3 +1,28 @@
-%article#blog-post
-  %h2#blog-title= blog.title
-  %section#blog-content.entry-content= blog.body.html_safe
+%article.blog-post.h-entry
+  %data.u-url{ value: url_for(blog) }
+  %header
+    .post-calendar{ class: "post-date-#{(blog.visible_date.year - 2007) % 4 + 1}" }
+      %span.post-month= blog.visible_date.strftime("%^b")
+      %span.post-day= blog.visible_date.day
+    .blog-title
+      %h2.p-name= link_to_unless_current blog.title, blog
+      .post-author= blog.user.login.capitalize
+      %ul.post-tag-3
+        - blog.tags.each do |tag|
+          %li= link_to tag, tag_url(tag.name), class: "p-category"
+  %blockquote#blog-content.entry-content.bubble.rounded.bottom.e-content
+    - if short and blog.has_read_more
+      = markdown(blog.short_body)
+      = link_to "Read more...", blog
+    - else
+      = markdown(blog.body)
+  %cite.bubble.blog-cite
+    %span.p-author.h-card
+      %strong.p-name= blog.user.login.capitalize
+      %data.u-url{ value: root_url }
+    on
+    %time.dt-published{ datetime: blog.visible_date.strftime("%Y-%m-%dT%H:%M:%SZ%z") }= blog.visible_date.strftime("%B #{blog.visible_date.day.ordinalize}, %Y at %-I:%M:%S%P")
+  .post-vote{ id: "blog-vote-section-#{blog.id}" }
+    %span.vote-link{ id: "blog-upvote-link-#{blog.id}" }= link_to_unless (not blog.published or blog.already_upvoted?(request.remote_ip)), "👍", upvote_blog_path(blog), remote: true, rel: "nofollow", class: "blog-upvote-link", method: :post
+    %span.post-rating{ id: "blog-rating-#{blog.id}" }= blog.upvotes
+    %span.vote-link{ id: "blog-downvote-link-#{blog.id}" }= link_to_unless (not blog.published or blog.already_downvoted?(request.remote_ip)), "👎", downvote_blog_path(blog), remote: true, rel: "nofollow", class: "blog-downvote-link", method: :post
@@ -0,0 +1,5 @@
+- if not @main_page
+  = will_paginate @blogs
+- @blogs.each do |blog|
+  = render blog, short: true
+= will_paginate @blogs
@@ -0,0 +1,15 @@
+atom_feed do |feed|
+  feed.title("Four Island")
+  feed.updated(@blogs[0].published_at) if @blogs.length > 0
+
+  @blogs.limit(10).each do |blog|
+    feed.entry(blog, published: blog.published_at) do |entry|
+      entry.title(blog.title)
+      entry.content(markdown(blog.body), type: 'html')
+
+      entry.author do |author|
+        author.name("hatkirby")
+      end
+    end
+  end
+end
@@ -0,0 +1,9 @@
+#blog-archive
+  %h2 Blog Archive
+  .bubble.rounded
+    - @blogs.chunk {|blog| blog.published_at.strftime("%B %Y") }.each do |chunk|
+      %h3= chunk[0]
+      - chunk[1].each do |blog|
+        %p.archive-link
+          = link_to blog.title, blog
+          %small= blog.published_at.strftime("%-d %b %Y")
@@ -1,6 +1,10 @@
-.breadcrumb= link_to "← Back to home page", root_path
-= render @blog
-%footer#blog-footer
-  This entry was posted on
-  = succeed "." do
-    %time= @blog.published_at.strftime("%B #{@blog.published_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+- title @blog.title
+- unless @prev.nil?
+  .back-post= link_to "← #{@prev.title}", @prev
+- unless @next.nil?
+  .next-post= link_to "#{@next.title} →", @next
+.clear
+= render @blog, short: false
+= show_comments(@blog)
+- content_for :meta_sidebar_content do
+  = link_to "Edit this post", edit_admin_blog_url(@blog.id)
@@ -0,0 +1 @@
+= render "list"
@@ -0,0 +1,12 @@
+$("#blog-rating-<%= @blog.id %>").html('<%= escape_javascript("#{@blog.upvotes - @blog.downvotes}") %>');
+
+<% if @blog.already_upvoted? request.remote_ip %>
+  $("#blog-upvote-link-<%= @blog.id %>").html("👍");
+<% elsif @blog.already_downvoted? request.remote_ip %>
+  $("#blog-downvote-link-<%= @blog.id %>").html("👎");
+<% else %>
+  $("#blog-upvote-link-<%= @blog.id %>").html('<%= escape_javascript(link_to("👍", upvote_blog_path(@blog), remote: true, rel: "nofollow", class: "blog-upvote-link", method: :post)) %>');
+  $("#blog-downvote-link-<%= @blog.id %>").html('<%= escape_javascript(link_to("👎", downvote_blog_path(@blog), remote: true, rel: "nofollow", class: "blog-downvote-link", method: :post)) %>');
+<% end %>
+
+$("#blog-vote-section-<%= @blog.id %>").effect('highlight', {}, 2000);
@@ -0,0 +1,21 @@
+%p
+  A comment has been posted on
+  = link_to @comment.blog.title, @comment.blog
+  by the following user:
+%ul
+  %li
+    Name:
+    = @comment.username
+  %li
+    Email:
+    = @comment.email
+  - unless @comment.website.empty?
+    %li
+      Website:
+      = @comment.website
+%p Here is the comment:
+%blockquote= @comment.body
+%p
+  Posted:
+  = @comment.published_at.strftime("%B #{@comment.published_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+%p= link_to "See the comment on the web", blog_url(@comment.blog, anchor: "comment-#{@comment.id}")
@@ -0,0 +1,17 @@
+A comment has been posted on <%= @comment.blog.title %> by the following user:
+
+* Name: <%= @comment.username %>
+* Email: <%= @comment.email %>
+<% unless @comment.website.empty? %>* Website: <%= @comment.website %>
+<% end %>
+Here is the comment:
+
+---
+
+<%= @comment.body %>
+
+---
+
+Posted: <%= @comment.published_at.strftime("%B #{@comment.published_at.day.ordinalize}, %Y at %-I:%M:%S%P") %>
+
+See the comment on the web: <%= blog_url(@comment.blog, anchor: "comment-#{@comment.id}") %>
@@ -0,0 +1,22 @@
+%p
+  A new comment has been posted on
+  = link_to @comment.blog.title, @comment.blog
+  that is pending moderation.
+%p The details of the user that posted it:
+%ul
+  %li
+    Name:
+    = @comment.username
+  %li
+    Email:
+    = @comment.email
+  - unless @comment.website.empty?
+    %li
+      Website:
+      = @comment.website
+%p Here is the comment:
+%blockquote= @comment.body
+%p
+  Posted:
+  = @comment.created_at.strftime("%B #{@comment.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+%p= link_to "Go to the admin panel", pending_admin_comments_url
@@ -0,0 +1,19 @@
+A comment has been posted on <%= @comment.blog.title %> that is pending moderation.
+
+The details of the user that posted it:
+
+* Name: <%= @comment.username %>
+* Email: <%= @comment.email %>
+<% unless @comment.website.empty? %>* Website: <%= @comment.website %>
+<% end %>
+Here is the comment:
+
+---
+
+<%= @comment.body %>
+
+---
+
+Posted: <%= @comment.created_at.strftime("%B #{@comment.created_at.day.ordinalize}, %Y at %-I:%M:%S%P") %>
+
+Go to the admin panel: <%= pending_admin_comments_url %>
@@ -0,0 +1,14 @@
+%p
+  A reply has been posted to your comment on
+  = succeed "." do
+    = link_to @comment.blog.title, @comment.blog
+  The original comment:
+%blockquote= @comment.reply_to.body
+%p
+  = @comment.username
+  left the following response:
+%blockquote= @comment.body
+%p
+  Posted:
+  = @comment.published_at.strftime("%B #{@comment.published_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+%p= link_to "See the comment on the web", blog_url(@comment.blog, anchor: "comment-#{@comment.id}")
@@ -0,0 +1,19 @@
+A reply has been posted to your comment on <%= @comment.blog.title %>. The original comment:
+
+---
+
+<%= @comment.reply_to.body %>
+
+---
+
+<%= @comment.username %> posted the following response:
+
+---
+
+<%= @comment.body %>
+
+---
+
+Posted: <%= @comment.published_at.strftime("%B #{@comment.published_at.day.ordinalize}, %Y at %-I:%M:%S%P") %>
+
+See the comment on the web: <%= blog_url(@comment.blog, anchor: "comment-#{@comment.id}") %>
@@ -0,0 +1,14 @@
+.blog-comment{ id: "comment-#{comment.id}" }
+  %blockquote.bubble.rounded.bottom
+    = image_tag comment.gravatar_url, class: "comment-avatar"
+    = markdown(comment.body, { restricted: true })
+    .clear
+  %cite.bubble
+    %strong
+      - if comment.website.empty?
+        = comment.username
+      - else
+        = link_to comment.username, comment.website
+    on
+    = comment.published_at.strftime("%B #{comment.published_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+    = link_to (image_tag "comment_add.png"), "#", class: "comment-reply-to", title: "Reply to comment", data: { comment_id: comment.id, comment_author: comment.username }
@@ -0,0 +1,32 @@
+= form_for @comment || blog.comments.new, html: { id: "comment-form" } do |f|
+  = f.hidden_field :reply_to_id
+  %fieldset#comment-body-field
+    %blockquote.bubble.rounded.bottom
+      #comment-reply-msg
+        = link_to (image_tag "cross.png"), "#", class: "comment-reply-cancel"
+        Replying to comment by
+        = succeed ":" do
+          %span.comment-reply-author
+      = f.label :body
+      = f.text_area :body
+    %cite.bubble Feel free to post a comment! You may use Markdown.
+  - if @comment and @comment.errors.any?
+    %ul#form-errors
+      - @comment.errors.full_messages.each do |msg|
+        %li= msg
+  %fieldset#comment-other-fields
+    .comment-name-field.comment-field
+      .comment-field-label= f.label :username
+      .comment-field-input= f.text_field :username
+    .comment-email-field.comment-field
+      .comment-field-label= f.label :email
+      .comment-field-input= f.text_field :email, type: :email
+    .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"
@@ -0,0 +1,6 @@
+%a{ name: "comments" }
+#comments
+  %h2 Comments
+  - blog.comments.published_and_ordered.each do |comment|
+    = render comment
+  = render "comments/form", blog: blog
@@ -1,3 +1,5 @@
+<% title "Resend confirmation instructions" %>
+
 <h2>Resend confirmation instructions</h2>
 
 <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
@@ -1,3 +1,5 @@
+<% "Edit account" %>
+
 <h2>Edit <%= resource_name.to_s.humanize %></h2>
 
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
@@ -1,3 +1,5 @@
+<% title "Sign up" %>
+
 <h2>Sign up</h2>
 
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
@@ -1,3 +1,5 @@
+<% title "Resend unlock instructions" %>
+
 <h2>Resend unlock instructions</h2>
 
 <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
@@ -0,0 +1,26 @@
+- title "Games"
+.breadcrumb= link_to "← Back to home page", root_path
+%h2#games-title Games
+%table#games-table
+  %thead
+    %tr
+      %th= sortable "title"
+      %th= sortable "status"
+      %th= sortable "score"
+      %th= sortable "progress"
+  %tbody
+    - @games.each do |game|
+      %tr{ class: cycle("even", "odd") }
+        %td
+          %span.game-title= game.title
+          - unless game.started_on.blank?
+            %span.game-started
+              Started on
+              %time= game.started_on
+          - unless game.finished_on.blank?
+            %span.game-finished
+              Finished on
+              %time= game.finished_on
+        %td= game.status
+        %td= game.score
+        %td.game-progress= simple_format game.progress
@@ -1,13 +1,13 @@
 !!! 5
 %html
   %head
-    %title Thoughts - Admin
+    %title= content_for?(:title) ? "Four Island - Admin - #{yield(:title)}" : "Four Island - Admin"
     = csrf_meta_tags
     = stylesheet_link_tag    'admin', media: 'all', 'data-turbolinks-track': 'reload'
     = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
   %body
     #banner
-      = link_to "Thoughts", root_url
+      = link_to "Four Island", root_url
       - if flash[:alert]
         #flash.flash-alert
           %span.flash-tag ERROR:
@@ -29,5 +29,21 @@
           = link_to "Streams", admin_streams_url, class: "major-link"
           %ul.minors
             %li.minor= link_to "New stream", new_admin_stream_url
+        %li{major_sidebar_attrs("links")}
+          = link_to "Links", admin_links_url, class: "major-link"
+          %ul.minors
+            %li.minor= link_to "New link", new_admin_link_url
+        %li{major_sidebar_attrs("games")}
+          = link_to "Games", admin_games_url, class: "major-link"
+          %ul.minors
+            %li.minor= link_to "New game", new_admin_game_url
+        %li{major_sidebar_attrs("comments")}
+          = link_to "Comments", admin_comments_url, class: "major-link"
+          %ul.minors
+            %li.minor= link_to "Pending", pending_admin_comments_url
+        %li{major_sidebar_attrs("quotes")}
+          = link_to "Quotes", admin_quotes_url, class: "major-link"
+          %ul.minors
+            %li.minor= link_to "Pending", pending_admin_quotes_url
       #main
         = yield
@@ -1,29 +1,97 @@
 !!! 5
 %html
   %head
-    %title Thoughts
+    %title= content_for?(:title) ? "Four Island - #{yield(:title)}" : "Four Island"
     = csrf_meta_tags
     = stylesheet_link_tag    'main', media: 'all', 'data-turbolinks-track': 'reload'
     = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
+    = display_meta_tags og: { site_name: "Four Island" }
+    %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
-      #sidebar
-        .sidebar-module
-          %h2 I'm Fef.
-          %p Coding is what I do. I make a lot of things, including Twitter bots. I really like Pokémon, and I write about it a lot.
-          %p B.S. in CS, Carnegie Mellon 2017
-        .sidebar-module
-          %h2 Meta
-          %ul
-            - if not user_signed_in?
-              %li= link_to "Log in", new_user_session_path
-            - if user_signed_in?
-              %li= link_to "Admin", admin_url
-              %li= link_to "Log out", destroy_user_session_path, method: :delete
-      #main
-        %header#banner= link_to "feffernoo.se", root_url
-        #content= yield
+      %header#banner
+        %h1 Four Island
+        = link_to image_tag("fourisland_header.png"), root_url
+      #page-body
+        #sidebar
+          .sidebar-module
+            %blockquote.pimped.bubble.rounded.bottom
+              %h2 I'm Hatkirby.
+              %p Coding is what I do. I make a lot of things, including Twitter bots. I really like Pokémon, and I write about it a lot.
+              %p B.S. in CS, Carnegie Mellon 2017
+            %cite.bubble
+              <strong>Hatkirby</strong> on Four Island
+          .sidebar-module.fun-links
+            .bubble.rounded
+              %h2 Me, elsewhere
+              %ul
+                %li
+                  = image_tag "user_comment.png"
+                  = link_to "Mastodon", "https://beppo.online/@starlight", rel: "me"
+                %li
+                  = image_tag "rainbow.png"
+                  = link_to "Archive of Our Own", "https://archiveofourown.org/users/StarlightSystem"
+                %li
+                  = image_tag "bricks.png"
+                  = link_to "itch.io", "https://hatkirby.itch.io"
+                %li
+                  = image_tag "controller.png"
+                  = link_to "Speedrun.com", "https://www.speedrun.com/users/hatkirby"
+          .sidebar-module.fun-links
+            .bubble.rounded
+              %h2 Projects
+              %ul
+                - links_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 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
+                  = image_tag "book_open.png"
+                  = link_to "Archive", blogs_url
+                %li
+                  = image_tag "tag_blue.png"
+                  = link_to "Tag cloud", tags_url
+                %li
+                  = image_tag "feed.png"
+                  = link_to "Atom feed", blogs_url(format: :atom)
+          - unless @random_song.nil?
+            .sidebar-module#scrobble-box
+              .bubble.rounded
+                %h2 Listening to
+                = image_tag @random_song.image, width: "174px"
+                %p
+                  %strong= @random_song.title
+                  by
+                  = @random_song.artist
+                %p= @random_song.album
+          .sidebar-module
+            .bubble.rounded
+              %h2 Meta
+              %ul
+                - if not user_signed_in?
+                  %li= link_to "Log in", new_user_session_path
+                - if user_signed_in?
+                  = yield :meta_sidebar_content
+                  %li= link_to "Admin", admin_url
+                  %li= link_to "Log out", destroy_user_session_path, method: :delete
+        #main
+          #content= yield
@@ -0,0 +1,41 @@
+!!! 5
+%html
+  %head
+    %title The Four Island Quotes DB
+    %meta{ :charset => "utf-8" }
+    = stylesheet_link_tag "quotes"
+    = javascript_include_tag "application"
+    = csrf_meta_tag
+    = auto_discovery_link_tag :atom, latest_quotes_url(:atom)
+    = display_meta_tags og: { site_name: "Four Island" }
+    %link{rel: "alternate", type: "application/atom+xml", href: latest_quotes_url(:atom)}
+    %meta{name: "viewport", content: "width=device-width, initial-scale=1.0"}
+  %body
+    #wrap
+      %header#banner
+        %h1#banner-title= link_to "The Four Island Quotes DB", quotes_url
+        #banner-abbr FIQDB
+        .cleardiv
+      %nav#top-bar
+        %ul
+          %li= link_to_unless_current "Home", quotes_url
+          %li= link_to_unless_current "Latest", latest_quotes_url
+          %li= link_to_unless_current "Top", top_quotes_url
+          %li{"data-turbolinks" => "false"}= link_to "Random", random_quotes_url
+          - 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{"data-turbolinks" => "false"}= link_to_unless_current "Stats", stats_quotes_url 
+          %li= link_to_unless_current "Feed", latest_quotes_url(:atom)
+          - if user_signed_in?
+            %li= link_to_unless_current "Admin", admin_url
+        .cleardiv
+      #page-body
+        - if flash[:notice]
+          #flash= flash[:notice]
+        = yield
+      %footer
+        #footer-left= raw "The Four Island Quotes DB is a #{link_to "Four Island", root_url} project and is &copy;&nbsp;hatkirby&nbsp;2008-#{Time.now.year}"
+        #footer-right #{Quote.published.count} approved quotes; #{Quote.pending.count} pending quotes
+        .cleardiv
@@ -1,7 +1,7 @@
 !!! 5
 %html
   %head
-    %title Thoughts
+    %title Four Island
     = csrf_meta_tags
     = stylesheet_link_tag    'userdata', media: 'all', 'data-turbolinks-track': 'reload'
     = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
@@ -0,0 +1,13 @@
+%p
+  A new quote has been submitted for moderation.
+- unless @quote.submitter.nil?
+  %p
+    It was submitted by:
+    = succeed "." do
+      = @quote.submitter
+%p The body of the quote:
+%pre= @quote.content
+%p
+  Submitted:
+  = @quote.created_at.strftime("%B #{@quote.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+%p= link_to "Go to the admin panel", pending_admin_quotes_url
@@ -0,0 +1,17 @@
+A new quote has been submitted for moderation.
+
+<% unless @quote.submitter.nil? %>
+It was submitted by: <%= @quote.submitter %>.
+
+<% end %>
+Here is the quote:
+
+---
+
+<%= @quote.content %>
+
+---
+
+Posted: <%= @quote.created_at.strftime("%B #{@quote.created_at.day.ordinalize}, %Y at %-I:%M:%S%P") %>
+
+Go to the admin panel: <%= pending_admin_quotes_url %>
@@ -0,0 +1,22 @@
+%article.quote.h-entry{ :id => "quote-#{quote.id}" }
+  %data.p-name{ value: "\##{quote.id}" }
+  %data.u-url{ value: url_for(quote) }
+  %header.quote-header{ :id => "quote-header-#{quote.id}" }
+    = link_to_unless (quote.new_record? or current_page?(quote)), "\##{quote.id}", quote, :class => "quote-link"
+    %span.vote-link{ :id => "quote-upvote-link-#{quote.id}" }= link_to_unless (quote.new_record? or quote.already_upvoted?(request.remote_ip)), "Up", upvote_quote_path(quote.id), :remote => true, :rel => "nofollow", :class => "quote-upvote-link", method: :post
+    %span.quote-rating{ :id => "quote-rating-#{quote.id}" }= "+#{quote.upvotes}/-#{quote.downvotes}"
+    %span.vote-link{ :id => "quote-downvote-link-#{quote.id}" }= link_to_unless (quote.new_record? or quote.already_downvoted?(request.remote_ip)), "Down", downvote_quote_path(quote.id), :remote => true, :rel => "nofollow", :class => "quote-downvote-link", method: :post
+    %time.dt-published{ datetime: quote.created_at.strftime("%Y-%m-%dT%H:%M:%SZ%z") }= quote.published_date
+    - if user_signed_in? and !quote.new_record?
+      = link_to "Edit", edit_admin_quote_path(quote), :class => "quote-edit-link"
+  - if quote.audio.attached?
+    .audioplayer= audio_tag(rails_blob_url(quote.audio), controls: true)
+  %blockquote.quote-body.e-content= raw quote_format(h(quote.content))
+  - if !quote.new_record? and quote.has_extra?
+    .quote-footer
+      - if quote.has_notes?
+        .quote-notes= auto_link(quote.notes, :link => :urls)
+      - if quote.has_tags?
+        %ul.quote-tags
+          - quote.tags.each do |tag|
+            %li= link_to tag.name, tag_quotes_path(tag.name)
@@ -0,0 +1,8 @@
+#about-left
+  #quotes= render @quote
+  %p.normal Welcome to the Four Island Quotes Database! Here you can find many strange and hopefully humorous Four Island quotes. There are currently #{@qnumber} quotes in the database, and there are #{@mnumber} quotes awaiting moderation.
+#about-right
+  %h3 About
+  %p.normal The Four Island Quotes DB is a repository for humorous and memorable quotes from #{link_to "FourNet", "http://irc.fourisland.com/"} channels, instant messaging sessions, real life situations, and more.
+  %p.normal The quotes database, in its first incarnation, was created on #{link_to "April 25th 2008", "http://www.fourisland.com/blog/quote-time/"} by hatkirby, who was inspired by #{link_to "bash.org", "http://bash.org/"} and his obsession with record-keeping to create a quotes database for Four Island. It ran on the now-defunct PHP quote management system, #{link_to "rash", "http://rqms.sourceforge.net/"}, on the subdomain "<code>quotes.fourisland.com</code>". It was rewritten by hand and integrated into Four Island (at the URL "<code>fourisland.com/quotes</code>") by hatkirby on #{link_to "June 13th 2008", "http://www.fourisland.com/blog/the-new-four-island/"} with the release of Four Island 2, dubbed The New Four Island. With the release of Four Island 3 on #{link_to "September 22nd, 2011", "http://www.fourisland.com/blog/four-island-3/"}, it was rewritten in Ruby on Rails, disassociated from Four Island and returned to its original URL.
+.cleardiv
@@ -0,0 +1,11 @@
+atom_feed do |feed|
+  feed.title("The Four Island Quotes DB")
+  feed.updated(@quotes.first.created_at)
+
+  @quotes.each do |quote|
+    feed.entry(quote) do |entry|
+      entry.title("##{quote.id}")
+      entry.content(quote_format(quote.content), :type => 'html')
+    end
+  end
+end
@@ -0,0 +1,4 @@
+%section#quotes
+  .pagination= will_paginate @quotes
+  = render @quotes
+  .pagination= will_paginate @quotes
@@ -0,0 +1,24 @@
+%p.normal You're about to submit a quote to the Four Island Quotes DB! This is great, but first, there are a few rules/guidelines/things you should know before submitting:
+%ul
+  %li Quotes should come from a chat involving one or more Four Island regulars. This is not a strict guideline, as quotes are often submitted from video chats or real life situations possibly involving only one Four Island regular, but just make sure before submitting that the quote you're submitting would be appreciated by other Four Island regulars.
+  %li Make sure to remove timestamps, if present in your quote, before submitting.
+  %li If your quote is extremely offensive, it will probably not be approved. This is not referring to profanity--you can leave profanity uncensored in your quotes.
+  %li If you want to, you can enter your username in the box below the quote labelled "Your username" (this is completely optional). This is mostly for record-keeping and statistical purposes; submitting a quote of yourself being awesome and then signing your name under it won't decrease the chances of it being accepted.
+  %li You can enter any notes about the quote that may be important (such as context, or if it's a memorable quote, why it's memorable) in the box below your quote.
+  %li You can also enter a list of comma-separated tags in the provided box. This is, again, optional, but it's suggested that you do tag your quote, especially with #{link_to "tags that already exist", tags_quotes_path}, though creating new tags is not frowned upon.
+%h3 Your Quote
+= form_for @quote do |f|
+  - if @quote.errors.any?
+    #error-messages
+      %h4 Errors were found!
+      %ul
+        - @quote.errors.full_messages.each do |msg|
+          %li= msg
+  .form-field= f.text_area :content
+  .form-field Your username (optional): #{f.text_field :submitter}
+  .form-field Notes (optional):
+  .form-field= f.text_area :notes
+  .form-field
+    Tags (optional):
+    .tags-input= f.text_field :tag_list, type: :tags, value: f.object.tag_list.join(",")
+  .form-field= f.submit
@@ -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
@@ -0,0 +1 @@
+%section#quotes= render @quote
@@ -0,0 +1,41 @@
+%script{ :type => "text/javascript", :src => "https://www.gstatic.com/charts/loader.js" }
+%script{ :type => "text/javascript" }
+    google.charts.load('visualization', '1.0', {'packages':['corechart']});
+    google.charts.setOnLoadCallback(drawChart);
+    function drawChart()
+    {
+    var data = new google.visualization.DataTable();
+    data.addColumn('string', 'Month');
+    data.addColumn('number', 'Quotes Submitted');
+    data.addRows([
+    - @months.each do |month|
+        ['#{month[:name]}', #{month[:number]}],
+    ]);
+    var options = {'title':'Quotes Submitted in the Last 12 Months', 'width':1000, 'height':500, 'legend':'none', 'hAxis.maxAlternation':1};
+    var chart = new google.visualization.ColumnChart(document.getElementById('chart_div'));
+    chart.draw(data, options);
+    //var data2 = new google.visualization.DataTable();
+    //data2.addColumn('string', 'Month');
+    //data2.addColumn('number', 'Quotes');
+    //data2.addRows([
+    //- @months2.each do |month|
+    //    ['\#{month[:name]}', \#{month[:number]}],
+    //]);
+    //var options2 = {'title':'Number of Quotes', 'width':1000, 'height':500, 'legend':'none', 'hAxis.maxAlternation':1};
+    //var chart2 = new google.visualization.AreaChart(document.getElementById('chart2_div'));
+    //chart2.draw(data2, options2);
+    var data3 = new google.visualization.DataTable();
+    data3.addColumn('string', 'Speaker');
+    data3.addColumn('number', 'Quotes');
+    data3.addRows([
+    - @by_speaker.each do |speaker|
+        ['#{speaker[0]}', #{speaker[1]}],
+    ]);
+    var options3 = {'title':'Number of Quotes per Speaker', 'width':1000, 'height':500};
+    var chart3 = new google.visualization.ColumnChart(document.getElementById('chart3_div'));
+    chart3.draw(data3, options3);
+    }
+%p.normal Because charts are fun, we've compiled a few charts here containing statistics about the Four Island Quotes DB.
+#chart2_div
+#chart_div
+#chart3_div
@@ -0,0 +1,4 @@
+%h2 Tag Cloud
+%ul#tags-container
+  - tag_cloud(@tags, %w(css1 css1_5 css2 css2_5 css3 css3_5 css4 css4_5 css5 css5_5 css6)) do |tag, css_class|
+    %li= link_to tag.name, tag_quotes_path(tag.name), :class => css_class
@@ -0,0 +1,12 @@
+$("#quote-rating-<%= @quote.id %>").html('<%= escape_javascript("+#{@quote.upvotes}/-#{@quote.downvotes}") %>');
+
+<% if @quote.already_upvoted? request.remote_ip %>
+  $("#quote-upvote-link-<%= @quote.id %>").html("Up");
+<% elsif @quote.already_downvoted? request.remote_ip %>
+  $("#quote-downvote-link-<%= @quote.id %>").html("Down");
+<% else %>
+  $("#quote-upvote-link-<%= @quote.id %>").html('<%= escape_javascript(link_to("Up", upvote_quote_path(@quote.id), :remote => true, :rel => "nofollow", :class => "quote-upvote-link", method: :post)) %>');
+  $("#quote-downvote-link-<%= @quote.id %>").html('<%= escape_javascript(link_to("Down", downvote_quote_path(@quote.id), :remote => true, :rel => "nofollow", :class => "quote-downvote-link", method: :post)) %>');
+<% end %>
+
+$("#quote-header-<%= @quote.id %>").effect('highlight', {}, 2000);
@@ -0,0 +1,7 @@
+%li
+  %span.description= link_to record.description, record.recordable.path
+  %ul.tags
+    %li.record-date= record.created_at.strftime("%m.%d.%y")
+    %li.entry-type{ class: "entry-type-#{record.recordable_type.downcase}" }= record.recordable_type
+    - record.recordable.taggable.tag_list.each do |tag|
+      %li.entry-tag= tag
@@ -1,7 +1 @@
-%ul#records
-  - @records.each do |record|
-    %li
-      %span.description= link_to record.description, record.recordable.path
-      %ul.tags
-        %li.record-date= record.created_at.strftime("%m.%d.%y")
-        %li.entry-type{ class: "entry-type-#{record.recordable_type.downcase}" }= record.recordable_type
+%ul#records= render @records
@@ -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,2 +1,3 @@
-.breadcrumb= link_to "← Back to home page", root_path
+- title @stream.title
+.breadcrumb= link_to "← Back to streams", streams_path
 = render @stream
@@ -0,0 +1,4 @@
+%h2.centered Tag cloud
+#tag-cloud
+  - tag_cloud @tags, %w[xs s m l xl] do |tag, css_class|
+    = link_to tag.name, tag_url(tag.name), class: css_class, title: tag.taggings_count
@@ -0,0 +1,6 @@
+- title "Tag #{@tag_name}"
+%h2.centered
+  Blog posts tagged
+  = surround "\"" do
+    = @tag_name
+= render "blogs/list"
@@ -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)
@@ -1,3 +1,4 @@
+- title "Change password"
 %h2 Change your password
 = devise_error_messages!
 #principal
@@ -1,3 +1,4 @@
+- title "Forgot password"
 %h2 Forgot your password?
 = devise_error_messages!
 #principal
@@ -1,3 +1,4 @@
+- title "Sign in"
 #principal
   = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
     .field
@@ -0,0 +1,8 @@
+%p
+  Users have upvoted content on Four Island in the last day!
+%ul
+  - @entries.each do |entry|
+    %li
+      = voters_list(entry, html: true)
+      upvoted
+      = link_to entry.first.votable.title, entry.first.votable, style: "font-weight: bold; font-style: italic"
@@ -0,0 +1,5 @@
+Users have upvoted content on Four Island in the last day!
+
+<% @entries.each do |entry| %>
+- <%= voters_list(entry) %> upvoted <%= entry.first.votable.title %> (<%= url_for(entry.first.votable) %>)
+<% end %>