caboose-cms 0.5.17 → 0.5.19

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ZDg5OWEzYmQ5M2NkNTRiMjhlMjc5ODBmNDE3OGViYjBiYjk4NTc3NA==
4
+ NmE2NTE5MDFhZWNmNTI5Y2JjMzk4MzFhOGMzYWQwMWRlMjc1OThkNQ==
5
5
  data.tar.gz: !binary |-
6
- MDdiNDRjZTUyZWNkMmU4MzU4MGNhMzVlNTdmMjM0YWI0ZjA2ZWE3Mg==
6
+ OGJjYWQ3NjE2MmQyYzA2YjYwZGJmMjhmNDc2NjRkY2FkMDEyODA1Yw==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- ZDhiNGNlY2M3YjdhOTU3NTlhMzUwZTZlMmQ1Mzg2Y2VjZTliZDdmZDUzZTFi
10
- ZGUyYTllZjRjMDgzMzRlOTUyYTQyMjMzZmM1YWUzMzViMTJjNjE4ODcxZmNh
11
- ZjNlNzgwN2ZiYjY3OTYxYTAyMWI0OTQ2NTYyNDZjM2RmZTY1YmY=
9
+ ODAwZWQ5MjNlZmRmNWZiNzM4NTIyMDJhNTIwOTA2ZDY4OWQ2N2JiMDU0ODY5
10
+ M2U0ZDRmYzhjZjdmNTdmYjU0ZDU0NmViM2Y1ODhkZjk4YmZlYTFlYTU3YmMz
11
+ NTM5ZDgxNTc5M2ZhNTJlNzRmMjA4OTdhNjk0OTE5ZTQ2OGIxYjQ=
12
12
  data.tar.gz: !binary |-
13
- N2UyYTAwOTFjZDYyMjA0NmY1NzMwYTY5ZTBjYTNjODIyMDFhOGE3MGU1YmY5
14
- OWI5NDI0Njk0ZTg3ZjI5MDEyOTQ3OGJkNjk4MDkwZjg5OWQ3ZTU4YzIxYTgw
15
- YzQxNTQ5Y2Q4MWZiZGI1OGUwNjYwNzY0NGU3ZWJiNWJjZDQ0ZjY=
13
+ NDg4NmFiY2ViNWVmZGRjZTU2NWM5MzNkNTk0OTY4MTk2OTdjMmVkZmUxMjRi
14
+ MWUxNDBmNzcwNGM1YWUyMGJmMDNjM2JiZjAxYjE3ODA2ZDgzYTliMDZjZGFm
15
+ NTAxODZhYjU0MzhhNjlmZDJkODVmYTM1ODI5ODNlYTcyMGM3NjU=
@@ -2,7 +2,7 @@
2
2
  class Caboose::Block < ActiveRecord::Base
3
3
  self.table_name = "blocks"
4
4
 
5
- #after_find :get_master_value
5
+ #after_find :get_master_value # TODO
6
6
 
7
7
  belongs_to :page
8
8
  belongs_to :block_type
@@ -16,7 +16,8 @@ class Caboose::Block < ActiveRecord::Base
16
16
  :styles => {
17
17
  :tiny => '160x120>',
18
18
  :thumb => '400x300>',
19
- :large => '640x480>'
19
+ :large => '640x480>',
20
+ :huge => '1400x1050>'
20
21
  }
21
22
  do_not_validate_attachment_file_type :image
22
23
 
@@ -0,0 +1 @@
1
+ /usr/local/rvm/gems/ruby-1.9.3-p547/bin:/usr/local/rvm/gems/ruby-1.9.3-p547@global/bin:/usr/local/rvm/rubies/ruby-1.9.3-p547/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/local/rvm/bin
@@ -3,22 +3,31 @@ s = @site
3
3
  store_config = s.store_config
4
4
  %>
5
5
  <%= render :partial => 'caboose/sites/admin_header' %>
6
-
6
+
7
+ <h2>Payment Processor</h2>
7
8
  <p><div id='storeconfig_<%= store_config.id %>_pp_name' ></div></p>
8
9
  <p><div id='storeconfig_<%= store_config.id %>_pp_username' ></div></p>
9
10
  <p><div id='storeconfig_<%= store_config.id %>_pp_password' ></div></p>
10
- <p><div id='storeconfig_<%= store_config.id %>_use_usps' ></div></p>
11
- <p><div id='storeconfig_<%= store_config.id %>_usps_secret_key' ></div></p>
12
- <p><div id='storeconfig_<%= store_config.id %>_usps_publishable_key' ></div></p>
11
+
12
+ <h2>Other</h2>
13
+ <p><div id='storeconfig_<%= store_config.id %>_fulfillment_email' ></div></p>
14
+ <p><div id='storeconfig_<%= store_config.id %>_shipping_email' ></div></p>
15
+ <p><div id='storeconfig_<%= store_config.id %>_handling_percentage' ></div></p>
16
+
17
+ <h2>Shipping</h2>
13
18
  <p><div id='storeconfig_<%= store_config.id %>_allowed_shipping_codes' ></div></p>
14
19
  <p><div id='storeconfig_<%= store_config.id %>_default_shipping_code' ></div></p>
20
+
21
+ <h3>Origin</h3>
15
22
  <p><div id='storeconfig_<%= store_config.id %>_origin_country' ></div></p>
16
23
  <p><div id='storeconfig_<%= store_config.id %>_origin_state' ></div></p>
17
24
  <p><div id='storeconfig_<%= store_config.id %>_origin_city' ></div></p>
18
25
  <p><div id='storeconfig_<%= store_config.id %>_origin_zip' ></div></p>
