added layout-type option

gravityblast · gravityblast · commit 80c69121d3c6 · 2010-09-27T16:29:16.000+02:00
diff --git a/README.md b/README.md
@@ -44,11 +44,11 @@ If you want to generate the stylesheets of a specific theme without changing the
 
 You can specify the text used in the header with the `--app-name` option:
 
-    script/generate theme --app_name="My New Application"
+    rails g web_app_theme:theme --app-name="My New Application"
   
 If you need a layout for login and signup pages, you can use the `--type` option with `sign` as value. Ìf not specified, the default value is `administration`
 
-    script/generate theme --type=sign
+    rails g web_app_theme:theme sign --layout-type=sign
 
 ### Themed Generator
 
diff --git a/lib/generators/web_app_theme/templates/layout_admin.html.erb b/lib/generators/web_app_theme/templates/layout_admin.html.erb
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><%= options.app_name %></title>
-  <%%= stylesheet_link_tag "web-app-theme/base", "web-app-theme/override", "web-app-theme/themes/<%= options.theme %>/style", :cache => true %>
+  <%%= stylesheet_link_tag "web-app-theme/base", "web-app-theme/themes/<%= options.theme %>/style", "web-app-theme/override", :cache => true %>
   <%%= csrf_meta_tag %>
 </head>
 <body>
diff --git a/lib/generators/web_app_theme/templates/layout_sign.html.erb b/lib/generators/web_app_theme/templates/layout_sign.html.erb
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title><%= options.app_name %></title>
+  <%%= stylesheet_link_tag "web-app-theme/base", "web-app-theme/themes/<%= options.theme %>/style", "web-app-theme/override", :cache => true %>
+  <%%= csrf_meta_tag %>
+</head>
+<body>
+  <div id="container">
+    <div id="box">
+      <%%= yield %>            
+    </div>
+  </div>
+</body>
+</html>
diff --git a/lib/generators/web_app_theme/theme/theme_generator.rb b/lib/generators/web_app_theme/theme/theme_generator.rb
@@ -4,14 +4,15 @@ class ThemeGenerator < Rails::Generators::Base
     
     argument :layout_name, :type => :string, :default => 'application'
     
-    class_option :theme,      :type => :string, :default => :default,   :desc => 'Specify the layout theme'
-    class_option :app_name,   :type => :string, :default => 'Web App',  :desc => 'Specify the application name'
-    class_option :engine,     :type => :string, :default => 'erb',      :desc => 'Specify the template engine'
-    class_option :no_layout,  :type => :boolean, :default => false,     :desc => 'Use this option if you want to generate only stylesheets'
+    class_option :theme,        :type => :string,   :default => :default,   :desc => 'Specify the layout theme'
+    class_option :app_name,     :type => :string,   :default => 'Web App',  :desc => 'Specify the application name'
+    class_option :engine,       :type => :string,   :default => 'erb',      :desc => 'Specify the template engine'
+    class_option :no_layout,    :type => :boolean,  :default => false,      :desc => 'Use this option if you want to generate only stylesheets'
+    class_option :layout_type,  :type => :string,   :default => 'admin',    :desc => 'Layout type, admin or sign'
     
     def copy_layout
-      return if options.no_layout
-      admin_layout_name = "layout_admin.html.erb"
+      return if options.no_layout      
+      admin_layout_name = options.layout_type == 'sign' ? "layout_sign.html.erb" : "layout_admin.html.erb"
       case options.engine
       when 'erb'
         template  admin_layout_name, "app/views/layouts/#{layout_name.underscore}.html.erb"
