diff --git a/Gemfile b/Gemfile index e390945..6c08d3e 100644 --- a/Gemfile +++ b/Gemfile @@ -6,5 +6,6 @@ gem "json", '~> 1.8' gem "middleman-favicon-maker" gem "middleman-livereload" +gem "middleman-blog" gem "redcarpet" diff --git a/config.rb b/config.rb index df45187..852f3e9 100644 --- a/config.rb +++ b/config.rb @@ -49,6 +49,10 @@ after_configuration do sprockets.append_path File.join "#{root}", @bower_config["directory"] end +activate :blog do |blog| + # set options on blog +end + #video pages data.video.keys.each do |vdo| proxy "video/#{vdo}.html", 'video/template.html', locals: {video: data.video[vdo]}, ignore: true diff --git a/source/blog/2012-01-01-example-article.html.markdown b/source/blog/2012-01-01-example-article.html.markdown new file mode 100644 index 0000000..618d7f3 --- /dev/null +++ b/source/blog/2012-01-01-example-article.html.markdown @@ -0,0 +1,7 @@ +--- +title: Example Article +date: 2012-01-01 +tags: example +--- + +This is an example article. You probably want to delete it and write your own articles! diff --git a/source/blog/calendar.html.erb b/source/blog/calendar.html.erb new file mode 100644 index 0000000..4cdfdf9 --- /dev/null +++ b/source/blog/calendar.html.erb @@ -0,0 +1,33 @@ +--- +pageable: true +--- +
Page <%= page_number %> of <%= num_pages %>
+ + <% if prev_page %> +<%= link_to 'Previous page', prev_page %>
+ <% end %> +<% end %> + +<%= link_to 'Next page', next_page %>
+ <% end %> +<% end %> diff --git a/source/blog/feed.xml.builder b/source/blog/feed.xml.builder new file mode 100644 index 0000000..6fa9c08 --- /dev/null +++ b/source/blog/feed.xml.builder @@ -0,0 +1,24 @@ +xml.instruct! +xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do + site_url = "http://blog.url.com/" + xml.title "Blog Name" + xml.subtitle "Blog subtitle" + xml.id URI.join(site_url, blog.options.prefix.to_s) + xml.link "href" => URI.join(site_url, blog.options.prefix.to_s) + xml.link "href" => URI.join(site_url, current_page.path), "rel" => "self" + xml.updated(blog.articles.first.date.to_time.iso8601) unless blog.articles.empty? + xml.author { xml.name "Blog Author" } + + blog.articles[0..5].each do |article| + xml.entry do + xml.title article.title + xml.link "rel" => "alternate", "href" => URI.join(site_url, article.url) + xml.id URI.join(site_url, article.url) + xml.published article.date.to_time.iso8601 + xml.updated File.mtime(article.source_file).iso8601 + xml.author { xml.name "Article Author" } + # xml.summary article.summary, "type" => "html" + xml.content article.body, "type" => "html" + end + end +end diff --git a/source/blog/index.html.erb b/source/blog/index.html.erb new file mode 100644 index 0000000..0fae27e --- /dev/null +++ b/source/blog/index.html.erb @@ -0,0 +1,24 @@ +--- +pageable: true +per_page: 10 +--- +<% if paginate && num_pages > 1 %> +Page <%= page_number %> of <%= num_pages %>
+ + <% if prev_page %> +<%= link_to 'Previous page', prev_page %>
+ <% end %> +<% end %> + +<% page_articles.each_with_index do |article, i| %> +<%= link_to 'Next page', next_page %>
+ <% end %> +<% end %> diff --git a/source/blog/layout.erb b/source/blog/layout.erb new file mode 100644 index 0000000..36c3da9 --- /dev/null +++ b/source/blog/layout.erb @@ -0,0 +1,38 @@ + + + + + +Page <%= page_number %> of <%= num_pages %>
+ + <% if prev_page %> +<%= link_to 'Previous page', prev_page %>
+ <% end %> +<% end %> + +<%= link_to 'Next page', next_page %>
+ <% end %> +<% end %> diff --git a/source/video/BackInTheDay_640x360.mov b/source/video/BackInTheDay_640x360.mov new file mode 100644 index 0000000..033fe69 Binary files /dev/null and b/source/video/BackInTheDay_640x360.mov differ diff --git a/source/video/BackInTheDay_640x360.png b/source/video/BackInTheDay_640x360.png new file mode 100644 index 0000000..62f21e6 Binary files /dev/null and b/source/video/BackInTheDay_640x360.png differ diff --git a/source/video/BalloonTime_400x262.mov b/source/video/BalloonTime_400x262.mov new file mode 100644 index 0000000..7d9c532 Binary files /dev/null and b/source/video/BalloonTime_400x262.mov differ diff --git a/source/video/BalloonTime_400x262.png b/source/video/BalloonTime_400x262.png new file mode 100644 index 0000000..a106c36 Binary files /dev/null and b/source/video/BalloonTime_400x262.png differ diff --git a/source/video/CCrawl_purple_960x540.m4v b/source/video/CCrawl_purple_960x540.m4v new file mode 100644 index 0000000..7c5c10b Binary files /dev/null and b/source/video/CCrawl_purple_960x540.m4v differ diff --git a/source/video/CCrawl_purple_960x540.png b/source/video/CCrawl_purple_960x540.png new file mode 100644 index 0000000..a4b728b Binary files /dev/null and b/source/video/CCrawl_purple_960x540.png differ diff --git a/source/video/CrawlDemo_960x540.mov b/source/video/CrawlDemo_960x540.mov new file mode 100644 index 0000000..26b8186 Binary files /dev/null and b/source/video/CrawlDemo_960x540.mov differ diff --git a/source/video/CrawlDemo_960x540.png b/source/video/CrawlDemo_960x540.png new file mode 100644 index 0000000..d535814 Binary files /dev/null and b/source/video/CrawlDemo_960x540.png differ diff --git a/source/video/LAS_InventYourFuture_720x404.mp4 b/source/video/LAS_InventYourFuture_720x404.mp4 new file mode 100644 index 0000000..59d39a2 Binary files /dev/null and b/source/video/LAS_InventYourFuture_720x404.mp4 differ diff --git a/source/video/LAS_InventYourFuture_720x404.png b/source/video/LAS_InventYourFuture_720x404.png new file mode 100644 index 0000000..41a168e Binary files /dev/null and b/source/video/LAS_InventYourFuture_720x404.png differ diff --git a/source/video/MarkMoser_reel2011.mp4 b/source/video/MarkMoser_reel2011.mp4 new file mode 100644 index 0000000..feb909b Binary files /dev/null and b/source/video/MarkMoser_reel2011.mp4 differ diff --git a/source/video/SecretGarden_Alternate-640.m4v b/source/video/SecretGarden_Alternate-640.m4v new file mode 100644 index 0000000..2391e72 Binary files /dev/null and b/source/video/SecretGarden_Alternate-640.m4v differ diff --git a/source/video/SecretGarden_Alternate-640.png b/source/video/SecretGarden_Alternate-640.png new file mode 100644 index 0000000..bf86d30 Binary files /dev/null and b/source/video/SecretGarden_Alternate-640.png differ diff --git a/source/video/template.html.haml b/source/video/template.html.haml new file mode 100644 index 0000000..2e1d7bc --- /dev/null +++ b/source/video/template.html.haml @@ -0,0 +1,45 @@ +--- +title: Video +--- + +.spacer-50 +.row + .col-sm-12 + %h3= video.title + +.row + .col-sm-12 + .player + - if video.vimeo? + = video.vimeo + - else + :ruby + options = { + src: "/video/#{video.file}", + style:"width:#{video.width}px; height:#{video.height}px", + poster: "/video/#{video.poster}", + } + %video{video.options.merge(options)} + +.row + .col-sm-12 + - if video.note + %p= video.note + + - if video.role? + %p My Role: #{video.role} + + - if video.credit + %p + Credits: + %br + = video.credit + +.row + .col-sm-12 + .side-links + %ul + %li More Videos: + - data.video.each do |vdo, video| + %li= link_to video.title, "#{vdo}.html" +