raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merging

Browse Source
This commit is contained in:
Will Marshall
2013-11-01 16:50:28 +11:00
parent 8f27c7be80 6aad840d05
commit 7d21dd053a
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
app/assets/stylesheets/shared/restore_spree_from_cms.css.scss → app/assets/stylesheets/admin/restore_spree_from_cms.css.scss
View File

2
app/views/order_cycles/_selection.html.haml
View File

@@ -44,5 +44,5 @@
= form_for current_order(true), :html => {:id => 'order_cycle_select'} do |f|
= f.hidden_field :distributor_id, :value => @enterprise.id
.order-cycles
= f.select :order_cycle_id, order_cycle_options, {include_blank: 'Available On'}
= f.select :order_cycle_id, order_cycle_options, {include_blank: 'Closing On'}
= hidden_field_tag :commit, 'Choose Order Cycle'

2
app/views/shared/_cms_elrte_head.html.haml
View File

@@ -11,7 +11,7 @@
'comfortable_mexican_sofa/jquery_ui',
'comfortable_mexican_sofa/dialogs',
'comfortable_mexican_sofa/widgets',
'shared/restore_spree_from_cms'
'admin/restore_spree_from_cms'
= javascript_include_tag('comfortable_mexican_sofa/application')

6
config/application.rb
View File

@@ -76,6 +76,10 @@ module Openfoodnetwork
config.assets.version = '1.0'
config.assets.initialize_on_precompile = true
config.assets.precompile += ['store/all.css', 'store/all.js', 'store/shop_front.js', 'admin/all.css', 'admin/*.js', 'admin/**/*.js', 'comfortable_mexican_sofa/*', 'search/all.css', 'search/*.js']
config.assets.precompile += ['store/all.css', 'store/all.js', 'store/shop_front.js']
config.assets.precompile += ['admin/all.css', 'admin/*.js', 'admin/**/*.js']
config.assets.precompile += ['comfortable_mexican_sofa/*']
config.assets.precompile += ['search/all.css', 'search/*.js']
config.assets.precompile += ['shared/*']
end
end