caboose-cms 0.9.116 → 0.9.117

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d420edee4905eb0c5efd46fad49653ef02b8ae80
-  data.tar.gz: 76eb6c0655e6c15e69fad16c5e408cfb21e0080e
+  metadata.gz: 746344802d927992c0c1c995175f7322ec22b4e2
+  data.tar.gz: 58012ad3bfc826b6f2bcdf067c7c4ab24eb142a0
 SHA512:
-  metadata.gz: 66f57a094bb0866aad1768dc62cfdbb7646b8c827fe701ffc16893d004a6524e4f153eaa111bd59cfda70c6a3d561ad1c055b04a1f88809736d5385e8b5f6962
-  data.tar.gz: 9fcf35c4256ded02237a17fe400b26c59412ec4851fc075003304d42a1d8d0bc40332192217d9f54122ee3c561c11e9e882d4cfcdabf1d050bd829322ccbfcb4
+  metadata.gz: 05cbaf50d9cbb2bb8f9b0de43ad94764f6f1acf21a3afbfbee8a9e7f2905169942fcabccbc64f4be0895f8007e7b87363f12c8cbf098834eb9cf4a39023a357e
+  data.tar.gz: 769f9f79f5ab0afc18224a4029d3a0afb59cf1d4b9f6f6f13e7d3262608b2ea7b5cc76235364931d60c4304788c16b2ff5f614368881be9005c494d73bf8c2b2

data/app/controllers/caboose/domains_controller.rb

@@ -42,6 +42,7 @@ module Caboose
           when 'under_construction' then d.under_construction = value
           when 'forward_to_primary' then d.forward_to_primary = value
           when 'forward_to_uri'     then d.forward_to_uri     = value
+          when 'force_ssl'     then d.force_ssl     = value
           when 'primary'            then
             d.primary = value
             Domain.where(:site_id => params[:site_id]).all.each do |d2|

data/app/controllers/caboose/pages_controller.rb

@@ -48,12 +48,17 @@ module Caboose
         url = "#{request.protocol}#{d.domain}#{d.forward_to_uri}"
         redirect_to url
         return
+      elsif d.force_ssl == true && request.protocol != 'https://' && Rails.env.production?
+        url = "https://#{d.domain}#{request.fullpath}"
+        redirect_to url
+        return
       end
       
       if !page
         asset
         return
       end
+      
 
       user = logged_in_user      
       if !user.is_allowed(page, 'view')                

data/app/controllers/caboose/sites_controller.rb

@@ -183,6 +183,7 @@ module Caboose
           when 'custom_js'                then site.custom_js               = value
           when 'default_layout_id'        then site.default_layout_id       = value
           when 'allow_self_registration'  then site.allow_self_registration = value
+          when 'theme_color'  then site.theme_color = value
     	  end
     	end
     	

data/app/controllers/caboose/social_controller.rb

@@ -93,6 +93,17 @@ module Caboose
       resp.success = true
       render :json => resp
     end
+
+    # @route POST /admin/social/image
+    def admin_update_image
+      return if !user_is_allowed('social', 'edit')
+      resp = Caboose::StdClass.new
+      sc = @site.social_config
+      sc.share_image = params[:share_image]            
+      resp.success = sc.save
+      resp.attributes = { 'share_image' => { 'value' => sc.share_image.url(:large) }}
+      render :text => resp.to_json
+    end
     
   end
 end

data/app/models/caboose/domain.rb

@@ -3,6 +3,6 @@ class Caboose::Domain < ActiveRecord::Base
   self.table_name = "domains"
        
   belongs_to :site, :class_name => 'Caboose::Site'        
-  attr_accessible :id, :site_id, :domain, :primary, :under_construction, :forward_to_primary, :forward_to_uri
+  attr_accessible :id, :site_id, :domain, :primary, :under_construction, :forward_to_primary, :forward_to_uri, :force_ssl
       
 end

data/app/models/caboose/schema.rb

@@ -293,6 +293,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :primary            , :boolean, { :default => false }],
         [ :under_construction , :boolean, { :default => false }],
         [ :forward_to_primary , :boolean, { :default => false }],
+        [ :force_ssl          , :boolean, { :default => false }],
         [ :forward_to_uri     , :string  ]
       ],
       Caboose::Font => [
@@ -748,7 +749,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :default_layout_id       , :integer    ],
         [ :login_fail_lock_count   , :integer     , { :default => 5 }],
         [ :sitemap_xml , :text       ],
-        [ :robots_txt , :text        ]
+        [ :robots_txt , :text        ],
+        [ :theme_color , :string        ]
         #[ :custom_css              , :text       ],
         #[ :custom_css_files        , :text       ],
         #[ :custom_js               , :text       ],
@@ -786,7 +788,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :linkedin_url         , :string ],
         [ :google_analytics_id  , :string ],
         [ :google_analytics_id2 , :string ],
