caboose-cms 0.9.185 → 0.9.186

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a44bbf807dee07c46455284ebc542fe64f679f3
-  data.tar.gz: a6700b6e26f8080f444e48e749e0d3fc18f1bca0
+  metadata.gz: a54046beb7e66063a1a9ed7951eedbb5fa6d1d4c
+  data.tar.gz: 5277cae8be51f4b8ee729dfec6ce2e0a63828b44
 SHA512:
-  metadata.gz: 60049316ca5e63a457452f94c87eed894d58aba619dd4d94adcd9e5495c433b432464f238fc627fd32cc20bdb5ccaf8b2937542915316491ed400b79d3248e72
-  data.tar.gz: 40d5eaf66f71161dee9a957cb82a9e3d2a2aaeaf4e74a31c9fcc9ce6a51e210366b83bf8339f49626d6bb4255c7fa5251ffbfa69687e5c2f4700c706d3a2829c
+  metadata.gz: 900fc17bb8b33ef0f64579ce7a2cad570b7eb61c78f9531f503bd938868e85666d3315547256f7d64788ae719713f097e478d1257e78ecf78d96ccfb3effd77e
+  data.tar.gz: 43947619ab12956c139d728d796c234f4e62da9a8e19e1b580ddc5460b29898a883c23e3e070df51022d34955302ea71b401c9f1af15108b0d9b6438bc432697

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

@@ -121,10 +121,6 @@ BoundColor = BoundControl.extend({
     this.attribute.value = this.attribute.value_clean;
     $('#'+this.el).val(this.attribute.value);
     $('#'+this.el).removeClass('mb_dirty');
-    
-    //if ($('#'+this.el+'_check').length)
-    //  this.hide_check();
-    
     if (this.attribute.after_cancel) this.attribute.after_cancel();
   },
     

data/app/controllers/caboose/sites_controller.rb

@@ -121,6 +121,16 @@ module Caboose
       end   
       @site = Site.find(params[:id])      
     end
+
+    # @route GET /admin/sites/:id/codes
+    def admin_edit_codes
+      return if !user_is_allowed('sites', 'edit')
+      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/delete
     def admin_delete_form
@@ -205,6 +215,9 @@ module Caboose
           when 'zip' then site.zip = value
           when 'fax' then site.fax = value
           when 'contact_email' then site.contact_email = value
+          when 'head_code' then site.head_code = value
+          when 'body_open_code' then site.body_open_code = value
+          when 'body_close_code' then site.body_close_code = value
     	  end
     	end
     	resp.success = save && site.save

data/app/models/caboose/schema.rb

@@ -824,7 +824,10 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :state, :string ],
         [ :zip, :string ],
         [ :fax, :string ],
