caboose-cms 0.3.52 → 0.3.53

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MWQ1MzE3NDYzYTI1Mzg1Njg4ZTVkYWJiZjQ5MGNmNmNjZjg5ZWU0YQ==
4
+ YzA2MTE0YTNhNjQyZGNlN2MzNWNkMmVmNzFlZmNiNWIwODM3NzcwMg==
5
5
  data.tar.gz: !binary |-
6
- MjMyYzUxYjI5Mjk1MjJiZWZlYTk0NzJjNWUzZWJkMjZjODA0ZTFlOQ==
6
+ ODYxN2ZlMmY5ZjNlODk3Y2M3OGE2MzM3NjA0MjViNTYwZDk3MGU1NQ==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- NmNmZGRkNzVmNzkxZDVhNTJlYThiMzQyMDIxNGVmNmNkOThiNDg4YTNmMGFh
10
- NjMyMzQ3MWI5MDg1YzdmMGFjNWI3OWU1YjkyOTRkMTNhOWI3ZTEzNDI5MDJi
11
- Y2YwNDNkNDZhZGE0NzMxMjc4ODU3ZjIzYThkNGQwNjJiODljYjk=
9
+ ZjQ4YzYwZTM4ZjFhNWMwZWU5NTMwOTRhYWQ3NDliYzNkNjE1ZjA4ZmExYmE1
10
+ NTRmZDg0NDY4ZDBiNTBmOGM4NDVkNDA2ZjdkZWNlMGFhZjE1NDFlNzY4NDVi
11
+ ODQxOTljZmY0NmY5YjEwNmU4MTRkMjI3NDk3YTk3MGE1YjMxNTU=
12
12
  data.tar.gz: !binary |-
13
- OGRlYzNlYjJlZGIxZmUwZjI2YzEwNWU1YWFhM2I3ZTc1NTAxODAzZTg2Y2Qy
14
- NjA2MzI5MTI1NTZiMTQ3YTA0ZTUyZGI5ZDM5YmRiZjE5Y2FlNGI4YzM5ZjM2
15
- ODNhYjcwYTQwMTg0ZWEzNDJiZDQyNDk3NjE4YTA2MDRkMjE4MGU=
13
+ MDgzNjlkZDY1ZmUwMTI3MzhiNGQ5OTZjMjJlZWEwNGYyMWU2NTU0MjQyYWZi
14
+ ZGQ3MTBiMzZlYWMxNWM1NjYzNjBkZDc3ZWNhYjBhZDE0MzE0Yjc3MDA3MGUw
15
+ ZjY1NjZhYjNiMWNiMWM2ZmMxMTgzY2Y0YTA5N2Y2NWViOGQwNWI=
@@ -1,19 +1,21 @@
1
1
 
2
2
  <%= content_for :js do %>
3
- <script>window.loggedIn = <%= logged_in?.to_json %></script>
4
- <%= javascript_include_tag(*Caboose::javascripts) %>
5
- <%= yield :caboose_js %>
3
+ <%= javascript_include_tag "caboose/application" %>
4
+ <script>window.loggedIn = <%= logged_in?.to_json %></script>
5
+ <%= javascript_include_tag(*Caboose::javascripts) %>
6
+ <%= yield :caboose_js %>
6
7
  <% end %>
7
8
 
8
9
  <%= content_for :css do %>
9
- <%= stylesheet_link_tag(*Caboose::stylesheets) %>
10
- <%= yield :caboose_css %>
10
+ <%= stylesheet_link_tag('caboose/application') %>
11
+ <%= stylesheet_link_tag(*Caboose::stylesheets) %>
12
+ <%= yield :caboose_css %>
11
13
  <% end %>
12
14
 
13
15
  <% if (File.exists?("#{Rails.root}/app/views/layouts/layout_#{@page.id}.html.erb") || File.exists?("#{Rails.root}/app/views/layouts/layout_#{@page.id}.html.haml")) %>
14
- <%= render :file => "layouts/layout_#{@page.id}" %>
16
+ <%= render :file => "layouts/layout_#{@page.id}" %>
15
17
  <% elsif (!@page.layout.nil? && @page.layout.length > 0 && (File.exists?("#{Rails.root}/app/views/layouts/layout_#{@page.layout}.html.erb") || File.exists?("#{Rails.root}/app/views/layouts/layout_#{@page.layout}.html.haml"))) %>
16
- <%= render :file => "layouts/layout_#{@page.layout}" %>
18
+ <%= render :file => "layouts/layout_#{@page.layout}" %>
17
19
  <% else %>
18
- <%= render :file => "layouts/layout_default" %>
20
+ <%= render :file => "layouts/layout_default" %>
19
21
  <% end %>
@@ -48,7 +48,7 @@ module Caboose
48
48
 
49
49
  # Define asset collections
50
50
  mattr_accessor :javascripts, :stylesheets
51
- @@javascripts = ['caboose/application']
52
- @@stylesheets = ['caboose/application']
51
+ @@javascripts = []
52
+ @@stylesheets = []
53
53
 
54
54
  end
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.3.52'
2
+ VERSION = '0.3.53'
3
3
  end
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.3.52
4
+ version: 0.3.53
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-06 00:00:00.000000000 Z
11
+ date: 2014-03-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails