honey-cms 0.3.5 → 0.3.7

data/lib/cms/form_builder.rb

@@ -127,10 +127,10 @@ module CMS::FormBuilder::Fields
   end
 
   def actions options = {}
-    options.reverse_merge! save: 'Save', saving: 'Saving...', class: 'form-actions'
+    options.reverse_merge! save: 'Save', saving: 'Saving...', class: 'form-actions', save_class: 'btn btn-primary'
     @template.content_tag(:div, class: options.delete(:class)) do
       actions = ''.html_safe
-      actions << submit(options[:save], disable_with: options[:saving], class: 'btn btn-primary')
+      actions << submit(options[:save], disable_with: options[:saving], class: options[:save_class])
       actions << status
     end
   end

data/lib/cms/helper.rb

@@ -8,26 +8,26 @@ module CMS::Helper
   def cms_file name, size = false
     if file = CMS::FileUpload.find_by_name(name) then return file end
     opts = {name: name}
-    opts[:description] = (size.sub('x', ' by ') << ' pixels')
+    opts[:description] = (size.sub('x', ' by ') << ' pixels') if size
     CMS::FileUpload.create(opts, without_protection: true)
   end
 
   def cms_image name, size = false, width = '', height = ''
     width, height = size.split('x') if size
     image = cms_file(name, size)
+    style = if size then "width: #{width}px ; height: #{height}px" else '' end
 
     if image.file?
-      image_tag image.file.url, class: 'cms-image', style: "width: #{width}px ; height: #{height}px"
+      image_tag image.file.url, class: 'cms-image', style: style
     else
       if current_user && current_user.role.admin?
-        link_to(name, edit_cms_file_upload_path(image), class: 'cms-image missing-cms-image', style: "width: #{width}px ; height: #{height}px ")
+        link_to(name, edit_cms_file_upload_path(image), class: 'cms-image missing-cms-image', style: style)
       else
-        content_tag :div, name, class: 'cms-image missing-cms-image', style: "width: #{width}px ; height: #{height}px"
+        content_tag :div, name, class: 'cms-image missing-cms-image', style: style
       end
     end
   end
 
-
   def cms_page_area name, options = {}, &block
     page_area = if area = CMS::PageArea.find_by_name(name) then area else CMS::PageArea.new({name: name}, without_protection: true) end
     options[:editable] = true unless options.key?(:editable)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honey-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors: