caboose-cms 0.5.70 → 0.5.71

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +8 -8
  2. data/app/controllers/caboose/application_controller.rb +1 -1
  3. data/lib/caboose/engine.rb +44 -35
  4. data/lib/caboose/version.rb +1 -1
  5. metadata +1 -2
  6. data/app/views/caboose/checkout/#Untitled-1# +0 -2
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- N2MzZDNkOTk2YzlkNGQ2ZTNiODlkYmZlM2M2YThkYjAyODgxMjNjNg==
4
+ M2YzYjYyMWYwZmRjOGVlZWVlOTEyZjkxNWI1ZDQwZGEzOGNmYzQyZQ==
5
5
  data.tar.gz: !binary |-
6
- MWRlZDQwNGIxNGEwODYxMzkzNjZmOTUwMzc5NjljOTRmYjM1OWRlYQ==
6
+ OTU5NTAxYTFjN2NmZGMwYTFkYWRiNTcyN2U2NjU2MjMwMTNiMTJkNg==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- MTk1NTRiMzNkMjYxNDgxNTEzYzRjNDc2YTRkMmMzMDc3ZTQwZWMxNDQ1OTk0
10
- Yzg4MWU0MGNmY2Y5NTczMTRiYTgyYzU4YTlmZTU2OWZlY2E4ZGMxYTk1ODc5
11
- MzA4ZWIwOTNhZDMyMTVmZmRhNTQ3MWIwYjg5YWQzODcyNmM2MTE=
9
+ ZDQ1NGY0NDdkZTE0MjFmYjAxYmMxM2JmZTliZTJjODQ0ZGJiZmMyYjRhODBk
10
+ YzFkMTVjODMzMDU0NDE3YzA0ODBiZjkxYTA5MDg3YjFlYzc5NzQ0ZmYzYmQ5
11
+ NmQ0Mjk5ZWFlMmZlZWEyMGZhNGI4MTJkMThhN2IzNDRjMDIxMTc=
12
12
  data.tar.gz: !binary |-
13
- MTA4YzQ4YTJmYzA5NzE2OGJhY2M3M2JmYTMxOThhOTYwNjczN2NhYWVlMTc5
14
- YmM0OGFhYTcxYjc2YWIzNjUzYWJjZmE1NTYyMGU3MzQ3NGY5ZTkzNTgwN2M3
15
- ZmI2MzBkZjNlOGJkYjg5MWVjMWFmMmU3YzZiNTFlMzJkZTY5M2U=
13
+ NDgzMDA2ZWRiOGJkYmNjMTM2YjU5OWMyZGQxOTk1MTM5Y2I1ZjE0OTg5YzYy
14
+ NTNkMzY1NmVkNjRlNjJkNThjNGI2OWIyOGQ2ZjAxMDU3MjAyYjBkOWU5MzNj
15
+ YjY2MGExNTgwNDIwNGUzZTBlZjZhMmJlZGFmMDJkMjBiNzUwN2E=
data/app/controllers/caboose/application_controller.rb CHANGED
@@ -47,7 +47,7 @@ module Caboose
47
47
  @logged_in_user = logged_in_user
48
48
 
49
49
  # Initialize the card
50
- init_cart if @site.use_store
50
+ init_cart if @site && @site.use_store
51
51
 
52
52
  before_action
53
53
  end
data/lib/caboose/engine.rb CHANGED
@@ -87,64 +87,70 @@ module Caboose
87
87
 
88
88
  # Javascript
89
89
  'caboose/admin_block_edit.js',
90
+ 'caboose/admin_edit_order.js',
90
91
  'caboose/admin_images_index.js',
92
+ 'caboose/admin_main.js',
91
93
  'caboose/admin_page_edit_content.js',
92
94
  'caboose/admin_page_new_blocks.js',
93
95
  'caboose/admin_products.js',
94
96
  'caboose/admin.js',
95
97
  'caboose/application.js',
98
+ 'caboose/authorize.net.js',
96
99
  'caboose/cart.js',
97
- 'caboose/cart2.js',
98
- 'caboose/checkout.js',
99
- 'caboose/checkout_step1.js',
100
- 'caboose/checkout_step2.js',
101
- 'caboose/checkout_step3.js',
102
- 'caboose/checkout_step4.js',
100
+ 'caboose/checkout_addresses.js',
101
+ 'caboose/checkout_gift_cards.js',
102
+ 'caboose/checkout_login_register.js',
103
+ 'caboose/checkout_module.js',
104
+ 'caboose/checkout_payment.js',
105
+ 'caboose/checkout_shipping.js',
106
+ 'caboose/checkout.js',
107
+ 'caboose/imageZoom.js',
108
+ 'caboose/jquery.detect.js',
109
+ 'caboose/jquery.fileupload.js',
110
+ 'caboose/jquery.iframe-transport.js',
111
+ 'caboose/jquery.placeholder.js',
112
+ 'caboose/lodash.min.js',
103
113
  'caboose/main.js',
104
114
  'caboose/modal_integration.js',
105
- 'caboose/modal.js',
115
+ 'caboose/modal.js',
106
116
  'caboose/model/all.js',
107
117
  'caboose/model/attribute.js',
108
118
  'caboose/model/bound_checkbox_multiple.js',
109
119
  'caboose/model/bound_checkbox.js',
120
+ 'caboose/model/bound_code.js',
121
+ 'caboose/model/bound_color.js',
110
122
  'caboose/model/bound_control.js',
111
- 'caboose/model/bound_image.js',
123
+ 'caboose/model/bound_date.js',
112
124
  'caboose/model/bound_file.js',
125
+ 'caboose/model/bound_image.js',
113
126
  'caboose/model/bound_richtext.js',
114
127
  'caboose/model/bound_s3_image.js',
115
- 'caboose/model/bound_select.js',
128
+ 'caboose/model/bound_select.js',
116
129
  'caboose/model/bound_text.js',
117
130
  'caboose/model/bound_textarea.js',
131
+ 'caboose/model/bound_time.js',
118
132
  'caboose/model/class.js',
119
- 'caboose/model/imageZoom.js',
133
+ 'caboose/model/index_table_bak.js',
120
134
  'caboose/model/index_table.js',
121
135
  'caboose/model/model_binder.js',
122
136
  'caboose/model/model.js',
137
+ 'caboose/model/pager.js',
123
138
  'caboose/model/s3.js',
124
139
  'caboose/model.form.page.js',
125
140
  'caboose/model.form.user.js',
126
- 'caboose/placeholder.js',
127
- 'caboose/shortcut.js',
128
- 'caboose/station.js',
129
- 'caboose/tinymce/plugins/caboose/plugin.js',
130
- 'caboose/messages/error.js',
131
- 'caboose/jquery.placeholder.js',
132
- 'caboose/jquery.detect.js',
133
- 'caboose/jquery.fileupload.js',
134
- 'caboose/jquery.iframe-transport.js',
135
- 'caboose/jquery.placeholder.js',
136
- 'caboose/model/s3.js',
137
- 'caboose/model/bound_s3_image.js',
138
- 'caboose/model/bound_file.js',
139
141
  'caboose/product.js',
142
+ 'caboose/s3upload.js',
143
+ 'caboose/shortcut.js',
144
+ 'caboose/spectrum.js',
145
+ 'caboose/station.js',
146
+ 'caboose/testing.js',
140
147
  'jquery.js',
141
148
  'jquery_ujs.js',
142
149
  'jquery-ui.js',
143
150
  'colorbox-rails/jquery.colorbox-min.js',
144
151
  'colorbox-rails.js',
145
152
  'colorbox-rails/colorbox-links.js',
146
- 'tinymce/plugins/caboose/plugin.js',
147
-
153
+ 'tinymce/plugins/caboose/plugin.js',
148
154
  'tinymce/preinit.js',
149
155
  'tinymce/plugins/caboose/plugin.js',
150
156
  'tinymce/themes/modern/theme.js',
@@ -180,42 +186,45 @@ module Caboose
180
186
  # Site JS
181
187
  '*/js/application.js',
182
188
 
183
- # CSS
184
- 'colorbox-rails.css',
185
- 'colorbox-rails/colorbox-rails.css',
186
- 'caboose/admin_page_edit_content.css',
189
+ # CSS
187
190
  'caboose/admin_crumbtrail.css',
188
191
  'caboose/admin_images_index.css',
189
192
  'caboose/admin_main.css',
190
- 'caboose/admin_page_edit_content.css',
193
+ 'caboose/admin_page_edit_content.css',
194
+ 'caboose/admin_products.css',
191
195
  'caboose/admin.css',
192
196
  'caboose/application.css',
193
197
  'caboose/bound_input.css',
194
198
  'caboose/caboose.css',
195
- 'caboose/cart.css',
196
- 'caboose/checkout.css',
197
- 'caboose/model_binder.css',
199
+ 'caboose/cart.scss',
200
+ 'caboose/checkout.css',
201
+ 'caboose/fonts/avenir-medium.eot',
202
+ 'caboose/fonts/avenir-medium.ttf',
198
203
  'caboose/fonts/big_noodle_titling_oblique.ttf',
199
204
  'caboose/fonts/big_noodle_titling.ttf',
200
205
  'caboose/fonts.css',
201
206
  'caboose/icomoon_fonts.css',
207
+ 'caboose/icons.txt',
202
208
  'caboose/login.css',
203
209
  'caboose/message_boxes.css',
204
210
  'caboose/modal.css',
205
- 'caboose/model_binder.css',
211
+ 'caboose/model_binder.css',
206
212
  'caboose/page_bar_generator.css',
207
213
  'caboose/print.css',
208
214
  'caboose/product_images.css',
209
215
  'caboose/product_options.css',
210
216
  'caboose/register.css',
211
217
  'caboose/responsive.css',
218
+ 'caboose/spectrum.css',
212
219
  'caboose/station_modal.css',
213
220
  'caboose/station_sidebar.css',
214
221
  'caboose/tinymce.css',
222
+ 'colorbox-rails.css',
223
+ 'colorbox-rails/colorbox-rails.css',
215
224
  'jquery-ui.css',
216
225
 
217
226
  # Site CSS
218
- '*/css/application.js'
227
+ '*/css/application.css'
219
228
 
220
229
  ]
221
230
  end
data/lib/caboose/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.5.70'
2
+ VERSION = '0.5.71'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.70
4
+ version: 0.5.71
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
@@ -693,7 +693,6 @@ files:
693
693
  - app/views/caboose/categories/admin_edit.html.erb
694
694
  - app/views/caboose/categories/admin_index.html.erb
695
695
  - app/views/caboose/categories/admin_new.html.erb
696
- - app/views/caboose/checkout/#Untitled-1#
697
696
  - app/views/caboose/checkout/_address_form.html.erb
698
697
  - app/views/caboose/checkout/_billing_form.html.erb
699
698
  - app/views/caboose/checkout/_cart.html.erb