From a2bc6f97627d78d42230061125252f074ce4f4cd Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Sat, 23 Jul 2011 00:23:50 -0400
Subject: 1. Added image tag plugin 2. Removed figure tag plugin 3. Renamed
 custom_filters to octopress_filters 4. Added styles to support new image tag
 plugin

---
 .themes/classic/sass/partials/_blog.scss | 30 +++++++++---
 plugins/custom_filters.rb                | 84 --------------------------------
 plugins/figure_tag.rb                    | 69 --------------------------
 plugins/image_tag.rb                     | 41 ++++++++++++++++
 plugins/octopress_filters.rb             | 84 ++++++++++++++++++++++++++++++++
 5 files changed, 149 insertions(+), 159 deletions(-)
 delete mode 100644 plugins/custom_filters.rb
 delete mode 100644 plugins/figure_tag.rb
 create mode 100644 plugins/image_tag.rb
 create mode 100644 plugins/octopress_filters.rb

diff --git a/.themes/classic/sass/partials/_blog.scss b/.themes/classic/sass/partials/_blog.scss
index 26ad19b4..cc8c6848 100644
--- a/.themes/classic/sass/partials/_blog.scss
+++ b/.themes/classic/sass/partials/_blog.scss
@@ -42,14 +42,32 @@ article {
     font-size: 2.0em; font-style: italic;
     line-height: 1.3em;
   }
