caboose-cms 0.9.191 → 0.9.192

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fa5770805f90830e81dff80410e37b9e1a5dc64
-  data.tar.gz: 2592eb9ace69d288395420b4462bcaafac49026c
+  metadata.gz: a2f210c34837b56153cad8ff9b6f4a2ca4983794
+  data.tar.gz: 39f7b86cad1ed518471ffd3e02bc86d5f760e9a5
 SHA512:
-  metadata.gz: 16a284437d1add3322b15695d27ed450b8c4ec88677946a496d5ec89a386f7a163f46be0dbed4ab17b5671a27b75335bb463d872dea54c69b2e78642a337cb20
-  data.tar.gz: ca6b126f2655f79365178bf79a74c3a5506a460875fd87418b05e6729b2e986684b4faf50b13416a393845e67960fc141a132a885bfb21a1cb6e73cab1cd5ff1
+  metadata.gz: e9bdb953025a86eaad3dd383ae4793fe75a855cdd5f5b12af6b5bbe549c50c6f09d59d664cf9bef90b14c2d27ef4ac2991131effed91b3b87c5764c38b03e586
+  data.tar.gz: 44ed7ad818b22c2ddf13d78c0a1bc3ee232f2a370e95af3058edbc895fa449d2aac80a16184e0b4404701bd2b81aac52ab29e4294c4710b801d8c85d37097934

data/app/assets/javascripts/caboose/block_content_controller_dragdrop.js

@@ -401,7 +401,7 @@ BlockContentController.prototype = {
       }
 
       // child block of content area
