app/controllers/mtdevise/application_controller.rb in mtdevise-1.7.8 vs app/controllers/mtdevise/application_controller.rb in mtdevise-1.7.11

@@ -15,24 +15,16 @@
 		# Helpers for Current Account and Users
 		def current_user?(user)
 			user == current_user
 		end
 		helper_method :current_user
+
 		def current_account?(account)
 			account == current_account
 		end
-		helper_method :current_account 
+		helper_method :current_account
 
-		# Devise Custom Layouts
-		config.to_prepare do
-			Devise::SessionsController.layout "mtdevise/accounts"
-			Devise::RegistrationsController.layout proc{ |controller| user_signed_in? ? "application" : "mtdevise/accountsedit" }
-			Devise::ConfirmationsController.layout "mtdevise/accounts"
-			Devise::UnlocksController.layout "mtdevise/accounts"
-			Devise::PasswordsController.layout "mtdevise/accounts"
-		end
-
 		private
 
 		# Logged in redirect
 		def redirect_logged_in_users_to_account_page
 			redirect_to mtdevise.accounts_path if user_signed_in?
@@ -43,18 +35,18 @@
 			if request.subdomain.present? && Account.where(subdomain: request.subdomain).blank?
 				redirect_to mtdevise.root_url(subdomain: false), notice: "Subdomain Doesn't Exist. Would you like to Register."
 			end
 		end
 
-		# Resolve Layouts
+		# Resolve Layouts Devise & Application Controller
 		def layouts_rsolver
 			case action_name
 				when "index"
-					"mtdevise/accountsindex"
+					"layouts/mtdevise/accountsindex"
 				else
-					"mtdevise/accounts"
+					"layouts/mtdevise/accounts"
 			end
 		end
 
 	end
 
-end
\ No newline at end of file
+end