caboose-cms 0.9.173 → 0.9.174

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b280a399c0fe0c9481f1047fb86e5c3d71b51fd1
-  data.tar.gz: 15b6a9ffa8951c7711fe3b512ac637c5ad02daf9
+  metadata.gz: 2a5f146158d05cdcba0981301de5c3a2fccd86fd
+  data.tar.gz: 409a559e70e8b54e566f4da4aae8856bd73fe463
 SHA512:
-  metadata.gz: e66eea6f8d026e9fa62396ba72b9be702f3269e1357b189b40c6f77bbb3c49d553755fdf11a3435dd73fa261e32020ca8b87cd6391e98a9f6c3a2086620b3901
-  data.tar.gz: 2d9620d712cf82a6e7e202718c01eccd9011fa1265075b6e618707864068c12e8f43fca4a5809fe71c0f6c265ace4377598d702796fa50134fbd14200a744fbd
+  metadata.gz: 03206cafed754a35295390a14c683f34bde884efc581caa7665887416bd6d8a14920f2500161559d0294a61c66d2ddb5ee3a8c9bb8aacc28a9049ddf532a92ed
+  data.tar.gz: 2981f58cc12e869b43f2a8c95b20ae6cd654dd80444897bce1b84066fee01ae2ca90d11218deda4a75ef014237dd3f8757e468efd996471fcaa47ea76b0101ca

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

