caboose-cms 0.9.206 → 0.9.207
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/images/caboose/loading2.gif +0 -0
- data/app/assets/javascripts/caboose/block_content_controller_dragdrop.js +4 -3
- data/app/assets/javascripts/caboose/block_modal_controllers/block_dd_modal_controller.js +50 -46
- data/app/assets/javascripts/caboose/block_modal_controllers/media_modal_controller.js +52 -20
- data/app/assets/javascripts/caboose/block_modal_controllers/richtext_modal_controller.js +69 -2
- data/app/assets/javascripts/caboose/modal_controller.js +6 -54
- data/app/assets/javascripts/caboose/sidebar_controller.js +168 -0
- data/app/assets/stylesheets/caboose/admin_block_edit_image.css.scss +4 -4
- data/app/assets/stylesheets/caboose/admin_edit_page_content_dragdrop.scss +395 -44
- data/app/assets/stylesheets/caboose/login.scss +2 -2
- data/app/assets/stylesheets/caboose/modal_inline.css +6 -5
- data/app/assets/stylesheets/caboose/model_binder.css +1 -1
- data/app/controllers/caboose/sites_controller.rb +1 -1
- data/app/views/caboose/blocks/_image.html.erb +2 -0
- data/app/views/caboose/pages/_new_block_header.html.erb +1 -1
- data/app/views/caboose/pages/admin_edit_content.html.erb +1 -1
- data/app/views/caboose/posts/admin_edit_content.html.erb +1 -1
- data/lib/caboose/version.rb +1 -1
- metadata +4 -2
|
@@ -55,13 +55,13 @@
|
|
|
55
55
|
font-weight: 300;
|
|
56
56
|
font-size: 16px;
|
|
57
57
|
border: 1px solid #d8d8d8;
|
|
58
|
-
height:
|
|
58
|
+
height: 40px;
|
|
59
59
|
padding: 6px;
|
|
60
60
|
font-style: normal;
|
|
61
61
|
background-color: transparent;
|
|
62
62
|
-webkit-appearance: none;
|
|
63
63
|
border-radius: 0;
|
|
64
|
-
line-height:
|
|
64
|
+
line-height: 40px;
|
|
65
65
|
text-align: left;
|
|
66
66
|
&:focus {
|
|
67
67
|
outline-width: 0;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
/* DEPRECATED
|
|
2
2
|
#the_modal div.icons { max-height: 800px; overflow-y: scroll; }
|
|
3
3
|
#the_modal div.icons h2 { clear: both; padding: 20px 0px 10px 0; text-align: center; }
|
|
4
4
|
#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 @@
|
|
|
18
18
|
#the_modal h6 {
|
|
19
19
|
font-family: 'Roboto'; font-weight: 300;
|
|
20
20
|
}
|
|
21
|
-
|
|
21
|
+
|
|
22
|
+
/*#the_modal .mb_container input { border: #ccc 1px solid; }
|
|
22
23
|
#the_modal div.mb_container div.mb_placeholder { top: 9px; }
|
|
23
24
|
#the_modal div.mb_container div.mb_placeholder span { font-size: 16px; }
|
|
24
25
|
#the_modal div.mb_container select { border: #ccc 1px solid; height: 38px; }
|
|
25
26
|
#the_modal div.mb_container select option { font-size: 16px; }
|
|
26
|
-
#the_modal div.mb_container input[type=checkbox] { top: 12px; }
|
|
27
|
-
|
|
27
|
+
#the_modal div.mb_container input[type=checkbox] { top: 12px; }*/
|
|
28
|
+
/*#the_modal #modal_crumbtrail,
|
|
28
29
|
#the_modal #modal_crumbtrail h2,
|
|
29
30
|
#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; }
|
|
30
31
|
#the_modal #modal_crumbtrail h2 a:hover {
|
|
31
32
|
color: #09a710;
|
|
32
|
-
}
|
|
33
|
+
}*/
|
|
@@ -10,7 +10,7 @@ module Caboose
|
|
|
10
10
|
|
|
11
11
|
def sitemap
|
|
12
12
|
@protocol = request && request.protocol ? request.protocol : 'http://'
|
|
13
|
-
@protocol = 'https://' if request && request.env['HTTP_CF_VISITOR'] && request.env['HTTP_CF_VISITOR'].to_s.include?('https')
|
|
13
|
+
@protocol = 'https://' if request && request.env['HTTP_CF_VISITOR'] && request.env['HTTP_CF_VISITOR'].to_s.include?('https')
|
|
14
14
|
begin
|
|
15
15
|
view = ActionView::Base.new(ActionController::Base.view_paths)
|
|
16
16
|
str = view.render(:partial => "../../app/views/caboose/blocks/#{@site.name}/sitemap", :locals => {:site => @site, :protocol => @protocol})
|
|
@@ -9,12 +9,14 @@ if editing && url.include?('placehold') %>
|
|
|
9
9
|
<div class="img-wrap" style="position:relative;display:inline-block;">
|
|
10
10
|
<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 %>'>
|
|
11
11
|
<img src='https://cabooseit.s3.amazonaws.com/assets/select_image.png' width="150" style="max-width:100%;display:block;" />
|
|
12
|
+
<span style="opacity:0;" class="select">Select an Image</span>
|
|
12
13
|
</div>
|
|
13
14
|
</div>
|
|
14
15
|
<% elsif editing %>
|
|
15
16
|
<div class="img-wrap" style="position:relative;display:inline-block;">
|
|
16
17
|
<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 %>'>
|
|
17
18
|
<img src='<%== url %>' width="200" style="max-width:100%;display:block;" />
|
|
19
|
+
<span style="opacity:0;" class="select">Select an Image</span>
|
|
18
20
|
</div>
|
|
19
21
|
</div>
|
|
20
22
|
<% else %>
|
|
@@ -5,8 +5,8 @@ grid = Caboose::BlockType.where(:name => 'flex_grid').first
|
|
|
5
5
|
%>
|
|
6
6
|
|
|
7
7
|
<div class='icons' id='new_blocks_container2'>
|
|
8
|
+
<div id='caboose_sidebar_holder'></div>
|
|
8
9
|
<h4>Drag a block<br />onto the page.</h4>
|
|
9
|
-
|
|
10
10
|
<ul id='new_blocks'>
|
|
11
11
|
<% if grid %>
|
|
12
12
|
<li class='title'><span>Structure</span></li>
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
<% else %>
|
|
7
7
|
<%= stylesheet_link_tag 'caboose/admin_edit_page_content' %>
|
|
8
8
|
<% end %>
|
|
9
|
-
|
|
9
|
+
<%# stylesheet_link_tag "caboose/modal_inline" %>
|
|
10
10
|
<%= stylesheet_link_tag "caboose/icomoon_fonts" %>
|
|
11
11
|
<% end %>
|
|
12
12
|
<% content_for :caboose_js do %>
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
<% else %>
|
|
7
7
|
<%= stylesheet_link_tag 'caboose/admin_edit_page_content' %>
|
|
8
8
|
<% end %>
|
|
9
|
-
|
|
9
|
+
<%# stylesheet_link_tag "caboose/modal_inline" %>
|
|
10
10
|
<%= stylesheet_link_tag "caboose/icomoon_fonts" %>
|
|
11
11
|
<% end %>
|
|
12
12
|
<% content_for :caboose_js do %>
|
data/lib/caboose/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: caboose-cms
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.9.
|
|
4
|
+
version: 0.9.207
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- William Barry
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-11-
|
|
11
|
+
date: 2018-11-28 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: pg
|
|
@@ -502,6 +502,7 @@ files:
|
|
|
502
502
|
- app/assets/images/caboose/file_types/xlsx.png
|
|
503
503
|
- app/assets/images/caboose/file_types/zip.png
|
|
504
504
|
- app/assets/images/caboose/grid.png
|
|
505
|
+
- app/assets/images/caboose/loading2.gif
|
|
505
506
|
- app/assets/images/caboose/loading_black_on_white.gif
|
|
506
507
|
- app/assets/images/caboose/loading_black_on_yellow.gif
|
|
507
508
|
- app/assets/images/caboose/loading_green.gif
|
|
@@ -609,6 +610,7 @@ files:
|
|
|
609
610
|
- app/assets/javascripts/caboose/product.js
|
|
610
611
|
- app/assets/javascripts/caboose/s3upload.js
|
|
611
612
|
- app/assets/javascripts/caboose/shortcut.js
|
|
613
|
+
- app/assets/javascripts/caboose/sidebar_controller.js
|
|
612
614
|
- app/assets/javascripts/caboose/spectrum.js
|
|
613
615
|
- app/assets/javascripts/caboose/station.js
|
|
614
616
|
- app/assets/javascripts/caboose/tinymce_init.js
|