caboose-cms 0.9.172 → 0.9.173

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e94f6b70e7405d620738735f3988354796aff2b
-  data.tar.gz: 7b04c7c819bd1e4dc982386a3fc3dc5c75440f9d
+  metadata.gz: b280a399c0fe0c9481f1047fb86e5c3d71b51fd1
+  data.tar.gz: 15b6a9ffa8951c7711fe3b512ac637c5ad02daf9
 SHA512:
-  metadata.gz: 5631f4acdbbe4a3bf46243ab1e9fda542abc05fa6c1dbc8026265044e9972a3f83bffab7d3b953a430ffb3f9d7ef4ab8b3241bfe9eddc148725ed6af69ef7b30
-  data.tar.gz: 44604487593826996692a81dc5cf324184e1d269debefeb895584cfc5cc89a9796fc8eb3b484f4385caece005354137b26d862368cef6f88667aa18fb1e7873c
+  metadata.gz: e66eea6f8d026e9fa62396ba72b9be702f3269e1357b189b40c6f77bbb3c49d553755fdf11a3435dd73fa261e32020ca8b87cd6391e98a9f6c3a2086620b3901
+  data.tar.gz: 2d9620d712cf82a6e7e202718c01eccd9011fa1265075b6e618707864068c12e8f43fca4a5809fe71c0f6c265ace4377598d702796fa50134fbd14200a744fbd

data/app/assets/javascripts/caboose/block_modal_controllers/block_dd_modal_controller.js

