caboose-cms 0.9.122 → 0.9.123

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 586d423dd5415f61518228ee369e4352e15acaed
-  data.tar.gz: d145d232f2d491f7e9d4cda7ba9043ccc0d3d407
+  metadata.gz: 98d552831bfdc1857ec2037e19401f3e91a5d584
+  data.tar.gz: 50d11a36e85e89f0fed4ec5e1c254beb326dedc9
 SHA512:
-  metadata.gz: 5a6014124a22169e131c74aced643229f53b6e0ac90bc30014b14f59645bd6244c84f5ef25592373def1f57a697420a6bb2ffd6a483196c7ee396d717565fd7a
-  data.tar.gz: 1c02965973fd900dbf9f011f78039930b7b468abf4989d1fc87f49fbe10fe36aa9e124307fb342477c75d5430aa88a7adb7edb9e2e648f05e5e2149961af433c
+  metadata.gz: 96356f4ba8608bfddcb660a30dba3405c5f9edf36532b1836d70ee3f44a3b2ed52b360d06374e1f529f657b3f26f16adaf40203bb11ce4c6b2325af1c4f70d8e
+  data.tar.gz: 5fe03ee90cc07a29b31b80e86e756e3fdd7e85a0f6953d11f57b698a7ac6d800507678d158466c3d9f9b488dc4f070a631bd53b86988a9b057124a0661de2b29

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

@@ -175,7 +175,8 @@ h1,h2,h3,h4,h5,h6 {
 }
 
 #content h1 {
-  margin: 0 0 20px -30px;
+  margin: 0 0 20px 0;
+  width: calc(100% + 30px);
   padding: 0 2% 0 50px;
   height: 53px;  
   background: #dcdcdc;
@@ -184,6 +185,8 @@ h1,h2,h3,h4,h5,h6 {
   line-height: 54px;
   overflow: hidden;
   color: #2d2d2d;
+  position: relative;
+  right: 30px;
 }
 
 #content h1.model_attribute_h1 {
@@ -561,9 +564,12 @@ Page Bar Generator
   left: 0;
   */
   list-style: none; 
-  margin: -20px 0 0 -30px; 
+  margin: 0 0 0 0; 
   padding: 0;
   border-top: #ccc 0px solid;
+  position: relative;
+  right: 30px;
+  bottom: 20px;
 }
 #tabs li { 
   list-style: none; 
@@ -593,7 +599,11 @@ Page Bar Generator
   font-weight: bold;  
 }
 #content2 {
-  margin-left: 220px; 
+  width: calc(100% - 200px);
+  float: right;
+  padding: 20px 20px 20px 0;
+  position: relative;
+  bottom: 20px;
 }
 
 #crumbtrail {

data/app/controllers/caboose/application_controller.rb

@@ -13,7 +13,7 @@ module Caboose
       # Modify the built-in params array with URL params if necessary
       parse_url_params if Caboose.use_url_params
       
-      @use_page_cache = !request.fullpath.starts_with?('/admin')
+   #   @use_page_cache = !request.fullpath.starts_with?('/admin')
             
       # Get the site we're working with      
       @domain = Domain.where(:domain => request.host_with_port).first      
@@ -49,7 +49,7 @@ module Caboose
       
       #if @find_page
         @page = Page.page_with_uri(request.host_with_port, request.fullpath)
-        @crumb_trail  = Caboose::Page.crumb_trail(@page)		    
+    #    @crumb_trail  = Caboose::Page.crumb_trail(@page)		    
       #end
 
 
@@ -57,7 +57,7 @@ module Caboose
       # Sets an instance variable of the logged in user
       @logged_in_user = logged_in_user  
 
-      @nav = Caboose.plugin_hook('admin_nav', [], @logged_in_user, @page, @site)
+      @nav = Caboose.plugin_hook('admin_nav', [], @logged_in_user, @page, @site) if request.fullpath.include?('/admin')
       
       # Initialize the card
       init_cart if @site && @site.use_store && !@domain.under_construction

data/app/controllers/caboose/block_types_controller.rb

@@ -146,8 +146,8 @@ module Caboose
       end
       
       # Trigger the page cache to be updated      
-      query = ["update page_cache set refresh = true where page_id in (select distinct(page_id) from blocks where block_type_id = ?)", bt.id]
-      ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, query))      
+ #     query = ["update page_cache set refresh = true where page_id in (select distinct(page_id) from blocks where block_type_id = ?)", bt.id]
+ #     ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, query))      
   #    PageCacher.delay(:queue => 'caboose_cache').refresh
     
       resp.success = save && bt.save

data/app/controllers/caboose/pages_controller.rb

@@ -80,8 +80,8 @@ module Caboose
       @page = page
       @user = user
       @editmode = !params['edit'].nil? && user.is_allowed('pages', 'edit') ? true : false
-      @crumb_trail = Caboose::Page.crumb_trail(@page)
-      @subnav = Caboose::Page.subnav(@page, session['use_redirect_urls'], @user)
+   #   @crumb_trail = Caboose::Page.crumb_trail(@page)
+   #   @subnav = Caboose::Page.subnav(@page, session['use_redirect_urls'], @user)
 
       #@subnav.links = @tasks.collect {|href, task| {'href' => href, 'text' => task, 'is_current' => uri == href}}
   

data/app/controllers/caboose/social_controller.rb

@@ -17,7 +17,7 @@ module Caboose
     
     # @route PUT /admin/social
     def admin_update
-      return if !user_is_allowed('sites', 'edit')
+      return if !user_is_allowed('social', 'edit')
 
       resp = StdClass.new     
       sc = @site.social_config

data/app/views/layouts/caboose/admin.html.erb

@@ -84,9 +84,9 @@ end
   </div>
 </div>
 <div id='content_wrapper'>
-  <div id='content'>
+  <div id='content' class='clearfix'>
   
-<%= yield %>
+    <%= yield %>
 
   </div>
 </div>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.122'
+  VERSION = '0.9.123'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.122
+  version: 0.9.123
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -1238,7 +1238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: CMS built on rails.