Permalink
Browse files

Setting up Page, Active Admin, and error pages; making other various …

…tweaks
  • Loading branch information...
1 parent 4c1a2cf commit ae5fca7a66a859fa7b102ce9a211f101da2eb256 @tombenner committed Sep 18, 2012
Showing with 931 additions and 582 deletions.
  1. +5 −5 Gemfile
  2. +58 −61 Gemfile.lock
  3. +21 −261 README
  4. +47 −0 app/admin/dashboards.rb
  5. +29 −0 app/admin/pages.rb
  6. +39 −0 app/admin/users.rb
  7. +1 −0 app/assets/javascripts/active_admin.js
  8. +36 −53 app/assets/javascripts/app/login_dialog.js.coffee
  9. +97 −15 app/assets/javascripts/app/utilities.js.coffee
  10. +0 −1 app/assets/javascripts/application.js
  11. +0 −4 app/assets/javascripts/bootstrap.js.coffee
  12. +0 −5 app/assets/javascripts/public.js
  13. +6 −0 app/assets/stylesheets/active_admin.css.scss
  14. +1 −2 app/assets/stylesheets/application.css
  15. 0 app/assets/stylesheets/{ → public}/bootstrap_and_overrides.css.less
  16. +3 −109 app/assets/stylesheets/{public.css → public/bootstrap_overrides.css.scss}
  17. +95 −0 app/assets/stylesheets/public/main.css
  18. +34 −0 app/controllers/application_controller.rb
  19. +6 −0 app/controllers/pages_controller.rb
  20. +2 −0 app/controllers/profiles_controller.rb
  21. +13 −15 app/helpers/application_helper.rb
  22. +11 −0 app/helpers/cache_helper.rb
  23. +6 −0 app/helpers/pages_helper.rb
  24. +20 −0 app/helpers/users_helper.rb
  25. +10 −0 app/models/admin_user.rb
  26. +5 −0 app/models/page.rb
  27. +41 −31 app/models/user.rb
  28. +3 −0 app/views/errors/404.html.erb
  29. +3 −0 app/views/errors/500.html.erb
  30. +5 −8 app/views/layouts/application.html.erb
  31. +7 −0 app/views/pages/show.html.erb
  32. +3 −0 app/views/profiles/show.html.erb
  33. +129 −0 config/initializers/active_admin.rb
  34. +1 −1 config/initializers/devise.rb
  35. +8 −7 config/routes.rb
  36. +1 −1 config/site.yml
  37. +17 −0 db/migrate/20120918140422_create_admin_notes.rb
  38. +25 −0 db/migrate/20120918140423_move_admin_notes_to_comments.rb
  39. +11 −0 db/migrate/20120918190140_create_pages.rb
  40. +52 −0 db/migrate/20120918210405_devise_create_admin_users.rb
  41. +44 −3 db/schema.rb
  42. +11 −0 test/fixtures/admin_users.yml
  43. +11 −0 test/fixtures/pages.yml
  44. +7 −0 test/unit/admin_user_test.rb
  45. +7 −0 test/unit/page_test.rb
View
10 Gemfile
@@ -1,24 +1,24 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.1'
+gem 'rails', '3.2.7'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'mysql2'
gem 'devise'
gem 'activeadmin'
-gem 'friendly_id'
gem 'settingslogic'
gem 'paperclip', '~> 2.7'
gem 'twitter-bootstrap-rails'
-gem 'jquery-rails-aristo'
+gem 'auto_strip_attributes', '~> 1.0'
+gem 'redcarpet'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sass-rails', '~> 3.1.4'
- gem 'coffee-rails', '~> 3.1.1'
+ gem 'sass-rails', '~> 3.2.3'
+ gem 'coffee-rails', '~> 3.2.1'
gem 'uglifier', '>= 1.0.3'
end
View
@@ -1,20 +1,19 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.1)
- actionpack (= 3.1.1)
- mail (~> 2.3.0)
- actionpack (3.1.1)
- activemodel (= 3.1.1)
- activesupport (= 3.1.1)
+ actionmailer (3.2.7)
+ actionpack (= 3.2.7)
+ mail (~> 2.4.4)
+ actionpack (3.2.7)
+ activemodel (= 3.2.7)
+ activesupport (= 3.2.7)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.2)
- rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
+ journey (~> 1.0.4)
+ rack (~> 1.4.0)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.2)
+ sprockets (~> 2.1.3)
activeadmin (0.4.3)
bourbon (>= 1.0.0)
devise (>= 1.1.2)
@@ -26,34 +25,36 @@ GEM
meta_search (>= 0.9.2)
rails (>= 3.0.0)
sass (>= 3.1.0)
- activemodel (3.1.1)
- activesupport (= 3.1.1)
+ activemodel (3.2.7)
+ activesupport (= 3.2.7)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.1)
- activemodel (= 3.1.1)
- activesupport (= 3.1.1)
- arel (~> 2.2.1)
+ activerecord (3.2.7)
+ activemodel (= 3.2.7)
+ activesupport (= 3.2.7)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.1.1)
- activemodel (= 3.1.1)
- activesupport (= 3.1.1)
- activesupport (3.1.1)
+ activeresource (3.2.7)
+ activemodel (= 3.2.7)
+ activesupport (= 3.2.7)
+ activesupport (3.2.7)
+ i18n (~> 0.6)
multi_json (~> 1.0)
ansi (1.4.2)
- arel (2.2.3)
+ arel (3.0.2)
+ auto_strip_attributes (1.1)
+ activerecord (>= 3.0)
bcrypt-ruby (3.0.1)
bourbon (1.4.0)
sass (>= 3.1)
- builder (3.0.0)
+ builder (3.0.3)
cocaine (0.2.1)
- coffee-rails (3.1.1)
+ coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
- railties (~> 3.1.0)
+ railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.2.0)
+ coffee-script-source (1.3.3)
commonjs (0.2.0)
therubyracer (~> 0.9.9)
devise (2.0.4)
@@ -67,19 +68,17 @@ GEM
fastercsv (1.5.4)
formtastic (2.1.1)
actionpack (~> 3.0)
- friendly_id (4.0.4)
has_scope (0.5.1)
hike (1.2.1)
- i18n (0.6.0)
+ i18n (0.6.1)
inherited_resources (1.3.1)
has_scope (~> 0.5.0)
responders (~> 0.6)
+ journey (1.0.4)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- jquery-rails-aristo (1.0.0)
- rails (>= 3.1.0)
- json (1.6.6)
+ json (1.7.5)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
@@ -91,7 +90,7 @@ GEM
actionpack (>= 3.1)
less (~> 2.0.7)
libv8 (3.3.10.4)
- mail (2.3.3)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -100,8 +99,8 @@ GEM
activerecord (~> 3.1)
activesupport (~> 3.1)
polyamorous (~> 0.5.0)
- mime-types (1.18)
- multi_json (1.2.0)
+ mime-types (1.19)
+ multi_json (1.3.6)
mysql2 (0.3.11)
orm_adapter (0.0.7)
paperclip (2.7.0)
@@ -112,49 +111,47 @@ GEM
polyamorous (0.5.0)
activerecord (~> 3.0)
polyglot (0.3.3)
- rack (1.3.6)
+ rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.1)
- actionmailer (= 3.1.1)
- actionpack (= 3.1.1)
- activerecord (= 3.1.1)
- activeresource (= 3.1.1)
- activesupport (= 3.1.1)
+ rails (3.2.7)
+ actionmailer (= 3.2.7)
+ actionpack (= 3.2.7)
+ activerecord (= 3.2.7)
+ activeresource (= 3.2.7)
+ activesupport (= 3.2.7)
bundler (~> 1.0)
- railties (= 3.1.1)
- railties (3.1.1)
- actionpack (= 3.1.1)
- activesupport (= 3.1.1)
+ railties (= 3.2.7)
+ railties (3.2.7)
+ actionpack (= 3.2.7)
+ activesupport (= 3.2.7)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
+ thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
+ redcarpet (2.0.1)
responders (0.9.1)
railties (~> 3.1)
sass (3.1.15)
- sass-rails (3.1.6)
- actionpack (~> 3.1.0)
- railties (~> 3.1.0)
+ sass-rails (3.2.5)
+ railties (~> 3.2.0)
sass (>= 3.1.10)
- tilt (~> 1.3.2)
+ tilt (~> 1.3)
settingslogic (2.0.8)
- sprockets (2.0.3)
+ sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
therubyracer (0.9.10)
libv8 (~> 3.3.10)
- thor (0.14.6)
+ thor (0.16.0)
tilt (1.3.3)
treetop (1.4.10)
polyglot
@@ -165,7 +162,7 @@ GEM
actionpack (>= 3.1)
less-rails (~> 2.1.6)
railties (>= 3.1)
- tzinfo (0.3.32)
+ tzinfo (0.3.33)
uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
@@ -177,15 +174,15 @@ PLATFORMS
DEPENDENCIES
activeadmin
- coffee-rails (~> 3.1.1)
+ auto_strip_attributes (~> 1.0)
+ coffee-rails (~> 3.2.1)
devise
- friendly_id
jquery-rails
- jquery-rails-aristo
mysql2
paperclip (~> 2.7)
- rails (= 3.1.1)
- sass-rails (~> 3.1.4)
+ rails (= 3.2.7)
+ redcarpet
+ sass-rails (~> 3.2.3)
settingslogic
turn
twitter-bootstrap-rails
Oops, something went wrong.

0 comments on commit ae5fca7

Please sign in to comment.