Permalink
Browse files

Upgrade to Rails 3.2.1. Move all CSS to SCSS. Use Asset Pipeline!

  • Loading branch information...
kwiest committed Feb 24, 2012
1 parent c09c41c commit add93bbe6c1a42a1428e0b8bbc7cb3539b7de25f
Showing 2,994 changed files with 3,640 additions and 207,675 deletions.
View
@@ -8,6 +8,7 @@ config/deploy.rb
config/database.yml
config/s3.yml
db/*.sqlite3
+.sass-cache/
.rvmrc
.powenv
.powrc
View
21 Gemfile
@@ -1,17 +1,26 @@
source :rubygems
-gem 'rails', '3.0.10'
+gem 'rails', '3.2.1'
gem 'authlogic', '~> 3.1.0'
-gem 'paperclip', '2.3.5'
-gem 'aws', '2.5.6'
-gem 'aws-s3', '0.6.2'
-gem 'simple_form', '~> 1.5.2'
+gem 'paperclip', '~> 2.6.0'
+gem 'aws-sdk', '~> 1.3.5'
+gem 'simple_form', '~> 2.0.0.rc'
+gem 'anjlab-bootstrap-rails', '>= 2.0', require: 'bootstrap-rails'
gem 'zencoder', '2.3.1'
-gem 'state_machine', '1.0.2'
+gem 'state_machine', '~> 1.1.2'
gem 'postmark', '0.9.8'
gem 'postmark-rails', '0.4.1'
gem 'opentok', '~> 0.0.5'
+gem 'watu_table_builder', require: 'table_builder'
+gem 'jquery-rails'
+gem 'tinymce-rails'
+
+group :assets do
+ gem 'sass-rails', '~> 3.2.3'
+ gem 'coffee-rails', '~> 3.2.1'
+ gem 'uglifier', '>= 1.0.3'
+end
group :development do
gem 'sqlite3'
View
@@ -1,47 +1,47 @@
GEM
remote: http://rubygems.org/
specs:
- abstract (1.0.0)
- actionmailer (3.0.10)
- actionpack (= 3.0.10)
- mail (~> 2.2.19)
- actionpack (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.5.0)
- rack (~> 1.2.1)
- rack-mount (~> 0.6.14)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.10)
- activesupport (= 3.0.10)
- builder (~> 2.1.2)
- i18n (~> 0.5.0)
- activerecord (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- arel (~> 2.0.10)
- tzinfo (~> 0.3.23)
- activeresource (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- activesupport (3.0.10)
- addressable (2.2.6)
- arel (2.0.10)
+ actionmailer (3.2.1)
+ actionpack (= 3.2.1)
+ mail (~> 2.4.0)
+ actionpack (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
+ rack-cache (~> 1.1)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.1)
+ activesupport (= 3.2.1)
+ builder (~> 3.0.0)
+ activerecord (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
+ arel (~> 3.0.0)
+ tzinfo (~> 0.3.29)
+ activeresource (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
+ activesupport (3.2.1)
+ i18n (~> 0.6)
+ multi_json (~> 1.0)
+ addressable (2.2.7)
+ anjlab-bootstrap-rails (2.0.1.1)
+ railties (>= 3.0)
+ sass
+ arel (3.0.2)
authlogic (3.1.0)
activerecord (>= 3.0.7)
activerecord (>= 3.0.7)
- aws (2.5.6)
- http_connection
- uuidtools
- xml-simple
- aws-s3 (0.6.2)
- builder
- mime-types
- xml-simple
- builder (2.1.2)
+ aws-sdk (1.3.5)
+ httparty (~> 0.7)
+ json (~> 1.4)
+ nokogiri (>= 1.4.4)
+ uuidtools (~> 2.1)
+ builder (3.0.0)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -51,64 +51,86 @@ GEM
xpath (~> 0.1.4)
childprocess (0.3.1)
ffi (~> 1.0.6)
+ cocaine (0.2.1)
+ coffee-rails (3.2.2)
+ coffee-script (>= 2.2.0)
+ railties (~> 3.2.0)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.2.0)
database_cleaner (0.7.1)
diff-lcs (1.1.3)
- erubis (2.6.6)
- abstract (>= 1.0.0)
+ erubis (2.7.0)
+ execjs (1.3.0)
+ multi_json (~> 1.0)
factory_girl (2.6.0)
activesupport (>= 2.3.9)
factory_girl_rails (1.7.0)
factory_girl (~> 2.6.0)
railties (>= 3.0.0)
ffi (1.0.11)
- heroku (2.20.0)
+ heroku (2.20.1)
launchy (>= 0.3.2)
rest-client (~> 1.6.1)
rubyzip
term-ansicolor (~> 1.0.5)
- http_connection (1.4.1)
- i18n (0.5.0)
+ hike (1.2.1)
+ httparty (0.8.1)
+ multi_json
+ multi_xml
+ i18n (0.6.0)
+ journey (1.0.2)
+ jquery-rails (2.0.0)
+ railties (>= 3.2.0.beta, < 5.0)
+ thor (~> 0.14)
json (1.6.5)
+ json_pure (1.6.5)
launchy (2.0.5)
addressable (~> 2.2.6)
- mail (2.2.19)
- activesupport (>= 2.3.6)
+ mail (2.4.1)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
- multi_json (1.0.4)
+ multi_json (1.1.0)
+ multi_xml (0.4.1)
nokogiri (1.5.0)
opentok (0.0.5)
- paperclip (2.3.5)
- activerecord
- activesupport
+ paperclip (2.6.0)
+ activerecord (>= 2.3.0)
+ activesupport (>= 2.3.2)
+ cocaine (>= 0.0.2)
+ mime-types
pg (0.13.1)
polyglot (0.3.3)
postmark (0.9.8)
postmark-rails (0.4.1)
actionmailer
postmark (>= 0.9.0)
rake
- rack (1.2.5)
- rack-mount (0.6.14)
- rack (>= 1.0.0)
- rack-test (0.5.7)
+ rack (1.4.1)
+ rack-cache (1.1)
+ rack (>= 0.4)
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.1)
rack (>= 1.0)
- rails (3.0.10)
- actionmailer (= 3.0.10)
- actionpack (= 3.0.10)
- activerecord (= 3.0.10)
- activeresource (= 3.0.10)
- activesupport (= 3.0.10)
+ rails (3.2.1)
+ actionmailer (= 3.2.1)
+ actionpack (= 3.2.1)
+ activerecord (= 3.2.1)
+ activeresource (= 3.2.1)
+ activesupport (= 3.2.1)
bundler (~> 1.0)
- railties (= 3.0.10)
- railties (3.0.10)
- actionpack (= 3.0.10)
- activesupport (= 3.0.10)
+ railties (= 3.2.1)
+ railties (3.2.1)
+ actionpack (= 3.2.1)
+ activesupport (= 3.2.1)
+ rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.4)
+ thor (~> 0.14.6)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
@@ -128,22 +150,31 @@ GEM
railties (>= 3.0)
rspec (~> 2.8.0)
rubyzip (0.9.6.1)
- selenium-webdriver (2.19.0)
- childprocess (>= 0.2.5)
+ sass (3.1.15)
+ sass-rails (3.2.4)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
+ selenium-webdriver (2.13.0)
+ childprocess (>= 0.2.1)
ffi (~> 1.0.9)
- multi_json (~> 1.0.4)
+ json_pure
rubyzip
sequel (3.20.0)
shoulda-matchers (1.0.0)
- simple_form (1.5.2)
+ simple_form (2.0.0.rc)
actionpack (~> 3.0)
activemodel (~> 3.0)
sinatra (1.0)
rack (>= 1.0)
+ sprockets (2.1.2)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
- state_machine (1.0.2)
+ state_machine (1.1.2)
taps (0.3.23)
rack (>= 1.0.1)
rest-client (>= 1.4.0, < 1.7.0)
@@ -152,12 +183,18 @@ GEM
sqlite3-ruby (~> 1.2)
term-ansicolor (1.0.7)
thor (0.14.6)
+ tilt (1.3.3)
+ tinymce-rails (3.4.8)
+ railties (>= 3.1)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.31)
+ uglifier (1.2.3)
+ execjs (>= 0.3.0)
+ multi_json (>= 1.0.2)
uuidtools (2.1.2)
- xml-simple (1.1.1)
+ watu_table_builder (0.3.0)
xpath (0.1.4)
nokogiri (~> 1.3)
zencoder (2.3.1)
@@ -168,23 +205,29 @@ PLATFORMS
ruby
DEPENDENCIES
+ anjlab-bootstrap-rails (>= 2.0)
authlogic (~> 3.1.0)
- aws (= 2.5.6)
- aws-s3 (= 0.6.2)
+ aws-sdk (~> 1.3.5)
capybara
+ coffee-rails (~> 3.2.1)
database_cleaner
factory_girl_rails
heroku
+ jquery-rails
opentok (~> 0.0.5)
- paperclip (= 2.3.5)
+ paperclip (~> 2.6.0)
pg
postmark (= 0.9.8)
postmark-rails (= 0.4.1)
- rails (= 3.0.10)
+ rails (= 3.2.1)
rspec-rails (~> 2.8.0)
+ sass-rails (~> 3.2.3)
shoulda-matchers
- simple_form (~> 1.5.2)
+ simple_form (~> 2.0.0.rc)
sqlite3
- state_machine (= 1.0.2)
+ state_machine (~> 1.1.2)
taps
+ tinymce-rails
+ uglifier (>= 1.0.3)
+ watu_table_builder
zencoder (= 2.3.1)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Diff not rendered.
@@ -0,0 +1,36 @@
+//= require jquery
+//= require jquery-ui
+//= require jquery_ujs
+//= require tinymce-jquery
+//= require bootstrap-tooltip
+//= require video
+//= require_self
+//= require_tree ./admin
+
+$(function() {
+ VideoJS.setupAllWhenReady();
+
+ $('.datepicker').datepicker({dateFormat: "yy-mm-dd"});
+
+ // TinyMCE Rich Text Editor
+ $('.tinymce').tinymce({
+ theme: 'advanced',
+ theme_advanced_buttons1: 'formatselect,fontsizeselect,bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,separator,bullist,numlist,separator,link,unlink,undo,redo',
+ theme_advanced_buttons2: '',
+ theme_advanced_buttons3: '',
+ theme_advanced_toolbar_location : "top",
+ theme_advanced_toolbar_align : "left",
+ theme_advanced_resizing : false,
+ width: "50%"
+ });
+
+ // Calendar Tooltip
+ $('.has-tip').tooltip({
+ showURL: false,
+ fixPNG: true,
+ top: -120,
+ left: -100,
+ track: true,
+ });
+
+});
@@ -0,0 +1,9 @@
+//= require jquery
+//= require jquery_ujs
+//= require video
+//= require_self
+
+
+$(function() {
+ VideoJS.setupAllWhenReady();
+});
File renamed without changes.
@@ -0,0 +1,10 @@
+/*
+*= require bootstrap
+*= require jquery-ui
+*= require common
+*= require posts
+*= require reviews
+*= require video-js
+*= require_tree ./admin
+*/
+
Oops, something went wrong.

0 comments on commit add93bb

Please sign in to comment.