Permalink
Browse files

Merge branch 'mercury-pages'

  • Loading branch information...
2 parents 203b097 + d848c83 commit d95af6bcb7238803f265639e31ef9c76ad3f7763 @mkuhl mkuhl committed Nov 26, 2011
Showing with 773 additions and 77 deletions.
  1. +1 −0 .gitignore
  2. +2 −1 Gemfile
  3. +32 −20 Gemfile.lock
  4. +6 −0 app/assets/javascripts/app.js.coffee
  5. +2 −1 app/assets/javascripts/application.js
  6. +0 −3 app/assets/javascripts/home.js.coffee
  7. +418 −0 app/assets/javascripts/mercury.js
  8. 0 app/assets/javascripts/{page.js.coffee → pages.js.coffee}
  9. +17 −0 app/assets/stylesheets/mercury_overrides.css
  10. +3 −0 app/assets/stylesheets/pages.css.scss
  11. +22 −1 app/controllers/home_controller.rb
  12. +0 −23 app/controllers/page_controller.rb
  13. +8 −0 app/controllers/page_editor_controller.rb
  14. +76 −0 app/controllers/pages_controller.rb
  15. +0 −2 app/helpers/page_helper.rb
  16. +16 −0 app/helpers/pages_helper.rb
  17. +5 −4 app/models/{blog_post.rb → page.rb}
  18. +18 −2 app/views/layouts/application.html.erb
  19. +25 −0 app/views/layouts/mercury.html.erb
  20. +30 −0 app/views/pages/new.html.erb
  21. +8 −0 app/views/pages/show.html.erb
  22. 0 app/views/{page → static}/about.html.erb
  23. 0 app/views/{page → static}/home.html.erb
  24. 0 app/views/{page → static}/notyet.html.erb
  25. 0 app/views/{page → static}/secret.html.erb
  26. +7 −0 config/initializers/quiet_assets.rb
  27. +11 −4 config/routes.rb
  28. +0 −11 db/migrate/20110920162144_create_blog_posts.rb
  29. +14 −0 db/migrate/20111123085209_create_pages.rb
  30. +11 −0 db/migrate/20111126131807_create_mercury_images.rb
  31. +13 −2 db/schema.rb
  32. +6 −0 db/seeds.rb
  33. +5 −0 spec/controllers/pages_controller_spec.rb
  34. +9 −0 spec/factories/pages.rb
  35. +3 −3 spec/helpers/{page_helper_spec.rb → pages_helper_spec.rb}
  36. +5 −0 spec/models/page_spec.rb