-      if ( $(v).closest('.content_body').length > 0 ) {
+      if ( $(v).closest('.content_body').length > 0 && !$(v).parent().hasClass('nodrag') ) {
         var parent_id = $(v).parents("[id^='block_']").first().attr('id').replace('block_','');
         var is_last_child = $(v).next("[id^='block_']").length == 0 ? true : false;
         $(v).before($('<div/>')          
@@ -517,7 +517,7 @@ BlockContentController.prototype = {
     if (el.length > 0 && block_id.indexOf('constrain') < 0 && block_id.indexOf('full_width') < 0 && block_id.indexOf('_value_') < 0) {
       if ( el.attr('id').indexOf('_value') >= 0 || el.children('.drag_handle').length > 0 )
         return true;
-      if ( el.parents('.content_body').length > 0 ) {
+      if ( el.parents('.content_body').length > 0 && el.parents('.nodrag').length == 0 ) {
         $('#block_' + block_id + ' *').attr('onclick', '').unbind('click');
         el.prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_drag'      ).addClass('drag_handle'      ).append($('<span/>').addClass('ui-icon ui-icon-arrow-4'    )).click(function(e) { e.preventDefault(); e.stopPropagation();  }))
           .prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_select'    ).addClass('select_handle'    ).append($('<span/>').addClass('ui-icon ui-icon-check'      )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.select_block(block_id);    }))

data/app/controllers/caboose/block_type_categories_controller.rb

@@ -12,6 +12,7 @@ module Caboose
     def admin_options
     	btc = BlockTypeCategory.find(params[:id])
       options = params[:default] == 'yes' ? [{:text => 'Default', :value => 'Default'}] : []
+      options << { 'value' => 'none', 'text' => "No Header" } if params[:none] == 'yes'
     	BlockType.joins(:block_type_site_memberships).where("block_type_site_memberships.site_id = ?",@site.id).where("block_type_site_memberships.block_type_id = block_types.id").where("block_types.block_type_category_id = ?",btc.id).reorder('block_types.description').all.each do |s|
         options << { 'value' => s.id, 'text' => s.description }
       end
@@ -19,4 +20,4 @@ module Caboose
     end
     		
   end  
-end
+end

data/app/controllers/caboose/themes_controller.rb

@@ -95,6 +95,13 @@ module Caboose
           when 'note_success_bg' then theme.note_success_bg = value
           when 'nav_lineheight_offset' then theme.nav_lineheight_offset = value
 
+          when 'mobile_header_height' then theme.mobile_header_height = value
+          when 'mobile_logo_width' then theme.mobile_logo_width = value
+          when 'mobile_logo_height' then theme.mobile_logo_height = value
+          when 'mobile_logo_top_padding' then theme.mobile_logo_top_padding = value
+          when 'constrain_footer' then theme.constrain_footer = value
+          when 'heading_base_font_size' then theme.heading_base_font_size = value
+
     	  end
     	end
     	resp.success = save && theme.save

data/app/models/caboose/schema.rb

@@ -933,7 +933,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :google_analytics_id  , :string ],
         [ :google_analytics_id2 , :string ],
         [ :auto_ga_js           , :boolean , { :default => false }],
-        [ :share_image , :attachment ]
+        [ :share_image , :attachment ],
+        [ :facebook_pixel, :text ]
       ],
       Caboose::StackableGroup => [       
         [ :name           , :string  ],
@@ -1088,7 +1089,13 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :note_error_bg, :string ],
         [ :note_loading_bg, :string ],
         [ :note_success_bg, :string ],
-        [ :nav_lineheight_offset, :string ]
+        [ :nav_lineheight_offset, :string ],
+        [ :mobile_header_height, :string ],
+        [ :mobile_logo_width, :string ],
+        [ :mobile_logo_height, :string ],
+        [ :mobile_logo_top_padding, :string ],
+        [ :constrain_footer, :string ],
+        [ :heading_base_font_size, :string ]
       ],
       Caboose::ThemeFile => [
         [ :filename, :string ],

data/app/models/caboose/social_config.rb

@@ -16,7 +16,8 @@ class Caboose::SocialConfig < ActiveRecord::Base
     :rss_url              ,
     :google_plus_url      ,
     :linkedin_url         , 
-    :google_analytics_id
+    :google_analytics_id  ,
+    :facebook_pixel
 
     has_attached_file :share_image,      
       :path => 'share_images/:id_:style.:extension',      

data/app/models/caboose/theme.rb

@@ -92,7 +92,13 @@ class Caboose::Theme < ActiveRecord::Base
 		:note_loading_bg,
 		:note_success_bg,
 		:nav_lineheight_offset,
-		
+
+		:mobile_header_height,
+		:mobile_logo_width,
+		:mobile_logo_height,
+		:mobile_logo_top_padding,
+		:constrain_footer,
+		:heading_base_font_size,
 
     :digest,
     :custom_sass,

data/app/views/caboose/fonts/admin_index.html.erb

@@ -261,7 +261,7 @@
 		  e.preventDefault();
 		  $.ajax({
 		    url: '/admin/themes/<%= @site.theme_id %>/compile',
-		    type: 'get',    
+		    type: 'put',    
 		    success: function(resp) {
 		      if (resp.error) $('#cmessage').html("<p class='note error'>" + resp.error + "</p>").fadeIn();
 		      if (resp.success && resp.message) {

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

@@ -33,6 +33,7 @@ position = header.child('position') if header
       <div id="theme_<%= @theme.id %>_body_line_height"></div>
       <div id="theme_<%= @theme.id %>_body_font_color"></div>
       <div id="theme_<%= @theme.id %>_heading_line_height"></div>
+      <div id="theme_<%= @theme.id %>_heading_base_font_size"></div>
     </section>
     <section>
       <h5>Header</h5>
@@ -41,8 +42,6 @@ position = header.child('position') if header
       <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>
       <div id="theme_<%= @theme.id %>_header_nav_spacing"></div>
       <div id="theme_<%= @theme.id %>_logo_width"></div>
@@ -55,6 +54,16 @@ position = header.child('position') if header
       <div id="theme_<%= @theme.id %>_nav_lineheight_offset"></div>
       <div id="theme_<%= @theme.id %>_default_header_style"></div>
       <div id="theme_<%= @theme.id %>_default_header_position"></div>
+      
+    </section>
+    <section>
+      <h5>Mobile Header</h5>
+      <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 %>_mobile_header_height"></div>
+      <div id="theme_<%= @theme.id %>_mobile_logo_width"></div>
+      <div id="theme_<%= @theme.id %>_mobile_logo_height"></div>
+      <div id="theme_<%= @theme.id %>_mobile_logo_top_padding"></div>
     </section>
     <section>
       <h5>Footer</h5>
@@ -68,17 +77,7 @@ position = header.child('position') if header
       <div id="theme_<%= @theme.id %>_ninebar_show"></div>
       <div id="theme_<%= @theme.id %>_ninebar_bg_color"></div>
       <div id="theme_<%= @theme.id %>_ninebar_text"></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 %>
+      <div id="theme_<%= @theme.id %>_constrain_footer"></div>
     </section>
 
   </div>
@@ -92,7 +91,6 @@ position = header.child('position') if header
       <div id="theme_<%= @theme.id %>_btn_border_color"></div>
       <div id="theme_<%= @theme.id %>_btn_font_color"></div>
       <div id="theme_<%= @theme.id %>_btn_font_size"></div>
-      <div id="theme_<%= @theme.id %>_btn_font_weight"></div>
       <div id="theme_<%= @theme.id %>_btn_font_case"></div>
       <div id="theme_<%= @theme.id %>_btn_border_side"></div>
       <div id="theme_<%= @theme.id %>_button_padding"></div>
@@ -137,12 +135,21 @@ position = header.child('position') if header
       <div id="theme_<%= @theme.id %>_sidebar_width"></div>
       <div id="theme_<%= @theme.id %>_sidebar_bg_color"></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>
-      
-
-
+        
 
 <% content_for :caboose_css do %>
 <%= stylesheet_link_tag "caboose/spectrum" %>
@@ -256,7 +263,6 @@ $(document).ready(function() {
       { 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: 'select', value: <%== Caboose.json(@theme.btn_font_case) %>, options: [{'text':'none','value':'none'},{'text':'uppercase','value':'uppercase'},{'text':'lowercase','value':'lowercase'}], width: 400 },
       { name: 'btn_border_side', nice_name: "<%= 'border_side'.titleize %>", type: 'select', options: [{'text':'none','value':'none'},{'text':'all','value':'all'},{'text':'bottom','value':'bottom'}], 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 },
@@ -315,7 +321,14 @@ $(document).ready(function() {
       { name: 'note_error_bg', nice_name: "<%= 'note_error_background'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.note_error_bg) %>, width: 400 },
       { name: 'note_loading_bg', nice_name: "<%= 'note_loading_background'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.note_loading_bg) %>, width: 400 },
       { name: 'note_success_bg', nice_name: "<%= 'note_success_background'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.note_success_bg) %>, width: 400 },
-      { name: 'nav_lineheight_offset', nice_name: "<%= 'nav_line_height_offset'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.nav_lineheight_offset) %>, width: 400 }
+      { name: 'nav_lineheight_offset', nice_name: "<%= 'nav_line_height_offset'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.nav_lineheight_offset) %>, width: 400 },
+      { name: 'mobile_header_height', nice_name: 'Height', type: 'text', value: <%== Caboose.json(@theme.mobile_header_height) %>, width: 400 },
+      { name: 'mobile_logo_width', nice_name: 'Logo Width', type: 'text', value: <%== Caboose.json(@theme.mobile_logo_width) %>, width: 400 },
+      { name: 'mobile_logo_height', nice_name: 'Logo Height', type: 'text', value: <%== Caboose.json(@theme.mobile_logo_height) %>, width: 400 },
+      { name: 'mobile_logo_top_padding', nice_name: 'Logo Top Padding', type: 'text', value: <%== Caboose.json(@theme.mobile_logo_top_padding) %>, width: 400 },
+      { name: 'constrain_footer', nice_name: 'Constrain', type: 'select', options: [{'text':'Yes','value':'Yes'},{'text':'No','value':'No'}], value: <%== Caboose.json(@theme.constrain_footer) %>, width: 400 },
+      { name: 'heading_base_font_size', nice_name: 'Heading Base Font Size', type: 'text', value: <%== Caboose.json(@theme.heading_base_font_size) %>, width: 400 }
+
     ]    
   });  
 });

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

@@ -36,7 +36,6 @@
 <span>$btn-font-color: <%= @theme.btn_font_color %></span>
 <span>$btn-font: button-font</span>
 <span>$btn-font-size: <%= @theme.btn_font_size %></span>
-<span>$btn-font-weight: <%= @theme.btn_font_weight %></span>
 <span>$btn-font-case: <%= @theme.btn_font_case %></span>
 <span>$btn-border-side: <%= @theme.btn_border_side %></span>
 <span>$input-border-radius: <%= @theme.input_border_radius %></span>
@@ -72,6 +71,11 @@
 <span>$actual_footer_height: <%= @theme.actual_footer_height %></span>
 <span>$actual_banner_height: <%= @theme.actual_banner_height %></span>
 <span>$dropdown_nav_padding: <%= @theme.dropdown_nav_padding %></span>
+<span>$mobile_header_height: <%= @theme.mobile_header_height %></span>
+<span>$mobile_logo_width: <%= @theme.mobile_logo_width %></span>
+<span>$mobile_logo_height: <%= @theme.mobile_logo_height %></span>
+<span>$mobile_logo_top_padding: <%= @theme.mobile_logo_top_padding %></span>
+<span>$heading_base_font_size: <%= @theme.heading_base_font_size %></span>
 
 	</aside>
 	<div class="holder">

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.191'
+  VERSION = '0.9.192'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.191
+  version: 0.9.192
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg