Well it's after midnight and here I am...porting apps to Rails 3.1 ag…

…ain...
concerto · May 30, 2011 · a573ac6 · bamnet · May 30, 2011 · a573ac6
1 parent 822b61f
commit a573ac6
Show file tree

Hide file tree

Showing 65 changed files with 69 additions and 49 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,24 +1,26 @@
 # Edit this Gemfile to bundle your application's dependencies.
-source 'http://gemcutter.org'
+source 'http://rubygems.org'
 
-gem "rails", "3.0.7"
-
-## Bundle edge rails:
-# gem "rails", :git => "git://github.com/rails/rails.git"
+gem "rails", "3.1.0.rc1"
+gem "mysql2", "0.3.2"
+# Rails 3.1 - Asset Pipeline
+gem 'json'
+gem 'sass'
+gem 'coffee-script'
+gem 'uglifier'
+# Rails 3.1 - JavaScript
+gem 'jquery-rails'
 
 # ActiveRecord requires a database adapter.
 gem 'sqlite3-ruby', :require => 'sqlite3'
 
 #RMagick is used for image resizing and processing
 gem "rmagick", ">= 2.12.2"
 
-# We use jquery
-gem "jquery-rails"
-
 # Ruby 1.9.2 doesn't include unit testing by default
 gem 'test-unit'
 
 ## Bundle gems used only in certain environments:
 group :test do
   gem "test_benchmark", :require => 'test_benchmark'
-end
+end
diff --git a/public/images/elements/date.png → app/assets/images/elements/date.png b/public/images/elements/date.png → app/assets/images/elements/date.png
diff --git a/public/images/elements/filetype-icons.jpg → ...assets/images/elements/filetype-icons.jpg b/public/images/elements/filetype-icons.jpg → ...assets/images/elements/filetype-icons.jpg
diff --git a/public/images/elements/slider.png → app/assets/images/elements/slider.png b/public/images/elements/slider.png → app/assets/images/elements/slider.png
diff --git a/public/images/elements/time.png → app/assets/images/elements/time.png b/public/images/elements/time.png → app/assets/images/elements/time.png
diff --git a/public/images/layout/C/bg_lg.png → app/assets/images/layout/C/bg_lg.png b/public/images/layout/C/bg_lg.png → app/assets/images/layout/C/bg_lg.png
diff --git a/public/images/layout/C/bg_sm.png → app/assets/images/layout/C/bg_sm.png b/public/images/layout/C/bg_sm.png → app/assets/images/layout/C/bg_sm.png
diff --git a/public/images/layout/C/header_bg.png → app/assets/images/layout/C/header_bg.png b/public/images/layout/C/header_bg.png → app/assets/images/layout/C/header_bg.png
diff --git a/public/images/layout/C/sidebar_light.png → app/assets/images/layout/C/sidebar_light.png b/public/images/layout/C/sidebar_light.png → app/assets/images/layout/C/sidebar_light.png
diff --git a/public/images/layout/C/submit_bar_bg.png → app/assets/images/layout/C/submit_bar_bg.png b/public/images/layout/C/submit_bar_bg.png → app/assets/images/layout/C/submit_bar_bg.png
diff --git a/public/images/layout/LG_baseline.png → app/assets/images/layout/LG_baseline.png b/public/images/layout/LG_baseline.png → app/assets/images/layout/LG_baseline.png
diff --git a/public/images/layout/LG_bluebg.png → app/assets/images/layout/LG_bluebg.png b/public/images/layout/LG_bluebg.png → app/assets/images/layout/LG_bluebg.png
diff --git a/...ic/images/layout/MS/iconlist_inactive.png → ...ts/images/layout/MS/iconlist_inactive.png b/...ic/images/layout/MS/iconlist_inactive.png → ...ts/images/layout/MS/iconlist_inactive.png
diff --git a/public/images/layout/MS/inner.png → app/assets/images/layout/MS/inner.png b/public/images/layout/MS/inner.png → app/assets/images/layout/MS/inner.png
diff --git a/public/images/layout/MS/outer.png → app/assets/images/layout/MS/outer.png b/public/images/layout/MS/outer.png → app/assets/images/layout/MS/outer.png
diff --git a/public/images/layout/TM/TM_bg.png → app/assets/images/layout/TM/TM_bg.png b/public/images/layout/TM/TM_bg.png → app/assets/images/layout/TM/TM_bg.png
diff --git a/public/images/layout/TM/TM_logobutton.png → ...assets/images/layout/TM/TM_logobutton.png b/public/images/layout/TM/TM_logobutton.png → ...assets/images/layout/TM/TM_logobutton.png
diff --git a/public/images/layout/TM/TM_secline.png → app/assets/images/layout/TM/TM_secline.png b/public/images/layout/TM/TM_secline.png → app/assets/images/layout/TM/TM_secline.png
diff --git a/public/images/layout/TM/button_TM_states.png → ...ets/images/layout/TM/button_TM_states.png b/public/images/layout/TM/button_TM_states.png → ...ets/images/layout/TM/button_TM_states.png
diff --git a/public/images/layout/button_back_states.png → ...sets/images/layout/button_back_states.png b/public/images/layout/button_back_states.png → ...sets/images/layout/button_back_states.png
diff --git a/public/images/layout/button_date_states.png → ...sets/images/layout/button_date_states.png b/public/images/layout/button_date_states.png → ...sets/images/layout/button_date_states.png
diff --git a/public/images/layout/button_disclosure.png → ...ssets/images/layout/button_disclosure.png b/public/images/layout/button_disclosure.png → ...ssets/images/layout/button_disclosure.png
diff --git a/public/images/layout/button_feed_states.png → ...sets/images/layout/button_feed_states.png b/public/images/layout/button_feed_states.png → ...sets/images/layout/button_feed_states.png
diff --git a/public/images/layout/button_norm_states.png → ...sets/images/layout/button_norm_states.png b/public/images/layout/button_norm_states.png → ...sets/images/layout/button_norm_states.png
diff --git a/public/images/layout/button_time_states.png → ...sets/images/layout/button_time_states.png b/public/images/layout/button_time_states.png → ...sets/images/layout/button_time_states.png
diff --git a/public/images/layout/forms/textfield_bg.png → ...sets/images/layout/forms/textfield_bg.png b/public/images/layout/forms/textfield_bg.png → ...sets/images/layout/forms/textfield_bg.png
diff --git a/public/images/layout/pagebg.gif → app/assets/images/layout/pagebg.gif b/public/images/layout/pagebg.gif → app/assets/images/layout/pagebg.gif
diff --git a/public/images/layout/sv_left_bg.png → app/assets/images/layout/sv_left_bg.png b/public/images/layout/sv_left_bg.png → app/assets/images/layout/sv_left_bg.png
diff --git a/public/images/ph/ph.png → app/assets/images/ph/ph.png b/public/images/ph/ph.png → app/assets/images/ph/ph.png
diff --git a/public/javascripts/application.js → app/assets/javascripts/application.js b/public/javascripts/application.js → app/assets/javascripts/application.js
@@ -1,3 +1,13 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .
+
 // Place your application-specific JavaScript functions and classes here
 // This file is automatically included by javascript_include_tag :defaults
 

