diff --git a/app/views/layouts/_javascripts.html.haml b/app/views/layouts/_javascripts.html.haml index 63f4f7020..08c436a7d 100644 --- a/app/views/layouts/_javascripts.html.haml +++ b/app/views/layouts/_javascripts.html.haml @@ -4,7 +4,9 @@ :javascript !window.jQuery && document.write(unescape('%3Cscript src="/javascripts/jquery.min.js"%3E%3C/script%3E')) -= include_javascripts :application +-#= include_javascripts :application + += javascript_include_tag "jrails", "application", "drop_down_menu" -# Append your own using content_for :javascripts = yield :javascripts diff --git a/app/views/layouts/_stylesheets.html.haml b/app/views/layouts/_stylesheets.html.haml index 96ea106a2..6cab6f752 100644 --- a/app/views/layouts/_stylesheets.html.haml +++ b/app/views/layouts/_stylesheets.html.haml @@ -1,3 +1,5 @@ -= include_stylesheets :application +-#= include_stylesheets :application + += stylesheet_link_tag "web-app-theme/base.css", "web-app-theme/themes/default/style.css", "web-app-theme/override.css", "git/style.css" = yield :stylesheets \ No newline at end of file diff --git a/app/views/layouts/sessions.html.haml b/app/views/layouts/sessions.html.haml index 0ddff96d8..be5bfb52f 100644 --- a/app/views/layouts/sessions.html.haml +++ b/app/views/layouts/sessions.html.haml @@ -2,7 +2,9 @@ %html %head %title= t("layout.global_header") - = include_stylesheets :sessions + -#= include_stylesheets :sessions + = stylesheet_link_tag "web-app-theme/base.css", "web-app-theme/themes/default/style.css", "web-app-theme/override.css" + = csrf_meta_tag %body #container diff --git a/config/assets.yml b/config/assets.yml index 979cd78ce..999046ee8 100644 --- a/config/assets.yml +++ b/config/assets.yml @@ -1,6 +1,5 @@ javascripts: application: - - public/javascripts/rails.js - public/javascripts/application.js - public/javascripts/drop_down_menu.js diff --git a/config/deploy.rb b/config/deploy.rb index 192fd7488..a4cdaedb2 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -60,21 +60,21 @@ namespace :deploy do run "cd #{deploy_to}/current ; pkill unicorn; sleep 0.5; pkill -9 unicorn; sleep 0.5 ; unicorn_rails -c config/unicorn.rb -E production -D " end - desc 'Bundle and minify the JS and CSS files' - task :build_assets, :roles => :app do - root_path = File.expand_path(File.dirname(__FILE__) + '/..') - assets_path = "#{root_path}/public/assets" - envs = "RAILS_ENV=production" - - # Precaching assets - run_locally "bash -c '#{envs} jammit'" - - # Uploading prechached assets - top.upload assets_path, "#{current_release}/public", :via => :scp, :recursive => true - end +# desc 'Bundle and minify the JS and CSS files' +# task :build_assets, :roles => :app do +# root_path = File.expand_path(File.dirname(__FILE__) + '/..') +# assets_path = "#{root_path}/public/assets" +# envs = "RAILS_ENV=production" +# +# # Precaching assets +# run_locally "bash -c '#{envs} jammit'" +# +# # Uploading prechached assets +# top.upload assets_path, "#{current_release}/public", :via => :scp, :recursive => true +# end after "deploy:update_code", :roles => :web do - build_assets +# build_assets symlink_config_files end