19
- <p><div id='storeconfig_<%= store_config.id %>_fulfillment_email' ></div></p>
20
- <p><div id='storeconfig_<%= store_config.id %>_shipping_email' ></div></p>
21
- <p><div id='storeconfig_<%= store_config.id %>_handling_percentage' ></div></p>
26
+
27
+ <h3>USPS</h3>
28
+ <p><div id='storeconfig_<%= store_config.id %>_use_usps' ></div></p>
29
+ <p><div id='storeconfig_<%= store_config.id %>_usps_secret_key' ></div></p>
30
+ <p><div id='storeconfig_<%= store_config.id %>_usps_publishable_key' ></div></p>
22
31
 
23
32
  <div id='message'></div>
24
33
 
@@ -42,18 +51,18 @@ $(document).ready(function() {
42
51
  update_url: '/admin/sites/<%= @site.id %>/store',
43
52
  authenticity_token: '<%= form_authenticity_token %>',
44
53
  attributes: [
45
- { name: 'pp_name' , nice_name: 'Payment Processor Type' , type: 'select' , value: <%= raw Caboose.json(store_config.pp_name ) %>, width: 400 , options_url: '/admin/sites/payment-processor-options' },
46
- { name: 'pp_username' , nice_name: 'Payment Processor Username' , type: 'text' , value: <%= raw Caboose.json(store_config.pp_username ) %>, width: 400 },
47
- { name: 'pp_password' , nice_name: 'Payment Processor Password' , type: 'text' , value: <%= raw Caboose.json(store_config.pp_password ) %>, width: 400 },
54
+ { name: 'pp_name' , nice_name: 'Type' , type: 'select' , value: <%= raw Caboose.json(store_config.pp_name ) %>, width: 400 , options_url: '/admin/sites/payment-processor-options' },
55
+ { name: 'pp_username' , nice_name: 'Username' , type: 'text' , value: <%= raw Caboose.json(store_config.pp_username ) %>, width: 400 },
56
+ { name: 'pp_password' , nice_name: 'Password' , type: 'text' , value: <%= raw Caboose.json(store_config.pp_password ) %>, width: 400 },
48
57
  { name: 'use_usps' , nice_name: 'Use USPS' , type: 'checkbox' , value: <%= raw Caboose.json(store_config.use_usps ? 1 : 0 ) %>, width: 400 },
49
58
  { name: 'usps_secret_key' , nice_name: 'USPS Secret Key' , type: 'text' , value: <%= raw Caboose.json(store_config.usps_secret_key ) %>, width: 400 },
50
59
  { name: 'usps_publishable_key' , nice_name: 'USPS Publishable Key' , type: 'text' , value: <%= raw Caboose.json(store_config.usps_publishable_key ) %>, width: 400 },
51
60
  { name: 'allowed_shipping_codes' , nice_name: 'Allowed Shipping Codes' , type: 'text' , value: <%= raw Caboose.json(store_config.allowed_shipping_codes ) %>, width: 400 },
52
61
  { name: 'default_shipping_code' , nice_name: 'Default Shipping Code' , type: 'text' , value: <%= raw Caboose.json(store_config.default_shipping_code ) %>, width: 400 },
53
- { name: 'origin_country' , nice_name: 'Origin Country' , type: 'text' , value: <%= raw Caboose.json(store_config.origin_country ) %>, width: 400 },
54
- { name: 'origin_state' , nice_name: 'Origin State' , type: 'text' , value: <%= raw Caboose.json(store_config.origin_state ) %>, width: 400 },
55
- { name: 'origin_city' , nice_name: 'Origin City' , type: 'text' , value: <%= raw Caboose.json(store_config.origin_city ) %>, width: 400 },
56
- { name: 'origin_zip' , nice_name: 'Origin Zip' , type: 'text' , value: <%= raw Caboose.json(store_config.origin_zip ) %>, width: 400 },
62
+ { name: 'origin_country' , nice_name: 'Country' , type: 'text' , value: <%= raw Caboose.json(store_config.origin_country ) %>, width: 400 },
63
+ { name: 'origin_state' , nice_name: 'State' , type: 'text' , value: <%= raw Caboose.json(store_config.origin_state ) %>, width: 400 },
64
+ { name: 'origin_city' , nice_name: 'City' , type: 'text' , value: <%= raw Caboose.json(store_config.origin_city ) %>, width: 400 },
65
+ { name: 'origin_zip' , nice_name: 'Zip' , type: 'text' , value: <%= raw Caboose.json(store_config.origin_zip ) %>, width: 400 },
57
66
  { name: 'fulfillment_email' , nice_name: 'Fulfillment Email' , type: 'text' , value: <%= raw Caboose.json(store_config.fulfillment_email ) %>, width: 400 },
58
67
  { name: 'shipping_email' , nice_name: 'Shipping Email' , type: 'text' , value: <%= raw Caboose.json(store_config.shipping_email ) %>, width: 400 },
59
68
  { name: 'handling_percentage' , nice_name: 'Handling Percentage' , type: 'text' , value: <%= raw Caboose.json(store_config.handling_percentage ) %>, width: 400 }
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.5.17'
2
+ VERSION = '0.5.19'
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.5.17
4
+ version: 0.5.19
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-23 00:00:00.000000000 Z
11
+ date: 2014-10-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -663,6 +663,7 @@ files:
663
663
  - app/views/caboose/settings/edit.html.erb
664
664
  - app/views/caboose/settings/index.html.erb
665
665
  - app/views/caboose/settings/new.html.erb
666
+ - app/views/caboose/sites/#Untitled-1#
666
667
  - app/views/caboose/sites/_admin_footer.html.erb
667
668
  - app/views/caboose/sites/_admin_header.html.erb
668
669
  - app/views/caboose/sites/admin_delete_form.html.erb