caboose-cms 0.9.171 → 0.9.172
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/caboose/theme.rb +2 -1
- data/app/views/layouts/caboose/application.html.erb +4 -4
- data/lib/caboose/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7e94f6b70e7405d620738735f3988354796aff2b
|
4
|
+
data.tar.gz: 7b04c7c819bd1e4dc982386a3fc3dc5c75440f9d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5631f4acdbbe4a3bf46243ab1e9fda542abc05fa6c1dbc8026265044e9972a3f83bffab7d3b953a430ffb3f9d7ef4ab8b3241bfe9eddc148725ed6af69ef7b30
|
7
|
+
data.tar.gz: 44604487593826996692a81dc5cf324184e1d269debefeb895584cfc5cc89a9796fc8eb3b484f4385caece005354137b26d862368cef6f88667aa18fb1e7873c
|
data/app/models/caboose/theme.rb
CHANGED
@@ -133,7 +133,8 @@ class Caboose::Theme < ActiveRecord::Base
|
|
133
133
|
end
|
134
134
|
|
135
135
|
def asset_url(site_id = 0)
|
136
|
-
|
136
|
+
pre = Rails.env.production? ? "https://" : ""
|
137
|
+
"#{pre}#{ActionController::Base.asset_host}/#{asset_path(self.digest,site_id)}"
|
137
138
|
end
|
138
139
|
|
139
140
|
def js_url
|
@@ -2,9 +2,9 @@
|
|
2
2
|
<% content_for :js do %>
|
3
3
|
<%= gzip_javascript_include_tag "caboose/application" %>
|
4
4
|
<% if @site.theme %>
|
5
|
-
<%=
|
5
|
+
<script type='text/javascript' src="<%= @site.theme.js_url %>"></script>
|
6
6
|
<% else %>
|
7
|
-
<%= gzip_javascript_include_tag @site.name == 'application' ? 'application' : "#{@site.name}/js/application" %>
|
7
|
+
<%= gzip_javascript_include_tag @site.name == 'application' ? 'application' : "#{@site.name}/js/application" %>
|
8
8
|
<% end %>
|
9
9
|
<script>window.loggedIn = <%= logged_in?.to_json %></script>
|
10
10
|
<% Caboose::javascripts.each do |js| %><%= javascript_include_tag(js) %><% end %>
|
@@ -19,9 +19,9 @@
|
|
19
19
|
<% content_for :css do %>
|
20
20
|
<%= gzip_stylesheet_link_tag 'caboose/application' %>
|
21
21
|
<% if @site.theme %>
|
22
|
-
<%=
|
22
|
+
<link rel='stylesheet' type='text/css' media='all' href="<%= @site.theme.asset_url(@site.id) %>" />
|
23
23
|
<% else %>
|
24
|
-
<%= gzip_stylesheet_link_tag @site.name == 'application' ? 'application' : "#{@site.name}/css/application" %>
|
24
|
+
<%= gzip_stylesheet_link_tag @site.name == 'application' ? 'application' : "#{@site.name}/css/application" %>
|
25
25
|
<% end %>
|
26
26
|
<% Caboose::stylesheets.each do |css| %><%= gzip_stylesheet_link_tag(css) %><% end %>
|
27
27
|
<% @page.linked_resources_map[:css].each do |r| %><%= gzip_stylesheet_link_tag r %><% end %>
|
data/lib/caboose/version.rb
CHANGED