Permalink
Browse files

Removed ExtJS views in favor of using jQuery mobile. Have event new, …

…create, show, edit, update working. Need to work on checkin next.
  • Loading branch information...
1 parent a38240a commit 2e04cbfc3bd758a2bc9e2293ada96c0c782aacaf Ethan Waldo committed Feb 16, 2012
Showing with 12,013 additions and 32,501 deletions.
  1. +1 −0 .gitignore
  2. +16 −26 Gemfile
  3. +143 −147 Gemfile.lock
  4. +0 −432 app/assets/javascripts/DateTimePicker.js
  5. +0 −35 app/assets/javascripts/admin.js
  6. +0 −314 app/assets/javascripts/adminEvents.js
  7. +0 −296 app/assets/javascripts/adminUsers.js
  8. +16 −0 app/assets/javascripts/application.js
  9. +0 −449 app/assets/javascripts/events.js
  10. +0 −125 app/assets/javascripts/ext_overrides.js
  11. +0 −132 app/assets/javascripts/raor.js
  12. +0 −30,222 app/assets/javascripts/sencha-touch-debug.js
  13. +0 −6 app/assets/javascripts/sencha-touch.js
  14. +29 −0 app/assets/stylesheets/application.css.scss
  15. +0 −96 app/assets/stylesheets/master.css.scss
  16. +0 −1 app/assets/stylesheets/sencha-touch.css
  17. +7 −36 app/controllers/events_controller.rb
  18. +23 −0 app/helpers/application_helper.rb
  19. +37 −5 app/models/event.rb
  20. +0 −13 app/views/events/_event.html.erb
  21. +13 −0 app/views/events/_event.html.slim
  22. +0 −16 app/views/events/_form.html.erb
  23. +21 −0 app/views/events/_form.html.slim
  24. +0 −7 app/views/events/edit.html.erb
  25. +8 −0 app/views/events/edit.html.slim
  26. +0 −5 app/views/events/index.html.erb
  27. +15 −0 app/views/events/index.html.slim
  28. +0 −7 app/views/events/new.html.erb
  29. +8 −0 app/views/events/new.html.slim
  30. +0 −21 app/views/events/show.html.erb
  31. +24 −0 app/views/events/show.html.slim
  32. +5 −16 app/views/layouts/application.html.erb
  33. +7 −0 config/environments/development.rb
  34. +3 −0 config/environments/test.rb
  35. +2 −0 config/initializers/devise.rb
  36. +3 −4 config/locales/devise.en.yml
  37. +0 −1 config/routes.rb
  38. +6 −0 db/migrate/20120216050303_alter_events_rename_start_date_and_end_date.rb
  39. +3 −3 db/schema.rb
  40. +0 −2 public/javascripts/application.js
  41. +0 −11 test/fixtures/checkins.yml
  42. +0 −11 test/fixtures/events.yml
  43. +0 −8 test/functional/checkins_controller_test.rb
  44. +0 −8 test/functional/sessions_controller_test.rb
  45. +0 −9 test/performance/browsing_test.rb
  46. +0 −13 test/test_helper.rb
  47. +0 −8 test/unit/checkin_test.rb
  48. +0 −8 test/unit/event_test.rb
  49. +0 −4 test/unit/helpers/checkin_helper_test.rb
  50. +0 −4 test/unit/helpers/sessions_helper_test.rb
  51. +2,281 −0 vendor/assets/javascripts/jquery.mobile.datebox.js
  52. +7,075 −0 vendor/assets/javascripts/jquery.mobile.js
  53. +249 −0 vendor/assets/javascripts/jquery.mobile.pagination.js
  54. +1,869 −0 vendor/assets/stylesheets/jquery.mobile.css
  55. +76 −0 vendor/assets/stylesheets/jquery.mobile.datebox.css
  56. +73 −0 vendor/assets/stylesheets/jquery.mobile.pagination.css
View
@@ -6,3 +6,4 @@ tmp/
config/*.yml
public/assets/*
vendor/cache
+bin
View
42 Gemfile
@@ -1,20 +1,21 @@
source 'http://rubygems.org'
source "http://gems.github.com"
-gem 'rails', '3.1.0'
+gem 'rails', '3.2.0'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
#gem 'sqlite3'
-gem 'pg', '~>0.11.0'
-gem 'devise', '~>1.4.5'
-gem 'omniauth', '~>0.2.6'
-gem "oa-oauth", '~>0.2.6', :require => "omniauth/oauth"
-gem 'devise-twitter', '~>0.1.1'
-gem 'cancan', '~>1.6.5'
-gem 'will_paginate', '~>3.0.0'
-gem 'date_validator', '~> 0.6.2'
+gem 'pg'
+gem 'devise'
+gem 'omniauth'
+gem "omniauth-twitter"
+gem 'cancan'
+gem 'will_paginate'
+gem 'date_validator'
+gem 'jquery-rails'
+gem 'slim-rails'
# Use unicorn as the web server
gem 'unicorn'
@@ -23,27 +24,16 @@ gem 'unicorn'
gem 'capistrano'
group :assets do
- gem 'execjs', '~>1.2.9'
- gem 'therubyracer', '~>0.9.4'
- gem 'sass-rails', '~>3.1.0'
- gem 'uglifier', '~>1.0.3'
+ gem 'execjs'
+ gem 'therubyracer'
+ gem 'sass-rails'
+ gem 'uglifier'
end
group :development, :test do
# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
#gem 'ruby-debug'
gem 'ruby-debug19', :require => 'ruby-debug'
+ gem 'jasmine'
+ gem 'jasmine-headless-webkit'
end
-
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
-
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-# group :development, :test do
-# gem 'webrat'
-# end
Oops, something went wrong.

0 comments on commit 2e04cbf

Please sign in to comment.