browser

app/assets/javascripts/admin/browser.js

@@ -22,10 +22,8 @@ $(document).ready(function ($) {
 			opera:true,
 			safari2 : true,
 			safari3:true,
-			safari4:true,
+			safari4:true
-			firefox1: true,
+		
-			firefox2: true,
-			firefox3: true
 	
 		},
 

config/deploy.rb

@@ -2,7 +2,6 @@ set :application, 'maisonarbre_app'
 set :domain, 'www.lamaisondelarbre.fr'
 
 
-$:.unshift(File.expand_path('./lib', ENV['rvm_path']))
 
 require "rvm/capistrano"
 
@@ -34,22 +33,52 @@ set :branch, "master"
 	default_run_options[:pty] = true 
 
 
-after "deploy", "deploy:bundle_gems"
+	
+	before "deploy:symlink", "deploy:bundle_gems"
 	after "deploy:bundle_gems", "deploy:make_simlinks"
-after "deploy:make_simlinks", "deploy:restart"
+	after "deploy:make_simlinks", "assets:precompile"
+
+	
+	
+#	after "deploy", "deploy:restart"
 	after "deploy:restart", "deploy:cleanup"
 	
 	
+	#after "deploy", "deploy:bundle_gems"
+	#after "deploy:bundle_gems", "deploy:make_simlinks"
+	#after "deploy:make_simlinks", "assets:precompile"
+	#after "assets:precompile", "deploy:restart"
+	#after "deploy:restart", "deploy:cleanup"
+	
+
+	namespace :assets do
+	  task :precompile, :roles => :web do
+		run "rm -rf #{release_path}/public/assets"
+		run "ln -s #{deploy_to}shared/assets #{release_path}/public/assets"
+		
+		
+	    run "cd #{release_path} && bundle exec rake assets:precompile --trace"
+	  end
+
+	  task :cleanup, :roles => :web do
+	    run "cd #{current_path} && RAILS_ENV=production bundle exec rake assets:clean"
+	  end
+	end
+
+	
+
+
+
 	namespace :deploy do
 		task :bundle_gems do 
-		run "cd #{deploy_to}current && bundle install"
+			run "cd #{release_path} && bundle install"
 		end
 
 		task :make_simlinks do 
-		run "rm -rf #{deploy_to}current/private_medias"
+			run "rm -rf #{release_path}/private_medias"
-		run "ln -s #{deploy_to}shared/storage/private #{deploy_to}current/private_medias"
+			run "ln -s #{deploy_to}shared/storage/private #{release_path}/private_medias"
-		run "rm -rf #{deploy_to}current/public/public_medias"
+			run "rm -rf #{release_path}/public/public_medias"
-		run "ln -s #{deploy_to}shared/storage/public #{deploy_to}current/public/public_medias"
+			run "ln -s #{deploy_to}shared/storage/public #{release_path}/public/public_medias"
 		end
 
 		task :start do 
@@ -65,4 +94,10 @@ namespace :deploy do
 			run "cd #{deploy_to}current && rake db:migrate RAILS_ENV=#{rails_env}"
 
 		end
+		
+		task :seeds do 
+			run "cd #{deploy_to}current && rake db:seeds RAILS_ENV=#{rails_env}"
+
 		end
+	end
+