From 929e606111b920a2da2f8c21a1d58d1ffeadd91a Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Mon, 13 Jun 2011 16:41:03 -0400 Subject: 1. Removed pullquote and improved semantics of blockquote plugin. 2. Removed iterator plugin as it was not being used. 3. Added initial support for html5 video with flash fallback. 4. Added responsive scaling for embedded youtube and vimeo videos. 5. Improved footer styleing. --- themes/classic/_plugins/blockquote.rb | 59 +++-------------------------------- themes/classic/_plugins/iterator.rb | 49 ----------------------------- 2 files changed, 4 insertions(+), 104 deletions(-) delete mode 100644 themes/classic/_plugins/iterator.rb (limited to 'themes/classic/_plugins') diff --git a/themes/classic/_plugins/blockquote.rb b/themes/classic/_plugins/blockquote.rb index 7a885175..21ebc5d7 100644 --- a/themes/classic/_plugins/blockquote.rb +++ b/themes/classic/_plugins/blockquote.rb @@ -1,7 +1,7 @@ # # Author: Josediaz Gonzalez - https://github.com/josegonzalez # Source URL: https://github.com/josegonzalez/josediazgonzalez.com/blob/master/_plugins/blockquote.rb -# Modified by Brandon Mathis +# Modified by Brandon Mathis removed pullquotes and added simple cite paramaters # require './_plugins/titlecase.rb' module Jekyll @@ -45,65 +45,14 @@ module Jekyll if @by.nil? '

' + output.join + '

' elsif !@title.nil? - '

' + output.join + '

' + '

' + @by + '' + '' + @title + '

' + '

' + output.join + '

' + '

' + @by + '' + '' + @title + '

' elsif !@source.nil? - '

' + output.join + '

' + '

' + @by + '' + 'source

' + '

' + output.join + '

' + '

' + @by + '' + 'source

' else - '

' + output.join + '

' + '

' + @by + '

' - end - end - end - - # Outputs a string with a given attribution as a pullquote - # - # {% blockquote John Paul Jones %} - # Monkeys! - # {% endblockquote %} - # ... - #
- # Monkeys! - #
- # John Paul Jones - #
- # - class Pullquote < Liquid::Block - FullCiteWithTitle = /([\w\s]+)(http:\/\/|https:\/\/)(\S+)([\w\s]+)/i - FullCite = /([\w\s]+)(http:\/\/|https:\/\/)(\S+)/i - Author = /([\w\s]+)/ - - def initialize(tag_name, markup, tokens) - @by = nil - @source = nil - @title = nil - if markup =~ FullCiteWithTitle - @by = $1 - @source = $2 + $3 - @title = $4 - elsif markup =~ FullCite - @by = $1 - @source = $2 + $3 - elsif markup =~ Author - @by = $1 - end - super - end - - def render(context) - output = super - if @by.nil? - '

' + output.join + '

' - elsif @title - '

' + output.join + '

' + '

' + @by + '' + ' ' + @title + '

' - elsif @source - '

' + output.join + '

' + '

' + @by + '' + ' source

' - elsif @by - '

' + output.join + '

' + '

' + @by + '

' + '

' + output.join + '

' + '

' + @by + '

' end end end end Liquid::Template.register_tag('blockquote', Jekyll::Blockquote) -Liquid::Template.register_tag('pullquote', Jekyll::Pullquote) - - diff --git a/themes/classic/_plugins/iterator.rb b/themes/classic/_plugins/iterator.rb deleted file mode 100644 index da0b5f0a..00000000 --- a/themes/classic/_plugins/iterator.rb +++ /dev/null @@ -1,49 +0,0 @@ -## -## Author: Jose Gonzalez - https://github.com/josegonzalez -## Source URL: https://github.com/josegonzalez/josediazgonzalez.com/blob/master/_plugins/iterator.rb -## - -#module Jekyll - #class Site - #alias_method :orig_site_payload, :site_payload - - ## Constuct an array of hashes that will allow the user, using Liquid, to - ## iterate through the keys of _kv_hash_ and be able to iterate through the - ## elements under each key. - ## - ## Example: - ## categories = { 'Ruby' => [, ] } - ## make_iterable(categories, :index => 'name', :items => 'posts') - ## Will allow the user to iterate through all categories and then iterate - ## though each post in the current category like so: - ## {% for category in site.categories %} - ## h1. {{ category.name }} - ##
    - ## {% for post in category.posts %} - ##
  • {{ post.title }}
  • - ## {% endfor %} - ##
- ## {% endfor %} - ## - ## Returns [ { => , => kv_hash[]}, ... ] - - #def make_iterable(kv_hash, options) - #options = {:index => 'name', :items => 'items'}.merge(options) - #result = [] - #kv_hash.sort.each do |key, value| - #result << { options[:index] => key, options[:items] => value } - #end - #result - #end - - #def site_payload - #payload = orig_site_payload - #payload['site']['iterable'].merge!({ - #'categories' => make_iterable(self.categories, :index => 'name', :items => 'posts'), - #'tags' => make_iterable(self.tags, :index => 'name', :items => 'posts') - #}) - #payload - #end - - #end -#end -- cgit v1.2.1