caboose-cms 0.4.11 → 0.4.12
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 +8 -8
- data/app/assets/stylesheets/caboose/print.css +0 -0
- data/app/models/caboose/block.rb +14 -8
- data/app/views/caboose/blocks/_layout_basic.html.erb +1 -4
- data/app/views/caboose/pages/admin_edit_content.html.erb +4 -2
- data/app/views/layouts/caboose/application.html.erb +6 -6
- data/lib/caboose/version.rb +1 -1
- metadata +2 -1
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
MDc1NDJkNWFjZDc5MWU0M2U0MGRlMWQwZTQyZjJlOTYzMTdlZjM5NA==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
OTI4OTljZTEzMjFlNDdjYWQyMTc5YWNmMDUzNWQ5NTNjM2NjNDIzZQ==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
ODYzNDA5YTkwYTA1NzQzMGNkYWQzM2M0YThiNTNhYjk4Mzg4OTUyMWMwM2Jh
|
10
|
+
YTU3ZjdlNzYyMjVjMWYzMGE4NjMwMmQ1ODAzMmIwYjNhNDUxMTNkMzQ1YjUx
|
11
|
+
ODFlZWNlZTUyZjYzNjg5NTg0YzU4ZGUxYTE3ZTIyODUxNTcxNmE=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
ZmJiMjM2NmY2MDIxYjliN2Y2MjdlN2E0M2EzMGUxMzI0NDBiNDlkNmRjMTRi
|
14
|
+
YWM5YWI2NTFkNDhhMmUyZDk3MDFkNjVkMWM5YTdhMTk3NTBlNGFlZTE3NTgy
|
15
|
+
NDIwNmJlZWU4NTEyNWRiMGU3MzU2YTFlOTk3MTZkMDA0ZTVmZmM=
|
File without changes
|
data/app/models/caboose/block.rb
CHANGED
@@ -92,7 +92,7 @@ class Caboose::Block < ActiveRecord::Base
|
|
92
92
|
#Caboose.log("block.render\nself.id = #{self.id}\nblock = #{block}\nblock.full_name = #{block.full_name}\noptions.class = #{options.class}\noptions = #{options}")
|
93
93
|
|
94
94
|
if block && block.is_a?(String)
|
95
|
-
Caboose.log("Block #{block} is a string, finding block object... self.id = #{self.id}")
|
95
|
+
#Caboose.log("Block #{block} is a string, finding block object... self.id = #{self.id}")
|
96
96
|
b = self.child(block)
|
97
97
|
if b.nil?
|
98
98
|
self.create_children
|
@@ -119,16 +119,22 @@ class Caboose::Block < ActiveRecord::Base
|
|
119
119
|
str = block.render_from_function(options2)
|
120
120
|
else
|
121
121
|
view = ActionView::Base.new(ActionController::Base.view_paths)
|
122
|
-
begin
|
123
|
-
#str = view.render(:partial => "caboose/blocks/#{block.name}", :locals => options2)
|
122
|
+
begin
|
124
123
|
str = view.render(:partial => "caboose/blocks/#{block.full_name}", :locals => options2)
|
125
|
-
rescue
|
124
|
+
rescue ActionView::MissingTemplate
|
126
125
|
begin
|
127
|
-
str = view.render(:partial => "caboose/blocks/#{block.block_type.name}", :locals => options2)
|
128
|
-
|
129
|
-
|
130
|
-
|
126
|
+
str = view.render(:partial => "caboose/blocks/#{block.block_type.name}", :locals => options2)
|
127
|
+
rescue ActionView::MissingTemplate
|
128
|
+
begin
|
129
|
+
str = view.render(:partial => "caboose/blocks/#{block.block_type.field_type}", :locals => options2)
|
130
|
+
rescue Exception => ex
|
131
|
+
Caboose.log(ex.message)
|
132
|
+
end
|
133
|
+
rescue Exception => ex
|
134
|
+
Caboose.log(ex.message)
|
131
135
|
end
|
136
|
+
rescue Exception => ex
|
137
|
+
Caboose.log(ex.message)
|
132
138
|
end
|
133
139
|
end
|
134
140
|
return str
|
@@ -11,7 +11,7 @@ page = block.page
|
|
11
11
|
<meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1" />
|
12
12
|
<title><%= !page.title.nil? && page.title.strip.length > 0 ? "#{page.title} | " : "" %><%= Caboose::website_name %></title>
|
13
13
|
<meta name="description" content="" />
|
14
|
-
<meta name="viewport" content="width=device-width"
|
14
|
+
<meta name="viewport" content="width=device-width" />
|
15
15
|
<%= raw css %>
|
16
16
|
<%= stylesheet_link_tag 'print', :media => 'print' %>
|
17
17
|
<%= raw csrf_meta_tags %>
|
@@ -25,9 +25,6 @@ page = block.page
|
|
25
25
|
<%= raw block.render('content', local_assigns) %>
|
26
26
|
<%= raw block.render('footer' , local_assigns) %>
|
27
27
|
</div>
|
28
|
-
<% content_for :js do %>
|
29
|
-
<script type='text/javascript' src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAzhmPHU-MEhWXbpvAdZRjd0-ZmVy-KYA8&sensor=false" /></script>
|
30
|
-
<% end %>
|
31
28
|
<%= raw js %>
|
32
29
|
</body>
|
33
30
|
</html>
|
@@ -24,8 +24,10 @@
|
|
24
24
|
<% end %>
|
25
25
|
|
26
26
|
<% content_for :caboose_js do %>
|
27
|
-
|
28
|
-
|
27
|
+
<%
|
28
|
+
#= javascript_include_tag "jquery.ui.all"
|
29
|
+
#= javascript_include_tag "caboose/model/all"
|
30
|
+
%>
|
29
31
|
<%= javascript_include_tag 'caboose/admin_page_edit_content' %>
|
30
32
|
<script type='text/javascript'>
|
31
33
|
|
@@ -7,12 +7,12 @@
|
|
7
7
|
<% @page.linked_resources_map[:js].each do |r| %><%= javascript_include_tag r %><% end %>
|
8
8
|
<%= yield :caboose_js %>
|
9
9
|
<% end %>
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
10
|
+
<% content_for :css do %>
|
11
|
+
<%= stylesheet_link_tag('caboose/application') %>
|
12
|
+
<% Caboose::stylesheets.each do |css| %><%= stylesheet_link_tag(css) %><% end %>
|
13
|
+
<% @page.linked_resources_map[:css].each do |r| %><%= stylesheet_link_tag r %><% end %>
|
14
|
+
<%= yield :caboose_css %>
|
15
|
+
<% end %>
|
16
16
|
<%
|
17
17
|
b = @page.block
|
18
18
|
str = b.render(b, {
|
data/lib/caboose/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: caboose-cms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.12
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- William Barry
|
@@ -236,6 +236,7 @@ files:
|
|
236
236
|
- app/assets/stylesheets/caboose/modal.css
|
237
237
|
- app/assets/stylesheets/caboose/model_binder.css
|
238
238
|
- app/assets/stylesheets/caboose/page_bar_generator.css
|
239
|
+
- app/assets/stylesheets/caboose/print.css
|
239
240
|
- app/assets/stylesheets/caboose/register.css
|
240
241
|
- app/assets/stylesheets/caboose/station_modal.css
|
241
242
|
- app/assets/stylesheets/caboose/station_sidebar.css
|