caboose-cms 0.9.206 → 0.9.207

data/app/assets/stylesheets/caboose/login.scss

@@ -55,13 +55,13 @@
         font-weight: 300;
         font-size: 16px;
         border: 1px solid #d8d8d8;
-        height: 36px;
+        height: 40px;
         padding: 6px;
         font-style: normal;
         background-color: transparent;
         -webkit-appearance: none;
         border-radius: 0;
-        line-height: 36px;
+        line-height: 40px;
         text-align: left;
         &:focus {
           outline-width: 0;

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

@@ -1,4 +1,4 @@
-
+/* DEPRECATED
 #the_modal div.icons { max-height: 800px; overflow-y: scroll; }
 #the_modal div.icons h2 { clear: both; padding: 20px 0px 10px 0; text-align: center; }
 #the_modal div.icons a { display: block; float: left; margin: 4px; width: 120px; height: 100px; text-align: center; vertical-align: middle; border: #000 1px solid; text-decoration: none; border-radius: 3px; overflow: hidden; }
@@ -18,15 +18,16 @@
 #the_modal h6 {
 	font-family: 'Roboto'; font-weight: 300;
 }
-#the_modal .mb_container input { border: #ccc 1px solid; }                                                          
+
+/*#the_modal .mb_container input { border: #ccc 1px solid; }                                                          
 #the_modal div.mb_container div.mb_placeholder { top: 9px; }
 #the_modal div.mb_container div.mb_placeholder span { font-size: 16px; }                                                         
 #the_modal div.mb_container select { border: #ccc 1px solid; height: 38px; }
 #the_modal div.mb_container select option { font-size: 16px; }
-#the_modal div.mb_container input[type=checkbox] { top: 12px; }
-#the_modal #modal_crumbtrail,
+#the_modal div.mb_container input[type=checkbox] { top: 12px; }*/
+/*#the_modal #modal_crumbtrail,
 #the_modal #modal_crumbtrail h2,
 #the_modal #modal_crumbtrail h2 a { font-family: 'Roboto'; font-weight: 300; font-size: 15px !important; color: #0975a7; text-decoration: none; text-transform: none; letter-spacing: 0; }
 #the_modal #modal_crumbtrail h2 a:hover {
 	color: #09a710;
-}
+}*/

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

@@ -115,7 +115,7 @@ div.mb_container div.mb_placeholder {
   margin: 0;
   padding: 0 5px 0 0;
   position: absolute;
-  top: 8px;
+  top: 9px;
   left: 9px;
   z-index: 19;  
 }

data/app/controllers/caboose/sites_controller.rb

@@ -10,7 +10,7 @@ module Caboose
 
     def sitemap
       @protocol = request && request.protocol ? request.protocol : 'http://'
-      @protocol = 'https://' if request && request.env['HTTP_CF_VISITOR'] && request.env['HTTP_CF_VISITOR'].to_s.include?('https') 
+      @protocol = 'https://' if request && request.env['HTTP_CF_VISITOR'] && request.env['HTTP_CF_VISITOR'].to_s.include?('https')
       begin
         view = ActionView::Base.new(ActionController::Base.view_paths)
         str = view.render(:partial => "../../app/views/caboose/blocks/#{@site.name}/sitemap", :locals => {:site => @site, :protocol => @protocol})

data/app/views/caboose/blocks/_image.html.erb

@@ -9,12 +9,14 @@ if editing && url.include?('placehold') %>
 <div class="img-wrap" style="position:relative;display:inline-block;">
 	<div class="img-holder" style="background-image:url(https://cabooseit.s3.amazonaws.com/assets/caboose/grid.png);background-size:15px;display:inline-block;position:relative;" id='block_<%= block.id %>'>
 		<img src='https://cabooseit.s3.amazonaws.com/assets/select_image.png' width="150" style="max-width:100%;display:block;" />
+		<span style="opacity:0;" class="select">Select an Image</span>
 	</div>
 </div>
 <% elsif editing %>
 <div class="img-wrap" style="position:relative;display:inline-block;">
 	<div class="img-holder" style="background-image:url(https://cabooseit.s3.amazonaws.com/assets/caboose/grid.png);background-size:15px;display:inline-block;position:relative;" id='block_<%= block.id %>'>
 		<img src='<%== url %>' width="200" style="max-width:100%;display:block;" />
+		<span style="opacity:0;" class="select">Select an Image</span>
 	</div>
 </div>
 <% else %>

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

@@ -5,8 +5,8 @@ grid = Caboose::BlockType.where(:name => 'flex_grid').first
 %>
 
 <div class='icons' id='new_blocks_container2'>
+  <div id='caboose_sidebar_holder'></div>
   <h4>Drag a block<br />onto the page.</h4>
- 
   <ul id='new_blocks'>
     <% if grid %>
     	<li class='title'><span>Structure</span></li>

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

@@ -6,7 +6,7 @@
 <% else %>
 <%= stylesheet_link_tag 'caboose/admin_edit_page_content' %>
 <% end %>
-<%= stylesheet_link_tag "caboose/modal_inline" %>
+<%# stylesheet_link_tag "caboose/modal_inline" %>
 <%= stylesheet_link_tag "caboose/icomoon_fonts" %>
 <% end %>
 <% content_for :caboose_js do %>

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

@@ -6,7 +6,7 @@
 <% else %>
 <%= stylesheet_link_tag 'caboose/admin_edit_page_content' %>
 <% end %>
-<%= stylesheet_link_tag "caboose/modal_inline" %>
+<%# stylesheet_link_tag "caboose/modal_inline" %>
 <%= stylesheet_link_tag "caboose/icomoon_fonts" %>
 <% end %>
 <% content_for :caboose_js do %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.206'
+  VERSION = '0.9.207'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.206
+  version: 0.9.207
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -502,6 +502,7 @@ files:
 - app/assets/images/caboose/file_types/xlsx.png
 - app/assets/images/caboose/file_types/zip.png
 - app/assets/images/caboose/grid.png
+- app/assets/images/caboose/loading2.gif
 - app/assets/images/caboose/loading_black_on_white.gif
 - app/assets/images/caboose/loading_black_on_yellow.gif
 - app/assets/images/caboose/loading_green.gif
@@ -609,6 +610,7 @@ files:
 - app/assets/javascripts/caboose/product.js
 - app/assets/javascripts/caboose/s3upload.js
 - app/assets/javascripts/caboose/shortcut.js
+- app/assets/javascripts/caboose/sidebar_controller.js
 - app/assets/javascripts/caboose/spectrum.js
 - app/assets/javascripts/caboose/station.js
 - app/assets/javascripts/caboose/tinymce_init.js