enable debug mode for bushido + fix minor issues

Gemfile.lock

@@ -1,3 +1,12 @@
+GIT
+  remote: git://github.com/Bushido/devise_cas_authenticatable.git
+  revision: 0e5a949fba02629b4ee18a59c0ff410cea523829
+  specs:
+    devise_cas_authenticatable (1.0.0.alpha10)
+      devise
+      devise (>= 1.0.6)
+      rubycas-client (>= 2.2.1)
+
 GIT
   remote: git://github.com/did/bushido_stub.git
   revision: 87f64541b4444dd3ff9fd1c1c44ac20c549ce2c6
@@ -72,6 +81,9 @@ GEM
       xpath (~> 0.1.4)
     carrierwave (0.5.5)
       activesupport (~> 3.0)
+    cells (3.6.4)
+      actionpack (~> 3.0)
+      railties (~> 3.0)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
     columnize (0.3.3)
@@ -241,6 +253,8 @@ GEM
     ruby-hmac (0.4.0)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
+    rubycas-client (2.2.1)
+      activesupport
     rubyzip (0.9.4)
     s3 (0.3.8)
       proxies (~> 0.2.0)
@@ -283,12 +297,14 @@ DEPENDENCIES
   cancan
   capybara
   carrierwave (~> 0.5.5)
+  cells
   cucumber-rails (= 1.0.2)
   custom_fields (= 1.0.0.beta.21)
   database_cleaner
   delayed_job (= 2.1.4)
   delayed_job_mongoid (= 1.0.2)
   devise (= 1.3.4)
+  devise_cas_authenticatable!
   dragonfly (~> 0.9.1)
   factory_girl_rails
   fog (= 0.8.2)

app/views/admin/layouts/application.html.haml

@@ -8,7 +8,7 @@
       .container
         #header
           = render 'admin/shared/header'
-          = render 'admin/shared/menu'
+          = render_cell 'admin/main_menu', :show
 
           #submenu
             %ul

app/views/admin/shared/_header.html.haml

@@ -1,7 +1,7 @@
 %h1
   = link_to current_site.name, admin_pages_url, :class => 'single'
 
-= render_cell 'admin/global_actions', :show, :current_admin => current_admin
+= render_cell 'admin/global_actions', :show, :current_admin => current_admin, :current_site_url => current_site_url
 
 - if multi_sites? && current_admin.sites.size > 1
   #sites-picker{ :style => 'display: none' }

config/environments/development.rb

@@ -4,7 +4,7 @@ Locomotive::Application.configure do
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the webserver when you make code changes.
-  config.cache_classes = false
+  config.cache_classes = true
 
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
@@ -30,12 +30,12 @@ Locomotive::Application.configure do
 
   # set up the bushido stub (uncomment it)
   # config.bushido_stub_env = false
-  # config.bushido_stub_env = {
+  config.bushido_stub_env = {
-  #   'APP_TLD'               => 'bushi.do',
+    'APP_TLD'               => 'bushi.do',
-  #   'BUSHIDO_APP'           => 'san_francisco',
+    'BUSHIDO_APP'           => 'san_francisco',
-  #   'BUSHIDO_HOST'          => 'bushi.do',
+    'BUSHIDO_HOST'          => 'bushi.do',
-  #   'LOCOMOTIVE_SITE_NAME'  => 'Locomotive TEST',
+    'LOCOMOTIVE_SITE_NAME'  => 'Locomotive TEST',
-  #   'BUSHIDO_CLAIMED'       => 'true',
+    'BUSHIDO_CLAIMED'       => 'true',
-  #   'BUSHIDO_METRICS_TOKEN' => 'foobar'
+    'BUSHIDO_METRICS_TOKEN' => 'foobar'
-  # }
+  }
 end