AS released, fix #103

13 years ago · 9056646108
7 changed files with 22 additions and 19 deletions
--- a/3
+++ b/3
@ -12,7 +12,8 @@ gem 'cancan', '~> 1.6.7'
 gem 'squeel', '~> 0.9.3'
 gem 'sentient_user', '~> 0.3.2'
 gem 'userstamp_basic', '~> 0.1.0'
-gem 'active_scaffold', '~> 3.2.0', git: 'https://github.com/activescaffold/active_scaffold.git'
+gem 'active_scaffold', '~> 3.2.1'
+# git: 'https://github.com/activescaffold/active_scaffold.git'
 # path: '/home/clyfe/dev/active_scaffold'
 gem 'pjax_rails', '~> 0.1.7', git: 'https://github.com/rails/pjax_rails.git'
 gem 'validates_hostname', '~> 1.0.0', git: 'https://github.com/KimNorgaard/validates_hostname.git'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -4,13 +4,6 @@ GIT
  specs:
    validates_hostname (1.0.0)

-GIT
-  remote: https://github.com/activescaffold/active_scaffold.git
-  revision: b81585d8dec4616d13da8034fe8a704bf14a5b81
-  specs:
-    active_scaffold (3.2.0)
-      rails (>= 3.1.3)
-
 GIT
  remote: https://github.com/jejacks0n/navigasmic.git
  revision: 6108afe7930fd4b3282cbe8942240bf4f70e2f74
@ -43,6 +36,8 @@ GEM
    active-model-email-validator (1.0.2)
      activemodel
      mail
+    active_scaffold (3.2.1)
+      rails (>= 3.1.3)
    activemodel (3.2.2)
      activesupport (= 3.2.2)
      builder (~> 3.0.0)
@ -277,7 +272,7 @@ PLATFORMS

 DEPENDENCIES
  active-model-email-validator (~> 1.0.2)
-  active_scaffold (~> 3.2.0)!
+  active_scaffold (~> 3.2.1)
  acts_as_nested_interval (~> 0.0.2)
  bootstrap-sass-rails (~> 2.0.0.2)
  cancan (~> 1.6.7)
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@ -25,8 +25,7 @@ $ ->
  $pjaxContainer.on 'pjax:success', (event, data, status, xhr, options) ->
    $('.pjax-nav').find('li.active').removeClass 'active'
    $(".pjax-nav a[href=\"#{window.location.pathname}\"]").parents('li').addClass 'active'
-    if $pjaxContainerParent.hasClass('container') || $pjaxContainer.find('.container').length > 0
-      $pjaxContainer.removeClass 'container'
+    if $pjaxContainer.find('.container').length > 0
      $pjaxContainerParent.removeClass 'container'
    else
-      $pjaxContainer.addClass 'container'
+      $pjaxContainerParent.addClass 'container'
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@ -20,8 +20,10 @@
        <%= flash_display 'flash' %>          
        <%= yield %>
      </div>
-      <%= render 'shared/bottom' %>
    </div>
    
+    <div class="container">
+      <%= render 'shared/bottom' %>
+    </div>
  </body>
 </html>
--- a/app/views/layouts/errors.html.erb
+++ b/app/views/layouts/errors.html.erb
@ -19,8 +19,10 @@
        <%= flash_display 'flash' %>
        <%= yield %>
      </div>
-      <%= render 'shared/bottom' %>
    </div>

+    <div class="container">
+      <%= render 'shared/bottom' %>
+    </div>
  </body>
 </html>
--- a/app/views/layouts/home.html.erb
+++ b/app/views/layouts/home.html.erb
@ -3,13 +3,15 @@
  <body class="public">
    <%= render 'shared/navigation' %>

-    <div data-pjax-container="true" id="main">
-      <%= flash_display 'flash' %>
-      <%= yield %>
+    <div id="main">
+      <div data-pjax-container="true">
+        <%= flash_display 'flash' %>
+        <%= yield %>
+      </div>
    </div>
+    
    <div class="container">
      <%= render 'shared/bottom' %>
    </div>
-
  </body>
 </html>
--- a/app/views/layouts/public.html.erb
+++ b/app/views/layouts/public.html.erb
@ -8,8 +8,10 @@
        <%= flash_display 'flash' %>
        <%= yield %>
      </div>
-      <%= render 'shared/bottom' %>
    </div>

+    <div class="container">
+      <%= render 'shared/bottom' %>
+    </div>
  </body>
 </html>