diff --git a/vendor/plugins/design/init.rb b/vendor/plugins/design/init.rb
index b54b9a4..8ccd640 100644
--- a/vendor/plugins/design/init.rb
+++ b/vendor/plugins/design/init.rb
@@ -1,36 +1,3 @@
require 'design'
require 'acts_as_design'
-class ActionController::Base
-
- # Declares that this controller uses design plugin to generate its layout.
- # See the plugin README for options that can be passed to this method.
- def self.design(config = {})
-
- raise ArgumentError.new("design argument must be a Hash") unless config.kind_of? Hash
-
- if (config.has_key?(:holder) && config.has_key?(:fixed)) || (!config.has_key?(:holder) && !config.has_key?(:fixed))
- raise ArgumentError.new("You must supply either :holder or :fixed to design.")
- end
-
- @design_plugin_config = config
-
- def self.design_plugin_config
- @design_plugin_config || self.superclass.design_plugin_config
- end
-
- include Design
- helper Design::Helper
- end
-
- # declares this controller as a design editor, including in it all the
- # functionalities to do that (besides those for using a design). Accepts the
- # same options as design.
- def self.design_editor(config = {})
- self.design(config)
- include Design::Editor
- helper Design::Editor::Helper
- end
-
-end
-
diff --git a/vendor/plugins/design/lib/design.rb b/vendor/plugins/design/lib/design.rb
index a26c744..7241fa3 100644
--- a/vendor/plugins/design/lib/design.rb
+++ b/vendor/plugins/design/lib/design.rb
@@ -1,3 +1,5 @@
+require 'design/controller_methods'
+
require 'design/fixed_design_holder'
require 'design/proxy_design_holder'
diff --git a/vendor/plugins/design/lib/design/controller_methods.rb b/vendor/plugins/design/lib/design/controller_methods.rb
new file mode 100644
index 0000000..4a20234
--- /dev/null
+++ b/vendor/plugins/design/lib/design/controller_methods.rb
@@ -0,0 +1,33 @@
+class ActionController::Base
+
+ # Declares that this controller uses design plugin to generate its layout.
+ # See the plugin README for options that can be passed to this method.
+ def self.design(config = {})
+
+ raise ArgumentError.new("design argument must be a Hash") unless config.kind_of? Hash
+
+ if (config.has_key?(:holder) && config.has_key?(:fixed)) || (!config.has_key?(:holder) && !config.has_key?(:fixed))
+ raise ArgumentError.new("You must supply either :holder or :fixed to design.")
+ end
+
+ @design_plugin_config = config
+
+ def self.design_plugin_config
+ @design_plugin_config || self.superclass.design_plugin_config
+ end
+
+ include Design
+ helper Design::Helper
+ end
+
+ # declares this controller as a design editor, including in it all the
+ # functionalities to do that (besides those for using a design). Accepts the
+ # same options as design.
+ def self.design_editor(config = {})
+ self.design(config)
+ include Design::Editor
+ helper Design::Editor::Helper
+ end
+
+end
+
--
libgit2 0.21.2