Merge branch 'master' of github.com:fredwu/angel_nest

Author: gitfly

Gemfile

@@ -8,6 +8,7 @@ gem 'devise',              '~> 1.4.2'
 gem 'omniauth',            '~> 0.2.0'
 gem 'inherited_resources', '~> 1.2.0'
 gem 'simple_form',         '~> 1.4.0'
+gem 'nested_form',                    :git => 'git://github.com/ryanb/nested_form.git'
 gem 'squeel',              '~> 0.8.0'
 gem 'rails_config'
 gem 'has_scope'

Gemfile.lock

@@ -1,3 +1,9 @@
+GIT
+  remote: git://github.com/ryanb/nested_form.git
+  revision: 57f32788f1952bcd633057b4b56b69b51df17610
+  specs:
+    nested_form (0.1.1)
+
 GIT
   remote: git://github.com/stonean/slim.git
   revision: a3465a03f913fb1c724797c785f13703265acd12
@@ -290,6 +296,7 @@ DEPENDENCIES
   mini_magick
   modernizr-rails
   mysql2
+  nested_form!
   omniauth (~> 0.2.0)
   pickle
   rails (~> 3.1.0.rc4)

app/assets/javascripts/_global_variables.js.coffee.erb

@@ -1 +1,2 @@
-window.label = <%= I18n.t('label').to_json %>
+window.label    = <%= I18n.t('label').to_json %>
+window.settings = <%= Settings.to_json %>

app/assets/javascripts/concerns/editable.js.coffee

@@ -45,7 +45,7 @@ jQuery ->
   edit_action = (parent) ->
     edit_target = parent.data('edit_target')
     cached_html = $(edit_target).html()
-    target_link = $('a', parent).attr('href')
+    target_link = $(parent).data('edit_href') || $('a', parent).attr('href')
 
     $(edit_target).wrapInner('<div class="cached" />') unless $('.cached', edit_target).length > 0
     $('.cached', edit_target).after('<div class="inline_edit"></div>') unless $('.inline_edit', edit_target).length > 0

app/assets/javascripts/concerns/gallery.js.coffee

@@ -0,0 +1,11 @@
+jQuery ->
+  $('#slideshow').livequery(->
+    $(@).slideshow(
+      pauseSeconds: 5
+      width: window.settings.group.logo.full.width
+      height: window.settings.group.logo.full.height
+      caption: false
+    )
+
+    $('> a', @).fancybox()
+  )