-        [ :auto_ga_js           , :boolean , { :default => false }]
+        [ :auto_ga_js           , :boolean , { :default => false }],
+        [ :share_image , :attachment ]
       ],
       Caboose::StackableGroup => [       
         [ :name           , :string  ],

data/app/models/caboose/site.rb

@@ -36,7 +36,8 @@ class Caboose::Site < ActiveRecord::Base
     :default_layout_id       ,
     :login_fail_lock_count   ,
     :sitemap_xml             ,
-    :robots_txt              
+    :robots_txt              ,
+    :theme_color             
             
   before_save :validate_presence_of_store_config
   

data/app/models/caboose/social_config.rb

@@ -1,7 +1,8 @@
 class Caboose::SocialConfig < ActiveRecord::Base
   self.table_name = "social_configs"
        
-  belongs_to :site      
+  belongs_to :site, :class_name => "Caboose::Site"
+
   attr_accessible :id, 
     :site_id              ,
     :facebook_page_id     ,
@@ -15,6 +16,15 @@ class Caboose::SocialConfig < ActiveRecord::Base
     :rss_url              ,
     :google_plus_url      ,
     :linkedin_url         , 
-    :google_analytics_id  
+    :google_analytics_id
+
+    has_attached_file :share_image,      
+      :path => ':share_images/:id_:style.:extension',      
+      :default_url => 'http://placehold.it/800x500',
+      :s3_protocol => :https,
+      :styles      => {
+        large:   '1200x1200>'
+      }
+    do_not_validate_attachment_file_type :share_image
     
 end

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

@@ -17,6 +17,7 @@ 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>
+<p><div id='site_<%= @site.id %>_theme_color' ></div></p>
 <p><div id='site_<%= @site.id %>_default_layout_id'       ></div></p>
 
 <h2>Domains</h2>
@@ -28,6 +29,7 @@ user_ids = [] if user_ids.nil?
     <th>Domain</th>
     <th>Primary</th>
     <th>Under Construction</th>
+    <th>Force SSL</th>
     <th>Forward to Primary</th>
     <th>Forward to URI</th>
     <th>Delete</th>
@@ -37,6 +39,7 @@ user_ids = [] if user_ids.nil?
     <td><%= d.domain %></td>
     <td align='center'><input type='radio'    name='primary_domain' <%= d.primary? ? "checked='true'" : '' %> onclick="set_primary_domain(<%= s.id %>, <%= d.id %>);" /></td>
     <td align='center'><input type='checkbox' name='under_construction_<%= d.id %>' <%= d.under_construction ? "checked='true'" : '' %> onclick="set_under_construction(<%= s.id %>, <%= d.id %>, $(this).prop('checked'));" /></td>
+    <td align='center'><input type='checkbox' name='force_ssl_<%= d.id %>' <%= d.force_ssl ? "checked='true'" : '' %> onclick="set_force_ssl(<%= s.id %>, <%= d.id %>, $(this).prop('checked'));" /></td>
     <td align='center'><input type='checkbox' name='forward_to_primary_<%= d.id %>' <%= d.forward_to_primary ? "checked='true'" : '' %> onclick="set_forward_to_primary(<%= s.id %>, <%= d.id %>, $(this).prop('checked'));" /></td>
     <td align='center'><input type='text'     name='forward_to_uri_<%= d.id %>' value="<%= d.forward_to_uri %>" onchange="set_forward_to_uri(<%= s.id %>, <%= d.id %>, $(this).val());" /></td>
     <td align='center'><input type='button'   value='Delete' onclick="delete_domain(<%= @site.id %>, <%= d.id %>);" /></td>    
@@ -73,6 +76,9 @@ user_ids = [] if user_ids.nil?
     line-height: 20px;
     padding: 30px 9px 9px 9px !important;
   }
+  table.data th {
+    padding: 2px 8px !important;
+  }
 </style>
 <% end %>
 
@@ -88,6 +94,7 @@ $(document).ready(function() {
     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: '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: 'under_construction_html' , nice_name: 'Under Construction HTML'  , type: 'textarea' , value: <%= raw Caboose.json(@site.under_construction_html)                %>, width: 600, height: 220 },
       { name: 'use_store'               , nice_name: 'Enable Store'             , type: 'checkbox' , value: <%= raw Caboose.json(@site.use_store               ? true : false) %>, width: 400 },
       { name: 'use_fonts'               , nice_name: 'Enable Fonts'             , type: 'checkbox' , value: <%= raw Caboose.json(@site.use_fonts               ? true : false) %>, width: 400 },
@@ -116,6 +123,15 @@ function set_forward_to_primary(site_id, domain_id, checked)
   });
 }
 
+function set_force_ssl(site_id, domain_id, checked)
+{
+  $.ajax({
+    url: '/admin/sites/' + site_id + '/domains/' + domain_id,
+    type: 'put',
+    data: { force_ssl: checked ? 1 : 0 }
+  });
+}
+
 function set_forward_to_uri(site_id, domain_id, val)
 {
   $.ajax({

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

@@ -31,6 +31,7 @@ Authorized
 <p><div id="socialconfig_<%= sc.id %>_google_analytics_id"  ></div></p>
 <p><div id="socialconfig_<%= sc.id %>_google_analytics_id2" ></div></p>
 <p><div id="socialconfig_<%= sc.id %>_auto_ga_js"           ></div></p>
+<p><div id="socialconfig_<%= sc.id %>_share_image"          ></div></p>
       
 <div id='message'></div>
 
@@ -78,7 +79,8 @@ $(document).ready(function() {
       { name: 'linkedin_url'         , nice_name: 'LinkedIn URL'                           , type: 'text'     , value: <%= raw Caboose.json(sc.linkedin_url) %>, width: 500 },
       { 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: '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' }
     ]    
   });
       

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.116'
+  VERSION = '0.9.117'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.116
+  version: 0.9.117
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg