Permalink
Browse files

Bump to Rails 3.1.1.rc1 and rewrite with bootstrap.css

Lots of UI and functional updates coming - fully switching to Twitter bootstrap CSS and Postmark for incoming and outgoing email processing
  • Loading branch information...
1 parent b93e5f1 commit 7478ff64843fe062a1df70b586e79aa8d4cf36f6 @bensie committed Sep 22, 2011
Showing with 2,694 additions and 576 deletions.
  1. +12 −15 Gemfile
  2. +75 −63 Gemfile.lock
  3. +4 −7 app/assets/stylesheets/application.css
  4. +0 −302 app/assets/stylesheets/global.css
  5. +5 −0 app/assets/stylesheets/global.css.scss
  6. +80 −0 app/helpers/bootstrap_helper.rb
  7. +0 −2 app/helpers/emails_helper.rb
  8. +0 −2 app/helpers/lists_helper.rb
  9. +0 −2 app/helpers/messages_helper.rb
  10. +0 −2 app/helpers/servers_helper.rb
  11. +0 −2 app/helpers/sessions_helper.rb
  12. +0 −2 app/helpers/subscribers_helper.rb
  13. +0 −2 app/helpers/subscriptions_helper.rb
  14. +0 −2 app/helpers/topics_helper.rb
  15. +0 −57 app/views/layouts/application.html.erb
  16. +47 −0 app/views/layouts/application.html.haml
  17. +0 −20 app/views/lists/_form.html.erb
  18. +6 −0 app/views/lists/_form.html.haml
  19. +0 −25 app/views/lists/_list.html.erb
  20. +13 −0 app/views/lists/_list.html.haml
  21. +0 −24 app/views/lists/index.html.erb
  22. +13 −0 app/views/lists/index.html.haml
  23. +0 −11 app/views/lists/new.html.erb
  24. +10 −0 app/views/lists/new.html.haml
  25. +0 −4 app/views/servers/_form.html.erb
  26. +1 −0 app/views/servers/_form.html.haml
  27. +8 −1 app/views/servers/_server.html.erb
  28. +0 −9 app/views/servers/index.html.erb
  29. +12 −0 app/views/servers/index.html.haml
  30. +0 −12 app/views/servers/new.html.erb
  31. +11 −0 app/views/servers/new.html.haml
  32. +2 −2 app/views/servers/show.html.erb
  33. +9 −3 config/application.rb
  34. +7 −0 config/environments/development.rb
  35. +13 −5 config/environments/production.rb
  36. +3 −0 config/environments/test.rb
  37. +1 −0 db/schema.rb
  38. +2,362 −0 vendor/assets/stylesheets/bootstrap.css
View
27 Gemfile
@@ -1,21 +1,18 @@
source "http://rubygems.org"
-gem 'rails', '3.1.0.rc5'
-gem 'mysql2'
+gem "rails", "3.1.1.rc1"
+gem "mysql2"
group :assets do
- gem 'coffee-rails'
- gem 'sass-rails'
- gem 'uglifier'
+ gem "sass-rails"
+ gem "coffee-rails"
+ gem "jquery-rails"
+ gem "uglifier"
+ gem "compass", "0.12.alpha.0"
end
-gem 'jquery-rails'
-
-gem 'postmark-rails'
-gem 'kaminari'
-gem 'dynamic_form'
-
-group :test do
- # Pretty printed test output
- gem 'turn', :require => false
-end
+gem "devise"
+gem "dynamic_form"
+gem "haml"
+gem "kaminari"
+gem "postmark-rails"
View
@@ -1,55 +1,62 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.0.rc5)
- actionpack (= 3.1.0.rc5)
+ actionmailer (3.1.1.rc1)
+ actionpack (= 3.1.1.rc1)
mail (~> 2.3.0)
- actionpack (3.1.0.rc5)
- activemodel (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
+ actionpack (3.1.1.rc1)
+ activemodel (= 3.1.1.rc1)
+ activesupport (= 3.1.1.rc1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
- rack (~> 1.3.1)
- rack-cache (~> 1.0.2)
- rack-mount (~> 0.8.1)
- rack-test (~> 0.6.0)
- sprockets (~> 2.0.0.beta.12)
- activemodel (3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
- bcrypt-ruby (~> 2.1.4)
+ rack (~> 1.3.2)
+ rack-cache (~> 1.0.3)
+ rack-mount (~> 0.8.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.0.0)
+ activemodel (3.1.1.rc1)
+ activesupport (= 3.1.1.rc1)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.0.rc5)
- activemodel (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
- arel (~> 2.1.4)
+ activerecord (3.1.1.rc1)
+ activemodel (= 3.1.1.rc1)
+ activesupport (= 3.1.1.rc1)
+ arel (~> 2.2.1)
tzinfo (~> 0.3.29)
- activeresource (3.1.0.rc5)
- activemodel (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
- activesupport (3.1.0.rc5)
+ activeresource (3.1.1.rc1)
+ activemodel (= 3.1.1.rc1)
+ activesupport (= 3.1.1.rc1)
+ activesupport (3.1.1.rc1)
multi_json (~> 1.0)
- ansi (1.3.0)
- arel (2.1.4)
- bcrypt-ruby (2.1.4)
+ arel (2.2.1)
+ bcrypt-ruby (3.0.1)
builder (3.0.0)
- coffee-rails (3.1.0.rc.5)
- actionpack (~> 3.1.0.rc1)
+ chunky_png (1.2.4)
+ coffee-rails (3.1.1)
coffee-script (>= 2.2.0)
- railties (~> 3.1.0.rc1)
- sprockets (>= 2.0.0.beta.9)
+ railties (~> 3.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.1)
+ coffee-script-source (1.1.2)
+ compass (0.12.alpha.0)
+ chunky_png (~> 1.2)
+ fssm (>= 0.2.7)
+ sass (~> 3.1)
+ devise (1.4.7)
+ bcrypt-ruby (~> 3.0)
+ orm_adapter (~> 0.0.3)
+ warden (~> 1.0.3)
dynamic_form (1.1.4)
erubis (2.7.0)
- execjs (1.2.0)
+ execjs (1.2.8)
multi_json (~> 1.0)
- hike (1.2.0)
+ fssm (0.2.7)
+ haml (3.1.3)
+ hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.12)
+ jquery-rails (1.0.14)
railties (~> 3.0)
thor (~> 0.14)
kaminari (0.12.4)
@@ -60,71 +67,76 @@ GEM
treetop (~> 1.4.8)
mime-types (1.16)
multi_json (1.0.3)
- mysql2 (0.3.6)
- polyglot (0.3.1)
- postmark (0.9.6)
+ mysql2 (0.3.7)
+ orm_adapter (0.0.5)
+ polyglot (0.3.2)
+ postmark (0.9.8)
postmark-rails (0.4.1)
actionmailer
postmark (>= 0.9.0)
rake
- rack (1.3.2)
- rack-cache (1.0.2)
+ rack (1.3.3)
+ rack-cache (1.0.3)
rack (>= 0.4)
- rack-mount (0.8.1)
+ rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
- rack-test (0.6.0)
+ rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.0.rc5)
- actionmailer (= 3.1.0.rc5)
- actionpack (= 3.1.0.rc5)
- activerecord (= 3.1.0.rc5)
- activeresource (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
+ rails (3.1.1.rc1)
+ actionmailer (= 3.1.1.rc1)
+ actionpack (= 3.1.1.rc1)
+ activerecord (= 3.1.1.rc1)
+ activeresource (= 3.1.1.rc1)
+ activesupport (= 3.1.1.rc1)
bundler (~> 1.0)
- railties (= 3.1.0.rc5)
- railties (3.1.0.rc5)
- actionpack (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
+ railties (= 3.1.1.rc1)
+ railties (3.1.1.rc1)
+ actionpack (= 3.1.1.rc1)
+ activesupport (= 3.1.1.rc1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2)
- rdoc (3.8)
- sass (3.1.5)
- sass-rails (3.1.0.rc.5)
- actionpack (~> 3.1.0.rc1)
- railties (~> 3.1.0.rc1)
+ rdoc (3.9.4)
+ sass (3.1.7)
+ sass-rails (3.1.2)
+ actionpack (~> 3.1.0)
+ railties (~> 3.1.0)
sass (>= 3.1.4)
- sprockets (>= 2.0.0.beta.9)
- sprockets (2.0.0.beta.12)
+ sprockets (~> 2.0.0)
+ tilt (~> 1.3.2)
+ sprockets (2.0.0)
hike (~> 1.2)
rack (~> 1.0)
tilt (!= 1.3.0, ~> 1.1)
thor (0.14.6)
- tilt (1.3.2)
- treetop (1.4.9)
+ tilt (1.3.3)
+ treetop (1.4.10)
+ polyglot
polyglot (>= 0.3.1)
- turn (0.8.2)
- ansi (>= 1.2.2)
tzinfo (0.3.29)
- uglifier (1.0.0)
+ uglifier (1.0.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
+ warden (1.0.5)
+ rack (>= 1.0)
PLATFORMS
ruby
DEPENDENCIES
coffee-rails
+ compass (= 0.12.alpha.0)
+ devise
dynamic_form
+ haml
jquery-rails
kaminari
mysql2
postmark-rails
- rails (= 3.1.0.rc5)
+ rails (= 3.1.1.rc1)
sass-rails
- turn
uglifier
@@ -1,7 +1,4 @@
-/*
- * 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 .
-*/
+/* ...
+*= require bootstrap
+*= require global
+*/
Oops, something went wrong.

0 comments on commit 7478ff6

Please sign in to comment.