-        [ :contact_email, :string ]
+        [ :contact_email, :string ],
+        [ :head_code, :text ],
+        [ :body_open_code, :text ],
+        [ :body_close_code, :text ]
       ],
       Caboose::SiteMembership => [
         [ :site_id     , :integer ],

data/app/models/caboose/site.rb

@@ -61,7 +61,10 @@ class Caboose::Site < ActiveRecord::Base
     :state,
     :zip,
     :fax,
-    :contact_email
+    :contact_email,
+    :head_code,
+    :body_open_code,
+    :body_close_code
             
   before_save :validate_presence_of_store_config
 

data/app/models/caboose/theme.rb

@@ -6,7 +6,7 @@ class Caboose::Theme < ActiveRecord::Base
   has_many :theme_files, :through => :theme_file_memberships    
 
   has_attached_file :default_banner_image,      
-    :path => 'banner_images/:id_:style.:extension',      
+    :path => ':caboose_prefixbanner_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',
     :s3_protocol => :https,
     :styles      => {
@@ -187,7 +187,7 @@ class Caboose::Theme < ActiveRecord::Base
 			url = self.default_banner_image.url(:huge)
 			url = "https:#{url}" if !url.include?('https')
 			if !url.include?('res.cloudinary')
-	      result = Cloudinary::Uploader.upload(url , :public_id => "banner_images/#{self.id}_huge", :overwrite => true)
+	      result = Cloudinary::Uploader.upload(url, :public_id => "caboose/banner_images/#{self.id}_huge", :overwrite => true)
 	      self.cl_banner_version = result['version'] if result && result['version']
 	      self.save
 	    end

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

@@ -29,7 +29,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",
+  'Embedded HTML'     => "/admin/sites/#{@site.id}/codes",
   'Delete Site'       => "/admin/sites/#{@site.id}/delete" 
 }
 

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

@@ -25,7 +25,7 @@ user_ids = [] if user_ids.nil?
 <p><div id='site_<%= @site.id %>_favicon'                    ></div></p>
 
 <h2>Domains</h2>
-<p><a href='#' onclick="add_domain(<%= @site.id %>);">New Domain</a></p>
+<p><a href='#' onclick="add_domain(<%= @site.id %>);return false;">New Domain</a></p>
 <div id='new_domain_container'></div>
 <% if @site.domains && @site.domains.count > 0 %>
   <table class='data'>

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

@@ -0,0 +1,38 @@
+<%= render :partial => 'caboose/sites/admin_header' %>
+
+<h5 style="margin:0;font-size:18px;">Embedded HTML</h5>
+
+<p><div id='site_<%= @site.id %>_head_code'></div></p>
+<p><div id='site_<%= @site.id %>_body_open_code'></div></p>
+<p><div id='site_<%= @site.id %>_body_close_code'></div></p>
+
+<%= render :partial => 'caboose/sites/admin_footer' %>
+
+<% content_for :caboose_css do %>
+<style>
+  textarea {
+    font-family: monospace;
+    font-size: 13px;
+    line-height: 18px;
+  }
+</style>
+<% end %>
+
+<% content_for :caboose_js do %>
+<script type="text/javascript">
+
+$(document).ready(function() {
+  new ModelBinder({
+    name: 'Site',
+    id: <%= @site.id %>,
+    update_url: '/admin/sites/<%= @site.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'head_code', nice_name: 'Code for &lt;head&gt;', type: 'textarea', value: <%== Caboose.json(@site.head_code) %>, width: 600, height: 300 },
+      { name: 'body_open_code', nice_name: 'Code for after &lt;body&gt;', type: 'textarea', value: <%== Caboose.json(@site.body_open_code) %>, width: 600, height: 300 },
+      { name: 'body_close_code', nice_name: 'Code for before &lt;/body&gt;', type: 'textarea', value: <%== Caboose.json(@site.body_close_code) %>, width: 600, height: 300 }
+    ]    
+  });       
+});
+</script>
+<% end %>

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

@@ -332,6 +332,7 @@ $(window).load(function() {
   $.each($(".mb_container.color"), function(k,v) {
     var inp = $(v).find("input[type='text']").first();
     inp.spectrum("option","showPalette",false);
+    inp.spectrum("option","showAlpha",true);
     inp.spectrum("option","showSelectionPalette",false);
     if ( inp.val() == 'main' ) {
       inp.spectrum("set",color_main);
@@ -350,8 +351,8 @@ $(window).load(function() {
       inp.val('dark');
     }
     inp.on("change.spectrum", function(e, color) {
-      console.log("input changed to " + color);
-      console.log("input v: " + inp.val());
+      // console.log("input changed to " + color);
+      // console.log("input v: " + inp.val());
       if ( inp.val() == 'main' ) {
         inp.spectrum("set",color_main);
         inp.val('main');
@@ -368,10 +369,12 @@ $(window).load(function() {
         inp.spectrum("set",color_dark);
         inp.val('dark');
       }
-      else {
-        inp.spectrum("set", inp.val());
-   //     inp.val(color);
+      else if ( inp.val() == 'transparent' ) {
+        inp.spectrum("set","rgba(0,0,0,0)");
+        inp.val('transparent');
       }
+      else
+        inp.spectrum("set", inp.val());
     });
   });
   $("#theme_<%= @theme.id %>_color_main").on("change.spectrum", function(e, color) {

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.185'
+  VERSION = '0.9.186'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.185
+  version: 0.9.186
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -1161,6 +1161,7 @@ files:
 - app/views/caboose/sites/admin_delete_form.html.erb
 - app/views/caboose/sites/admin_edit.html.erb
 - app/views/caboose/sites/admin_edit_block_types.html.erb
+- app/views/caboose/sites/admin_edit_codes.html.erb
 - app/views/caboose/sites/admin_edit_contact.html.erb
 - app/views/caboose/sites/admin_edit_css.html.erb
 - app/views/caboose/sites/admin_edit_js.html.erb