diff --git a/public/javascripts/html5.js → app/assets/javascripts/html5.js b/public/javascripts/html5.js → app/assets/javascripts/html5.js
diff --git a/...javascripts/jquery-ui-timepicker-addon.js → ...javascripts/jquery-ui-timepicker-addon.js b/...javascripts/jquery-ui-timepicker-addon.js → ...javascripts/jquery-ui-timepicker-addon.js
diff --git a/public/javascripts/jquery-ui.js → app/assets/javascripts/jquery-ui.js b/public/javascripts/jquery-ui.js → app/assets/javascripts/jquery-ui.js
diff --git a/public/javascripts/jquery-ui.min.js → app/assets/javascripts/jquery-ui.min.js b/public/javascripts/jquery-ui.min.js → app/assets/javascripts/jquery-ui.min.js
diff --git a/public/javascripts/jquery.js → app/assets/javascripts/jquery.js b/public/javascripts/jquery.js → app/assets/javascripts/jquery.js
diff --git a/public/javascripts/jquery.min.js → app/assets/javascripts/jquery.min.js b/public/javascripts/jquery.min.js → app/assets/javascripts/jquery.min.js
diff --git a/public/javascripts/rails.js → app/assets/javascripts/rails.js b/public/javascripts/rails.js → app/assets/javascripts/rails.js
diff --git a/public/javascripts/rangeinput.js → app/assets/javascripts/rangeinput.js b/public/javascripts/rangeinput.js → app/assets/javascripts/rangeinput.js
diff --git a/public/stylesheets/.gitkeep → app/assets/stylesheets/.gitkeep b/public/stylesheets/.gitkeep → app/assets/stylesheets/.gitkeep
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -0,0 +1,7 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require_tree . 
+*/
diff --git a/public/stylesheets/base.css → app/assets/stylesheets/base.css b/public/stylesheets/base.css → app/assets/stylesheets/base.css
diff --git a/public/stylesheets/datetime.css → app/assets/stylesheets/datetime.css b/public/stylesheets/datetime.css → app/assets/stylesheets/datetime.css
diff --git a/...ts/images/ui-bg_flat_55_999999_40x100.png → ...ts/images/ui-bg_flat_55_999999_40x100.png b/...ts/images/ui-bg_flat_55_999999_40x100.png → ...ts/images/ui-bg_flat_55_999999_40x100.png
diff --git a/...ts/images/ui-bg_flat_75_aaaaaa_40x100.png → ...ts/images/ui-bg_flat_75_aaaaaa_40x100.png b/...ts/images/ui-bg_flat_75_aaaaaa_40x100.png → ...ts/images/ui-bg_flat_75_aaaaaa_40x100.png
diff --git a/...ts/images/ui-bg_glass_45_0078ae_1x400.png → ...ts/images/ui-bg_glass_45_0078ae_1x400.png b/...ts/images/ui-bg_glass_45_0078ae_1x400.png → ...ts/images/ui-bg_glass_45_0078ae_1x400.png
diff --git a/...ts/images/ui-bg_glass_55_f8da4e_1x400.png → ...ts/images/ui-bg_glass_55_f8da4e_1x400.png b/...ts/images/ui-bg_glass_55_f8da4e_1x400.png → ...ts/images/ui-bg_glass_55_f8da4e_1x400.png
diff --git a/...ts/images/ui-bg_glass_75_79c9ec_1x400.png → ...ts/images/ui-bg_glass_75_79c9ec_1x400.png b/...ts/images/ui-bg_glass_75_79c9ec_1x400.png → ...ts/images/ui-bg_glass_75_79c9ec_1x400.png
diff --git a/...es/ui-bg_gloss-wave_45_e14f1c_500x100.png → ...es/ui-bg_gloss-wave_45_e14f1c_500x100.png b/...es/ui-bg_gloss-wave_45_e14f1c_500x100.png → ...es/ui-bg_gloss-wave_45_e14f1c_500x100.png
diff --git a/...es/ui-bg_gloss-wave_50_6eac2c_500x100.png → ...es/ui-bg_gloss-wave_50_6eac2c_500x100.png b/...es/ui-bg_gloss-wave_50_6eac2c_500x100.png → ...es/ui-bg_gloss-wave_50_6eac2c_500x100.png
diff --git a/...es/ui-bg_gloss-wave_75_2191c0_500x100.png → ...es/ui-bg_gloss-wave_75_2191c0_500x100.png b/...es/ui-bg_gloss-wave_75_2191c0_500x100.png → ...es/ui-bg_gloss-wave_75_2191c0_500x100.png
diff --git a/...ges/ui-bg_inset-hard_100_fcfdfd_1x100.png → ...ges/ui-bg_inset-hard_100_fcfdfd_1x100.png b/...ges/ui-bg_inset-hard_100_fcfdfd_1x100.png → ...ges/ui-bg_inset-hard_100_fcfdfd_1x100.png
diff --git a/...sheets/images/ui-icons_0078ae_256x240.png → ...sheets/images/ui-icons_0078ae_256x240.png b/...sheets/images/ui-icons_0078ae_256x240.png → ...sheets/images/ui-icons_0078ae_256x240.png
diff --git a/...sheets/images/ui-icons_056b93_256x240.png → ...sheets/images/ui-icons_056b93_256x240.png b/...sheets/images/ui-icons_056b93_256x240.png → ...sheets/images/ui-icons_056b93_256x240.png
diff --git a/...sheets/images/ui-icons_d8e7f3_256x240.png → ...sheets/images/ui-icons_d8e7f3_256x240.png b/...sheets/images/ui-icons_d8e7f3_256x240.png → ...sheets/images/ui-icons_d8e7f3_256x240.png
diff --git a/...sheets/images/ui-icons_e0fdff_256x240.png → ...sheets/images/ui-icons_e0fdff_256x240.png b/...sheets/images/ui-icons_e0fdff_256x240.png → ...sheets/images/ui-icons_e0fdff_256x240.png
diff --git a/...sheets/images/ui-icons_f5e175_256x240.png → ...sheets/images/ui-icons_f5e175_256x240.png b/...sheets/images/ui-icons_f5e175_256x240.png → ...sheets/images/ui-icons_f5e175_256x240.png
diff --git a/...sheets/images/ui-icons_f7a50d_256x240.png → ...sheets/images/ui-icons_f7a50d_256x240.png b/...sheets/images/ui-icons_f7a50d_256x240.png → ...sheets/images/ui-icons_f7a50d_256x240.png
diff --git a/...sheets/images/ui-icons_fcd113_256x240.png → ...sheets/images/ui-icons_fcd113_256x240.png b/...sheets/images/ui-icons_fcd113_256x240.png → ...sheets/images/ui-icons_fcd113_256x240.png
diff --git a/...ic/stylesheets/jquery-ui-1.8.5.custom.css → ...ts/stylesheets/jquery-ui-1.8.5.custom.css b/...ic/stylesheets/jquery-ui-1.8.5.custom.css → ...ts/stylesheets/jquery-ui-1.8.5.custom.css
diff --git a/public/stylesheets/scaffold.css → app/assets/stylesheets/scaffold.css b/public/stylesheets/scaffold.css → app/assets/stylesheets/scaffold.css
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -3,11 +3,13 @@
 <head>
   <title><%= controller.action_name.titleize %> - <%= controller.controller_name.titleize %> - Concerto Signage Panel</title>
 
-  <%= stylesheet_link_tag 'base' %>
-  <%= stylesheet_link_tag 'jquery-ui-1.8.5.custom' %>
-  <%= stylesheet_link_tag 'datetime' %>
+  <%#= stylesheet_link_tag 'base' %>
+  <%#= stylesheet_link_tag 'jquery-ui-1.8.5.custom' %>
+  <%#= stylesheet_link_tag 'datetime' %>
   
-  <%= javascript_include_tag :defaults %>
+  <%= stylesheet_link_tag "application" %>
+  <%= javascript_include_tag "application" %>
+
   <%= csrf_meta_tag %>
   <%= render :partial => 'elements/head' %>
   <%= render :partial => 'elements/javascript' %>

diff --git a/config/application.rb b/config/application.rb
@@ -38,5 +38,8 @@ class Application < Rails::Application
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
   end
 end
diff --git a/config/boot.rb b/config/boot.rb
@@ -1,13 +1,6 @@
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
-begin
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
-end if File.exist?(gemfile)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -11,7 +11,6 @@
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -46,4 +46,8 @@
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+
+  # Compress both stylesheets and JavaScripts
+  config.assets.js_compressor  = :uglifier
+  config.assets.css_compressor = :scss
 end