caboose-cms 0.9.202 → 0.9.203

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,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 594ecd258a29ebf021cb1027118e4d5bdd14053e14a510dabe5984af1d06e01c
4
- data.tar.gz: 4431d98ed2160f9a81c90d9c276c280d4e34f24cbb51facd068063420b8278db
3
+ metadata.gz: 1725d5a46f0948469bc5bbb94e701c1ad6fe6b0d34ac4cd2454a2382be0074a0
4
+ data.tar.gz: c674a21714a52e1f1f8d29b9a62d436e01694c7150485f342b37f0d3e503627b
5
5
  SHA512:
6
- metadata.gz: eddf552c561fb568d8f17ae458494756d50abcbcd5f7963a9f779a38a1783cfc2de30d96abc515f39fe2a763550521462a34318de9d108e2a8bb9643c3f83d17
7
- data.tar.gz: 70399d22a0dc430571772bf0c8c2c573cc627c93402243d12fabe887e466eb05304f66647be3c1edd2d1d4e41a99bd0fb78658ae596db09fd255d222dce7865a
6
+ metadata.gz: 1b4e7c09ffbd75fdbddafd309c4a24b3e86f25c6d9dc1f2b4645651b76ac4c52e58e29ef1708fd31dda2a7b33e335292ef49f51f26005032b4be82467b6bb2e9
7
+ data.tar.gz: 30c8c2285347b66aedac3036eb0e437afb5cabeab016df70785202613fb30e487ad33aaf0457091cee73af26ab71cac46f86f0667d9fd70b2ecba6be98c73256
@@ -24,8 +24,7 @@ MediaController.prototype = {
24
24
  init: function(params) {
25
25
  var that = this;
26
26
  for (var i in params)
27
- this[i] = params[i];
28
-
27
+ this[i] = params[i];
29
28
  $("#uploader")
30
29
  .empty()
31
30
  .append($('<p/>')
@@ -39,6 +38,7 @@ MediaController.prototype = {
39
38
 
40
39
  refresh: function()
41
40
  {
41
+ //console.log("REFRESHING EVERYTHING");
42
42
  var that = this;
43
43
  that.refresh_categories();
44
44
  that.refresh_media();
@@ -64,6 +64,7 @@ MediaController.prototype = {
64
64
 
65
65
  refresh_media: function()
66
66
  {
67
+ //console.log("REFRESHING MEDIA");
67
68
  var that = this;
68
69
  $.ajax({
69
70
  url: '/admin/media/json',
@@ -80,7 +81,6 @@ MediaController.prototype = {
80
81
 
81
82
  change_sort_order: function(list) {
82
83
  var that = this;
83
- // console.log(list.toString());
84
84
  $.ajax({
85
85
  url: '/admin/media-categories/' + that.cat_id + '/sort-order',
86
86
  type: 'put',
@@ -162,7 +162,8 @@ MediaController.prototype = {
162
162
  flash_swf_url: '../../js/Moxie.swf', // Flash settings
163
163
  silverlight_xap_url: '../../js/Moxie.xap', // Silverlight settings
164
164
  init: {
165
- BeforeUpload: function(up, file) {
165
+ BeforeUpload: function(up, file) {
166
+ //console.log("BeforeUpload");
166
167
  //up.settings.multipart_params["Content-Type"] = file.type;
167
168
  $.ajax({
168
169
  url: '/admin/media/pre-upload',
@@ -175,14 +176,16 @@ MediaController.prototype = {
175
176
  success: function(resp) {},
176
177
  async: false
177
178
  });
178
- controller.refresh();
179
+ // controller.refresh();
179
180
  },
180
181
  FileUploaded: function(ip, file)
181
182
  {
182
- that.refresh();
183
+ //console.log("FileUploaded");
184
+ // that.refresh();
183
185
  },
184
186
  UploadComplete: function(up, files) {
185
- that.refresh();
187
+ //console.log("UploadComplete");
188
+ that.refresh_media();
186
189
  that.ajax_count = 0;
187
190
  if (that.uploader)
188
191
  {
@@ -9,7 +9,8 @@ module Caboose
9
9
  end
10
10
 
11
11
  def sitemap
12
- @protocol = request && request.protocol ? request.protocol : 'http'
12
+ @protocol = request && request.protocol ? request.protocol : 'http://'
13
+ @protocol = 'https://' if request && request.env['HTTPS'] == 'on'
13
14
  begin
14
15
  view = ActionView::Base.new(ActionController::Base.view_paths)
15
16
  str = view.render(:partial => "../../app/views/caboose/blocks/#{@site.name}/sitemap", :locals => {:site => @site, :protocol => @protocol})
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.9.202'
2
+ VERSION = '0.9.203'
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.9.202
4
+ version: 0.9.203
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-11-19 00:00:00.000000000 Z
11
+ date: 2018-11-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pg