X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3ca29a8dc7c52c516f8ab72f46af47094fc1772d..67f365843186c4a2214b5d4bcfae47d59aa86309:/config/initializers/assets.rb

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 209eaabf4..7baac7f78 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -1,24 +1,31 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
+Rails.application.config.assets.version = "1.0"
+
+# Location of manifest file.
+Rails.application.config.assets.manifest = Rails.root.join("tmp/manifest.json")
+
+# Add additional assets to the asset load path
+Rails.application.config.assets.paths << Rails.root.join("config")
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 Rails.application.config.assets.precompile += %w( index.js browse.js welcome.js fixthemap.js )
-Rails.application.config.assets.precompile += %w( user.js diary_entry.js swfobject.js )
-Rails.application.config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
-Rails.application.config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
+Rails.application.config.assets.precompile += %w( user.js diary_entry.js )
+Rails.application.config.assets.precompile += %w( screen-ltr.css print-ltr.css )
+Rails.application.config.assets.precompile += %w( screen-rtl.css print-rtl.css )
 Rails.application.config.assets.precompile += %w( leaflet-all.css leaflet.ie.css )
+Rails.application.config.assets.precompile += %w( id.js id.css )
 Rails.application.config.assets.precompile += %w( embed.js embed.css )
 Rails.application.config.assets.precompile += %w( html5shiv.js )
 Rails.application.config.assets.precompile += %w( images/marker-*.png img/*-handle.png )
+Rails.application.config.assets.precompile += %w( swfobject.js expressInstall.swf )
 Rails.application.config.assets.precompile += %w( potlatch2.swf )
 Rails.application.config.assets.precompile += %w( potlatch2/assets.zip )
 Rails.application.config.assets.precompile += %w( potlatch2/FontLibrary.swf )
 Rails.application.config.assets.precompile += %w( potlatch2/locales/*.swf )
 Rails.application.config.assets.precompile += %w( help/introduction.* )
-Rails.application.config.assets.precompile += %w( iD.js iD.css )
 Rails.application.config.assets.precompile += %w( iD/img/*.svg iD/img/*.png iD/img/*.gif )
 Rails.application.config.assets.precompile += %w( iD/img/pattern/*.png )
 Rails.application.config.assets.precompile += %w( iD/locales/*.json )