caboose-cms 0.9.171 → 0.9.172

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b950057eda03512416be71eff5a5c7a1f677e742
-  data.tar.gz: 383c29854f9f65087a636bda0725b0f49652508b
+  metadata.gz: 7e94f6b70e7405d620738735f3988354796aff2b
+  data.tar.gz: 7b04c7c819bd1e4dc982386a3fc3dc5c75440f9d
 SHA512:
-  metadata.gz: ab66668a97bc53e4e5895ff48164df9381e0945c7d8cb8c835698717af74e7c965a4409983d8df783c44b38dcd29fd6da7d6bfdae45280b918c23ac48cc50f27
-  data.tar.gz: cdfd51f7ea390fbedde16b9e16d1962e1454bda33c9bab72fba9d6fb9eac410dfa37ed34644ea8fb34d0eb2504d1897ff36956b26671201db6ccba63560a890e
+  metadata.gz: 5631f4acdbbe4a3bf46243ab1e9fda542abc05fa6c1dbc8026265044e9972a3f83bffab7d3b953a430ffb3f9d7ef4ab8b3241bfe9eddc148725ed6af69ef7b30
+  data.tar.gz: 44604487593826996692a81dc5cf324184e1d269debefeb895584cfc5cc89a9796fc8eb3b484f4385caece005354137b26d862368cef6f88667aa18fb1e7873c

data/app/models/caboose/theme.rb

@@ -133,7 +133,8 @@ class Caboose::Theme < ActiveRecord::Base
 	end
 
 	def asset_url(site_id = 0)
-		"#{ActionController::Base.asset_host}/#{asset_path(self.digest,site_id)}"
+		pre = Rails.env.production? ? "https://" : ""
+		"#{pre}#{ActionController::Base.asset_host}/#{asset_path(self.digest,site_id)}"
 	end
 
 	def js_url

data/app/views/layouts/caboose/application.html.erb

@@ -2,9 +2,9 @@
 <% content_for :js do %>
 <%= gzip_javascript_include_tag "caboose/application" %>
 <% if @site.theme %>
-<%= gzip_javascript_include_tag(@site.theme.js_url) %>
+  <script type='text/javascript' src="<%= @site.theme.js_url %>"></script>
 <% else %>
-<%= gzip_javascript_include_tag @site.name == 'application' ? 'application' : "#{@site.name}/js/application" %>
+  <%= gzip_javascript_include_tag @site.name == 'application' ? 'application' : "#{@site.name}/js/application" %>
 <% end %>
 <script>window.loggedIn = <%= logged_in?.to_json %></script>
 <% Caboose::javascripts.each do |js| %><%= javascript_include_tag(js) %><% end %>
@@ -19,9 +19,9 @@
 <% content_for :css do %>
 <%= gzip_stylesheet_link_tag 'caboose/application' %>
 <% if @site.theme %>
-<%= gzip_stylesheet_link_tag(@site.theme.asset_url(@site.id)) %>
+  <link rel='stylesheet' type='text/css' media='all' href="<%= @site.theme.asset_url(@site.id) %>" />
 <% else %>
-<%= gzip_stylesheet_link_tag @site.name == 'application' ? 'application' : "#{@site.name}/css/application" %>
+  <%= gzip_stylesheet_link_tag @site.name == 'application' ? 'application' : "#{@site.name}/css/application" %>
 <% end %>
 <% Caboose::stylesheets.each do |css| %><%= gzip_stylesheet_link_tag(css) %><% end %>
 <% @page.linked_resources_map[:css].each do |r| %><%= gzip_stylesheet_link_tag r %><% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.171'
+  VERSION = '0.9.172'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.171
+  version: 0.9.172
 platform: ruby
 authors:
 - William Barry