Commit aae2320d

@@ -38,11 +38,11 @@
            
           <p class="notice"><%= notice %></p>
           <p class="alert"><%= alert %></p>
+          <%= devise_error_messages! %>
         </div>
         <div class="grid_5">
           <%# <%= yield %>
           <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
-            <%= devise_error_messages! %>
             <p><%= f.label :name %><br /> <%= f.text_field :name, :class => "forms" %></p>
             <p><%= f.label :email %><br /> <%= f.email_field :email, :class => "forms"  %></p>
             <p><%= f.label :password %><br /> <%= f.password_field :password, :class => "forms"  %></p>

@@ -47,10 +47,10 @@ module Cake
 
     config.to_prepare {
       Devise::SessionsController.layout "users"
-      Devise::RegistrationsController.layout proc{ |controller| user_signed_in? ? "application" : "devise" }
-      Devise::ConfirmationsController.layout "devise"
-      Devise::UnlocksController.layout "devise"            
-      Devise::PasswordsController.layout "devise"  
+      Devise::RegistrationsController.layout proc{ |controller| user_signed_in? ? "application" : "users" }
+      Devise::ConfirmationsController.layout "application"
+      Devise::UnlocksController.layout "application"            
+      Devise::PasswordsController.layout "application"  
     }
 
   end

@@ -2,7 +2,7 @@ load 'deploy' if respond_to?(:namespace) # cap2 differentiator
 Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
 
 load 'config/deploy' # remove this line to skip loading any of the default tasks
-load 'deploy/assets'
+# load 'deploy/assets'
 
 task :search_libs, :roles => :web do
   run "ls -x1 /usr/lib | grep -i xml"