Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: owlforestry/alula
base: ab4d983765
...
head fork: owlforestry/alula
compare: 7f2b518a79
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 6 additions and 5 deletions.
  1. +5 −5 lib/alula/helpers/imagehelper.rb
  2. +1 −0  lib/alula/plugins/assets.rb
View
10 lib/alula/helpers/imagehelper.rb
@@ -8,14 +8,14 @@ class ImageHelper < AssetHelper
def process
# Copy original
if !File.exists?(File.join(@original_path, "#{@name}.#{@ext}"))
- puts "--> Copying original"
+ # puts "--> Copying original (#{@asset})"
FileUtils.cp @asset, File.join(@original_path, "#{@name}.#{@ext}")
end
# Detect if we need to generate full-size image
full_size = File.join(@image_path, "#{@name}.#{@ext}")
unless File.exists?(full_size)
- puts "--> Generating full-size image"
+ # puts "--> Generating full-size image (#{@asset})"
width, height = @options["images"]["size"].split("x").collect {|i| i.to_i }
resize_image(width, height, :output => full_size, :type => :fullsize)
end
@@ -24,7 +24,7 @@ def process
unless File.exists?(output2x)
width, height = @options["images"]["size"].split("x").collect {|i| i.to_i }
if @options['images']['retina'] and (@image_width > width * 2) or (@image_height > height * 2)
- puts "--> Generating full-size image (2x)"
+ # puts "--> Generating full-size image (2x) (#{@asset})"
resize_image(width * 2, height * 2, :output => output2x, :type => :fullsize)
end
end
@@ -32,7 +32,7 @@ def process
# Thumbnail
tn_size = File.join(@thumbnail_path, "#{@name}.#{@ext}")
unless File.exists?(tn_size)
- puts "--> Generating thumbnail image"
+ # puts "--> Generating thumbnail image (#{@asset})"
width, height = @options["images"]["thumbnails"].split("x").collect {|i| i.to_i }
resize_image(width, height, :output => tn_size, :type => :thumbnail)
end
@@ -41,7 +41,7 @@ def process
unless File.exists?(tn2x)
width, height = @options["images"]["thumbnails"].split("x").collect {|i| i.to_i }
if @options['images']['retina'] and (@image_width > width * 2) or (@image_height > height * 2)
- puts "--> Generating thumbnail image (2x)"
+ # puts "--> Generating thumbnail image (2x) (#{@asset})"
resize_image(width * 2, height * 2, :output => tn2x, :type => :thumbnail)
end
end
View
1  lib/alula/plugins/assets.rb
@@ -90,6 +90,7 @@ class VideoAsset < CommonAsset
def initialize(tag_name, markup, tokens)
/(?<src>(?:https?:\/\/|\/|\S+\/)[^"]+)(?:"|')?/ =~ markup
@name = src.strip
+ @controls = true
end
def render(context)

No commit comments for this range

Something went wrong with that request. Please try again.