View
@@ -5,3 +5,4 @@ tmp/
.sass-cache/
.idea/
.rails_footnotes
+public/system/images
View
@@ -25,6 +25,7 @@ gem 'tilt'
gem 'jquery-rails'
gem 'devise'
gem 'twitter_bootstrap_form_for', :git => 'git://github.com/softmachine/twitter_bootstrap_form_for.git'
+gem 'mercury-rails', :git => 'https://github.com/jejacks0n/mercury.git'
group :development do
@@ -33,7 +34,7 @@ group :development do
#gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git'
gem 'factory_girl_rails'
gem 'faker'
- gem 'rails-footnotes'
+ #gem 'rails-footnotes'
end
group :production do
View
@@ -6,6 +6,15 @@ GIT
actionpack (~> 3)
railties (~> 3)
+GIT
+ remote: https://github.com/jejacks0n/mercury.git
+ revision: 38df02f55e55b1656581b893b14a6e3e006f9b78
+ specs:
+ mercury-rails (0.2.3)
+ coffee-script
+ paperclip
+ rails (~> 3.1.0)
+
GEM
remote: http://rubygems.org/
specs:
@@ -38,36 +47,37 @@ GEM
activesupport (= 3.1.0)
activesupport (3.1.0)
multi_json (~> 1.0)
- ansi (1.4.0)
+ ansi (1.4.1)
arel (2.2.1)
bcrypt-ruby (3.0.1)
bcrypt-ruby (3.0.1-x86-mingw32)
builder (3.0.0)
+ cocaine (0.2.0)
coffee-rails (3.1.1)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.2)
- devise (1.4.9)
+ coffee-script-source (1.1.3)
+ devise (1.5.1)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
- warden (~> 1.0.3)
+ warden (~> 1.1)
diff-lcs (1.1.3)
erubis (2.7.0)
execjs (1.2.9)
multi_json (~> 1.0)
- factory_girl (2.2.0)
+ factory_girl (2.3.1)
activesupport
- factory_girl_rails (1.3.0)
- factory_girl (~> 2.2.0)
+ factory_girl_rails (1.4.0)
+ factory_girl (~> 2.3.0)
railties (>= 3.0.0)
faker (1.0.1)
i18n (~> 0.4)
hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.16)
+ jquery-rails (1.0.18)
railties (~> 3.0)
thor (~> 0.14)
json (1.6.1)
@@ -77,14 +87,19 @@ GEM
actionpack (~> 3.1.0)
less (~> 2.0.7)
railties (~> 3.1.0)
- libv8 (3.3.10.2)
+ libv8 (3.3.10.4)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
multi_json (1.0.3)
orm_adapter (0.0.5)
+ paperclip (2.4.5)
+ activerecord (>= 2.3.0)
+ activesupport (>= 2.3.2)
+ cocaine (>= 0.0.2)
+ mime-types
pg (0.11.0)
pg (0.11.0-x86-mingw32)
polyglot (0.3.3)
@@ -105,8 +120,6 @@ GEM
activesupport (= 3.1.0)
bundler (~> 1.0)
railties (= 3.1.0)
- rails-footnotes (3.7.5)
- rails (>= 3.0.0)
railties (3.1.0)
actionpack (= 3.1.0)
activesupport (= 3.1.0)
@@ -131,19 +144,18 @@ GEM
railties (~> 3.0)
rspec (~> 2.6.0)
sass (3.1.10)
- sass-rails (3.1.4)
+ sass-rails (3.1.5)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
- sass (>= 3.1.4)
- sprockets (~> 2.0.0)
+ sass (~> 3.1.10)
tilt (~> 1.3.2)
sprockets (2.0.3)
hike (~> 1.2)
rack (~> 1.0)
- tilt (!= 1.3.0, ~> 1.1)
+ tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.4)
sqlite3 (1.3.4-x86-mingw32)
- therubyracer (0.9.8)
+ therubyracer (0.9.9)
libv8 (~> 3.3.10)
thor (0.14.6)
tilt (1.3.3)
@@ -152,11 +164,11 @@ GEM
polyglot (>= 0.3.1)
turn (0.8.3)
ansi
- tzinfo (0.3.30)
- uglifier (1.0.4)
+ tzinfo (0.3.31)
+ uglifier (1.1.0)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- warden (1.0.6)
+ warden (1.1.0)
rack (>= 1.0)
PLATFORMS
@@ -170,9 +182,9 @@ DEPENDENCIES
faker
jquery-rails
less-rails
+ mercury-rails!
pg
rails (= 3.1.0)
- rails-footnotes
rspec-rails (= 2.6.1)
sass-rails (~> 3.1.0)
sqlite3
@@ -9,3 +9,9 @@ $(document).ready ->
li = $(this).parent("li").toggleClass('open');
return false;
+ jQuery(top).trigger('initialize:frame');
+
+ $(window).bind 'mercury:saved', ->
+ window.location = window.location.href.replace(/\/editor\//i, '/');
+
+
@@ -7,4 +7,5 @@
//= require jquery
//= require jquery_ujs
//= require bootstrap/bootstrap
-//= require_directory .
+//= require app
+//= require pages
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
Oops, something went wrong.

0 comments on commit d95af6b

Please sign in to comment.