@@ -16,7 +16,7 @@ BoundColor = BoundControl.extend({
     this.el = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;    
     $('#'+this.el).wrap($('<div/>')
       .attr('id', this.el + '_container')
-      .addClass('mb_container')
+      .addClass('mb_container').addClass('color')
       .css('position', 'relative')
     );
     $('#'+this.el+'_container').empty().append(              
@@ -24,7 +24,7 @@ BoundColor = BoundControl.extend({
         .attr('id', this.el)
         .attr('type', 'text')
         .attr('placeholder', this.attribute.fixed_placeholder ? 'empty' : this.attribute.nice_name)        
-        .val(this.attribute.value)      
+        .val(this.attribute.value)
     );
     $('#'+this.el+'_container').css('text-align', 'right');
     
@@ -35,10 +35,26 @@ BoundColor = BoundControl.extend({
     if (this.attribute.fixed_placeholder  && this.attribute.align != 'left')
     {
       var w = $('#'+this.el+'_placeholder').outerWidth(true);
-      $('#'+this.el).attr('placeholder', 'empty').css('padding-left', '+=' + w).css('width', '-=' + w);      
+      $('#'+this.el).attr('placeholder', 'empty'); //.css('padding-left', '+=' + w); //.css('width', '-=' + w);      
     }
     
     var this2 = this;
+
+    $('#'+this.el).css('z-index', 21);
+    $('#'+this.el).css('position', 'relative');
+    $('#'+this.el).css('background', 'transparent');
+    $('#'+this.el).spectrum({
+      color: this2.attribute.value,              
+      showPalette: true,
+      showInput: true,
+      preferredFormat: 'hex',
+      replacerClassName: this2.el + '_bound_color',
+      change: function(color) {
+        this2.attribute.value = color.toHexString();
+        this2.save();        
+      }      
+    });
+
     $('#'+this.el).on('keyup', function(e) {
       if (e.keyCode == 27) this2.cancel(); // Escape 
       if (e.keyCode == 13) this2.save();   // Enter
@@ -55,27 +71,13 @@ BoundColor = BoundControl.extend({
         this2.save();
       }      
     });
-    $('#'+this.el).css('z-index', 21);
-    $('#'+this.el).css('position', 'relative');
-    $('#'+this.el).css('background', 'transparent');
-    $('#'+this.el).spectrum({
-      color: this2.attribute.value,              
-      showPalette: true,
-      showInput: true,
-      preferredFormat: 'hex',
-      replacerClassName: this2.el + '_bound_color',
-      change: function(color) {
-        this2.attribute.value = color.toHexString();
-        this2.save();        
-      }      
-    });
             
     $('.' + this.el + '_bound_color').css('text-align', this.attribute.align);
-    //if (this.attribute.width) $('.' + this.el + '_bound_color').css('width', this.attribute.width);
+    //if (this.attribute.width) $('.' + this.el + '_bound_color').css('width', this.attribute.width)
     if (this.attribute.fixed_placeholder && this.attribute.align != 'right')
     {
       var w = $('#'+this.el+'_placeholder').outerWidth(true);        
-      $('.' + this2.el + '_bound_color').css('padding-left', '+=' + w).css('width', '-=' + w);      
+      $('.' + this2.el + '_bound_color'); //.css('padding-left', '+=' + w); //.css('width', '-=' + w);      
     } 
     if (this.attribute.align == 'right')
       $('.' + this.el + '_bound_color').css('margin', '0 0 0 auto');
@@ -83,22 +85,28 @@ BoundColor = BoundControl.extend({
   
   save: function() {
     //this.attribute.value = $('#'+this.el).val();
+
+    var vl = $('#'+this.el).val();
+    if ( !vl )
+      vl = this.attribute.value;
+    this.attribute.value = vl;
+
     if (this.attribute.value == this.attribute.value_clean)
       return;
     
-    //this.show_loader();        
+    this.show_loader();        
     var this2 = this;    
     
     this.binder.save(this.attribute, function(resp) {
       this2.save_attempts = 0;
       if (resp.error)
       {
-        //this2.hide_loader();
+        this2.hide_loader();
         this2.error(resp.error);
       }
       else
       {
-        //this2.show_check(500);
+        this2.show_check(500);
         $('#'+this2.el).val(this2.attribute.value);
         $('#'+this2.el).removeClass('mb_dirty');
 

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

@@ -17,6 +17,27 @@ require caboose/spectrum
   color: #000;
 }
 
+.mb_container.color {
+  border: 1px solid #ccc;
+  height: 36px;
+}
+
+.mb_container.color .sp-replacer {
+  background-color: transparent;
+  border: 0;
+  position: relative;
+  bottom: 1px;
+}
+.admin-theme .mb_container.color input[type="text"] {
+  display: inline-block !important;
+  width: 80px;
+  border: 0;
+  padding-top: 0px;
+}
+div.mb_container.color div.mb_placeholder {
+  top: 7px;
+}
+
 .mb_container.model-image .img-holder {
   background-image: url('/assets/caboose/grid.png');
   background-size: 15px;

data/app/controllers/caboose/pages_controller.rb

@@ -478,6 +478,7 @@ module Caboose
       return if !user_is_allowed('pages', 'edit')
       #return if !Page.is_allowed(logged_in_user, params[:id], 'edit')            
       @page = Page.find(params[:id])
+      @can_edit_home = user_is_allowed_to('edit', Caboose::Page.index_page(@site.id))
       if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
         redirect_to '/admin/pages'
       else
@@ -544,7 +545,7 @@ module Caboose
         resp.redirect = "/admin/pages/#{page.id}/content"
 
       # Copy from an existing page
-      elsif !params[:copy_from_id].blank?
+      elsif !params[:copy_from_id].blank? && params[:use_copy] == 'yes'
         source = Caboose::Page.find(params[:copy_from_id])
         if source
           Caboose.log("copying from source page: #{source.id}")
@@ -728,6 +729,53 @@ module Caboose
       })
       render json: resp
     end
+
+    # @route PUT /admin/pages/:id/promote
+    def admin_promote
+      resp = StdClass.new
+      return unless user_is_allowed('pages', 'edit')
+      old_home = Caboose::Page.index_page(@site.id)
+      return unless user_is_allowed_to('edit', old_home)
+      new_home = Caboose::Page.find(params[:id])
+      if new_home && (old_home.site_id == new_home.site_id && new_home.site_id == @site.id) && (@site.id == @logged_in_user.site_id || @logged_in_user.is_super_admin?)
+        old_layout = Caboose::Block.where(:parent_id => nil, :page_id => old_home.id).first
+        old_footer = old_layout.child('footer') if old_layout
+        new_home.parent_id = -1
+        new_home.title = 'Home'
+        new_home.slug = nil
+        new_home.alias = nil
+        new_home.uri = nil
+        new_home.redirect_url = nil
+        new_home.hide = false
+        new_home.save
+        new_layout = Caboose::Block.where(:parent_id => nil, :page_id => new_home.id).first
+        new_footer = new_layout.child('footer') if new_layout
+        if new_footer && new_footer.children.count > 0
+          new_footer.children.each do |nc|
+            nc.destroy
+          end
+        end
+        if old_footer && old_footer.children.count > 0
+          old_footer.children.each do |oc|
+            oc.parent_id = new_footer.id
+            oc.page_id = new_home.id
+            oc.save
+          end
+        end
+        old_home.title = 'OLD Home'
+        old_home.parent_id = new_home.id
+        old_home.slug = "old-home-#{old_home.id}"
+        old_home.uri = "old-home-#{old_home.id}"
+        old_home.hide = true
+        old_home.save
+        resp.success = true
+        resp.redirect = "/admin/pages/#{new_home.id}"
+      else
+        resp.success = false
+        resp.error = "You don't have permission to do this."
+      end
+      render json: resp
+    end
         
     # @route_priority 1
     # @route GET /admin/pages/:field-options    

data/app/controllers/caboose/themes_controller.rb

@@ -109,6 +109,25 @@ module Caboose
       resp.attributes = { 'default_banner_image' => { 'value' => theme.default_banner_image.url(:huge) }}
       render :text => resp.to_json
     end
+
+    # @route PUT /admin/themes/:id/files/:file_id/toggle
+    def admin_toggle_file
+      resp = Caboose::StdClass.new
+      checked = params[:checked]
+      theme_id = params[:id]
+      file_id = params[:file_id]
+      if checked && checked != false && checked != 'false'
+        am = Caboose::ThemeFileMembership.where(:theme_id => theme_id, :theme_file_id => file_id).first
+        am = am ? am : Caboose::ThemeFileMembership.new
+        am.theme_id = theme_id
+        am.theme_file_id = file_id
+        am.save
+      else
+        Caboose::ThemeFileMembership.delete_all(:theme_id => theme_id, :theme_file_id => file_id)
+      end
+      resp.success = "Success"
+      render :json => resp
+    end
     
   end
 end

data/app/models/caboose/media_category.rb

@@ -56,7 +56,8 @@ class Caboose::MediaCategory < ActiveRecord::Base
   
   def self.tree_hash(site_id)
     top_cat = self.where(:parent_id => nil, :site_id => site_id).first
-    return self.tree_hash_helper(top_cat)        
+    top_cat = Caboose::MediaCategory.create(:parent_id => nil, :site_id => site_id, :name => 'Media') if top_cat.nil?
+    return self.tree_hash_helper(top_cat)
   end
   
   def self.tree_hash_helper(cat)

data/app/models/caboose/page.rb

@@ -461,8 +461,8 @@ class Caboose::Page < ActiveRecord::Base
     p.title                = "Copy of " + self.title                 
     p.menu_title           = self.menu_title            
     p.alias                = self.alias                               
-    p.redirect_url         = self.redirect_url          
-    p.hide                 = self.hide                  
+    p.redirect_url         = self.redirect_url
+    p.hide                 = true               
     p.content_format       = self.content_format        
     p.custom_css           = self.custom_css            
     p.custom_js            = self.custom_js             

data/app/models/caboose/schema.rb

@@ -988,7 +988,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :dropdown_nav_padding, :string ]
       ],
       Caboose::ThemeFile => [
-        [ :filename, :string ]
+        [ :filename, :string ],
+        [ :nice_name, :string ],
+        [ :default_included, :boolean     , { :default => false }]
       ],
       Caboose::ThemeFileMembership => [
         [ :theme_file_id                      , :integer    ],

data/app/models/caboose/theme.rb

@@ -82,7 +82,6 @@ class Caboose::Theme < ActiveRecord::Base
     :digest
 
   def compile(for_site_id = 0)
-  	Caboose.log("compiling theme for site #{for_site_id}")
   	theme = self
   	theme_name = 'default'
   	path = Rails.root.join('themes', "#{theme_name}.scss.erb")

data/app/models/caboose/theme_file.rb

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

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

@@ -15,8 +15,29 @@
 <% end %>
 <div class='field_with_explanation'><div id='page_<%= @page.id %>_tags'                  ></div><span class='explanation'>Tags to help categorize your page. Use as many as you want, just separate by commas.</span></div>
 
+<% if @can_edit_home %>
+<div class='field_with_explanation'>
+  <a href="#" onclick="promote_page(<%= @page.id %>, false);return false;" id="promote">Make this page my homepage</a>
+  <div id="pmessage"></div>
+</div>
+<% end %>
+
 <%= render :partial => 'caboose/pages/admin_footer' %>
 
+<% content_for :caboose_css do %>
+  <style>
+    a#promote {
+      color: #565daa;
+      font-size: 13px;
+      text-decoration: none;
+      display: inline-block;
+      margin-bottom: 7px;
+    }
+    a#promote:hover {
+      text-decoration: underline;
+    }
+  </style>
+<% end %>
 
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
@@ -60,5 +81,27 @@ function update_uri(page_id)
   });
 }
 
+function promote_page(page_id, confirm) 
+{
+  if (!confirm)
+  {
+    var p = $('<p/>').addClass('note warning')
+      .append("Are you sure you want to do this? This page will replace the existing homepage. The existing homepage will be hidden but not deleted.")
+      .append($('<input/>').attr('type','button').val('Yes').click(function() { promote_page(page_id, true); })).append(' ')
+      .append($('<input/>').attr('type','button').val('No').click(function() { $('#pmessage').empty(); }));      
+    $('#pmessage').empty().append(p);
+    return;
+  }  
+  $('#pmessage').empty().html($('<p/>').addClass('loading').html("Promoting page..."));
+  $.ajax({
+    url: '/admin/pages/' + page_id + '/promote',
+    type: 'put',    
+    success: function(resp) {
+      if (resp.error) $('#pmessage').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
 </script>
 <% end %>

data/app/views/caboose/posts/admin_edit_general.html.erb

@@ -34,7 +34,7 @@ $(document).ready(function() {
       { name: 'author'     , nice_name: 'Author'         , type: 'text'      , value: <%= raw Caboose.json(@post.author     )        %>, width: 600 },    
       { name: 'created_at' , nice_name: 'Date Published' , type: 'date'      , value: <%= raw Caboose.json(@post.created_at.strftime('%m/%d/%Y')     )        %>, width: 600 },     
       { name: 'published'  , nice_name: 'Published'      , type: 'checkbox'  , value: <%= raw @post.published ? true : false         %>, width: 600 },
-      { name: 'image'      , nice_name: 'Image'          , type: 'image'     , value: <%= raw Caboose.json(@post.image.url(:thumb))  %>, width: 600, update_url: '/admin/posts/<%= @post.id %>/image' }            
+      { name: 'image'      , nice_name: 'Image'          , type: 'image'     , value: <%= raw Caboose.json(@post.image.url(:thumb))  %>, width: 200, update_url: '/admin/posts/<%= @post.id %>/image' }            
     ]
   });
   <% @post.post_custom_field_values.each do |fv| %>

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

@@ -135,7 +135,7 @@ $(document).ready(function() {
       { name: 'google_analytics_id'  , nice_name: 'Primary Google Analytics Tracking ID'   , type: 'text'     , value: <%= raw Caboose.json(sc.google_analytics_id) %>, width: 500 },
       { name: 'google_analytics_id2' , nice_name: 'Secondary Google Analytics Tracking ID' , type: 'text'     , value: <%= raw Caboose.json(sc.google_analytics_id2) %>, width: 500 },
       { name: 'auto_ga_js'           , nice_name: 'Auto Embed Google Analytics JS'         , type: 'checkbox' , value: <%= sc.auto_ga_js ? 1 : 0 %>, width: 500 },
-      { name: 'share_image'  , nice_name: 'Share Image'   , type: 'image'  , value: <%= raw Caboose.json(sc.share_image ? sc.share_image.url(:large) : 'http://placehold.it?300x300') %>, width: 800, update_url: '/admin/social/image' }
+      { name: 'share_image'  , nice_name: 'Share Image'   , type: 'image'  , value: <%= raw Caboose.json(sc.share_image ? sc.share_image.url(:large) : 'http://placehold.it?300x300') %>, width: 300, update_url: '/admin/social/image' }
     ]    
   });
       

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

@@ -7,7 +7,7 @@ position = header.child('position') if header
 
 <h1>Theme</h1>
 
-<div class="grid-row">
+<div class="admin-theme grid-row">
   <div class="unit1of2 left">
     <section>
       <h5>Compile</h5>
@@ -57,6 +57,18 @@ position = header.child('position') if header
       <div id="theme_<%= @theme.id %>_footer_font_size"></div>
       <div id="theme_<%= @theme.id %>_actual_footer_height"></div>
     </section>
+
+    <section>
+      <h5>Theme Files</h5>
+      <% Caboose::ThemeFile.order(:nice_name).all.each do |tf| %>
+        <% tfm = Caboose::ThemeFileMembership.where(:theme_file_id => tf.id, :theme_id => @theme.id).exists? %>
+        <div class="field cb">
+          <input class="file-toggle" <% if tfm %>checked<% end %> type="checkbox" value="<%= tf.id %>" name="tf_<%= tf.id %>" id="<%= tf.id %>" />
+          <label for="<%= tf.id %>"><%= tf.nice_name %></label>
+        </div>
+      <% end %>
+    </section>
+
   </div>
   <div class="unit1of2 right">
     <section>
@@ -116,6 +128,7 @@ position = header.child('position') if header
 
 
 <% content_for :caboose_css do %>
+<%= stylesheet_link_tag "caboose/spectrum" %>
 <style>
   .grid-row::after {
     content: "."; 
@@ -139,13 +152,47 @@ position = header.child('position') if header
   section > div {
     margin-bottom: 10px;
   }
+  input[type="text"]:disabled {
+    color: #969696;
+  }
+  .field.cb {
+    height: 26px;
+  }
+  .field.cb input {
+    height: auto;
+  }
+  .field.cb label {
+    font-size: 14px;
+    position: relative;
+    top: 1px;
+  }
 </style>
 <% end %>
 
 <% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/spectrum" %>
 <%= javascript_include_tag "caboose/model/all" %>
 <script type="text/javascript">
 
+function toggle_file(file_id, checked) {
+  var status = checked;
+  $.ajax({
+    url: '/admin/themes/<%= @theme.id %>/files/' + file_id + '/toggle',
+    type: 'put',
+    data: {
+      checked: status
+    },
+    success: function(resp) {
+
+    }
+  });
+}
+$(window).load(function() {
+  $(".file-toggle").change(function() {
+    toggle_file($(this).attr("id"), $(this).is(':checked'));
+  });
+});
+
 $("#compile-btn").click(function(e) {
   $('#message').html("<p class='note loading'>Compiling theme...</p>").fadeIn();
   e.preventDefault();
@@ -168,42 +215,42 @@ $(document).ready(function() {
     update_url: '/admin/theme',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [      
-      { name: 'color_main'              , nice_name: 'Main'                    , type: 'text'     , value: <%= raw Caboose.json(@theme.color_main              ) %>, width: 400 },  
-      { name: 'color_alt'                 , nice_name: 'Alternate'                    , type: 'text'     , value: <%= raw Caboose.json(@theme.color_alt                 ) %>, width: 400 },
-      { name: 'color_dark', nice_name: "<%= 'dark'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.color_dark) %>, width: 400 },
-      { name: 'color_light', nice_name: "<%= 'light'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.color_light) %>, width: 400 },
+      { name: 'color_main'              , nice_name: 'Main'                    , type: 'color'     , value: <%= raw Caboose.json(@theme.color_main              ) %>, width: 400 },  
+      { name: 'color_alt'                 , nice_name: 'Alternate'                    , type: 'color'     , value: <%= raw Caboose.json(@theme.color_alt                 ) %>, width: 400 },
+      { name: 'color_dark', nice_name: "<%= 'dark'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.color_dark) %>, width: 400 },
+      { name: 'color_light', nice_name: "<%= 'light'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.color_light) %>, width: 400 },
       { name: 'max_width', nice_name: "<%= 'max_width'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.max_width) %>, width: 400 },
-      { name: 'body_bg_color', nice_name: "<%= 'background_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.body_bg_color) %>, width: 400 },
+      { name: 'body_bg_color', nice_name: "<%= 'background_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.body_bg_color) %>, width: 400 },
       { name: 'font_size', nice_name: "<%= 'font_size'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.font_size) %>, width: 400 },
       { name: 'header_height', nice_name: "<%= 'height'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.header_height) %>, width: 400 },
-      { name: 'header_bg_color', nice_name: "<%= 'background_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.header_bg_color) %>, width: 400 },
-      { name: 'header_font_color', nice_name: "<%= 'font_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.header_font_color) %>, width: 400 },
-      { name: 'dropdown_color', nice_name: "<%= 'dropdown_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.dropdown_color) %>, width: 400 },
-      { name: 'mobile_menu_bg_color', nice_name: "<%= 'background_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.mobile_menu_bg_color) %>, width: 400 },
-      { name: 'mobile_menu_font_color', nice_name: "<%= 'font_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.mobile_menu_font_color) %>, width: 400 },
-      { name: 'mobile_menu_border_color', nice_name: "<%= 'border_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.mobile_menu_border_color) %>, width: 400 },
-      { name: 'mobile_menu_icon_color', nice_name: "<%= 'icon_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.mobile_menu_icon_color) %>, width: 400 },
+      { name: 'header_bg_color', nice_name: "<%= 'background_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.header_bg_color) %>, width: 400 },
+      { name: 'header_font_color', nice_name: "<%= 'font_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.header_font_color) %>, width: 400 },
+      { name: 'dropdown_color', nice_name: "<%= 'dropdown_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.dropdown_color) %>, width: 400 },
+      { name: 'mobile_menu_bg_color', nice_name: "<%= 'background_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.mobile_menu_bg_color) %>, width: 400 },
+      { name: 'mobile_menu_font_color', nice_name: "<%= 'font_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.mobile_menu_font_color) %>, width: 400 },
+      { name: 'mobile_menu_border_color', nice_name: "<%= 'border_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.mobile_menu_border_color) %>, width: 400 },
+      { name: 'mobile_menu_icon_color', nice_name: "<%= 'icon_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.mobile_menu_icon_color) %>, width: 400 },
       { name: 'mobile_menu_icon_top', nice_name: "<%= 'icon_top'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.mobile_menu_icon_top) %>, width: 400 },
       { name: 'footer_height', nice_name: "<%= 'height'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.footer_height) %>, width: 400 },
-      { name: 'footer_bg_color', nice_name: "<%= 'background_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.footer_bg_color) %>, width: 400 },
-      { name: 'footer_font_color', nice_name: "<%= 'font_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.footer_font_color) %>, width: 400 },
+      { name: 'footer_bg_color', nice_name: "<%= 'background_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.footer_bg_color) %>, width: 400 },
+      { name: 'footer_font_color', nice_name: "<%= 'font_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.footer_font_color) %>, width: 400 },
       { name: 'btn_border_radius', nice_name: "<%= 'border_radius'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.btn_border_radius) %>, width: 400 },
       { name: 'btn_border_width', nice_name: "<%= 'border_width'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.btn_border_width) %>, width: 400 },
-      { name: 'btn_border_color', nice_name: "<%= 'border_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.btn_border_color) %>, width: 400 },
-      { name: 'btn_font_color', nice_name: "<%= 'font_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.btn_font_color) %>, width: 400 },
+      { name: 'btn_border_color', nice_name: "<%= 'border_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.btn_border_color) %>, width: 400 },
+      { name: 'btn_font_color', nice_name: "<%= 'font_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.btn_font_color) %>, width: 400 },
       { name: 'btn_font_size', nice_name: "<%= 'font_size'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.btn_font_size) %>, width: 400 },
       { name: 'btn_font_weight', nice_name: "<%= 'font_weight'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.btn_font_weight) %>, width: 400 },
       { name: 'btn_font_case', nice_name: "<%= 'font_case'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.btn_font_case) %>, width: 400 },
       { name: 'btn_border_side', nice_name: "<%= 'border_side'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.btn_border_side) %>, width: 400 },
       { name: 'input_border_radius', nice_name: "<%= 'border_radius'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.input_border_radius) %>, width: 400 },
-      { name: 'input_bg_color', nice_name: "<%= 'background_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.input_bg_color) %>, width: 400 },
-      { name: 'input_border_color', nice_name: "<%= 'border_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.input_border_color) %>, width: 400 },
+      { name: 'input_bg_color', nice_name: "<%= 'background_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.input_bg_color) %>, width: 400 },
+      { name: 'input_border_color', nice_name: "<%= 'border_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.input_border_color) %>, width: 400 },
       { name: 'input_border_width', nice_name: "<%= 'border_width'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.input_border_width) %>, width: 400 },
-      { name: 'input_font_color', nice_name: "<%= 'font_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.input_font_color) %>, width: 400 },
+      { name: 'input_font_color', nice_name: "<%= 'font_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.input_font_color) %>, width: 400 },
       { name: 'input_font_size', nice_name: "<%= 'font_size'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.input_font_size) %>, width: 400 },
       { name: 'input_padding', nice_name: "<%= 'padding'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.input_padding) %>, width: 400 },
       { name: 'body_line_height', nice_name: "<%= 'line_height'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.body_line_height) %>, width: 400 },
-      { name: 'body_font_color', nice_name: "<%= 'font_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.body_font_color) %>, width: 400 },
+      { name: 'body_font_color', nice_name: "<%= 'font_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.body_font_color) %>, width: 400 },
       { name: 'button_padding', nice_name: "<%= 'padding'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.button_padding) %>, width: 400 },
       { name: 'button_line_height', nice_name: "<%= 'line_height'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.button_line_height) %>, width: 400 },
       { name: 'footer_padding', nice_name: "<%= 'padding'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.footer_padding) %>, width: 400 },
@@ -218,7 +265,7 @@ $(document).ready(function() {
       { name: 'mobile_menu_nav_padding', nice_name: "<%= 'nav_padding'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.mobile_menu_nav_padding) %>, width: 400 },
       { name: 'mobile_menu_font_size', nice_name: "<%= 'font_size'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.mobile_menu_font_size) %>, width: 400 },
       { name: 'banner_padding', nice_name: "<%= 'banner_padding'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.banner_padding) %>, width: 400 },
-      { name: 'banner_overlay_color', nice_name: "<%= 'banner_overlay_color'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.banner_overlay_color) %>, width: 400 },
+      { name: 'banner_overlay_color', nice_name: "<%= 'banner_overlay_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.banner_overlay_color) %>, width: 400 },
       { name: 'banner_overlay_opacity', nice_name: "<%= 'banner_overlay_opacity'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.banner_overlay_opacity) %>, width: 400 },
     <% if style %>
       { name: 'default_header_style', nice_name: "<%= 'default_style'.titleize %>", type: 'select', value: <%== Caboose.json(@theme.default_header_style) %>, options_url: '/admin/block-types/<%= style.id %>/options', width: 400 },
@@ -231,10 +278,10 @@ $(document).ready(function() {
       { name: 'default_header_position', nice_name: "<%= 'default_position'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.default_header_position) %>, width: 400 },
     <% 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: 'sidebar_bg_color', nice_name: "<%= 'background_color'.titleize %>", type: 'color', 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: 150, 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: 'footer_hover_color', nice_name: "<%= 'footer_hover_color'.titleize %>", type: 'color', 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 }
@@ -242,5 +289,101 @@ $(document).ready(function() {
   });  
 });
 
+$(window).load(function() {
+  var color_main = "<%= @theme.color_main %>";
+  var color_alt = "<%= @theme.color_alt %>";
+  var color_dark = "<%= @theme.color_dark %>";
+  var color_light = "<%= @theme.color_light %>";
+  $("#theme_<%= @theme.id %>_color_main").prop('disabled',true);
+  $("#theme_<%= @theme.id %>_color_alt").prop('disabled',true);
+  $("#theme_<%= @theme.id %>_color_light").prop('disabled',true);
+  $("#theme_<%= @theme.id %>_color_dark").prop('disabled',true);
+  $.each($(".mb_container.color"), function(k,v) {
+    var inp = $(v).find("input[type='text']").first();
+    inp.spectrum("option","showPalette",false);
+    inp.spectrum("option","showSelectionPalette",false);
+    if ( inp.val() == 'main' ) {
+      inp.spectrum("set",color_main);
+      inp.val('main');
+    }
+    else if ( inp.val() == 'alt' || inp.val() == 'alternate' ) {
+      inp.spectrum("set",color_alt);
+      inp.val('alt');
+    }
+    else if ( inp.val() == 'light' ) {
+      inp.spectrum("set",color_light);
+      inp.val('light');
+    }
+    else if ( inp.val() == 'dark' ) {
+      inp.spectrum("set",color_dark);
+      inp.val('dark');
+    }
+    inp.on("change.spectrum", function(e, color) {
+      console.log("input changed to " + color);
+      console.log("input v: " + inp.val());
+      if ( inp.val() == 'main' ) {
+        inp.spectrum("set",color_main);
+        inp.val('main');
+      }
+      else if ( inp.val() == 'alt' || inp.val() == 'alternate' ) {
+        inp.spectrum("set",color_alt);
+        inp.val('alt');
+      }
+      else if ( inp.val() == 'light' ) {
+        inp.spectrum("set",color_light);
+        inp.val('light');
+      }
+      else if ( inp.val() == 'dark' ) {
+        inp.spectrum("set",color_dark);
+        inp.val('dark');
+      }
+      else {
+        inp.spectrum("set", inp.val());
+   //     inp.val(color);
+      }
+    });
+  });
+  $("#theme_<%= @theme.id %>_color_main").on("change.spectrum", function(e, color) {
+    $.each($(".mb_container.color"), function(k,v) {
+      var inp = $(v).find("input[type='text']").first();
+      if ( inp.val() == 'main' ) {
+        inp.spectrum("set",color);
+        inp.val('main');
+      }
+    });
+    color_main = color;
+  });
+  $("#theme_<%= @theme.id %>_color_alt").on("change.spectrum", function(e, color) {
+    $.each($(".mb_container.color"), function(k,v) {
+      var inp = $(v).find("input[type='text']").first();
+      if ( inp.val() == 'alt' ) {
+        inp.spectrum("set",color);
+        inp.val('alt');
+      }
+    });
+    color_alt = color;
+  });
+  $("#theme_<%= @theme.id %>_color_dark").on("change.spectrum", function(e, color) {
+    $.each($(".mb_container.color"), function(k,v) {
+      var inp = $(v).find("input[type='text']").first();
+      if ( inp.val() == 'dark' ) {
+        inp.spectrum("set",color);
+        inp.val('dark');
+      }
+    });
+    color_dark = color;
+  });
+  $("#theme_<%= @theme.id %>_color_light").on("change.spectrum", function(e, color) {
+    $.each($(".mb_container.color"), function(k,v) {
+      var inp = $(v).find("input[type='text']").first();
+      if ( inp.val() == 'light' ) {
+        inp.spectrum("set",color);
+        inp.val('light');
+      }
+    });
+    color_light = color;
+  });
+});
+
 </script>
 <% end %>

data/lib/caboose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.173
+  version: 0.9.174
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2018-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg