lib/typus/controller/headless.rb in typus-3.1.0.rc19 vs lib/typus/controller/headless.rb in typus-3.1.0

@@ -4,11 +4,11 @@
 
       def self.included(base)
         base.before_filter :set_resources_action_for_headless_on_index, :only => [:index, :trash]
         base.before_filter :set_resources_action_for_headless, :only => [:new, :create, :edit, :show]
         base.helper_method :headless_mode?
-        base.layout :set_headless_layout
+        base.layout :headless_layout
       end
 
       def set_resources_action_for_headless_on_index
         add_resources_action("Add New", {:action => "new"}, {})
       end
@@ -17,32 +17,16 @@
       def set_resources_action_for_headless
         add_resources_action("All Entries", {:action => 'index', :id => nil}, {})
       end
       private :set_resources_action_for_headless
 
-      def set_headless_layout
-        params[:layout] || "admin/base"
+      def headless_layout
+        headless_mode? ? "admin/headless" : "admin/base"
       end
-      private :set_headless_layout
+      private :headless_layout
 
-      def headless_mode_with_custom_action_is_enabled?
-        headless_mode? && params[:resource_action]
-      end
-      private :headless_mode_with_custom_action_is_enabled?
-
-      def set_headless_resource_actions
-        body = params[:resource_action].titleize
-        url = { :controller => params[:resource].tableize,
-                :action => params[:resource_action],
-                :resource => params[:resource],
-                :resource_id => params[:resource_id],
-                :return_to => params[:return_to] }
-        options = { :target => "_parent" }
-        add_resource_action(body, url, options)
-      end
-
       def headless_mode?
-        params[:layout] == "admin/headless"
+        params[:_popup]
       end
 
     end
   end
 end