caboose-cms 0.9.75 → 0.9.76
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 +4 -4
- data/app/models/caboose/site.rb +5 -5
- data/app/views/layouts/caboose/application.html.erb +1 -1
- data/lib/caboose/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 609a44de81243d561064f99d93f9f7ff113f5d82
|
|
4
|
+
data.tar.gz: c4213dc5352d3fd9bf30e66ba8216035e5ee76c2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 58aa3be8111218acdd34d8dfd852589a0108fa2804e7076d6bc4d1dfd1a21d8d15a90f17c1c622c526bb94b379a093cd0c0252fbd78313f98908d6795b021482
|
|
7
|
+
data.tar.gz: a962f4a914ef23b7866e53fcca0f31147c9e664360d6bbd99b578e6eebf9bbb471956fc6ad7a74eff20607c471061cd8fadccd2ce45ef38027182183425a47ff
|
data/app/models/caboose/site.rb
CHANGED
|
@@ -96,19 +96,19 @@ class Caboose::Site < ActiveRecord::Base
|
|
|
96
96
|
end
|
|
97
97
|
|
|
98
98
|
def custom_js_url
|
|
99
|
-
url = "
|
|
99
|
+
url = "//#{Caboose::cdn_domain}/assets/#{self.name}/js/custom.js"
|
|
100
100
|
url << "?#{self.date_js_updated.strftime('%Y%m%d%H%M%S')}" if self.date_js_updated
|
|
101
101
|
return url
|
|
102
102
|
end
|
|
103
103
|
|
|
104
104
|
def custom_css_url
|
|
105
|
-
url = "
|
|
105
|
+
url = "//#{Caboose::cdn_domain}/assets/#{self.name}/css/custom.css"
|
|
106
106
|
url << "?#{self.date_css_updated.strftime('%Y%m%d%H%M%S')}" if self.date_css_updated
|
|
107
107
|
return url
|
|
108
108
|
end
|
|
109
109
|
|
|
110
|
-
def custom_js
|
|
111
|
-
resp = HTTParty.get(self.custom_js_url)
|
|
110
|
+
def custom_js
|
|
111
|
+
resp = HTTParty.get('https:' + self.custom_js_url)
|
|
112
112
|
if resp.nil? || resp.code.to_i == 403
|
|
113
113
|
self.custom_js = ""
|
|
114
114
|
return ""
|
|
@@ -117,7 +117,7 @@ class Caboose::Site < ActiveRecord::Base
|
|
|
117
117
|
end
|
|
118
118
|
|
|
119
119
|
def custom_css
|
|
120
|
-
resp = HTTParty.get(self.custom_css_url)
|
|
120
|
+
resp = HTTParty.get('https:' + self.custom_css_url)
|
|
121
121
|
if resp.nil? || resp.code.to_i == 403
|
|
122
122
|
self.custom_css = ""
|
|
123
123
|
return ""
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
<%= gzip_stylesheet_link_tag @site.name == 'application' ? 'application' : "#{@site.name}/css/application" %>
|
|
18
18
|
<% Caboose::stylesheets.each do |css| %><%= gzip_stylesheet_link_tag(css) %><% end %>
|
|
19
19
|
<% @page.linked_resources_map[:css].each do |r| %><%= gzip_stylesheet_link_tag r %><% end %>
|
|
20
|
-
<% if @site.date_css_updated %><link rel='stylesheet' type='text/css'
|
|
20
|
+
<% if @site.date_css_updated %><link rel='stylesheet' type='text/css' href="<%= raw @site.custom_css_url %>" /><% end %>
|
|
21
21
|
<% if @page.custom_css_files && @page.custom_css_files.strip.length > 0 %>
|
|
22
22
|
<% @page.custom_css_files.split("\n").each do |url| %><link rel="stylesheet" type='text/css' href="<%= raw url %>" /><% end %>
|
|
23
23
|
<% end %>
|
data/lib/caboose/version.rb
CHANGED
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.9.
|
|
4
|
+
version: 0.9.76
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- William Barry
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-10-
|
|
11
|
+
date: 2017-10-05 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: pg
|