diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9a01f92 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +build/ +components/ diff --git a/Gemfile b/Gemfile index 267c868..0927808 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source "https://rubygems.org" -gem "middleman", "~>3.3" +gem "middleman" #, "~>3.3" gem "awesome_print" -gem "json", '~> 1.8' +gem "json" #, '~> 1.8' gem 'nokogiri' gem 'builder' diff --git a/Gemfile.lock b/Gemfile.lock index 331c865..6c1cfd9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,18 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.1.5) + activesupport (4.1.9) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) addressable (2.3.6) - awesome_print (1.2.0) + awesome_print (1.6.1) builder (3.2.2) - celluloid (0.15.2) - timers (~> 1.1.0) - chunky_png (1.3.1) + celluloid (0.16.0) + timers (~> 4.0.0) + chunky_png (1.3.3) coffee-script (2.3.0) coffee-script-source execjs @@ -34,40 +34,41 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.0.3) - execjs (2.2.1) + eventmachine (1.0.4) + execjs (2.2.2) favicon_maker (1.3) docile (~> 1.1) - ffi (1.9.3) - haml (4.0.5) + ffi (1.9.6) + haml (4.0.6) tilt hike (1.2.3) + hitimes (1.2.2) hooks (0.4.0) uber (~> 0.0.4) http_parser.rb (0.6.0) i18n (0.6.11) json (1.8.1) - kramdown (1.4.1) - listen (2.7.9) + kramdown (1.5.0) + listen (2.8.5) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - middleman (3.3.5) + middleman (3.3.7) coffee-script (~> 2.2) - compass (>= 0.12.4) + compass (>= 1.0.0, < 2.0.0) compass-import-once (= 1.0.5) execjs (~> 2.0) haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.3.5) + middleman-core (= 3.3.7) middleman-sprockets (>= 3.1.2) - sass (>= 3.2.17, < 4.0) + sass (>= 3.4.0, < 4.0) uglifier (~> 2.5) middleman-blog (3.5.3) addressable (~> 2.3.5) middleman-core (~> 3.2) tzinfo (>= 0.3.0) - middleman-core (3.3.5) + middleman-core (3.3.7) activesupport (~> 4.1.0) bundler (~> 1.1) erubis @@ -79,41 +80,41 @@ GEM rack-test (~> 0.6.2) thor (>= 0.15.2, < 2.0) tilt (~> 1.4.1, < 2.0) - middleman-deploy (0.3.0) + middleman-deploy (1.0.0) middleman-core (>= 3.2) net-sftp ptools middleman-favicon-maker (3.7) favicon_maker (~> 1.3) middleman-core (>= 3.0.0) - middleman-livereload (3.3.4) + middleman-livereload (3.4.2) em-websocket (~> 0.5.1) - middleman-core (~> 3.2) + middleman-core (>= 3.3) rack-livereload (~> 0.3.15) - middleman-sprockets (3.3.9) - middleman-core (~> 3.3) + middleman-sprockets (3.4.1) + middleman-core (>= 3.3) sprockets (~> 2.12.1) sprockets-helpers (~> 1.1.0) - sprockets-sass (~> 1.2.0) + sprockets-sass (~> 1.3.0) middleman-syntax (2.0.0) middleman-core (~> 3.2) rouge (~> 1.0) - mini_portile (0.5.2) - minitest (5.4.1) + mini_portile (0.6.2) + minitest (5.5.0) multi_json (1.10.1) net-sftp (2.1.2) net-ssh (>= 2.6.5) net-ssh (2.9.1) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) - padrino-helpers (0.12.3) + nokogiri (1.6.5) + mini_portile (~> 0.6.0) + padrino-helpers (0.12.4) i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.12.3) + padrino-support (= 0.12.4) tilt (~> 1.4.1) - padrino-support (0.12.3) + padrino-support (0.12.4) activesupport (>= 3.1) - ptools (1.2.6) - rack (1.5.2) + ptools (1.3.2) + rack (1.6.0) rack-livereload (0.3.15) rack rack-test (0.6.2) @@ -121,27 +122,28 @@ GEM rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.1.2) - rouge (1.7.1) - sass (3.4.2) - sprockets (2.12.1) + redcarpet (3.2.2) + rouge (1.7.7) + sass (3.4.9) + sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sprockets-helpers (1.1.0) sprockets (~> 2.0) - sprockets-sass (1.2.0) + sprockets-sass (1.3.1) sprockets (~> 2.0) tilt (~> 1.1) thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) - timers (1.1.0) + timers (4.0.1) + hitimes tzinfo (1.2.2) thread_safe (~> 0.1) - uber (0.0.8) - uglifier (2.5.3) + uber (0.0.12) + uglifier (2.7.0) execjs (>= 0.3.0) json (>= 1.8.0) @@ -151,8 +153,8 @@ PLATFORMS DEPENDENCIES awesome_print builder - json (~> 1.8) - middleman (~> 3.3) + json + middleman middleman-blog middleman-deploy middleman-favicon-maker diff --git a/article_template.erb b/article_template.erb index 8acdb00..ebcd742 100644 --- a/article_template.erb +++ b/article_template.erb @@ -2,6 +2,7 @@ title: <%= @title %> date: <%= @date.strftime('%F') %> tags: +edited: poster: /assets/img/bg/brickwall_@2X.png published: false --- diff --git a/source/blog/podcasts.html.haml b/source/blog/podcasts.html.haml index fc13b72..4a11a94 100644 --- a/source/blog/podcasts.html.haml +++ b/source/blog/podcasts.html.haml @@ -1,6 +1,7 @@ --- title: Podcasts date: 2014-09-20 +edited: 2015-01-08 tags: about poster: /assets/img/stock/coffee.png --- @@ -16,13 +17,14 @@ poster: /assets/img/stock/coffee.png %li= link_to 'Ruby 5', 'http://ruby5.envylabs.com' %li= link_to 'Giant Robots Smashing into Other Giant Robots', 'http://podcasts.thoughtbot.com/giantrobots' -# %li= link_to 'JS Jabber', 'http://www.devchat.tv/js-jabber' - %li= link_to 'Back to Work', 'http://5by5.tv/b2w' - %li= link_to 'The Poo-edcast', 'http://adamryanmorrison.com/podcast/' %li= link_to 'You Need A Budget', 'http://www.youneedabudget.com/blog/c/podcast/' - %li= link_to 'Ruby on Rails Podcast', 'http://5by5.tv/rubyonrails' + %li= link_to '.Net Rocks', 'http://www.dotnetrocks.com' %h4 Past Gems %ul + %li= link_to 'Back to Work', 'http://5by5.tv/b2w' + %li= link_to 'Ruby on Rails Podcast', 'http://5by5.tv/rubyonrails' + %li= link_to 'The Poo-edcast', 'http://adamryanmorrison.com/podcast/' %li= link_to 'That Post Show', 'http://thatpostshow.com' %li= link_to 'The RC', 'http://www.fxguide.com/podcasts/' %li= link_to 'The VFX Show', 'http://www.fxguide.com/podcasts/' diff --git a/source/layouts/blog.html.haml b/source/layouts/blog.html.haml index 07cec33..1ba411d 100644 --- a/source/layouts/blog.html.haml +++ b/source/layouts/blog.html.haml @@ -7,7 +7,10 @@ .col-sm-9#main{:role => "main"} = yield .post_footer - %p published around #{current_article.date.strftime('%m/%d/%Y')} + %p + published around #{current_article.date.strftime('%m/%d/%Y')} + - if current_article.data.edited + · last edited around #{current_article.data.edited.strftime('%m/%d/%Y')} .col-sm-3 = partial 'shared/blog_list'