spree_core 0.30.2 → 0.40.0
Sign up to get free protection for your applications and to get access to all the features.
- data/app/controllers/admin/base_controller.rb +0 -31
- data/app/controllers/admin/orders_controller.rb +10 -9
- data/app/controllers/admin/overview_controller.rb +1 -1
- data/app/controllers/admin/products_controller.rb +8 -8
- data/app/controllers/admin/properties_controller.rb +1 -1
- data/app/controllers/admin/shipments_controller.rb +6 -3
- data/app/controllers/admin/shipping_methods_controller.rb +1 -1
- data/app/controllers/admin/tax_rates_controller.rb +2 -2
- data/app/controllers/admin/taxons_controller.rb +1 -2
- data/app/controllers/admin/users_controller.rb +7 -8
- data/app/controllers/admin/variants_controller.rb +2 -2
- data/app/controllers/countries_controller.rb +1 -1
- data/app/controllers/locale_controller.rb +1 -1
- data/app/controllers/spree/base_controller.rb +1 -117
- data/app/controllers/states_controller.rb +1 -1
- data/app/helpers/spree/base_helper.rb +1 -7
- data/app/helpers/taxons_helper.rb +2 -2
- data/app/models/app_configuration.rb +0 -3
- data/app/models/calculator/flat_percent_item_total.rb +2 -1
- data/app/models/calculator/vat.rb +1 -1
- data/app/models/creditcard.rb +1 -1
- data/app/models/gateway/authorize_net.rb +13 -2
- data/app/models/gateway/authorize_net_cim.rb +11 -0
- data/app/models/gateway/beanstream.rb +30 -7
- data/app/models/inventory_unit.rb +21 -31
- data/app/models/line_item.rb +7 -8
- data/app/models/order.rb +4 -1
- data/app/models/product_group.rb +4 -8
- data/app/models/property.rb +1 -3
- data/app/models/return_authorization.rb +6 -1
- data/app/models/state_event.rb +3 -3
- data/app/models/state_monitor.rb +16 -16
- data/app/models/taxon.rb +6 -7
- data/app/models/user.rb +4 -0
- data/app/views/admin/general_settings/edit.html.erb +0 -8
- data/app/views/admin/general_settings/show.html.erb +5 -10
- data/app/views/admin/images/_form.html.erb +1 -1
- data/app/views/admin/images/index.html.erb +1 -1
- data/app/views/admin/option_types/new.html.erb +1 -1
- data/app/views/admin/orders/_add_product.html.erb +3 -3
- data/app/views/admin/orders/_form.html.erb +3 -0
- data/app/views/admin/orders/_user_form.html.erb +1 -1
- data/app/views/admin/orders/index.html.erb +2 -2
- data/app/views/admin/orders/show.html.erb +3 -8
- data/app/views/admin/orders/user.html.erb +1 -1
- data/app/views/admin/product_groups/index.html.erb +1 -1
- data/app/views/admin/product_groups/show.html.erb +1 -1
- data/app/views/admin/products/index.html.erb +1 -1
- data/app/views/admin/return_authorizations/_form.html.erb +3 -1
- data/app/views/admin/shared/_address_form.html.erb +1 -1
- data/app/views/admin/shared/_configuration_menu.html.erb +11 -11
- data/app/views/admin/shared/_order_tabs.html.erb +12 -12
- data/app/views/admin/shared/_product_tabs.html.erb +6 -6
- data/app/views/admin/states/_state_list.html.erb +2 -2
- data/app/views/admin/taxonomies/_js_head.html.erb +6 -8
- data/app/views/admin/taxonomies/edit.html.erb +11 -11
- data/app/views/admin/taxonomies/get_children.json.erb +5 -5
- data/app/views/admin/taxons/available.js.erb +10 -10
- data/app/views/admin/taxons/selected.html.erb +13 -13
- data/app/views/admin/variants/index.html.erb +1 -1
- data/app/views/checkout/_address.html.erb +2 -2
- data/app/views/layouts/admin.html.erb +1 -2
- data/app/views/layouts/spree_application.html.erb +1 -2
- data/app/views/shared/_admin_head.html.erb +3 -3
- data/app/views/shared/_doc_and_xmlns.html.erb +2 -0
- data/app/views/shared/_filters.html.erb +3 -28
- data/app/views/taxons/show.html.erb +7 -5
- data/config/initializers/spree.rb +1 -19
- data/config/locales/en.yml +0 -2
- data/config/routes.rb +3 -5
- data/db/migrate/20091007134354_change_taxons_to_nested_set.rb +2 -2
- data/lib/product_filters.rb +10 -11
- data/lib/scopes/product.rb +15 -0
- data/lib/spree/mail_settings.rb +2 -4
- data/lib/spree/preference_access.rb +3 -3
- data/lib/spree_base.rb +116 -0
- data/lib/spree_core.rb +3 -1
- data/lib/spree_core/preferences/model_hooks.rb +1 -1
- data/lib/tasks/install.rake +0 -1
- data/public/javascripts/admin.js +0 -6
- data/public/javascripts/admin/checkouts/edit.js +41 -40
- data/public/javascripts/admin/orders/edit_form.js +5 -4
- data/public/javascripts/jquery.cookie.js +96 -0
- data/public/javascripts/jquery.delayedobserver.js +35 -0
- data/public/javascripts/jsTree/jquery.jstree.js +3510 -0
- data/public/javascripts/jsTree/themes/apple/d.png +0 -0
- data/public/javascripts/jsTree/themes/apple/style.css +60 -34
- data/public/javascripts/jsTree/themes/apple/throbber.gif +0 -0
- data/public/javascripts/taxonomy.js +150 -149
- data/public/stylesheets/admin/admin.css +0 -34
- metadata +36 -43
- data/app/controllers/password_resets_controller.rb +0 -48
- data/app/helpers/users_helper.rb +0 -13
- data/app/models/spree/alert.rb +0 -13
- data/app/views/admin/shared/_alert.html.erb +0 -6
- data/app/views/shared/_login.html.erb +0 -21
- data/app/views/shared/_user_form.html.erb +0 -17
- data/lib/spree/i18n_utils.rb +0 -47
- data/public/javascripts/jquery.js +0 -19
- data/public/javascripts/jrails.autocomplete.js +0 -274
- data/public/javascripts/jrails.js +0 -1
- data/public/javascripts/jsTree/jquery.tree.js +0 -2058
- data/public/javascripts/jsTree/plugins/jquery.tree.contextmenu.js +0 -129
- data/public/javascripts/jsTree/themes/apple/icons.png +0 -0
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spree_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
5
|
-
prerelease:
|
4
|
+
hash: 191
|
5
|
+
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
|
-
-
|
9
|
-
-
|
10
|
-
version: 0.
|
8
|
+
- 40
|
9
|
+
- 0
|
10
|
+
version: 0.40.0
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Sean Schofield
|
@@ -15,7 +15,8 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date:
|
18
|
+
date: 2010-12-22 00:00:00 -05:00
|
19
|
+
default_executable:
|
19
20
|
dependencies:
|
20
21
|
- !ruby/object:Gem::Dependency
|
21
22
|
name: acts_as_list
|
@@ -23,7 +24,7 @@ dependencies:
|
|
23
24
|
requirement: &id001 !ruby/object:Gem::Requirement
|
24
25
|
none: false
|
25
26
|
requirements:
|
26
|
-
- - "
|
27
|
+
- - ">="
|
27
28
|
- !ruby/object:Gem::Version
|
28
29
|
hash: 31
|
29
30
|
segments:
|
@@ -39,7 +40,7 @@ dependencies:
|
|
39
40
|
requirement: &id002 !ruby/object:Gem::Requirement
|
40
41
|
none: false
|
41
42
|
requirements:
|
42
|
-
- - "
|
43
|
+
- - ">="
|
43
44
|
- !ruby/object:Gem::Version
|
44
45
|
hash: 15
|
45
46
|
segments:
|
@@ -55,7 +56,7 @@ dependencies:
|
|
55
56
|
requirement: &id003 !ruby/object:Gem::Requirement
|
56
57
|
none: false
|
57
58
|
requirements:
|
58
|
-
- - "
|
59
|
+
- - ">="
|
59
60
|
- !ruby/object:Gem::Version
|
60
61
|
hash: 27
|
61
62
|
segments:
|
@@ -71,7 +72,7 @@ dependencies:
|
|
71
72
|
requirement: &id004 !ruby/object:Gem::Requirement
|
72
73
|
none: false
|
73
74
|
requirements:
|
74
|
-
- - "
|
75
|
+
- - ">="
|
75
76
|
- !ruby/object:Gem::Version
|
76
77
|
hash: 1
|
77
78
|
segments:
|
@@ -87,7 +88,7 @@ dependencies:
|
|
87
88
|
requirement: &id005 !ruby/object:Gem::Requirement
|
88
89
|
none: false
|
89
90
|
requirements:
|
90
|
-
- - "
|
91
|
+
- - ">="
|
91
92
|
- !ruby/object:Gem::Version
|
92
93
|
hash: 17
|
93
94
|
segments:
|
@@ -103,7 +104,7 @@ dependencies:
|
|
103
104
|
requirement: &id006 !ruby/object:Gem::Requirement
|
104
105
|
none: false
|
105
106
|
requirements:
|
106
|
-
- - "
|
107
|
+
- - ">="
|
107
108
|
- !ruby/object:Gem::Version
|
108
109
|
hash: 51
|
109
110
|
segments:
|
@@ -119,7 +120,7 @@ dependencies:
|
|
119
120
|
requirement: &id007 !ruby/object:Gem::Requirement
|
120
121
|
none: false
|
121
122
|
requirements:
|
122
|
-
- - "
|
123
|
+
- - ">="
|
123
124
|
- !ruby/object:Gem::Version
|
124
125
|
hash: 17
|
125
126
|
segments:
|
@@ -135,7 +136,7 @@ dependencies:
|
|
135
136
|
requirement: &id008 !ruby/object:Gem::Requirement
|
136
137
|
none: false
|
137
138
|
requirements:
|
138
|
-
- - "
|
139
|
+
- - ">="
|
139
140
|
- !ruby/object:Gem::Version
|
140
141
|
hash: 113
|
141
142
|
segments:
|
@@ -166,16 +167,14 @@ dependencies:
|
|
166
167
|
requirement: &id010 !ruby/object:Gem::Requirement
|
167
168
|
none: false
|
168
169
|
requirements:
|
169
|
-
- - "
|
170
|
+
- - ">="
|
170
171
|
- !ruby/object:Gem::Version
|
171
|
-
hash:
|
172
|
+
hash: 7
|
172
173
|
segments:
|
173
174
|
- 3
|
174
175
|
- 0
|
175
176
|
- 0
|
176
|
-
|
177
|
-
- 3
|
178
|
-
version: 3.0.0.rc3
|
177
|
+
version: 3.0.0
|
179
178
|
type: :runtime
|
180
179
|
version_requirements: *id010
|
181
180
|
- !ruby/object:Gem::Dependency
|
@@ -184,7 +183,7 @@ dependencies:
|
|
184
183
|
requirement: &id011 !ruby/object:Gem::Requirement
|
185
184
|
none: false
|
186
185
|
requirements:
|
187
|
-
- - "
|
186
|
+
- - ">="
|
188
187
|
- !ruby/object:Gem::Version
|
189
188
|
hash: 9
|
190
189
|
segments:
|
@@ -200,14 +199,14 @@ dependencies:
|
|
200
199
|
requirement: &id012 !ruby/object:Gem::Requirement
|
201
200
|
none: false
|
202
201
|
requirements:
|
203
|
-
- - "
|
202
|
+
- - ">="
|
204
203
|
- !ruby/object:Gem::Version
|
205
|
-
hash:
|
204
|
+
hash: -1876988247
|
206
205
|
segments:
|
207
206
|
- 3
|
208
207
|
- 0
|
209
|
-
-
|
210
|
-
version: 3.0.
|
208
|
+
- pre2
|
209
|
+
version: 3.0.pre2
|
211
210
|
type: :runtime
|
212
211
|
version_requirements: *id012
|
213
212
|
- !ruby/object:Gem::Dependency
|
@@ -216,14 +215,14 @@ dependencies:
|
|
216
215
|
requirement: &id013 !ruby/object:Gem::Requirement
|
217
216
|
none: false
|
218
217
|
requirements:
|
219
|
-
- - "
|
218
|
+
- - ">="
|
220
219
|
- !ruby/object:Gem::Version
|
221
|
-
hash:
|
220
|
+
hash: 1
|
222
221
|
segments:
|
223
222
|
- 3
|
224
223
|
- 0
|
225
|
-
-
|
226
|
-
version: 3.0.
|
224
|
+
- 3
|
225
|
+
version: 3.0.3
|
227
226
|
type: :runtime
|
228
227
|
version_requirements: *id013
|
229
228
|
- !ruby/object:Gem::Dependency
|
@@ -232,7 +231,7 @@ dependencies:
|
|
232
231
|
requirement: &id014 !ruby/object:Gem::Requirement
|
233
232
|
none: false
|
234
233
|
requirements:
|
235
|
-
- - "
|
234
|
+
- - ">="
|
236
235
|
- !ruby/object:Gem::Version
|
237
236
|
hash: 19
|
238
237
|
segments:
|
@@ -294,7 +293,6 @@ files:
|
|
294
293
|
- app/controllers/countries_controller.rb
|
295
294
|
- app/controllers/locale_controller.rb
|
296
295
|
- app/controllers/orders_controller.rb
|
297
|
-
- app/controllers/password_resets_controller.rb
|
298
296
|
- app/controllers/products_controller.rb
|
299
297
|
- app/controllers/spree/base_controller.rb
|
300
298
|
- app/controllers/states_controller.rb
|
@@ -320,7 +318,6 @@ files:
|
|
320
318
|
- app/helpers/spree/base_helper.rb
|
321
319
|
- app/helpers/taxons_helper.rb
|
322
320
|
- app/helpers/trackers_helper.rb
|
323
|
-
- app/helpers/users_helper.rb
|
324
321
|
- app/mailers/order_mailer.rb
|
325
322
|
- app/mailers/shipment_mailer.rb
|
326
323
|
- app/models/address.rb
|
@@ -372,7 +369,6 @@ files:
|
|
372
369
|
- app/models/shipment.rb
|
373
370
|
- app/models/shipping_category.rb
|
374
371
|
- app/models/shipping_method.rb
|
375
|
-
- app/models/spree/alert.rb
|
376
372
|
- app/models/state.rb
|
377
373
|
- app/models/state_event.rb
|
378
374
|
- app/models/state_monitor.rb
|
@@ -501,7 +497,6 @@ files:
|
|
501
497
|
- app/views/admin/shared/_address.html.erb
|
502
498
|
- app/views/admin/shared/_address_form.html.erb
|
503
499
|
- app/views/admin/shared/_adjustments_table.html.erb
|
504
|
-
- app/views/admin/shared/_alert.html.erb
|
505
500
|
- app/views/admin/shared/_calculator_fields.html.erb
|
506
501
|
- app/views/admin/shared/_configuration_menu.html.erb
|
507
502
|
- app/views/admin/shared/_destroy.js.erb
|
@@ -612,13 +607,13 @@ files:
|
|
612
607
|
- app/views/shared/_additional_field.html.erb
|
613
608
|
- app/views/shared/_admin_head.html.erb
|
614
609
|
- app/views/shared/_basic_layout.html.erb
|
610
|
+
- app/views/shared/_doc_and_xmlns.html.erb
|
615
611
|
- app/views/shared/_edit_resource_links.html.erb
|
616
612
|
- app/views/shared/_error_messages.html.erb
|
617
613
|
- app/views/shared/_filters.html.erb
|
618
614
|
- app/views/shared/_footer.html.erb
|
619
615
|
- app/views/shared/_google_analytics.html.erb
|
620
616
|
- app/views/shared/_head.html.erb
|
621
|
-
- app/views/shared/_login.html.erb
|
622
617
|
- app/views/shared/_method_error_message.html.erb
|
623
618
|
- app/views/shared/_nav_bar.html.erb
|
624
619
|
- app/views/shared/_new_resource_links.html.erb
|
@@ -629,7 +624,6 @@ files:
|
|
629
624
|
- app/views/shared/_store_menu.html.erb
|
630
625
|
- app/views/shared/_taxonomies.html.erb
|
631
626
|
- app/views/shared/_test_hook.html.erb
|
632
|
-
- app/views/shared/_user_form.html.erb
|
633
627
|
- app/views/shipment_mailer/shipped_email.text.erb
|
634
628
|
- app/views/states/index.js.erb
|
635
629
|
- app/views/taxons/_taxon.html.erb
|
@@ -659,11 +653,11 @@ files:
|
|
659
653
|
- lib/spree/current_order.rb
|
660
654
|
- lib/spree/file_utilz.rb
|
661
655
|
- lib/spree/gateway_error.rb
|
662
|
-
- lib/spree/i18n_utils.rb
|
663
656
|
- lib/spree/mail_interceptor.rb
|
664
657
|
- lib/spree/mail_settings.rb
|
665
658
|
- lib/spree/preference_access.rb
|
666
659
|
- lib/spree/search/base.rb
|
660
|
+
- lib/spree_base.rb
|
667
661
|
- lib/spree_core/authorize_net_cim_hack.rb
|
668
662
|
- lib/spree_core/delegate_belongs_to.rb
|
669
663
|
- lib/spree_core/enumerable_constants.rb
|
@@ -988,18 +982,16 @@ files:
|
|
988
982
|
- public/javascripts/jquery.alerts/jquery.alerts.js
|
989
983
|
- public/javascripts/jquery.alerts/jquery.alerts.spree.css
|
990
984
|
- public/javascripts/jquery.autocomplete.min.js
|
991
|
-
- public/javascripts/jquery.js
|
985
|
+
- public/javascripts/jquery.cookie.js
|
986
|
+
- public/javascripts/jquery.delayedobserver.js
|
992
987
|
- public/javascripts/jquery.suggest.js
|
993
988
|
- public/javascripts/jquery.template.js
|
994
989
|
- public/javascripts/jquery.tokeninput.js
|
995
990
|
- public/javascripts/jquery.validate.min.js
|
996
|
-
- public/javascripts/
|
997
|
-
- public/javascripts/jrails.js
|
998
|
-
- public/javascripts/jsTree/jquery.tree.js
|
999
|
-
- public/javascripts/jsTree/plugins/jquery.tree.contextmenu.js
|
991
|
+
- public/javascripts/jsTree/jquery.jstree.js
|
1000
992
|
- public/javascripts/jsTree/themes/apple/bg.jpg
|
993
|
+
- public/javascripts/jsTree/themes/apple/d.png
|
1001
994
|
- public/javascripts/jsTree/themes/apple/dot_for_ie.gif
|
1002
|
-
- public/javascripts/jsTree/themes/apple/icons.png
|
1003
995
|
- public/javascripts/jsTree/themes/apple/style.css
|
1004
996
|
- public/javascripts/jsTree/themes/apple/throbber.gif
|
1005
997
|
- public/javascripts/lang/af.js
|
@@ -1063,6 +1055,7 @@ files:
|
|
1063
1055
|
- public/stylesheets/jquery.autocomplete.css
|
1064
1056
|
- public/stylesheets/scaffold.css
|
1065
1057
|
- public/stylesheets/screen.css
|
1058
|
+
has_rdoc: true
|
1066
1059
|
homepage: http://spreecommerce.com
|
1067
1060
|
licenses: []
|
1068
1061
|
|
@@ -1094,7 +1087,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1094
1087
|
requirements:
|
1095
1088
|
- none
|
1096
1089
|
rubyforge_project: spree_core
|
1097
|
-
rubygems_version: 1.
|
1090
|
+
rubygems_version: 1.3.7
|
1098
1091
|
signing_key:
|
1099
1092
|
specification_version: 3
|
1100
1093
|
summary: Core e-commerce functionality for the Spree project.
|
@@ -1,48 +0,0 @@
|
|
1
|
-
class PasswordResetsController < Spree::BaseController
|
2
|
-
before_filter :load_user_using_perishable_token, :only => [:edit, :update]
|
3
|
-
|
4
|
-
def new
|
5
|
-
render
|
6
|
-
end
|
7
|
-
|
8
|
-
def create
|
9
|
-
@user = User.find_by_email(params[:email])
|
10
|
-
if @user
|
11
|
-
@user.deliver_password_reset_instructions!
|
12
|
-
flash.notice = t("password_reset_instructions_are_mailed")
|
13
|
-
redirect_to root_url
|
14
|
-
else
|
15
|
-
flash[:error] = t("no_user_found")
|
16
|
-
render :action => :new
|
17
|
-
end
|
18
|
-
end
|
19
|
-
|
20
|
-
def edit
|
21
|
-
render
|
22
|
-
end
|
23
|
-
|
24
|
-
def update
|
25
|
-
@user.password = params[:user][:password]
|
26
|
-
@user.password_confirmation = params[:user][:password_confirmation]
|
27
|
-
if @user.save
|
28
|
-
flash.notice = t("password_updated")
|
29
|
-
redirect_to account_url
|
30
|
-
else
|
31
|
-
render :action => :edit
|
32
|
-
end
|
33
|
-
end
|
34
|
-
|
35
|
-
private
|
36
|
-
def load_user_using_perishable_token
|
37
|
-
@user = User.find_using_perishable_token(params[:id])
|
38
|
-
unless @user
|
39
|
-
flash.notice = t("password_reset_token_not_found")
|
40
|
-
redirect_to root_url
|
41
|
-
end
|
42
|
-
end
|
43
|
-
|
44
|
-
def accurate_title
|
45
|
-
I18n.t(:forgot_password)
|
46
|
-
end
|
47
|
-
|
48
|
-
end
|
data/app/helpers/users_helper.rb
DELETED
@@ -1,13 +0,0 @@
|
|
1
|
-
module UsersHelper
|
2
|
-
def password_style(user)
|
3
|
-
show_openid ? "display:none" : ""
|
4
|
-
end
|
5
|
-
def openid_style(user)
|
6
|
-
show_openid ? "": "display:none"
|
7
|
-
end
|
8
|
-
|
9
|
-
private
|
10
|
-
def show_openid
|
11
|
-
Spree::Config[:allow_openid] and @user.openid_identifier
|
12
|
-
end
|
13
|
-
end
|
data/app/models/spree/alert.rb
DELETED
@@ -1,13 +0,0 @@
|
|
1
|
-
class Spree::Alert < ActiveResource::Base
|
2
|
-
self.site = "http://alerts.spreecommerce.com/"
|
3
|
-
self.format = :json
|
4
|
-
|
5
|
-
def self.current(host)
|
6
|
-
find(:all, :params => { :version => Spree.version,
|
7
|
-
:name => Spree::Config[:site_name],
|
8
|
-
:host => host,
|
9
|
-
:rails_env => Rails.env,
|
10
|
-
:rails_version => Rails.version })
|
11
|
-
end
|
12
|
-
end
|
13
|
-
|
@@ -1,6 +0,0 @@
|
|
1
|
-
<div class="alert <%= alert.severity.downcase %>">
|
2
|
-
<%= alert.message %> <%= link_to alert.url_name, alert.url if alert.url %>
|
3
|
-
<%= link_to 'X', dismiss_alert_admin_general_settings_path(:alert_id => alert.id),
|
4
|
-
:remote => true, :method => :post, :class => 'dismiss' %>
|
5
|
-
</div>
|
6
|
-
|
@@ -1,21 +0,0 @@
|
|
1
|
-
<%= form_tag user_session_path do %>
|
2
|
-
<div id='password-credentials'>
|
3
|
-
<p>
|
4
|
-
<%= label :user_session, :login, t("email") %><br />
|
5
|
-
<%= text_field :user_session, 'login', :class => 'title' %>
|
6
|
-
</p>
|
7
|
-
<p>
|
8
|
-
<%= label :user_session, :password, t("password") %><br />
|
9
|
-
<%= password_field :user_session, 'password', :class => 'title' %>
|
10
|
-
</p>
|
11
|
-
</div>
|
12
|
-
<p>
|
13
|
-
<label>
|
14
|
-
<%= check_box :user_session, :remember_me %>
|
15
|
-
<%= label :user_session, :remember_me, t('remember_me') %>
|
16
|
-
</label>
|
17
|
-
</p>
|
18
|
-
|
19
|
-
<p><%= submit_tag t("log_in"), :class => 'button primary'%></p>
|
20
|
-
|
21
|
-
<% end %>
|
@@ -1,17 +0,0 @@
|
|
1
|
-
<p>
|
2
|
-
<%= f.label :email, t("email") %><br />
|
3
|
-
<%= f.text_field :email, :class => 'title' %>
|
4
|
-
</p>
|
5
|
-
<div id="password-credentials" style="<%=password_style(@user)%>">
|
6
|
-
<p>
|
7
|
-
<%= f.label :password, t("password") %><br />
|
8
|
-
<%= f.password_field :password, :class => 'title' %>
|
9
|
-
</p>
|
10
|
-
|
11
|
-
<p>
|
12
|
-
<%= f.label :password_confirmation, t(:confirm_password) %><br />
|
13
|
-
<%= f.password_field :password_confirmation, :class => 'title' %>
|
14
|
-
</p>
|
15
|
-
</div>
|
16
|
-
|
17
|
-
<%= hook :signup_below_password_fields %>
|
data/lib/spree/i18n_utils.rb
DELETED
@@ -1,47 +0,0 @@
|
|
1
|
-
require 'rails'
|
2
|
-
|
3
|
-
module Spree
|
4
|
-
module I18nUtils
|
5
|
-
|
6
|
-
# #Retrieve comments, translation data in hash form
|
7
|
-
def read_file(filename, basename)
|
8
|
-
(comments, data) = IO.read(filename).split(/\n#{basename}:\s*\n/) #Add error checking for failed file read?
|
9
|
-
return comments, create_hash(data)
|
10
|
-
end
|
11
|
-
|
12
|
-
#Creates hash of translation data
|
13
|
-
def create_hash(data)
|
14
|
-
words = Hash.new
|
15
|
-
return words if !data
|
16
|
-
parent = Array.new
|
17
|
-
previous_key = 'base'
|
18
|
-
data.split("\n").each do |w|
|
19
|
-
next if w.strip.blank?
|
20
|
-
(key, value) = w.split(':', 2)
|
21
|
-
value ||= ''
|
22
|
-
shift = (key =~ /\w/)/2 - parent.size #Determine level of current key in comparison to parent array
|
23
|
-
key = key.sub(/^\s+/,'')
|
24
|
-
parent << previous_key if shift > 0 #If key is child of previous key, add previous key as parent
|
25
|
-
(shift*-1).times { parent.pop } if shift < 0 #If key is not related to previous key, remove parent keys
|
26
|
-
previous_key = key #Track key in case next key is child of this key
|
27
|
-
words[parent.join(':')+':'+key] = value
|
28
|
-
end
|
29
|
-
words
|
30
|
-
end
|
31
|
-
|
32
|
-
#Writes to file from translation data hash structure
|
33
|
-
def write_file(filename,basename,comments,words,comment_values=true, fallback_values={})
|
34
|
-
File.open(filename, "w") do |log|
|
35
|
-
log.puts(comments+"\n"+basename+": \n")
|
36
|
-
words.sort.each do |k,v|
|
37
|
-
keys = k.split(':')
|
38
|
-
(keys.size-1).times { keys[keys.size-1] = ' ' + keys[keys.size-1] } #Add indentation for children keys
|
39
|
-
value = v.strip
|
40
|
-
value = ("#" + value) if comment_values and not value.blank?
|
41
|
-
log.puts "#{keys[keys.size-1]}: #{value}\n"
|
42
|
-
end
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
end
|
47
|
-
end
|