caboose-cms 0.4.8 → 0.4.9

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 CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- YWRkMDE4MzQwODc3N2YyMTQ5ZmY4Mzc3MjkyNjFjNzJlYjBmNDBhNA==
4
+ ZjBlNDA1YjA0NzA2NDcwNzVkYWQ5MTk4YTc2NWUwMzYwNTg5ZmRjMQ==
5
5
  data.tar.gz: !binary |-
6
- MWRmMzJmNjEyNjdkZGNjNDM0MTAwNzFjZWVhZGUwNmU2MzRlMmNiMA==
6
+ ODhlMThhNThmODdhZWJkOWEzNDY5ZmE1MDFkOTNkYzU0ZWY2MmJmZA==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- NzhhNGFlMmU1NDE1NzFmZjNhMDMwNGIwZjk0ZjA5MDQzM2ZmMDEyY2QzOTdj
10
- MTg2ZmIyOWFjZTkxNjgxNGFiN2UwMTBjMjQ4OWQ4OTNiNjE0YmQ2ZDI0ZDM2
11
- MDIxY2Q1Yjg3YmI4YTQxYmYxYzM0MGQ4N2JlYmViN2M1YmYyODI=
9
+ YTI0Y2UxYTRiMzVlMjAzMzJhMWY1NDRhZWFjM2RlZjk4ZWI2ODllZDgwMzNi
10
+ Y2M4YTljNjE4OGUwMjk4YTIwNTBlZTFjZGUxMjhhNGFlZGQ1ZmMzZTNlMTVh
11
+ ODdhMTIwZTdlOWI3NTJkYWMyN2IzMWFiZWE5NzdjYzE5NDFhYmI=
12
12
  data.tar.gz: !binary |-
13
- NGMyODJlYWI0YjZlODkzYThkNjFkZGJiYjZlMTQ5NmM0NzFjN2EyN2JjNDI1
14
- ZjQzM2JhODQ4ZjU1MGI1ODU0MzE2NGI3NmE0ZjMwOWUzYTFjODJjYWVhZTI2
15
- NmY4ZDBlNWJiZjg3NDNhNGZhZDI2MWViMDkyOTJiODUyNmI0NDM=
13
+ N2I1MTRhMGMzZjM3NDVmOTcwN2I0NDEzZDRjZDJjZmQyMzEwMWUwNjg4NTMx
14
+ NTBjMDgyYTYzYzExYWQ3OWNhY2JiNmVjYmMxNGNjMzk4ZGU3ZTc4NGE4NjZk
15
+ MjE3YTUyZDU1ZWJjZGE1MTMzMWExOGViMzJmMDliN2I1OThlNDg=
@@ -337,15 +337,17 @@ class Caboose::Schema < Caboose::Utilities::Schema
337
337
  end
338
338
 
339
339
  if !Caboose::BlockType.where(:name => 'heading').exists?
340
- bt = Caboose::BlockType.create(:name => 'heading', :description => 'Heading')
340
+ bt = Caboose::BlockType.create(:name => 'heading', :description => 'Heading', :field_type => 'block')
341
341
  Caboose::BlockType.create(:parent_id => bt.id, :name => 'text', :description => 'Text', :field_type => 'text', :default => '', :width => 800, :fixed_placeholder => false)
342
342
  Caboose::BlockType.create(:parent_id => bt.id, :name => 'size', :description => 'Size', :field_type => 'text', :default => 1, :width => 800, :fixed_placeholder => false, :options => "1|2|3|4|5|6")
343
343
  end
344
344
 
345
- if !Caboose::BlockType.where(:name => 'richtext').exists?
346
- bt = Caboose::BlockType.create(:name => 'richtext', :description => 'Rich Text')
347
- Caboose::BlockType.create(:parent_id => bt.id, :name => 'text', :field_type => 'richtext', :description => 'Text', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)
345
+ if !Caboose::BlockType.where(:name => 'text').exists?
346
+ Caboose::BlockType.create(:name => 'text', :description => 'Text', :field_type => 'text', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)
348
347
  end
349
-
348
+ if !Caboose::BlockType.where(:name => 'richtext').exists?
349
+ Caboose::BlockType.create(:name => 'richtext', :description => 'Text', :field_type => 'richtext', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)
350
+ end
351
+
350
352
  end
351
353
  end
@@ -1,4 +1,7 @@
1
1
  <%
2
+ Caboose.log(@block.block_type.field_type)
3
+
4
+
2
5
  update_on_close = false
3
6
  @block.block_type.children.each do |bt|
4
7
  update_on_close = true if bt.field_type == 'image' || bt.field_type == 'file'
@@ -91,7 +94,7 @@ $(document).ready(function() {
91
94
  controller = new BlockController({
92
95
  block: <%= raw Caboose.json(@block.js_hash) %>,
93
96
  authenticity_token: '<%= form_authenticity_token %>'
94
- });
97
+ });
95
98
  });
96
99
 
97
100
  </script>
@@ -1,5 +1,17 @@
1
+ <%
2
+
3
+ #if !@page.nil? && @page.title != 'Access Denied'
4
+ #
5
+ # str = @page.block.render(@page.block, {
6
+ # :controller_view_content => yield,
7
+ # :modal => false,
8
+ # :empty_text => '',
9
+ # :editing => defined?(@editing) ? @editing : false
10
+ # })
1
11
 
2
- <%= content_for :js do %>
12
+ %>
13
+
14
+ <% content_for :js do %>
3
15
  <%= javascript_include_tag "caboose/application" %>
4
16
  <script>window.loggedIn = <%= logged_in?.to_json %></script>
5
17
  <% Caboose::javascripts.each do |js| %><%= javascript_include_tag(js) %><% end %>
@@ -7,7 +19,7 @@
7
19
  <%= yield :caboose_js %>
8
20
  <% end %>
9
21
 
10
- <%= content_for :css do %>
22
+ <% content_for :css do %>
11
23
  <%= stylesheet_link_tag('caboose/application') %>
12
24
  <% Caboose::stylesheets.each do |css| %><%= stylesheet_link_tag(css) %><% end %>
13
25
  <% @page.linked_resources_map[:css].each do |r| %><%= stylesheet_link_tag r %><% end %>
@@ -16,21 +28,6 @@
16
28
 
17
29
  <%
18
30
 
19
- #if yield && yield.strip.length > 0
20
- # %><%= yield %><%
21
- #elsif !@page.nil? && @page.title != 'Access Denied'
22
- # @page.top_level_blocks.each do |b|
23
- # %><%= raw b.render(b, {
24
- # :modal => false,
25
- # :empty_text => '',
26
- # :editing => defined?(@editing) ? @editing : false,
27
- # :css => yield(:css),
28
- # :js => yield(:js),
29
- # :csrf_meta_tags => csrf_meta_tags
30
- # }) %><%
31
- # end
32
- #end
33
-
34
31
  if !@page.nil? && @page.title != 'Access Denied'
35
32
  @page.top_level_blocks.each do |b|
36
33
  %><%= raw b.render(b, {
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.4.8'
2
+ VERSION = '0.4.9'
3
3
  end
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.8
4
+ version: 0.4.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry