caboose-cms 0.4.20 → 0.4.21

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjdlMDMyMzRjYjkzODcyMTczNjA4MDRiZGQzNzVjNDZlNGM5ZTdlYg==
+    ZWMyZGVlYmZhOTU1MDMxNjhjMDcyMDEyNTAyOWZjYWY5MDdiZjY3OA==
   data.tar.gz: !binary |-
-    MWRhMmVjNjkyODc3YjFhNTE5MTZkZGYxYjM3OTUzMzZkZmYzNjQ2YQ==
+    MTA2NGRmOWM3YzJlZGJiNDI0ZDJjN2MzYWFmNWMzODJjMTkxNmRkZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmQ4NGY2MjQ0Y2VkOTE0OTQ4MTY2MjMyNTFhYzdlMjdhOTczMjVkMjQxZmU2
-    MTc1MDI4MmM2MjkxMDI3YTgzMTc3YWYzZjkzNzkwNDJlMWJhN2ZiZDFiYjRh
-    MmE2ODAzN2U2NzdhMzM0Nzk3YjU4Yjc3MTNhNTkwOGVlNTI0MTU=
+    NzQyNzAwZjUwNWJhMDhlYjU5YjNiNWE2NmMzY2VkMTVkN2ExMjg0OWRiNTVj
+    MDIxMGNkMWQ5ZWE5NjIyZDZjNTQyZjkyYTI5YmJjZjcyNTExNjAzNTAyZDEx
+    YmUzYmI2MjE5MmQxOWQ3MTkyNTBkY2JiNjAwMzdkYzNjMDIxMWI=
   data.tar.gz: !binary |-
-    YjRjNzAzNjFiYTlmZjEwYjg1MzRiZjQ0M2M2MTA3ZjI5NTU5NGI2NmRlYWZk
-    ZDNlNDJhN2ExNWMyN2FmZTQ3NzhkNTQ3MDc0MGRmNjNhNjkzNGJjZmUzNDM5
-    ZWNiNzQwMjQ5ZjY5NjRlOWVjMWY0NDUzOTdjZmVkOWQ2MWRmYWU=
+    ODgyZTJjODBmYmE0ZDFmNDllNzhlOTk3ZGYwYWIzMjBlMzhjMjNkNDVjYmE1
+    MGRhYmMwZTJlZjBiODU5YWIzMzM4OGZhNzU3NjA2NWI2YmI5ZTAxZjYzODIz
+    ZjMxMTAxMTcxZTM3Y2VmNWQ4ZmUwMDRjZGViNmY3OTFhYjUzNWQ=

data/app/views/caboose/blocks/_image.html.erb

@@ -1,29 +1,38 @@
 <%
-img           = block.child('image_src')
-img_style     = block.child('image_style').value.to_sym
-link          = block.child('link').value
-align         = block.child('align').value
-width         = block.child('width').value
-height        = block.child('height').value
-margin_top    = block.child('margin_top').value
-margin_right  = block.child('margin_right').value
-margin_bottom = block.child('margin_bottom').value
-margin_left   = block.child('margin_left').value
+img       = block.child('image_src')
+img_style = block.child('image_style').value.to_sym
+link      = block.child('link').value
+align     = block.child('align').value
+width     = block.child('width').value
+height    = block.child('height').value
+mt        = block.child('margin_top').value.downcase
+mr        = block.child('margin_right').value.downcase
+mb        = block.child('margin_bottom').value.downcase
+ml        = block.child('margin_left').value.downcase
 url = img && img.image ? img.image.url(img_style.downcase.to_sym) : nil
 
 img = nil
 if url && !url.include?('missing.png')  
   style = []
-  style << "width: #{width}px"               if width
-  style << "max-height: #{height}px"         if height
-  style << "float: left"                     if align == 'Left'
-  style << "float: right"                    if align == 'Right'
-  style << "margin: 0 auto"                  if align == 'Center'
-  style << "display: block"                  if align == 'Center'
-  style << "margin-top: #{margin_top}px"       if margin_top
-  style << "margin-right: #{margin_right}px"   if margin_right
-  style << "margin-bottom: #{margin_bottom}px" if margin_bottom
-  style << "margin-left: #{margin_left}px"     if margin_left  
+  if align == 'Center'
+    ml = 'auto'
+    mr = 'auto'
+    style << "display: block"
+  end
+  
+  ml = "#{ml}px" if ml && ml != 'auto' && !ml.ends_with?('px') && !ml.ends_with?('em') && !ml.ends_with?('%') 
+  mr = "#{mr}px" if mr && mr != 'auto' && !mr.ends_with?('px') && !mr.ends_with?('em') && !mr.ends_with?('%')
+  mt = "#{mt}px" if mt && mt != 'auto' && !mt.ends_with?('px') && !mt.ends_with?('em') && !mt.ends_with?('%')
+  mb = "#{mb}px" if mb && mb != 'auto' && !mb.ends_with?('px') && !mb.ends_with?('em') && !mb.ends_with?('%')
+  
+  style << "width: #{width}px"       if width
+  style << "max-height: #{height}px" if height
+  style << "float: left"             if align == 'Left'
+  style << "float: right"            if align == 'Right'
+  style << "margin-left:   #{ml}"    if ml
+  style << "margin-right:  #{mr}"    if mr
+  style << "margin-top:    #{mt}"    if mt
+  style << "margin-bottom: #{mb}"    if mb  
   style = style.join('; ')  
   
   img = "<img src='#{url}' style='#{style}' id='block_#{block.id}' />"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.20'
+  VERSION = '0.4.21'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.20
+  version: 0.4.21
 platform: ruby
 authors:
 - William Barry