@@ -285,7 +285,7 @@ var BlockModalController = ModalController.extend({
       url: that.block_url(block) + '/remove-media',
       type: 'put',
       success: function(html) {
-        $('#the_modal img#block_' + block.id).attr('src','//d9hjv462jiw15.cloudfront.net/assets/blank.png').css('width','200px').css('height','120px');
+        $('#the_modal .img-holder#block_' + block.id).find("img").attr('src','https://cabooseit.s3.amazonaws.com/assets/select_image.png');
         $('#the_modal div#block_' + block.id + ' p').html('Empty file.');
         $('#the_modal #block_' + block.id).parent().find('.caboose-btn').remove();
         that.parent_controller.render_blocks();
@@ -312,14 +312,14 @@ var BlockModalController = ModalController.extend({
       that.parent_controller.edit_block(b.id); 
     });
 
-    if ( b.block_type && b.block_type.field_type == 'image' && b.rendered_value.indexOf('placehold') < 0 ) {
+    if ( b.block_type && b.block_type.field_type == 'image' && b.rendered_value.indexOf('select_image.png') < 0 ) {
       btn = $('<a href="#" class="caboose-btn">Remove</a>');
-      btn.css('position','relative').css('left','10px').css('bottom','10px').css('font-size','13px');
+      btn.css('position','absolute').css('left','100%').css('left','calc(100% + 10px)').css('bottom','0').css('font-size','13px');
       btn.on('click', function(e) {
         e.preventDefault();
         that.remove_media(b);
       });
-      $('#the_modal #block_' + b.id).after(btn);
+      $('#the_modal #block_' + b.id).closest(".img-wrap").append(btn);
     }
 
     if ( b.block_type && b.block_type.field_type == 'file' && b.rendered_value.indexOf('Click to select a file') < 0 ) {

data/app/assets/javascripts/caboose/block_modal_controllers/media_modal_controller.js

@@ -236,31 +236,31 @@ var MediaModalController = BlockModalController.extend({
     var that = this;            
     var m = that.media_with_id(media_id);
          
-    var image_urls = $('<div/>').attr('id', 'image_urls').css('margin-bottom', '20px');
-    if (m.image_urls)
-    {
-      image_urls.append($('<h2/>').append('Image URLs'));
-      for (var size in m.image_urls)
-      {
-        var s = size.replace('_url', '');
-        s = s[0].toUpperCase() + s.slice(1);
-        var url = m.image_urls[size];
-        image_urls.append($('<div/>')
-          .append($('<span/>').addClass('size').append(s))
-          .append($('<input/>').attr('type', 'text').attr('id', 'size_' + s).addClass('url').val(url))
-          .append($('<button/>').addClass('clippy').data('clipboard-target', '#size_' + s).append('Copy'))                
-        );                        
-      }
-    }
+    // var image_urls = $('<div/>').attr('id', 'image_urls').css('margin-bottom', '20px');
+    // if (m.image_urls)
+    // {
+    //   image_urls.append($('<h2/>').append('Image URLs'));
+    //   for (var size in m.image_urls)
+    //   {
+    //     var s = size.replace('_url', '');
+    //     s = s[0].toUpperCase() + s.slice(1);
+    //     var url = m.image_urls[size];
+    //     image_urls.append($('<div/>')
+    //       .append($('<span/>').addClass('size').append(s))
+    //       .append($('<input/>').attr('type', 'text').attr('id', 'size_' + s).addClass('url').val(url))
+    //       .append($('<button/>').addClass('clippy').data('clipboard-target', '#size_' + s).append('Copy'))                
+    //     );                        
+    //   }
+    // }
     
     $('#top_controls').empty();
-    var img_tag = m.media_type == 'image' ? ($('<img/>').attr('id', 'detail_image').attr('src', m.image_urls ? m.image_urls.thumb_url : '//placehold.it/250x250')) : ( $('<p/>').text(m.original_name) );
+    var img_tag = m.media_type == 'image' ? ($('<img/>').attr('id', 'detail_image').attr('src', m.image_urls ? m.image_urls.thumb_url : 'https://cabooseit.s3.amazonaws.com/assets/select_image.png')) : ( $('<p/>').text(m.original_name) );
     $('#the_modal #media').empty()
-      .append(img_tag)      
-      .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_media_category_id' ))) 
-      .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_name'              )))
-      .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_description'       )))      
-      .append(image_urls);
+      .append( $("<div />").addClass("img-wrap").append(img_tag) );
+      // .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_media_category_id' ))) 
+      // .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_name'              )))
+      // .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_description'       )))      
+      // .append(image_urls);
     var select_text = m.media_type == 'image' ? 'Select this Image' : 'Select this File';
     $('#modal_controls').empty()
       .append($('<p/>').css('clear', 'both')
@@ -273,24 +273,24 @@ var MediaModalController = BlockModalController.extend({
         .append($('<input/>').attr('type', 'button').addClass('caboose-btn').val('Close'             ).click(function(e) { that.parent_controller.render_blocks(); that.close(); }))
       );
     
-    var m = new ModelBinder({
-      name: 'Media',
-      id: m.id,
-      update_url: '/admin/media/' + m.id,      
-      authenticity_token: that.authenticity_token,
-      attributes: [                                                                                                                                             
-        { name: 'media_category_id' , nice_name: 'Category'    , type: 'select' , value: m.media_category_id  , fixed_placeholder: true, width: 400, after_update: function() { m.media_category_id = this.value; }, on_load: function() { that.autosize(); }, options_url: '/admin/media-categories/options' },
-        { name: 'name'              , nice_name: 'Name'        , type: 'text'   , value: m.name               , fixed_placeholder: true, width: 400, after_update: function() { m.name              = this.value; }, on_load: function() { that.autosize(); }},
-        { name: 'description'       , nice_name: 'Description' , type: 'text'   , value: m.description        , fixed_placeholder: true, width: 400, after_update: function() { m.description       = this.value; }, on_load: function() { that.autosize(); }},        
-      ]
-    });
-    $('#media_' + media_id + '_media_category_id' + '_container').css('width', '400px');
-    $('#media_' + media_id + '_name'              + '_container').css('width', '400px');
-    $('#media_' + media_id + '_description'       + '_container').css('width', '400px');
+    // var m = new ModelBinder({
+    //   name: 'Media',
+    //   id: m.id,
+    //   update_url: '/admin/media/' + m.id,      
+    //   authenticity_token: that.authenticity_token,
+    //   attributes: [                                                                                                                                             
+    //     { name: 'media_category_id' , nice_name: 'Category'    , type: 'select' , value: m.media_category_id  , fixed_placeholder: true, width: 400, after_update: function() { m.media_category_id = this.value; }, on_load: function() { that.autosize(); }, options_url: '/admin/media-categories/options' },
+    //     { name: 'name'              , nice_name: 'Name'        , type: 'text'   , value: m.name               , fixed_placeholder: true, width: 400, after_update: function() { m.name              = this.value; }, on_load: function() { that.autosize(); }},
+    //     { name: 'description'       , nice_name: 'Description' , type: 'text'   , value: m.description        , fixed_placeholder: true, width: 400, after_update: function() { m.description       = this.value; }, on_load: function() { that.autosize(); }},        
+    //   ]
+    // });
+    // $('#media_' + media_id + '_media_category_id' + '_container').css('width', '400px');
+    // $('#media_' + media_id + '_name'              + '_container').css('width', '400px');
+    // $('#media_' + media_id + '_description'       + '_container').css('width', '400px');
        
-    $('#image_urls span.size' ).css('width', '70px').css('display', 'inline-block');
-    $('#image_urls input.url' ).css('width', '270px').css('border', '#ccc 1px solid');
-    $('#image_urls button'    ).css('width', '60px');
+    // $('#image_urls span.size' ).css('width', '70px').css('display', 'inline-block');
+    // $('#image_urls input.url' ).css('width', '270px').css('border', '#ccc 1px solid');
+    // $('#image_urls button'    ).css('width', '60px');
     
     //c = new Clipboard('.clippy');
     //c.on('success', function(e) {

data/app/assets/javascripts/caboose/model/bound_image.js

@@ -18,21 +18,20 @@ BoundImage = BoundControl.extend({
     
     if (!this.attribute.update_url)
       this.attribute.update_url = this.model.update_url;
+
+    var awidth = this.attribute.width ? this.attribute.width : this.width;
          
     var this2 = this;
     $('#'+this.el).wrap($('<div/>')
       .attr('id', this.el + '_container')
-      .addClass('mb_container')
+      .addClass('mb_container model-image')
       .css('position', 'relative')
     );
     $('#'+this.el+'_container').empty();
     
-    $('#'+this.el+'_container').append($('<img/>')
-      .attr('src', this.attribute.value)
-      .css('width', this.width)
-      .css('float', 'left')
-      .css('margin-right', 10)
-    );    
+    $('#'+this.el+'_container').append( $("<div/>").addClass('img-holder').css('float','left').css('width',awidth).css('margin-right',10).append($('<img/>')
+      .attr('src', this.attribute.value).css('display','block').css('max-width','100%')
+    ));    
     $('#'+this.el+'_container')
       .append($('<form target="' + this.el + '_iframe"></form>')
         .attr('id', this.el + '_form')

data/app/assets/stylesheets/caboose/admin_block_edit_image.css.scss

@@ -1,8 +1,13 @@
+#media .img-wrap {
+  background-image:url('/assets/caboose/grid.png');
+  background-size: 15px;
+  display: inline-block;
+}
 
 #detail_image {
-  float: right;
-  margin: 0;  
-  width: 370px;
+  display: block;
+  max-height: 300px;
+  max-width: 100%;
 }
   
 // #left_content {

data/app/assets/stylesheets/caboose/admin_main.css.scss

@@ -579,6 +579,11 @@ Page Bar Generator
   max-width: 912px;
   margin: 0 auto;
   padding: 0 20px;
+  .copy-options {
+    border-top: 1px solid #d6d6d6;
+    padding-top: 20px;
+    margin-top: 10px;
+  }
   .category {
     border-top: 1px solid #d6d6d6;
     padding-top: 20px;

data/app/assets/stylesheets/caboose/message_boxes.css.scss

@@ -16,9 +16,7 @@ Message boxes
 .note {
   padding: 15px;
   background: #fff3ac;
-  //color: #fff;
   font-size: 15px;
-  //text-align: center;
   h2 { margin: 0 0 10px 0; padding: 0; }
   a {
     color: #fff;
@@ -28,9 +26,11 @@ Message boxes
   }
   &.error {
     background: #bf4448;
+    color: #fff;
   }
   &.success {
     background: #26ae88;
+    color: #fff;
   }
   &.loading {
     background-image: url('https://cabooseit.s3.amazonaws.com/assets/shared/loading_blue.gif');
@@ -38,6 +38,8 @@ Message boxes
     background-position: 0 center;
     background-repeat: no-repeat;
     padding-left: 40px;
+    background-color: #1a5aac;
+    color: white;
   }
 }
 

data/app/assets/stylesheets/caboose/model_binder.css

@@ -17,6 +17,11 @@ require caboose/spectrum
   color: #000;
 }
 
+.mb_container.model-image .img-holder {
+  background-image: url('/assets/caboose/grid.png');
+  background-size: 15px;
+}
+
 .mb_container input[type=text],
 .mb_container select,
 .mb_container .mb_fake option,

data/app/controllers/caboose/pages_controller.rb

@@ -437,7 +437,7 @@ module Caboose
       elsif site_id.nil?   then resp.error = "Invalid site"
       elsif parent_id.nil? then resp.error = "Invalid parent"
       else
-        resp.new_id = p.delay(:priority => 20).duplicate(site_id, parent_id, duplicate_children, block_type_id, child_block_type_id)
+        resp.new_id = Rails.env.production? ? p.delay(:priority => 20).duplicate(site_id, parent_id, duplicate_children, block_type_id, child_block_type_id) : p.duplicate(site_id, parent_id, duplicate_children, block_type_id, child_block_type_id)
         resp.success = true
       end
       
@@ -512,65 +512,81 @@ module Caboose
         return
       end
       
-      if params[:template_id].blank?
-
-                      
-        page = Caboose::Page.new      
-        
+      # Blank page
+      if params[:template_id].blank? && params[:copy_from_id].blank?      
+        page = Caboose::Page.new
         if parent.nil?
           d = Domain.where(:domain => request.host_with_port).first.site_id
           page.site_id = d.site_id
         else      
           page.site_id = parent.site_id
         end
-        
         page.title = title
         page.parent_id = parent_id      
         page.hide = true
         page.content_format = Caboose::Page::CONTENT_FORMAT_HTML
         page.save
-
         i = 0
         begin 
           page.slug = Page.slug(page.title + (i > 0 ? " #{i}" : ""))
           page.uri = parent.parent_id == -1 ? page.slug : "#{parent.uri}/#{page.slug}"
           i = i+1
         end while (Page.where(:uri => page.uri, :site_id => page.site_id).count > 0 && i < 10)
-
         page.save
-        
         # Create the top level block for the page
         bt = BlockType.find(params[:layout_id])
         Block.create(:page_id => page.id, :block_type_id => bt.id, :name => bt.name)
-        
         # Set the new page's permissions      
         viewers = Caboose::PagePermission.where({ :page_id => parent.id, :action => 'view' }).pluck(:role_id)
         editors = Caboose::PagePermission.where({ :page_id => parent.id, :action => 'edit' }).pluck(:role_id)
         Caboose::Page.update_authorized_for_action(page.id, 'view', viewers)
         Caboose::Page.update_authorized_for_action(page.id, 'edit', editors)
         resp.redirect = "/admin/pages/#{page.id}/content"
+
+      # Copy from an existing page
+      elsif !params[:copy_from_id].blank?
+        source = Caboose::Page.find(params[:copy_from_id])
+        if source
+          Caboose.log("copying from source page: #{source.id}")
+          new_page = source.duplicate(@site.id, parent_id, false, layout_id, nil)
+          new_page.title = params[:title]
+          new_page.hide = true
+          i = 0
+          begin 
+            new_page.slug = Page.slug(new_page.title + (i > 0 ? " #{i}" : ""))
+            new_page.uri = parent.parent_id == -1 ? new_page.slug : "#{parent.uri}/#{new_page.slug}"
+            i = i+1
+          end while (Page.where(:uri => new_page.uri, :site_id => @site.id).count > 0 && i < 10)
+          new_page.save
+          # Set the new page's permissions      
+          viewers = Caboose::PagePermission.where({ :page_id => parent.id, :action => 'view' }).pluck(:role_id)
+          editors = Caboose::PagePermission.where({ :page_id => parent.id, :action => 'edit' }).pluck(:role_id)
+          Caboose::Page.update_authorized_for_action(new_page.id, 'view', viewers)
+          Caboose::Page.update_authorized_for_action(new_page.id, 'edit', editors)
+          resp.redirect = "/admin/pages/#{new_page.id}/content"
+        else
+          resp.redirect = "/admin/pages/new"
+        end
+
+      # Use a page template
       else
         template = Caboose::PageTemplate.find(params[:template_id])
         if template && template.page
           new_page = template.page.duplicate(@site.id, parent_id, false, layout_id, nil)
           new_page.title = params[:title]
           new_page.hide = true
-
           i = 0
           begin 
             new_page.slug = Page.slug(new_page.title + (i > 0 ? " #{i}" : ""))
             new_page.uri = parent.parent_id == -1 ? new_page.slug : "#{parent.uri}/#{new_page.slug}"
             i = i+1
           end while (Page.where(:uri => new_page.uri, :site_id => @site.id).count > 0 && i < 10)
-
           new_page.save
-
           # Set the new page's permissions      
           viewers = Caboose::PagePermission.where({ :page_id => parent.id, :action => 'view' }).pluck(:role_id)
           editors = Caboose::PagePermission.where({ :page_id => parent.id, :action => 'edit' }).pluck(:role_id)
           Caboose::Page.update_authorized_for_action(new_page.id, 'view', viewers)
           Caboose::Page.update_authorized_for_action(new_page.id, 'edit', editors)
-
           resp.redirect = "/admin/pages/#{new_page.id}/content"
         else
           resp.redirect = "/admin/pages/new"

data/app/controllers/caboose/sites_controller.rb

@@ -30,7 +30,6 @@ module Caboose
         @error = "You are not allowed to manage sites."
         render :file => 'caboose/extras/error' and return
       end
-      
       @pager = PageBarGenerator.new(params, {
     		  'name_like' => '',    		  
     		},{
@@ -76,52 +75,48 @@ module Caboose
     # @route GET /admin/sites/new
     def admin_new
       return if !user_is_allowed('sites', 'add')
-      if !@site.is_master
-        @error = "You are not allowed to manage sites."
+      if (@site.id.to_s != params[:id] && !@site.is_master)
+        @error = "You are not allowed to edit this site."
         render :file => 'caboose/extras/error' and return
       end
-      
       @site = Site.new
     end
-        
-    
             
     # @route GET /admin/sites/:id/block-types
     def admin_edit_block_types
       return if !user_is_allowed('sites', 'edit')
-      if !@site.is_master
-        @error = "You are not allowed to manage sites."
+      if (@site.id.to_s != params[:id] && !@site.is_master)
+        @error = "You are not allowed to edit this site."
         render :file => 'caboose/extras/error' and return
       end
-      
       @site = Site.find(params[:id])      
     end
             
     # @route GET /admin/sites/:id/css
     def admin_edit_css
       return if !user_is_allowed('sites', 'edit')
-      if !@site.is_master
-        @error = "You are not allowed to manage sites."
+      if (@site.id.to_s != params[:id] && !@site.is_master)
+        @error = "You are not allowed to edit this site."
         render :file => 'caboose/extras/error' and return
-      end      
+      end    
       @site = Site.find(params[:id])      
     end
             
     # @route GET /admin/sites/:id/js
     def admin_edit_js
       return if !user_is_allowed('sites', 'edit')
-      if !@site.is_master
-        @error = "You are not allowed to manage sites."
+      if (@site.id.to_s != params[:id] && !@site.is_master)
+        @error = "You are not allowed to edit this site."
         render :file => 'caboose/extras/error' and return
-      end      
+      end   
       @site = Site.find(params[:id])      
     end
             
     # @route GET /admin/sites/:id/delete
     def admin_delete_form
       return if !user_is_allowed('sites', 'edit')
-      if !@site.is_master
-        @error = "You are not allowed to manage sites."
+      if (@site.id.to_s != params[:id] && !@site.is_master)
+        @error = "You are not allowed to edit this site."
         render :file => 'caboose/extras/error' and return
       end
       @site = Site.find(params[:id])      
@@ -130,14 +125,11 @@ module Caboose
     # @route GET /admin/sites/:id
     def admin_edit
       return if !user_is_allowed('sites', 'edit')
-      if !@site.is_master
-        @error = "You are not allowed to manage sites."
+      if (@site.id.to_s != params[:id] && !@site.is_master)
+        @error = "You are not allowed to edit this site."
         render :file => 'caboose/extras/error' and return
       end
-      
       @site = Site.find(params[:id])            
-      @site.init_users_and_roles
-            
     end
         
     # @route POST /admin/sites
@@ -173,11 +165,11 @@ module Caboose
     # @route PUT /admin/sites/:id
     def admin_update
       return if !user_is_allowed('sites', 'edit')
-      render :json => { :error => "You are not allowed to manage sites." } and return if !@site.is_master
-
+      if (@site.id.to_s != params[:id] && !@site.is_master)
+        render :json => { :error => "You are not allowed to manage sites." } and return
+      end
       resp = StdClass.new     
       site = Site.find(params[:id])
-    
       save = true
       params.each do |name,value|
         case name
@@ -196,7 +188,6 @@ module Caboose
           when 'assets_url'  then site.assets_url = value
     	  end
     	end
-    	
     	resp.success = save && site.save
     	render :json => resp
     end
@@ -204,15 +195,38 @@ module Caboose
     # @route POST /admin/sites/:id/logo
     def admin_update_logo
       return if !user_is_allowed('sites', 'edit')
-      render :json => { :error => "You are not allowed to manage sites." } and return if !@site.is_master
-      
+      if (@site.id.to_s != params[:id] && !@site.is_master)
+        render :json => { :error => "You are not allowed to manage sites." } and return
+      end
       site = Site.find(params[:id])       
       site.logo = params[:logo]
       site.save
-      
       resp = StdClass.new
       resp.success = true
-      resp.attributes = { :image => { :value => site.logo.url(:thumb) }}
+      resp.attributes = { :logo => { :value => site.logo.url(:thumb) }}
+      if Caboose::use_cloudinary
+        site.update_cloudinary_logo if Rails.env.development?
+        site.delay(:queue => 'general', :priority => 12).update_cloudinary_logo if Rails.env.production?
+      end
+      render :json => resp
+    end
+
+    # @route POST /admin/sites/:id/favicon
+    def admin_update_favicon
+      return if !user_is_allowed('sites', 'edit')
+      if (@site.id.to_s != params[:id] && !@site.is_master)
+        render :json => { :error => "You are not allowed to manage sites." } and return
+      end
+      site = Site.find(params[:id])       
+      site.favicon = params[:favicon]
+      site.save
+      resp = StdClass.new
+      resp.success = true
+      resp.attributes = { :favicon => { :value => site.favicon.url(:tiny) }}
+      if Caboose::use_cloudinary
+        site.update_cloudinary_favicon if Rails.env.development?
+        site.delay(:queue => 'general', :priority => 12).update_cloudinary_favicon if Rails.env.production?
+      end
       render :json => resp
     end
           
@@ -220,10 +234,8 @@ module Caboose
     def admin_delete
       return if !user_is_allowed('sites', 'delete')
       render :json => { :error => "You are not allowed to manage sites." } and return if !@site.is_master
-      
       site = Site.find(params[:id])
       site.destroy
-      
       resp = StdClass.new({
         'redirect' => '/admin/sites'
       })
@@ -234,7 +246,6 @@ module Caboose
     def admin_add_member
       return if !user_is_allowed('sites', 'edit')
       render :json => { :error => "You are not allowed to manage sites." } and return if !@site.is_master
-      
       sm = SiteMembership.where(:site_id => params[:id], :user_id => params[:user_id]).first
       sm = SiteMembership.create(:site_id => params[:id], :user_id => params[:user_id]) if sm.nil?
       sm.role = params[:role]
@@ -246,7 +257,6 @@ module Caboose
     def admin_remove_member
       return if !user_is_allowed('sites', 'edit')
       render :json => { :error => "You are not allowed to manage sites." } and return if !@site.is_master
-      
       SiteMembership.where(:site_id => params[:id], :user_id => params[:user_id]).destroy_all        
       render :json => true
     end
@@ -257,7 +267,6 @@ module Caboose
     # @route GET /admin/sites/:id/:field-options    
     def options
       return if !user_is_allowed('sites', 'view')
-      
       case params[:field]
         when nil
           options = logged_in_user.is_super_admin? ? Site.reorder('name').all.collect { |s| { 'value' => s.id, 'text' => s.name }} : []

data/app/controllers/caboose/themes_controller.rb

@@ -75,6 +75,12 @@ module Caboose
           when 'sidebar_width' then theme.sidebar_width = value
           when 'sidebar_bg_color' then theme.sidebar_bg_color = value
 
+          when 'banner_font_size' then theme.banner_font_size = value
+          when 'footer_hover_color' then theme.footer_hover_color = value
+          when 'actual_footer_height' then theme.actual_footer_height = value
+          when 'actual_banner_height' then theme.actual_banner_height = value
+          when 'dropdown_nav_padding' then theme.dropdown_nav_padding = value
+
     	  end
     	end
     	resp.success = save && theme.save

data/app/models/caboose/core_plugin.rb

@@ -14,8 +14,8 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
     item['children'] << { 'icon' => 'box', 'id' => 'inbox'             , 'text' => 'Inbox'               , 'href' => '/admin/inbox'              , 'modal' => false } if user.is_allowed('contacts'             , 'view')   && has_inbox && Contact.where(:site_id => site.id).count > 0
     nav << item if item['children'].count > 0
     
-    item = { 'id' => 'core', 'text' => 'Settings', 'children' => [] }                        
- #   item['children'] << { 'id' => 'blocktypes'        , 'text' => 'AB Test Variants'    , 'href' => '/admin/ab-variants'        , 'modal' => false } if user.is_allowed('abvariants'        , 'view')    
+    item = { 'id' => 'core', 'text' => 'Settings', 'children' => [] }   
+    item['children'] << { 'id' => 'settings'      , 'icon' => 'settings',        'text' => 'Site Settings'               , 'href' => "/admin/sites/#{site.id}"              , 'modal' => false } if user.is_super_admin?                   
     item['children'] << { 'id' => 'blocktypes'        , 'text' => 'Block Types'         , 'href' => '/admin/block-types'        , 'modal' => false } if user.is_allowed('blocktypes'        , 'view') && site.is_master == true
     item['children'] << { 'icon' => 'star', 'id' => 'fonts'             , 'text' => 'Fonts'               , 'href' => '/admin/fonts'              , 'modal' => false } if user.is_allowed('fonts'             , 'view') && site.use_fonts == true
     item['children'] << { 'id' => 'redirects'         , 'text' => 'Permanent Redirects' , 'href' => '/admin/redirects'          , 'modal' => false } if user.is_allowed('redirects'         , 'view')

data/app/models/caboose/page.rb

@@ -460,9 +460,7 @@ class Caboose::Page < ActiveRecord::Base
 
     p.title                = "Copy of " + self.title                 
     p.menu_title           = self.menu_title            
-    p.slug                 = self.slug                  
-    p.alias                = self.alias                 
-    p.uri                  = self.uri                   
+    p.alias                = self.alias                               
     p.redirect_url         = self.redirect_url          
     p.hide                 = self.hide                  
     p.content_format       = self.content_format        
@@ -478,7 +476,16 @@ class Caboose::Page < ActiveRecord::Base
     p.meta_robots          = self.meta_robots           
     p.canonical_url        = self.canonical_url         
     p.fb_description       = self.fb_description        
-    p.gp_description       = self.gp_description       
+    p.gp_description       = self.gp_description 
+
+    i = 0
+    begin
+      par = Caboose::Page.where(:id => parent_id).first
+      p.slug = Caboose::Page.slug(p.title + (i > 0 ? " #{i}" : ""))
+      p.uri = par.parent_id == -1 ? p.slug : "#{par.uri}/#{p.slug}"
+      i = i+1
+    end while (Caboose::Page.where(:uri => p.uri, :site_id => site_id).count > 0 && i < 10)
+
     p.save
     
     self.page_tags.each{ |tag| Caboose::PageTag.create(:page_id => p.id, :tag => tag.tag) }

data/app/models/caboose/schema.rb

@@ -807,11 +807,10 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :theme_color , :string        ],
         [ :assets_url , :string        ],
         [ :rets_office_id, :string ],
-        [ :theme_id, :integer ]
-        #[ :custom_css              , :text       ],
-        #[ :custom_css_files        , :text       ],
-        #[ :custom_js               , :text       ],
-        #[ :custom_js_files         , :text       ]
+        [ :theme_id, :integer ],
+        [ :favicon, :attachment ],
+        [ :cl_logo_version         , :string ],
+        [ :cl_favicon_version      , :string ]
       ],
       Caboose::SiteMembership => [
         [ :site_id     , :integer ],
@@ -924,7 +923,6 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :status           , :string  ]
       ],
       Caboose::Theme => [      
-       # [ :site_id  , :integer ],
         [ :color_main          , :string ],
         [ :color_alt     , :string    ],
         [ :color_light, :string ],
@@ -960,29 +958,41 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :input_font_size, :string ],
         [ :input_padding, :string ],
         [ :digest,         :text  ],
-        [ :body_line_height, :text ],
-        [ :body_font_color, :text ],
-        [ :button_padding, :text ],
-        [ :button_line_height, :text ],
-        [ :footer_padding, :text ],
-        [ :footer_font_size, :text ],
-        [ :header_font_size, :text ],
-        [ :note_padding, :text ],
-        [ :header_nav_spacing, :text ],
-        [ :logo_width, :text ],
-        [ :logo_height, :text ],
-        [ :logo_top_padding, :text ],
-        [ :heading_line_height, :text ],
-        [ :mobile_menu_nav_padding, :text ],
-        [ :mobile_menu_font_size, :text ],
-        [ :banner_padding, :text ],
-        [ :banner_overlay_color, :text ],
-        [ :banner_overlay_opacity, :text ],
-        [ :default_header_style, :text ],
-        [ :default_header_position, :text ],
-        [ :sidebar_width, :text ],
-        [ :sidebar_bg_color, :text ],
-        [ :default_banner_image, :attachment ]
+        [ :body_line_height, :string ],
+        [ :body_font_color, :string ],
+        [ :button_padding, :string ],
+        [ :button_line_height, :string ],
+        [ :footer_padding, :string ],
+        [ :footer_font_size, :string ],
+        [ :header_font_size, :string ],
+        [ :note_padding, :string ],
+        [ :header_nav_spacing, :string ],
+        [ :logo_width, :string ],
+        [ :logo_height, :string ],
+        [ :logo_top_padding, :string ],
+        [ :heading_line_height, :string ],
+        [ :mobile_menu_nav_padding, :string ],
+        [ :mobile_menu_font_size, :string ],
+        [ :banner_padding, :string ],
+        [ :banner_overlay_color, :string ],
+        [ :banner_overlay_opacity, :string ],
+        [ :default_header_style, :string ],
+        [ :default_header_position, :string ],
+        [ :sidebar_width, :string ],
+        [ :sidebar_bg_color, :string ],
+        [ :default_banner_image, :attachment ],
+        [ :banner_font_size, :string ],
+        [ :footer_hover_color, :string ],
+        [ :actual_footer_height, :string ],
+        [ :actual_banner_height, :string ],
+        [ :dropdown_nav_padding, :string ]
+      ],
+      Caboose::ThemeFile => [
+        [ :filename, :string ]
+      ],
+      Caboose::ThemeFileMembership => [
+        [ :theme_file_id                      , :integer    ],
+        [ :theme_id                      , :integer    ]
       ],
       Caboose::User => [
         [ :site_id                      , :integer    ],

data/app/models/caboose/site.rb

@@ -10,6 +10,7 @@ class Caboose::Site < ActiveRecord::Base
   has_many :fonts, :class_name => 'Caboose::Font', :dependent => :delete_all
   has_many :post_categories, :class_name => 'Caboose::PostCategory'
   has_one  :store_config
+
   has_attached_file :logo, 
     :path => ':caboose_prefixsite_logos/:id_:style.:extension',    
     :default_url => 'http://placehold.it/300x300',    
@@ -19,6 +20,16 @@ class Caboose::Site < ActiveRecord::Base
       :large => '600x800>'
     }
   do_not_validate_attachment_file_type :logo
+
+  has_attached_file :favicon, 
+    :path => ':caboose_prefixfavicons/:id_:style.:extension',    
+    :default_url => 'https://assets.caboosecms.com/site_logos/ninefavicon.png',    
+    :styles => {
+      :tiny  => '100x100>',
+      :thumb => '300x300>'
+    }
+  do_not_validate_attachment_file_type :favicon
+
   attr_accessible :id        ,         
     :name                    ,
     :description             ,
@@ -39,7 +50,9 @@ class Caboose::Site < ActiveRecord::Base
     :robots_txt              ,
     :theme_color             ,
     :assets_url              ,
-    :theme_id
+    :theme_id                ,
+    :cl_logo_version         ,
+    :cl_favicon_version      
             
   before_save :validate_presence_of_store_config
 
@@ -47,6 +60,22 @@ class Caboose::Site < ActiveRecord::Base
     Caboose::Theme.where(:id => self.theme_id).first
   end
 
+  def update_cloudinary_logo
+    if Caboose::use_cloudinary
+      result = Cloudinary::Uploader.upload("https:#{self.logo.url(:large)}" , :public_id => "caboose/site_logos/#{self.id}_large", :overwrite => true)
+      self.cl_logo_version = result['version'] if result && result['version']
+      self.save
+    end
+  end
+
+  def update_cloudinary_favicon
+    if Caboose::use_cloudinary
+      result = Cloudinary::Uploader.upload("https:#{self.favicon.url(:thumb)}" , :public_id => "caboose/favicons/#{self.id}_thumb", :overwrite => true)
+      self.cl_favicon_version = result['version'] if result && result['version']
+      self.save
+    end
+  end
+
   def build_new_site
    # if defined?(SuiteBuilder) == 'constant' && SuiteBuilder.class == Class  
       helper = Caboose::SiteBuilder.new(self.name)

data/app/models/caboose/theme.rb

@@ -2,6 +2,9 @@ class Caboose::Theme < ActiveRecord::Base
 
   self.table_name = "themes"
 
+  has_many :theme_file_memberships
+  has_many :theme_files, :through => :theme_file_memberships    
+
   has_attached_file :default_banner_image,      
     :path => 'banner_images/:id_:style.:extension',      
     :default_url => 'https://res.cloudinary.com/caboose/image/upload/c_scale,f_auto,q_auto:good,w_1800/v1539265856/default_banner.jpg',
@@ -70,6 +73,12 @@ class Caboose::Theme < ActiveRecord::Base
 		:sidebar_width,
 		:sidebar_bg_color,
 
+		:banner_font_size,
+		:footer_hover_color,
+		:actual_footer_height,
+		:actual_banner_height,
+		:dropdown_nav_padding,
+
     :digest
 
   def compile(for_site_id = 0)
@@ -82,7 +91,7 @@ class Caboose::Theme < ActiveRecord::Base
   	tmp_asset_name = "theme_#{self.id}_site_#{for_site_id}"
   	FileUtils.mkdir_p(tmp_themes_path) unless File.directory?(tmp_themes_path)
   	File.open(File.join(tmp_themes_path, "#{tmp_asset_name}.scss"), 'w') { |f| f.write(body) }
-#		begin
+		begin
 	    env = if Rails.application.assets.is_a?(Sprockets::Index)
 	      Rails.application.assets.instance_variable_get('@environment')
 	    else
@@ -107,9 +116,12 @@ class Caboose::Theme < ActiveRecord::Base
 	      File.open(File.join(Rails.root, 'public', theme.asset_path(asset.digest, for_site_id)), 'w') { |f| f.write(compressed_body) }
 	    end
 	    self.update_digest(asset.digest)
-	# 	rescue Sass::SyntaxError => error 
-	# 		theme.revert
-	# 	end
+		rescue Sass::SyntaxError => error
+			if Rails.env.development?
+				raise error
+			end
+			theme.revert
+		end
   end
 
   def revert
@@ -133,8 +145,16 @@ class Caboose::Theme < ActiveRecord::Base
 	end
 
 	def asset_url(site_id = 0)
-		pre = Rails.env.production? ? "https://" : ""
-		"#{pre}#{ActionController::Base.asset_host}/#{asset_path(self.digest,site_id)}"
+		if Rails.env.production?
+			return "https://#{ActionController::Base.asset_host}/#{asset_path(self.digest,site_id)}"
+		else
+			path = File.join(Rails.root, 'public', "#{asset_path(self.digest,site_id)}")
+			if File.file?(path)
+				return "#{ActionController::Base.asset_host}/#{asset_path(self.digest,site_id)}"
+			else
+				return "https://#{Caboose::cdn_domain}/#{asset_path(self.digest,site_id)}"
+			end
+		end
 	end
 
 	def js_url

data/app/models/caboose/theme_file.rb

@@ -0,0 +1,6 @@
+class Caboose::ThemeFile < ActiveRecord::Base
+  self.table_name = "theme_files"
+  
+  attr_accessible :filename
+  
+end

data/app/models/caboose/theme_file_membership.rb

@@ -0,0 +1,8 @@
+class Caboose::ThemeFileMembership < ActiveRecord::Base
+  self.table_name = "theme_file_memberships"
+  
+  belongs_to :theme
+  belongs_to :theme_file  
+  attr_accessible :theme_id, :theme_file_id
+  
+end

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

@@ -5,10 +5,18 @@ if block.media
 elsif block.image
   url = block.image.url(:tiny)
 end
- 
-if editing && url.nil?
-  %><p id='block_<%= block.id %>'>Please upload an image.</p><%
-else
-  %><img src='<%= raw url %>' id='block_<%= block.id %>' /><%
-end
-%>
+if editing && url.include?('placehold') %>
+<div class="img-wrap" style="position:relative;display:inline-block;">
+	<div class="img-holder" style="background-image:url(https://cabooseit.s3.amazonaws.com/assets/caboose/grid.png);background-size:15px;display:inline-block;position:relative;" id='block_<%= block.id %>'>
+		<img src='https://cabooseit.s3.amazonaws.com/assets/select_image.png' width="150" style="max-width:100%;display:block;" />
+	</div>
+</div>
+<% elsif editing %>
+<div class="img-wrap" style="position:relative;display:inline-block;">
+	<div class="img-holder" style="background-image:url(https://cabooseit.s3.amazonaws.com/assets/caboose/grid.png);background-size:15px;display:inline-block;position:relative;" id='block_<%= block.id %>'>
+		<img src='<%== url %>' width="200" style="max-width:100%;display:block;" />
+	</div>
+</div>
+<% else %>
+	<img src='<%== url %>' width="200" id='block_<%= block.id %>' />
+<% end %>

data/app/views/caboose/login/index.html.erb

@@ -1,6 +1,6 @@
 <form action="/login" method="post" id="login-form">
 	<div class="header">
-	  <% if @site.logo %>
+	  <% if @site.logo && !@site.logo.url.include?('placehold') %>
 	    <img src='<%= @site.logo.url(:thumb) %>' alt="<%= @site.description %>" />
 	  <% else %>
 		  <img src="/assets/caboose/caboose_logo.png" alt="Caboose">

data/app/views/caboose/pages/admin_new.html.erb

@@ -1,3 +1,8 @@
+<%
+temp = Caboose::PageTemplate.where('screenshot_file_name is not null').first
+tempimg = temp ? temp.screenshot.url(:small) : '//cabooseit.s3.amazonaws.com/assets/shared/template.png'
+%>
+
 <h1>New Page</h1>
 
 <div class="new-page-form-wrapper">
@@ -28,11 +33,11 @@
 				    <option <% if bt.description == 'Subpage' || bt.description == 'Standard' %>selected<% end %> value="<%= bt.id %>"><%= bt.description %></option>
 				  <% end %>
 				</select>
-				<p class="meta">The page layout defines the overall page structure, such as header, footer, and sidebar. Most of the time, this is 'Subpage'.</p>
+				<p class="meta">The page layout defines the overall page structure, such as header, footer, and sidebar.</p>
 			</div>
 		</section>
 	<%# temporarily only super admins can do templates %>
-	<% if @logged_in_user && @logged_in_user.is_super_admin? %>
+	
 		<section class="page-templates-wrapper">
 			<h4>Page Template</h4>
 			<div class="field">
@@ -42,19 +47,28 @@
 			<div class="category">
 				<div class="cat-templates">
 					<a href="#" id="template-blank" class="template selected opt">
-						<img src="//cabooseit.s3.amazonaws.com/assets/shared/template.png" width="200" alt="Blank" />
+						<img src="https://cabooseit.s3.amazonaws.com/assets/blank_template.png" width="200" alt="Blank" />
 						<div class="text">
 							<span class="title">Blank</span>
 							<span class="desc">A completely blank page.</span>
 						</div>
 					</a>
+				<% if @logged_in_user && @logged_in_user.is_super_admin? %>
 					<a href="#" id="template-choose" class="template opt">
-						<img src="//cabooseit.s3.amazonaws.com/assets/shared/template.png" width="200" alt="Blank" />
+						<img src="<%= tempimg %>" width="200" alt="Blank" />
 						<div class="text">
 							<span class="title">Use a Template</span>
 							<span class="desc">Choose a page template.</span>
 						</div>
 					</a>
+				<% end %>
+					<a href="#" id="template-copy" class="template opt">
+						<img src="https://cabooseit.s3.amazonaws.com/assets/copy_page.png" width="200" alt="Blank" />
+						<div class="text">
+							<span class="title">Existing page</span>
+							<span class="desc">Copy an existing page.</span>
+						</div>
+					</a>
 				</div>
 			</div>
 			<% @categories.each do |cat| %>
@@ -75,14 +89,25 @@
 					</div>
 				</div>
 			<% end %>
+			<div class="copy-options" style="display:none;">
+				<div class="field">
+					<label for="copy_from_id">Choose a page to copy</label>
+					<select name="copy_from_id" id="copy_from_id">
+						<% @sitemap.each do |sm| %>
+							<option value="<%= sm['value'] %>"><%= sm['text'] %></option>
+						<% end %>
+					</select>
+				</div>
+			</div>
 		</section>
-	<% end %>
+
 		<div id="page-message"></div>
 		<section class="buttons clearfix">
 			<a href="/admin/pages" class="caboose-btn-white">Cancel</a>
 			<a href="#" id="create_page" class="caboose-btn">Create Page</a>
 		</section>
 		<input type="hidden" id="use_template" name="use_template" value="no" />
+		<input type="hidden" id="use_copy" name="use_copy" value="no" />
 		<input type="hidden" id="template_id" name="template_id" value="" />
 	</form>
 </div>
@@ -107,11 +132,21 @@
 		$(this).addClass("selected");
 		if ( $(this).attr("id") == "template-choose") {
 			$(".category.more").slideDown();
+			$(".copy-options").slideUp();
 			$("#use_template").attr("value","yes");
+			$("#use_copy").attr("value","no");
 		}
 		else if ( $(this).attr("id") == "template-blank") {
 			$(".category.more").slideUp();
+			$(".copy-options").slideUp();
+			$("#use_template").attr("value","no");
+			$("#use_copy").attr("value","no");
+		}
+		else if ( $(this).attr("id") == "template-copy") {
+			$(".category.more").slideUp();
+			$(".copy-options").slideDown();
 			$("#use_template").attr("value","no");
+			$("#use_copy").attr("value","yes");
 		}
 	});
 	$(".template.tem").click(function(e) {

data/app/views/caboose/sites/_admin_header.html.erb

@@ -28,7 +28,7 @@ tabs = {
   'Block Types'       => "/admin/sites/#{@site.id}/block-types",
   'Custom CSS'        => "/admin/sites/#{@site.id}/css",
   'Custom JS'         => "/admin/sites/#{@site.id}/js",
-  'Retargeting'       => "/admin/sites/#{@site.id}/retargeting",
+#  'Retargeting'       => "/admin/sites/#{@site.id}/retargeting",
   'Delete Site'       => "/admin/sites/#{@site.id}/delete" 
 }
 

data/app/views/caboose/sites/admin_edit.html.erb

@@ -17,9 +17,12 @@ user_ids = [] if user_ids.nil?
 <p><div id='site_<%= @site.id %>_use_fonts'               ></div></p>
 <p><div id='site_<%= @site.id %>_use_dragdrop'            ></div></p>
 <p><div id='site_<%= @site.id %>_allow_self_registration' ></div></p>
+<% if @site.theme.nil? %>
 <p><div id='site_<%= @site.id %>_theme_color' ></div></p>
+<% end %>
 <p><div id='site_<%= @site.id %>_assets_url' ></div></p>
 <p><div id='site_<%= @site.id %>_default_layout_id'       ></div></p>
+<p><div id='site_<%= @site.id %>_favicon'                    ></div></p>
 
 <h2>Domains</h2>
 <p><a href='#' onclick="add_domain(<%= @site.id %>);">New Domain</a></p>
@@ -93,7 +96,8 @@ $(document).ready(function() {
     update_url: '/admin/sites/<%= @site.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'logo'                    , nice_name: 'Logo'                     , type: 'image'    , value: <%= raw Caboose.json(@site.logo ? @site.logo.url(:thumb) : '')     %>, width: 400, update_url: '/admin/sites/<%= @site.id %>/logo' },
+      { name: 'logo'                    , nice_name: 'Logo'                     , type: 'image'    , value: <%= raw Caboose.json(@site.logo ? @site.logo.url(:thumb) : '')     %>, width: 300, update_url: '/admin/sites/<%= @site.id %>/logo' },
+      { name: 'favicon'                    , nice_name: 'Favicon'                     , type: 'image'    , value: <%= raw Caboose.json(@site.favicon ? @site.favicon.url(:tiny) : '')     %>, width: 80, update_url: '/admin/sites/<%= @site.id %>/favicon' },
       { name: 'description'             , nice_name: 'Description'              , type: 'text' , value: <%= raw Caboose.json(@site.description)                            %>, width: 600  },
       { name: 'theme_color'             , nice_name: 'Theme Color'              , type: 'text' , value: <%= raw Caboose.json(@site.theme_color)                            %>, width: 600  },
       { name: 'assets_url'             , nice_name: 'Assets URL'              , type: 'text' , value: <%= raw Caboose.json(@site.assets_url)                            %>, width: 600  },

data/app/views/caboose/themes/admin_edit.html.erb

@@ -36,6 +36,7 @@ position = header.child('position') if header
       <div id="theme_<%= @theme.id %>_header_bg_color"></div>
       <div id="theme_<%= @theme.id %>_header_font_color"></div>
       <div id="theme_<%= @theme.id %>_dropdown_color"></div>
+      <div id="theme_<%= @theme.id %>_dropdown_nav_padding"></div>
       <div id="theme_<%= @theme.id %>_mobile_menu_icon_color"></div>
       <div id="theme_<%= @theme.id %>_mobile_menu_icon_top"></div>
       <div id="theme_<%= @theme.id %>_header_font_size"></div>
@@ -50,9 +51,11 @@ position = header.child('position') if header
       <h5>Footer</h5>
       <div id="theme_<%= @theme.id %>_footer_height"></div>
       <div id="theme_<%= @theme.id %>_footer_bg_color"></div>
+      <div id="theme_<%= @theme.id %>_footer_hover_color"></div>
       <div id="theme_<%= @theme.id %>_footer_font_color"></div>
       <div id="theme_<%= @theme.id %>_footer_padding"></div>
       <div id="theme_<%= @theme.id %>_footer_font_size"></div>
+      <div id="theme_<%= @theme.id %>_actual_footer_height"></div>
     </section>
   </div>
   <div class="unit1of2 right">
@@ -85,8 +88,10 @@ position = header.child('position') if header
     <section>
       <h5>Subpage Banner</h5>
       <div id="theme_<%= @theme.id %>_banner_padding"></div>
+      <div id="theme_<%= @theme.id %>_banner_font_size"></div>
       <div id="theme_<%= @theme.id %>_banner_overlay_color"></div>
       <div id="theme_<%= @theme.id %>_banner_overlay_opacity"></div>
+      <div id="theme_<%= @theme.id %>_actual_banner_height"></div>
       <div id="theme_<%= @theme.id %>_default_banner_image"></div>
     </section>
     <section>
@@ -134,12 +139,6 @@ position = header.child('position') if header
   section > div {
     margin-bottom: 10px;
   }
-  #message .note {
-    font-size: 16px !important;
-  }
-  #message p.note.loading {
-    background-color: #b7b7ff !important;
-  }
 </style>
 <% end %>
 
@@ -233,7 +232,12 @@ $(document).ready(function() {
     <% end %>
       { name: 'sidebar_width', nice_name: "<%= 'width'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.sidebar_width) %>, width: 400 },
       { name: 'sidebar_bg_color', nice_name: "<%= 'background_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.sidebar_bg_color) %>, width: 400 },
-      { name: 'default_banner_image'  , nice_name: 'Default Banner Image'   , type: 'image'  , value: <%= raw Caboose.json(@theme.default_banner_image ? @theme.default_banner_image.url(:huge) : 'https://res.cloudinary.com/caboose/image/upload/c_scale,f_auto,q_auto:good,w_300/v1539265856/default_banner.jpg') %>, width: 800, update_url: '/admin/themes/<%= @theme.id %>/default-banner-image' }
+      { name: 'default_banner_image'  , nice_name: 'Default Banner Image'   , type: 'image'  , value: <%= raw Caboose.json(@theme.default_banner_image ? @theme.default_banner_image.url(:huge) : 'https://res.cloudinary.com/caboose/image/upload/c_scale,f_auto,q_auto:good,w_300/v1539265856/default_banner.jpg') %>, width: 800, update_url: '/admin/themes/<%= @theme.id %>/default-banner-image' },
+      { name: 'banner_font_size', nice_name: "<%= 'banner_font_size'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.banner_font_size) %>, width: 400 },
+      { name: 'footer_hover_color', nice_name: "<%= 'footer_hover_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.footer_hover_color) %>, width: 400 },
+      { name: 'actual_footer_height', nice_name: "<%= 'actual_footer_height'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.actual_footer_height) %>, width: 400 },
+      { name: 'actual_banner_height', nice_name: "<%= 'actual_banner_height'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.actual_banner_height) %>, width: 400 },
+      { name: 'dropdown_nav_padding', nice_name: "<%= 'dropdown_nav_padding'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.dropdown_nav_padding) %>, width: 400 }
     ]    
   });  
 });

data/lib/caboose.rb

@@ -43,6 +43,10 @@ module Caboose
   # Whether or not to use AB Testing
   mattr_accessor :use_ab_testing
   @@use_ab_testing = true
+
+  # Whether or not to use Cloudinary for site logo and favicon
+  mattr_accessor :use_cloudinary
+  @@use_cloudinary = false
   
   # Website name
   mattr_accessor :website_name

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.172'
+  VERSION = '0.9.173'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.172
+  version: 0.9.173
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -879,6 +879,8 @@ files:
 - app/models/caboose/tax_calculator.rb
 - app/models/caboose/tax_line.rb
 - app/models/caboose/theme.rb
+- app/models/caboose/theme_file.rb
+- app/models/caboose/theme_file_membership.rb
 - app/models/caboose/user.rb
 - app/models/caboose/utilities/schema.rb
 - app/models/caboose/variant.rb