-  .entry-content {
-    img, video { max-width: 100%; height: auto; }
-    video {
-      width: 100%; display: block; margin-bottom: 1.5em;
-      padding: .8em; background: #fff; border: 1px solid #eee;
-      @include box-sizing(border-box);
+  img {
+    max-width: 100%;
+    border: .5em solid #fff;
+    @include border-radius(.3em);
+    @include box-shadow(rgba(#000, .15) 0 1px 4px);
+    @include box-sizing(border-box);
+    display: block;
+    margin: 0 auto 1.5em;
+    &.left {
+      float: left;
+      margin-right: 1.5em;
+    }
+    &.right {
+      float: right;
+      margin-left: 1.5em;
+    }
+    &.left, &.right {
+      margin-bottom: .8em;
     }
   }
+  img, video { max-width: 100%; height: auto; }
+  video {
+    width: 100%; display: block; margin-bottom: 1.5em;
+    padding: .8em; background: #fff; border: 1px solid #eee;
+    @include box-sizing(border-box);
+  }
   .flash-video {
     max-width: 100%;
     margin-bottom: 1.5em;
diff --git a/plugins/custom_filters.rb b/plugins/custom_filters.rb
deleted file mode 100644
index 5b49363b..00000000
--- a/plugins/custom_filters.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-#custom filters for Octopress
-
-module OctopressFilters
-  # Used on the blog index to split posts on the <!--more--> marker
-  def exerpt(input)
-    if input.index(/<!--\s*more\s*-->/i)
-      input.split(/<!--\s*more\s*-->/i)[0]
-    else
-      input
-    end
-  end
-
-  # Summary is used on the Archive pages to return the first block of content from a post.
-  def summary(input)
-    if input.index(/\n\n/)
-      input.split(/\n\n/)[0]
-    else
-      input
-    end
-  end
-
-  # Replaces relative urls with full urls
-  def expand_urls(input, url='')
-    url ||= '/'
-    input.gsub /(\s+(href|src)\s*=\s*["|']{1})(\/[^\"'>]+)/ do
-      $1+url+$3
-    end
-  end
-
-  # Removes trailing forward slash from a string for easily appending url segments
-  def strip_slash(input)
-    if input =~ /(.+)\/$|^\/$/
-      input = $1
-    end
-    input
-  end
-
-  # Returns a url without the protocol (http://)
-  def shorthand_url(input)
-    input.gsub /(https?:\/\/)(\S+)/ do
-      $2
-    end
-  end
-
-  # replaces primes with smartquotes using RubyPants
-  def smart_quotes(input)
-    require 'rubypants'
-    RubyPants.new(input).to_html
-  end
-
-  # Returns a title cased string based on John Gruber's title case http://daringfireball.net/2008/08/title_case_update
-  def titlecase(input)
-    input.titlecase
-  end
-
-  # Returns a datetime if the input is a string
-  def datetime(date)
-    if date.class == String
-      date = Time.parse(date)
-    end
-    date
-  end
-
-  # Returns an ordidinal date eg July 22 2007 -> July 22nd 2007
-  def ordinalize(date)
-    date = datetime(date)
-    "#{date.strftime('%b')} #{ordinal(date.strftime('%e').to_i)}, #{date.strftime('%Y')}"
-  end
-
-  # Returns an ordinal number. 13 -> 13th, 21 -> 21st etc.
-  def ordinal(number)
-    if (11..13).include?(number.to_i % 100)
-      "#{number}<span>th</span>"
-    else
-      case number.to_i % 10
-      when 1; "#{number}<span>st</span>"
-      when 2; "#{number}<span>nd</span>"
-      when 3; "#{number}<span>rd</span>"
-      else    "#{number}<span>th</span>"
-      end
-    end
-  end
-end
-Liquid::Template.register_filter OctopressFilters
diff --git a/plugins/figure_tag.rb b/plugins/figure_tag.rb
deleted file mode 100644
index 550e677f..00000000
--- a/plugins/figure_tag.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# Title: Simple Image Figure tag for Jekyll
-# Author: Brandon Mathis http://brandonmathis.com
-# Description: Easily output images in <figure> with an optional <figcaption> and class names.
-#
-# Syntax {% figure [class name(s)] url [caption text] %}
-#
-# Example:
-# {% figure left half http://site.com/images/ninja.png Ninja Attack! %}
-#
-# Output:
-# <figure class='left half'><img src="http://site.com/images/ninja.png"><figcaption>Ninja Attack!</figcaption></figure>
-#
-# Example 2 (image with caption)
-# {% figure /images/ninja.png Ninja Attack! %}
-#
-# Output:
-# <figure><img src="/images/ninja.png"><figcaption>Ninja Attack!</figcaption></figure>
-#
-# Example 3 (just an image with classes)
-# {% figure right /images/ninja.png %}
-#
-# Output:
-# <figure><img class="right" src="/images/ninja.png"></figure>
-#
-
-module Jekyll
-
-  class FigureImageTag < Liquid::Tag
-    ClassImgCaption = /(\S[\S\s]*)\s+(https?:\/\/|\/)(\S+)\s+(.+)/i
-    ClassImg = /(\S[\S\s]*)\s+(https?:\/\/|\/)(\S+)/i
-    ImgCaption = /^\s*(https?:\/\/|\/)(\S+)\s+(.+)/i
-    Img = /^\s*(https?:\/\/|\/)(\S+\s)/i
-
-    @img = nil
-    @caption = nil
-    @class = ''
-
-    def initialize(tag_name, markup, tokens)
-      if markup =~ ClassImgCaption
-        @class = $1
-        @img = $2 + $3
-        @caption = $4
-      elsif markup =~ ClassImg
-        @class = $1
-        @img = $2 + $3
-      elsif markup =~ ImgCaption
-        @img = $1 + $2
-        @caption = $3
-      elsif markup =~ Img
-        @img = $1 + $2
-      end
-      super
-    end
-
-    def render(context)
-      output = super
-      if @img
-        figure =  "<figure class='#{@class}'>"
-        figure += "<img src='#{@img}'>"
-        figure += "<figcaption>#{@caption}</figcaption>" if @caption
-        figure += "</figure>"
-      else
-        "Error processing input, expected syntax: {% figure [class name(s)] /url/to/image [caption] %}"
-      end
-    end
-  end
-end
-
-Liquid::Template.register_tag('figure', Jekyll::FigureImageTag)
diff --git a/plugins/image_tag.rb b/plugins/image_tag.rb
new file mode 100644
index 00000000..d7c85925
--- /dev/null
+++ b/plugins/image_tag.rb
@@ -0,0 +1,41 @@
+# Title: Simple Image tag for Jekyll
+# Author: Brandon Mathis http://brandonmathis.com
+# Description: Easily output images with optional class names and title/alt attributes
+#
+# Syntax {% image [class name(s)] url [title text] %}
+#
+# Example:
+# {% imaeg left half http://site.com/images/ninja.png Ninja Attack! %}
+#
+# Output:
+# <image class='left' src="http://site.com/images/ninja.png" title="Ninja Attack!" alt="Ninja Attack!">
+#
+
+module Jekyll
+
+  class ImageTag < Liquid::Tag
+    @img = nil
+    @title = nil
+    @class = ''
+
+    def initialize(tag_name, markup, tokens)
+      if markup =~ /(\S.*\s+)?(https?:\/\/|\/)(\S+)(\s+.+)?/i
+        @class = $1
+        @img = $2 + $3
+        @title = $4
+      end
+      super
+    end
+
+    def render(context)
+      output = super
+      if @img
+        figure =  "<img class='#{@class}' src='#{@img}' alt='#{@title}' title='#{@title}'>"
+      else
+        "Error processing input, expected syntax: {% img [class name(s)] /url/to/image [title text] %}"
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag('img', Jekyll::ImageTag)
diff --git a/plugins/octopress_filters.rb b/plugins/octopress_filters.rb
new file mode 100644
index 00000000..5b49363b
--- /dev/null
+++ b/plugins/octopress_filters.rb
@@ -0,0 +1,84 @@
+#custom filters for Octopress
+
+module OctopressFilters
+  # Used on the blog index to split posts on the <!--more--> marker
+  def exerpt(input)
+    if input.index(/<!--\s*more\s*-->/i)
+      input.split(/<!--\s*more\s*-->/i)[0]
+    else
+      input
+    end
+  end
+
+  # Summary is used on the Archive pages to return the first block of content from a post.
+  def summary(input)
+    if input.index(/\n\n/)
+      input.split(/\n\n/)[0]
+    else
+      input
+    end
+  end
+
+  # Replaces relative urls with full urls
+  def expand_urls(input, url='')
+    url ||= '/'
+    input.gsub /(\s+(href|src)\s*=\s*["|']{1})(\/[^\"'>]+)/ do
+      $1+url+$3
+    end
+  end
+
+  # Removes trailing forward slash from a string for easily appending url segments
+  def strip_slash(input)
+    if input =~ /(.+)\/$|^\/$/
+      input = $1
+    end
+    input
+  end
+
+  # Returns a url without the protocol (http://)
+  def shorthand_url(input)
+    input.gsub /(https?:\/\/)(\S+)/ do
+      $2
+    end
+  end
+
+  # replaces primes with smartquotes using RubyPants
+  def smart_quotes(input)
+    require 'rubypants'
+    RubyPants.new(input).to_html
+  end
+
+  # Returns a title cased string based on John Gruber's title case http://daringfireball.net/2008/08/title_case_update
+  def titlecase(input)
+    input.titlecase
+  end
+
+  # Returns a datetime if the input is a string
+  def datetime(date)
+    if date.class == String
+      date = Time.parse(date)
+    end
+    date
+  end
+
+  # Returns an ordidinal date eg July 22 2007 -> July 22nd 2007
+  def ordinalize(date)
+    date = datetime(date)
+    "#{date.strftime('%b')} #{ordinal(date.strftime('%e').to_i)}, #{date.strftime('%Y')}"
+  end
+
+  # Returns an ordinal number. 13 -> 13th, 21 -> 21st etc.
+  def ordinal(number)
+    if (11..13).include?(number.to_i % 100)
+      "#{number}<span>th</span>"
+    else
+      case number.to_i % 10
+      when 1; "#{number}<span>st</span>"
+      when 2; "#{number}<span>nd</span>"
+      when 3; "#{number}<span>rd</span>"
+      else    "#{number}<span>th</span>"
+      end
+    end
+  end
+end
+Liquid::Template.register_filter OctopressFilters
-- 
cgit v1.2.1