caboose-cms 0.4.18 → 0.4.19

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTc1OTFkZGQzMGQ3YTAyMGRkNGM2NjgzOGJjMDc4ZDZiOWEyZjE2MA==
+    NGI3NmNlNTQ5MDZlZjMzYzdhMzNmNGZkOTdkOGI3ZGIwODhlNjBmYw==
   data.tar.gz: !binary |-
-    NWYwYzBmMzhhZTlkMzcxMzdkMGZjNDM5ZjI2MzdhZTUwNDRjZDMyOA==
+    NWM5ZTM1ZjZmYTM4ZDc0M2UxZjNmOWJkY2MxN2U5ODRhODg5OTJiYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGMxMGFjZjMyNDIwZGE1YWMzNGI3MTNiN2MyOWI2MzkzZTM2MDk4NWEwYWYz
-    MWUwZGU1ZGRlZDRiYzY4YzZkYWVhMWU4NjkyYzcyYmYwNjE2OTIyZGYyMjhm
-    MjcyNzQ2NTNjNGM4MTI5OTI1YjIyMDg1ZjM4NDk1OWM1MWNiM2I=
+    Nzk4YzUwZTk1MjkwNDA2YTliMzhmNmE3NzE1YzU2ZGNmYTNiZWZhNTU0YmFm
+    Y2I0MzY0OGFlOTE0MTE4ZWNlZjE1MzI3OTE1MzMzNDQwZjE5ZTQxMzVjMDQ0
+    MzczNGQyYTM5NWYzOTY4NDIwNGU3ZWUyYjUzMDQxMTEyNGRkMmY=
   data.tar.gz: !binary |-
-    MjMzODI0Yzc4MTBlODZmMWNkZTNkYTFjODIxNGI5MDc5NjE4MDM0MDUwN2M1
-    MWIyZWExZGExOTM5NzllMmM2YWMwNGM5Y2I1MDBkMDIwMjk2YWZhZGEyZDA4
-    YzE4YWIyMjIyOTY0NGU4ZDk4NjdjNGViOWJjNzU4YmEwYTFjZmI=
+    NDFjNWYzOGZiNWQ1YWI5N2Y0MmI5YzQyYjM0ZDhkODJlMzlmNDI5OTcwM2Mz
+    MDAzMmUxMTk0OTdjOWZhOTg1ZjIxNmYwYTNhZDI2ODI5ZGIzYWZlZWMxMTFk
+    OGI5MzJjMTIyZWM1YWNmYjhlNDdhZWI3YWEwOTU4YmMzYzg5ZDU=

data/app/controllers/caboose/blocks_controller.rb

@@ -113,7 +113,7 @@ module Caboose
             :modal => false,
             :editing => true,
             :empty_text => params[:empty_text],            
-            :css => '|CABOOSE_CSS|',
+            :css => '|CABOOSE_CSS|',                     
             :js => '|CABOOSE_JAVASCRIPT|',
             :csrf_meta_tags => '|CABOOSE_CSRF|'
           })

data/app/controllers/caboose/pages_controller.rb

@@ -132,7 +132,7 @@ module Caboose
       return unless user_is_allowed('pages', 'edit')      
       @page = Page.find(params[:id])
       if @page.block.nil?      
-        redirect_to "/admin/page/#{@page.id}/layout"
+        redirect_to "/admin/pages/#{@page.id}/layout"
         return
       end
       @editing = true

data/app/models/caboose/schema.rb

@@ -353,10 +353,22 @@ class Caboose::Schema < Caboose::Utilities::Schema
       bt.save      
     end
     if !Caboose::BlockType.where(:name => 'image').exists?
-      Caboose::BlockType.create(:name => 'image', :description => 'Image', :field_type => 'image', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)      
+      bt = Caboose::BlockType.create(:name => 'image', :description => 'Image', :field_type => 'block')
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'image_src'     , :description => 'Image'         , :field_type => 'image'  , :default => ''      , :width => 400, :fixed_placeholder => false)
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'image_style'   , :description => 'Style'         , :field_type => 'select' , :default => 'Thumb' , :width => 400, :fixed_placeholder => false, :options => "Tiny\nThumb\nLarge")
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'link'          , :description => 'Link'          , :field_type => 'text'   , :default => ''      , :width => 400, :fixed_placeholder => false)
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'width'         , :description => 'Width'         , :field_type => 'text'   , :default => ''      , :width => 400, :fixed_placeholder => false)
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'height'        , :description => 'Height'        , :field_type => 'text'   , :default => ''      , :width => 400, :fixed_placeholder => false)
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'margin_top'    , :description => 'Top Margin'    , :field_type => 'text'   , :default => '10'    , :width => 400, :fixed_placeholder => false)
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'margin_right'  , :description => 'Right Margin'  , :field_type => 'text'   , :default => '10'    , :width => 400, :fixed_placeholder => false)
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'margin_bottom' , :description => 'Bottom Margin' , :field_type => 'text'   , :default => '10'    , :width => 400, :fixed_placeholder => false)
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'margin_left'   , :description => 'Left Margin'   , :field_type => 'text'   , :default => '10'    , :width => 400, :fixed_placeholder => false)
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'align'         , :description => 'Align'         , :field_type => 'select' , :default => 'None'  , :width => 400, :fixed_placeholder => false, :options => "None\nCenter\nLeft\nRight")      
     end
     if !Caboose::BlockType.where(:name => 'file').exists?
-      Caboose::BlockType.create(:name => 'file', :description => 'File', :field_type => 'file', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)      
+      bt = Caboose::BlockType.create(:name => 'file', :description => 'File', :field_type => 'block')
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'file' , :description => 'File' , :field_type => 'file', :default => ''         , :width => 400, :fixed_placeholder => false)
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'text' , :description => 'Text' , :field_type => 'text', :default => 'Download' , :width => 400, :fixed_placeholder => false)
     end    
             
   end

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

@@ -1,4 +1,11 @@
-<div id='block_<%= block.id %>'>
-<% if block.file %><a href="<%= block.file.url %>">Download</a>
-<% elsif editing %><p>Upload a file.</p>
-<% end %>
+<%
+file  = block.child('file')
+text  = block.child('text').value
+
+if editing && file && file.file && file.file.url.include?('missing.png')  
+  %><div id='block_<%= block.id %>'><p>Please upload a file.</p></div><%  
+elsif file && file.file
+  %><p><a href="<%= raw file.file.url %>"><%= raw text %></p><%
+end
+
+%>

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

@@ -1,5 +1,45 @@
-<% if block.image %>
-  <img src="<%= block.image.url(:large) %>" id='block_<%= block.id %>' />
-<% elsif editing %>
-  <div id='block_<%= block.id %>'><p>Upload an image.</p></div>
-<% end %>
+<%
+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
+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  
+  style = style.join('; ')  
+  
+  img = "<img src='#{url}' style='#{style}' id='block_#{block.id}' />"
+  if link && link.strip.length > 0
+    if editing
+      img = "<a href='#'>#{img}</a>"            
+    else
+      img = "<a href='#{link}'>#{img}</a>"
+    end
+  end
+end 
+
+if editing && img.nil?
+  %><p id='block_<%= block.id %>'>Please upload an image.</p><%
+else
+  %><%= raw img %><%
+end
+
+%>

data/app/views/layouts/caboose/application.html.erb

@@ -14,7 +14,7 @@
 <%= yield :caboose_css %>
 <% end %>
   <%
-  b = @page.block
+  b = @page.block  
   str = b.render(b, {     
     :view => self,
     :controller_view_content => yield,

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.18'
+  VERSION = '0.4.19'
 end

metadata

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