rails_layout 0.5.11 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af9cd246834d468c0a859cd5e114de5344fee621
-  data.tar.gz: 0bec88f7a7b34e51f6525d0b56e70537b08728ae
+  metadata.gz: 50274237c3f45d7435ac0ce7f03fc6d0da91e5d7
+  data.tar.gz: 4ca540793d7902b02e5c8b353b0eab95eb6b4c6b
 SHA512:
-  metadata.gz: cb6f756471d63e476ff756ad6a3d30dac557b0182aa86458452ec3c653d187d42ea82bf8c01be45b0b94cd2b3b34820785977945a415a5f552b2b8b5e933f127
-  data.tar.gz: 8d81553af2ca50058c5b3936f4be66ab50af7631310917f012b1cc607ba7d3bc249181ddea484d0714b49ede8328206cd89a926efdada2287d7d551de952b13c
+  metadata.gz: 888f101447c945b748df08d79c4c36583543a3f9ab941824abf354392232fcb72ed9757c9f12a81b1257bcb7e14737ba1d2c69146c2372b36df78c17b210d0e9
+  data.tar.gz: ee091c04a581aabc3635f289233222ff896b5ed8e272b61e5ca44f3a3696cd3f329cb2094448896b57f257c0ccc04c51cf49c7a7b9082f4afae0b5f7844504cf

data/CHANGELOG.textile

@@ -1,5 +1,11 @@
 h1. CHANGELOG
 
+h3. 1.0.0 January 9, 2014
+
+* generate Devise views (login view)
+* change generator commands (described in README)
+* Haml Foundation 5 topbar syntax correction (fixes #11) (contributed by i5okie)
+
 h3. 0.5.11 January 5, 2014
 
 * fix Devise navigation links (when there is no 'has_role?' for authorization)

data/README.textile

@@ -1,111 +1,61 @@
 h1. !http://railsapps.github.io/images/rails-36x36.jpg(RailsLayout Gem)! RailsLayout Gem
 
-RailsLayout is a utility gem to use during development.
-
-Use it to set up your choice of front-end framework:
+Use this gem to set up layout files for your choice of front-end framework:
 
-* Bootstrap 2.3
-* Bootstrap 3.0
-* Zurb Foundation 4.0
 * Zurb Foundation 5.0
+* Zurb Foundation 4.0
+* Bootstrap 3.0
+* Bootstrap 2.3
 
-Add it to your Rails application Gemfile, then use the generator.
-
-It will rename *application.css* to *application.css.scss*.
-
-It will add:
-
-* *framework_and_overrides.css.scss*
-
-And modify the JavaScript asset file:
-
-* *application.js*
-
-It will set up a default application layout.
-
-It creates partials for:
-
-* Rails flash messages
-* navigation links
-
-You can also generate a navigation links file suitable for use with Devise (the authentication gem).
-
-h4. Supported Frameworks
-
-You can generate layout files suitable for use with the following front-end frameworks:
-
-* @simple@ - simple layout
-* @bootstrap2@ - Bootstrap 2.3
-* @bootstrap3@ - Bootstrap 3.0
-* @foundation4@ - Zurb Foundation 4.0
-* @foundation5@ - Zurb Foundation 5.0
-* @none@ - removes all changes
-
-h4. Generated Files
-
-The RailsLayout gem generates application layout files:
-
-* app/views/layouts/application.html.erb
-* app/views/layouts/_messages.html.erb
-* app/views/layouts/_navigation.html.erb
-* app/views/layouts/_navigation_links.html.erb
-
-Additionally, when the @simple@ option is selected:
-
-* app/assets/stylesheets/simple.css
-
-h4. Note About the Navigation Partials
-
-Two navigation partials are created:
-
-* app/views/layouts/_navigation_links.html.erb
-* app/views/layouts/_navigation.html.erb
-
-The first file contains no framework-specific styling. It is only a list of links. You can add additional links to this file as needed.
+Plus it will set up "Devise":https://github.com/plataformatec/devise views with styling for Bootstrap or Foundation.
 
-The second file contains framework-specific styling.
+RailsLayout is a utility gem to use during development.
 
-h4. Support for ERB, Haml, or Slim
+h4. Rails Composer
 
-If you are using ERB for Rails views, the RailsLayout gem will generate ERB files.
+The RailsLayout gem is used by "Rails Composer":http://railsapps.github.io/rails-composer/ tool, an application template used to create starter applications. You can use Rails Composer to generate entire applications.
 
-If you are using Haml or Slim, the RailsLayout gem will generate Haml or Slim files instead.
+h2. Command Summary
 
-h4. Rails Composer
+h4. Generate Application Layout, Navigation, and Flash Message Files
 
-The "Rails Composer":http://railsapps.github.io/rails-composer/ tool, an application template used to create starter applications, uses the RailsLayout gem to generate the layout files used in various starter applications. You can use Rails Composer to generate entire applications.
+* @$ rails generate layout:install foundation5@
+* @$ rails generate layout:install foundation4@
+* @$ rails generate layout:install bootstrap3@
+* @$ rails generate layout:install bootstrap2@
+* @$ rails generate layout:install simple@
+* @$ rails generate layout:install none@
 
-h4. Usage Example
+h4. Add Links to the Navigation File
 
-Look at the "Learn Rails":https://github.com/RailsApps/learn-rails example application to see how the generated files from the RailsLayout gem are used. You'll find details about the example application in the book "Learn Ruby on Rails":http://learn-rails.com/learn-ruby-on-rails.html.
+* @$ $ rails generate layout:navigation@
 
-!http://railsapps.github.io/images/learn-rails-cover-130x161.jpg(Learn Ruby on Rails)!:http://learn-rails.com/learn-ruby-on-rails.html
+h4. Generate Devise Views
 
-h4. Documentation
+* @$ rails generate layout:devise foundation5@
+* @$ rails generate layout:devise bootstrap3@
 
-See these articles for information about how to set up the application layout:
+h2. Installing a Front-End Framework
 
-* "*Rails Application Layout*":http://railsapps.github.io/rails-default-application-layout.html
-* "*Rails and Bootstrap*":http://railsapps.github.io/twitter-bootstrap-rails.html
-* "*Rails and Foundation*":http://railsapps.github.io/rails-foundation.html
+Refer to instructions for:
 
-h2. Installing a Front-End Framework
+* "Foundation and Rails":http://railsapps.github.io/rails-foundation.html
+* "Bootstrap and Rails":http://railsapps.github.io/twitter-bootstrap-rails.html
 
-Instead of following the "instructions for Bootstrap":http://railsapps.github.io/twitter-bootstrap-rails.html or "Zurb Foundation":http://foundation.zurb.com/docs/rails.html to install a front-end framework, add the gems you need. Then use the RailsLayout gem. It will set up your assets files.
+In summary, to install a front-end framework, add the gems you need. Then use the RailsLayout gem. It will set up your assets files.
 
 Add the gems you need to your Rails application Gemfile:
 
-h4. Bootstrap 2.3
+h4. Zurb Foundation 5.0
 
 <pre>
-gem 'bootstrap-sass', '~> 2.3.2.2'
+gem 'foundation-rails'
 </pre>
 
-h4. Bootstrap 3.0
+Note: Check the status of these issues before using Foundation 5.0:
 
-<pre>
-gem 'bootstrap-sass'
-</pre>
+* "Foundation 5 requires JavaScript included in BODY not HEAD":https://github.com/zurb/foundation/issues/3643
+* "Foundation 5 topbar incompatible with Rails Turbolinks":https://github.com/zurb/foundation/issues/3642
 
 h4. Zurb Foundation 4.0
 
@@ -114,16 +64,17 @@ gem 'compass-rails'
 gem 'zurb-foundation'
 </pre>
 
-h4. Zurb Foundation 5.0
+h4. Bootstrap 3.0
 
 <pre>
-gem 'foundation-rails'
+gem 'bootstrap-sass'
 </pre>
 
-Note: Check the status of these issues before using Foundation 5.0:
+h4. Bootstrap 2.3
 
-* "Foundation 5 requires JavaScript included in BODY not HEAD":https://github.com/zurb/foundation/issues/3643
-* "Foundation 5 topbar incompatible with Rails Turbolinks":https://github.com/zurb/foundation/issues/3642
+<pre>
+gem 'bootstrap-sass', '~> 2.3.2.2'
+</pre>
 
 h4. Use Bundler
 
@@ -159,75 +110,146 @@ Use Bundler to install the gem:
 $ bundle install
 </pre>
 
-h2. Generate an Application Layout
+h2. The "layout:install" Command
 
-Generate application layout files for the framework you will use.
+The command will rename *application.css* to *application.css.scss*.
 
-h3. Generate a Simple Layout
+It will add:
 
-To create a set of simple layout files:
+* *framework_and_overrides.css.scss*
+
+And modify the JavaScript asset file:
+
+* *application.js*
+
+It will set up a default application layout.
+
+It creates partials for:
+
+* Rails flash messages
+* navigation links
+
+h4. Supported Frameworks
+
+You can generate layout files suitable for use with the following front-end frameworks:
+
+* @foundation5@ - Zurb Foundation 5.0
+* @foundation4@ - Zurb Foundation 4.0
+* @bootstrap3@ - Bootstrap 3.0
+* @bootstrap2@ - Bootstrap 2.3
+* @simple@ - simple layout
+* @none@ - removes all changes
+
+h4. Generated Files
+
+The RailsLayout gem generates application layout files:
+
+* app/views/layouts/application.html.erb
+* app/views/layouts/_messages.html.erb
+* app/views/layouts/_navigation.html.erb
+* app/views/layouts/_navigation_links.html.erb
+
+Additionally, when the @simple@ option is selected:
+
+* app/assets/stylesheets/simple.css
+
+h4. Note About the Navigation Partials
+
+Two navigation partials are created:
+
+* app/views/layouts/_navigation_links.html.erb
+* app/views/layouts/_navigation.html.erb
+
+The first file contains no framework-specific styling. It is only a list of links. You can add additional links to this file as needed.
+
+The second file contains framework-specific styling.
+
+h4. Support for ERB, Haml, or Slim
+
+If you are using ERB for Rails views, the RailsLayout gem will generate ERB files.
+
+If you are using Haml or Slim, the RailsLayout gem will generate Haml or Slim files instead.
+
+h4. Additional Documentation
+
+See these articles for information about how to set up the application layout:
+
+* "*Rails Application Layout*":http://railsapps.github.io/rails-default-application-layout.html
+* "*Rails and Bootstrap*":http://railsapps.github.io/twitter-bootstrap-rails.html
+* "*Rails and Foundation*":http://railsapps.github.io/rails-foundation.html
+
+Look at the "Learn Rails":https://github.com/RailsApps/learn-rails example application to see how the generated files from the RailsLayout gem are used. You'll find details about the example application in the book "Learn Ruby on Rails":http://learn-rails.com/learn-ruby-on-rails.html.
+
+!http://railsapps.github.io/images/learn-rails-cover-130x161.jpg(Learn Ruby on Rails)!:http://learn-rails.com/learn-ruby-on-rails.html
+
+h3. Zurb Foundation 5.0 Layout
+
+To create layout files for use with Zurb Foundation 5.0:
 
 <pre>
-$ rails generate layout simple
+$ rails generate layout:install foundation5
 </pre>
 
 Use @--force@ if you want to overwrite existing files:
 
 <pre>
-$ rails generate layout simple --force
+$ rails generate layout:install foundation5 --force
 </pre>
 
 See the files that are generated:
 
-* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/simple-application.html.erb
-* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/simple-messages.html.erb
-* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/simple-navigation.html.erb
-* "app/assets/stylesheets/simple.css":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/simple.css
+* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation5-application.html.erb
+* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4-messages.html.erb
+* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation5-navigation.html.erb
 
 The RailsLayout gem will create the file:
 
-* "app/assets/stylesheets/application.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/application.css.scss
+* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation5_and_overrides.css.scss
 
-h3. Bootstrap 2.3 Layout
+and modify the file:
 
-To create layout files for use with Bootstrap 2.3:
+* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation5-application.js
+
+h3. Zurb Foundation 4.0 Layout
+
+To create layout files for use with Zurb Foundation 4.0:
 
 <pre>
-$ rails generate layout bootstrap2
+$ rails generate layout:install foundation4
 </pre>
 
 Use @--force@ if you want to overwrite existing files:
 
 <pre>
-$ rails generate layout bootstrap2 --force
+$ rails generate layout:install foundation4 --force
 </pre>
 
 See the files that are generated:
 
-* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap2-application.html.erb
-* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap2-messages.html.erb
-* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap2-navigation.html.erb
+* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4-application.html.erb
+* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4-messages.html.erb
+* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4-navigation.html.erb
 
 The RailsLayout gem will create the file:
 
-* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap2_and_overrides.css.scss
+* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4_and_overrides.css.scss
 
 and modify the file:
 
-* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap-application.js
+* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4-application.js
 
 h3. Bootstrap 3.0 Layout
 
 To create layout files for use with Bootstrap 3.0:
 
 <pre>
-$ rails generate layout bootstrap3
+$ rails generate layout:install bootstrap3
 </pre>
 
 Use @--force@ if you want to overwrite existing files:
 
 <pre>
-$ rails generate layout bootstrap3 --force
+$ rails generate layout:install bootstrap3 --force
 </pre>
 
 See the files that are generated:
@@ -244,68 +266,65 @@ and modify the file:
 
 * "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap-application.js
 
-h3. Zurb Foundation 4.0 Layout
+h3. Bootstrap 2.3 Layout
 
-To create layout files for use with Zurb Foundation 4.0:
+To create layout files for use with Bootstrap 2.3:
 
 <pre>
-$ rails generate layout foundation4
+$ rails generate layout:install bootstrap2
 </pre>
 
 Use @--force@ if you want to overwrite existing files:
 
 <pre>
-$ rails generate layout foundation4 --force
+$ rails generate layout:install bootstrap2 --force
 </pre>
 
 See the files that are generated:
 
-* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4-application.html.erb
-* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4-messages.html.erb
-* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4-navigation.html.erb
+* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap2-application.html.erb
+* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap2-messages.html.erb
+* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap2-navigation.html.erb
 
 The RailsLayout gem will create the file:
 
-* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4_and_overrides.css.scss
+* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap2_and_overrides.css.scss
 
 and modify the file:
 
-* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4-application.js
+* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/bootstrap-application.js
 
-h3. Zurb Foundation 5.0 Layout
+h3. Generate a Simple Layout
 
-To create layout files for use with Zurb Foundation 5.0:
+To create a set of simple layout files:
 
 <pre>
-$ rails generate layout foundation5
+$ rails generate layout:install simple
 </pre>
 
 Use @--force@ if you want to overwrite existing files:
 
 <pre>
-$ rails generate layout foundation5 --force
+$ rails generate layout:install simple --force
 </pre>
 
 See the files that are generated:
 
-* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation5-application.html.erb
-* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation4-messages.html.erb
-* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation5-navigation.html.erb
+* "app/views/layouts/application.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/simple-application.html.erb
+* "app/views/layouts/_messages.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/simple-messages.html.erb
+* "app/views/layouts/_navigation.html.erb":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/simple-navigation.html.erb
+* "app/assets/stylesheets/simple.css":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/simple.css
 
 The RailsLayout gem will create the file:
 
-* "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation5_and_overrides.css.scss
-
-and modify the file:
-
-* "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/foundation5-application.js
+* "app/assets/stylesheets/application.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/templates/application.css.scss
 
 h3. Reverting to None
 
 To revert your application to a default application layout:
 
 <pre>
-$ rails generate layout none
+$ rails generate layout:install none
 </pre>
 
 The RailsLayout gem will remove any files it may have added:
@@ -324,12 +343,14 @@ Additionally, it will restore these files to the default versions:
 
 The file *app/assets/stylesheets/application.css.scss* will contain a CSS rule but you can ignore it or remove it.
 
-h2. Navigation Links for Devise
+h2. The "layout:navigation" Command
 
 If you are using Devise for authentication, you can generate a navigation links partial containing links for Devise.
 
+This command is used to populate the navigation bar in starter applications created by the "Rails Composer":http://railsapps.github.io/rails-composer/ tool.
+
 <pre>
-$ rails generate navigation --force
+$ rails generate layout:navigation --force
 </pre>
 
 This creates a file *app/views/layouts/_navigation_links.html.erb*:
@@ -362,18 +383,27 @@ The full set of links will be created if the following files are found in your a
 * app/views/devise/registrations/new.html.erb
 * app/views/users/index.html.erb
 
-These files will be present in your application if you have created custom views for Devise.
-
-The @rails generate navigation@ command is used to populate the navigation bar in starter applications created by the "Rails Composer":http://railsapps.github.io/rails-composer/ tool.
+h2. The "layout:devise" Command
 
-h2. Help
+"Devise":https://github.com/plataformatec/devise is a gem for authentication and user management (signup, login, and related features). Devise provides a utility command @rails generate devise:views@. The Devise command creates view files for signup, login, and related features. However, the views generated by Devise lack CSS styling.
 
-To see help messages:
+Use the RailsLayout gem to generate Devise views with styling for Bootstrap or Foundation.
 
 <pre>
-$ rails generate layout --help
+$ rails generate layout:devise
 </pre>
 
+The command will create (or replace) these files:
+
+* app/views/devise/sessions/new.html.erb
+* (TODO: more to come)
+
+Additionally, the command will append Sass mixins to accommodate Bootstrap or Foundation to the file:
+
+* app/assets/stylesheets/framework_and_overrides.css.scss
+
+The Sass mixins allow any view to be used with either Bootstrap or Foundation (so we don't have to maintain separate views for each front-end framework).
+
 h2. Issues
 
 Any issues? Please create an "issue":http://github.com/RailsApps/rails_layout/issues on GitHub. Reporting issues (and patching!) helps everyone.
@@ -390,6 +420,6 @@ h2. MIT License
 
 "MIT License":http://www.opensource.org/licenses/mit-license
 
-Copyright © 2013 Daniel Kehoe
+Copyright © 2013-2014 Daniel Kehoe
 
 !https://cruel-carlota.pagodabox.com/b096716fb733287d5c3d5eec65aaa26b(githalytics.com alpha)!

data/lib/generators/layout/devise/devise_generator.rb

@@ -0,0 +1,37 @@
+require 'rails/generators'
+
+module Layout
+  module Generators
+    class DeviseGenerator < ::Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+      argument :framework_name, :type => :string, :default => "simple"
+
+      desc "Copies Devise views to your application, with styling for a front-end framework."
+
+      # Add stylesheet for Devise views
+      def add_devise_stylesheet
+        dir = File.expand_path("../templates", __FILE__)
+        case framework_name
+          when 'none'
+            # TODO
+          when 'simple'
+            # TODO
+          when 'bootstrap2'
+            # TODO
+          when 'bootstrap3'
+            append_file 'app/assets/stylesheets/framework_and_overrides.css.scss', File.read("#{dir}/bootstrap3.css.scss")
+          when 'foundation4'
+            # TODO
+          when 'foundation5'
+            append_file 'app/assets/stylesheets/framework_and_overrides.css.scss', File.read("#{dir}/foundation5.css.scss")
+        end
+      end
+
+      # Add Devise views
+      def add_devise_views
+        copy_file 'sessions/new.html.erb', 'app/views/devise/sessions/new.html.erb'
+      end
+
+    end
+  end
+end

data/lib/generators/layout/devise/templates/bootstrap3.css.scss

@@ -0,0 +1,20 @@
+
+// Styles for Devise views
+// using Bootstrap
+// generated by the rails_layout gem
+.authform {
+  padding-top: 30px;
+  max-width: 320px;
+  margin: 0 auto;
+}
+.authform form {
+  @extend .well;
+  @extend .well-lg;
+}
+.authform .right {
+  float: right !important;
+}
+.authform .button {
+  @extend .btn;
+  @extend .btn-primary;
+}

data/lib/generators/layout/devise/templates/foundation5.css.scss

@@ -0,0 +1,25 @@
+
+// Styles for Devise views
+// using Foundation
+// generated by the rails_layout gem
+.authform {
+  padding-top: 30px;
+  max-width: 320px;
+  margin: 0 auto;
+}
+.authform form {
+  @include panel();
+  padding-bottom: 40px;
+}
+.authform form a {
+  font-size: rem-calc(13);
+}
+.authform .form-group {
+  // for Bootstrap, not used for Foundation
+}
+.authform .form-control {
+  // for Bootstrap, not used for Foundation
+}
+.authform .checkbox {
+  // for Bootstrap, not used for Foundation
+}

data/lib/generators/layout/devise/templates/sessions/new.html.erb

@@ -0,0 +1,26 @@
+<div class="authform">
+  <%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :role => 'form'}) do |f| %>
+    <h3>Log in</h3>
+    <%= devise_error_messages! %>
+    <div class="form-group">
+      <%- if devise_mapping.registerable? %>
+        <%= link_to 'Sign up', new_registration_path(resource_name), class: 'right'  %>
+      <% end -%>
+      <%= f.label :email %>
+      <%= f.email_field :email, :autofocus => true, class: 'form-control' %>
+    </div>
+    <div class="form-group">
+      <%- if devise_mapping.recoverable? %>
+        <%= link_to "Forgot password?", new_password_path(resource_name), class: 'right' %>
+      <% end -%>
+      <%= f.label :password %>
+      <%= f.password_field :password, class: 'form-control' %>
+    </div>
+      <%= f.submit 'Log in', :class => 'button right' %>
+      <% if devise_mapping.rememberable? -%>
+        <div class="checkbox">
+          <%= f.check_box :remember_me %> <%= f.label :remember_me %>
+        </div>
+      <% end -%>
+  <% end %>
+</div>

data/lib/generators/layout/{layout_generator.rb → install/install_generator.rb}

@@ -2,10 +2,12 @@ require 'rails/generators'
 
 module Layout
   module Generators
-    class LayoutGenerator < ::Rails::Generators::Base
+    class InstallGenerator < ::Rails::Generators::Base
       source_root File.expand_path("../templates", __FILE__)
       argument :framework_name, :type => :string, :default => "simple"
 
+      desc "Creates Rails layout files suitable for various front-end frameworks."
+
       attr_reader :app_name
 
       # Install the desired framework

data/lib/generators/layout/{templates → install/templates}/foundation5-navigation.html.haml

@@ -1,6 +1,6 @@
 -# navigation styled for Zurb Foundation 5
 -# the syntax for data-topbar may need to change for Zurb Foundation 5
-%nav.top-bar{:data-topbar => true}
+%nav.top-bar{"data-topbar" => true}
   %ul.title-area
     %li.name
       = link_to 'Home', root_path

data/lib/generators/{navigation → layout/navigation}/navigation_generator.rb

@@ -1,10 +1,12 @@
 require 'rails/generators'
 
-module Navigation
+module Layout
   module Generators
     class NavigationGenerator < ::Rails::Generators::Base
       source_root File.expand_path("../templates", __FILE__)
 
+      desc "Adds links to a navigation bar."
+
       # Add navigation links
       def add_navigation_links
         app = ::Rails.application

data/lib/rails_layout/version.rb

@@ -1,3 +1,3 @@
 module RailsLayout
-  VERSION = "0.5.11"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_layout
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 1.0.0
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,71 +52,78 @@ files:
 - LICENSE.txt
 - README.textile
 - Rakefile
-- lib/generators/layout/.DS_Store
-- lib/generators/layout/USAGE
-- lib/generators/layout/layout_generator.rb
-- lib/generators/layout/templates/application.css.scss
-- lib/generators/layout/templates/application.js
-- lib/generators/layout/templates/bootstrap-application.js
-- lib/generators/layout/templates/bootstrap2-application.html.erb
-- lib/generators/layout/templates/bootstrap2-application.html.haml
-- lib/generators/layout/templates/bootstrap2-application.html.slim
-- lib/generators/layout/templates/bootstrap2-messages.html.erb
-- lib/generators/layout/templates/bootstrap2-messages.html.haml
-- lib/generators/layout/templates/bootstrap2-messages.html.slim
-- lib/generators/layout/templates/bootstrap2-navigation.html.erb
-- lib/generators/layout/templates/bootstrap2-navigation.html.haml
-- lib/generators/layout/templates/bootstrap2-navigation.html.slim
-- lib/generators/layout/templates/bootstrap2_and_overrides.css.scss
-- lib/generators/layout/templates/bootstrap3-application.html.erb
-- lib/generators/layout/templates/bootstrap3-application.html.haml
-- lib/generators/layout/templates/bootstrap3-application.html.slim
-- lib/generators/layout/templates/bootstrap3-messages.html.erb
-- lib/generators/layout/templates/bootstrap3-messages.html.haml
-- lib/generators/layout/templates/bootstrap3-messages.html.slim
-- lib/generators/layout/templates/bootstrap3-navigation.html.erb
-- lib/generators/layout/templates/bootstrap3-navigation.html.haml
-- lib/generators/layout/templates/bootstrap3-navigation.html.slim
-- lib/generators/layout/templates/bootstrap3_and_overrides.css.scss
-- lib/generators/layout/templates/foundation4-application.html.erb
-- lib/generators/layout/templates/foundation4-application.html.haml
-- lib/generators/layout/templates/foundation4-application.html.slim
-- lib/generators/layout/templates/foundation4-application.js
-- lib/generators/layout/templates/foundation4-messages.html.erb
-- lib/generators/layout/templates/foundation4-messages.html.haml
-- lib/generators/layout/templates/foundation4-messages.html.slim
-- lib/generators/layout/templates/foundation4-navigation.html.erb
-- lib/generators/layout/templates/foundation4-navigation.html.haml
-- lib/generators/layout/templates/foundation4-navigation.html.slim
-- lib/generators/layout/templates/foundation4_and_overrides.css.scss
-- lib/generators/layout/templates/foundation5-application.html.erb
-- lib/generators/layout/templates/foundation5-application.html.haml
-- lib/generators/layout/templates/foundation5-application.html.slim
-- lib/generators/layout/templates/foundation5-application.js
-- lib/generators/layout/templates/foundation5-messages.html.erb
-- lib/generators/layout/templates/foundation5-messages.html.haml
-- lib/generators/layout/templates/foundation5-messages.html.slim
-- lib/generators/layout/templates/foundation5-navigation.html.erb
-- lib/generators/layout/templates/foundation5-navigation.html.haml
-- lib/generators/layout/templates/foundation5-navigation.html.slim
-- lib/generators/layout/templates/foundation5_and_overrides.css.scss
-- lib/generators/layout/templates/navigation_links.html.erb
-- lib/generators/layout/templates/navigation_links.html.slim
-- lib/generators/layout/templates/none-application.html.erb
-- lib/generators/layout/templates/none-application.html.haml
-- lib/generators/layout/templates/none-application.html.slim
-- lib/generators/layout/templates/simple-application.html.erb
-- lib/generators/layout/templates/simple-application.html.haml
-- lib/generators/layout/templates/simple-application.html.slim
-- lib/generators/layout/templates/simple-messages.html.erb
-- lib/generators/layout/templates/simple-messages.html.haml
-- lib/generators/layout/templates/simple-messages.html.slim
-- lib/generators/layout/templates/simple-navigation.html.erb
-- lib/generators/layout/templates/simple-navigation.html.haml
-- lib/generators/layout/templates/simple-navigation.html.slim
-- lib/generators/layout/templates/simple.css
-- lib/generators/navigation/navigation_generator.rb
-- lib/generators/navigation/templates/navigation_links.html.erb
+- lib/generators/.DS_Store
+- lib/generators/layout/devise/.DS_Store
+- lib/generators/layout/devise/devise_generator.rb
+- lib/generators/layout/devise/templates/.DS_Store
+- lib/generators/layout/devise/templates/bootstrap3.css.scss
+- lib/generators/layout/devise/templates/foundation5.css.scss
+- lib/generators/layout/devise/templates/sessions/new.html.erb
+- lib/generators/layout/install/.DS_Store
+- lib/generators/layout/install/install_generator.rb
+- lib/generators/layout/install/templates/application.css.scss
+- lib/generators/layout/install/templates/application.js
+- lib/generators/layout/install/templates/bootstrap-application.js
+- lib/generators/layout/install/templates/bootstrap2-application.html.erb
+- lib/generators/layout/install/templates/bootstrap2-application.html.haml
+- lib/generators/layout/install/templates/bootstrap2-application.html.slim
+- lib/generators/layout/install/templates/bootstrap2-messages.html.erb
+- lib/generators/layout/install/templates/bootstrap2-messages.html.haml
+- lib/generators/layout/install/templates/bootstrap2-messages.html.slim
+- lib/generators/layout/install/templates/bootstrap2-navigation.html.erb
+- lib/generators/layout/install/templates/bootstrap2-navigation.html.haml
+- lib/generators/layout/install/templates/bootstrap2-navigation.html.slim
+- lib/generators/layout/install/templates/bootstrap2_and_overrides.css.scss
+- lib/generators/layout/install/templates/bootstrap3-application.html.erb
+- lib/generators/layout/install/templates/bootstrap3-application.html.haml
+- lib/generators/layout/install/templates/bootstrap3-application.html.slim
+- lib/generators/layout/install/templates/bootstrap3-messages.html.erb
+- lib/generators/layout/install/templates/bootstrap3-messages.html.haml
+- lib/generators/layout/install/templates/bootstrap3-messages.html.slim
+- lib/generators/layout/install/templates/bootstrap3-navigation.html.erb
+- lib/generators/layout/install/templates/bootstrap3-navigation.html.haml
+- lib/generators/layout/install/templates/bootstrap3-navigation.html.slim
+- lib/generators/layout/install/templates/bootstrap3_and_overrides.css.scss
+- lib/generators/layout/install/templates/foundation4-application.html.erb
+- lib/generators/layout/install/templates/foundation4-application.html.haml
+- lib/generators/layout/install/templates/foundation4-application.html.slim
+- lib/generators/layout/install/templates/foundation4-application.js
+- lib/generators/layout/install/templates/foundation4-messages.html.erb
+- lib/generators/layout/install/templates/foundation4-messages.html.haml
+- lib/generators/layout/install/templates/foundation4-messages.html.slim
+- lib/generators/layout/install/templates/foundation4-navigation.html.erb
+- lib/generators/layout/install/templates/foundation4-navigation.html.haml
+- lib/generators/layout/install/templates/foundation4-navigation.html.slim
+- lib/generators/layout/install/templates/foundation4_and_overrides.css.scss
+- lib/generators/layout/install/templates/foundation5-application.html.erb
+- lib/generators/layout/install/templates/foundation5-application.html.haml
+- lib/generators/layout/install/templates/foundation5-application.html.slim
+- lib/generators/layout/install/templates/foundation5-application.js
+- lib/generators/layout/install/templates/foundation5-messages.html.erb
+- lib/generators/layout/install/templates/foundation5-messages.html.haml
+- lib/generators/layout/install/templates/foundation5-messages.html.slim
+- lib/generators/layout/install/templates/foundation5-navigation.html.erb
+- lib/generators/layout/install/templates/foundation5-navigation.html.haml
+- lib/generators/layout/install/templates/foundation5-navigation.html.slim
+- lib/generators/layout/install/templates/foundation5_and_overrides.css.scss
+- lib/generators/layout/install/templates/navigation_links.html.erb
+- lib/generators/layout/install/templates/navigation_links.html.slim
+- lib/generators/layout/install/templates/none-application.html.erb
+- lib/generators/layout/install/templates/none-application.html.haml
+- lib/generators/layout/install/templates/none-application.html.slim
+- lib/generators/layout/install/templates/simple-application.html.erb
+- lib/generators/layout/install/templates/simple-application.html.haml
+- lib/generators/layout/install/templates/simple-application.html.slim
+- lib/generators/layout/install/templates/simple-messages.html.erb
+- lib/generators/layout/install/templates/simple-messages.html.haml
+- lib/generators/layout/install/templates/simple-messages.html.slim
+- lib/generators/layout/install/templates/simple-navigation.html.erb
+- lib/generators/layout/install/templates/simple-navigation.html.haml
+- lib/generators/layout/install/templates/simple-navigation.html.slim
+- lib/generators/layout/install/templates/simple.css
+- lib/generators/layout/navigation/.DS_Store
+- lib/generators/layout/navigation/navigation_generator.rb
+- lib/generators/layout/navigation/templates/navigation_links.html.erb
 - lib/rails_layout.rb
 - lib/rails_layout/version.rb
 - rails_layout.gemspec

data/lib/generators/layout/USAGE

@@ -1,38 +0,0 @@
-Description:
-    Creates Rails layout files suitable for various front-end frameworks.
-
-    Create simple layout files when no front-end framework is used:
-      rails generate layout simple
-
-    Create layout files suitable for Bootstrap 2.3:
-      rails generate layout bootstrap2
-
-    Create layout files suitable for Bootstrap 3.0:
-      rails generate layout bootstrap3
-
-    Create layout files suitable for Zurb Foundation 4.0:
-      rails generate layout foundation4
-
-    Create layout files suitable for Zurb Foundation 5.0:
-      rails generate layout foundation5
-
-    Remove layout files:
-      rails generate layout none
-
-Creates files:
-  * app/views/layouts/application.html.erb
-  * app/views/layouts/_messages.html.erb
-  * app/views/layouts/_navigation.html.erb
-  * app/views/layouts/_navigation_links.html.erb
-  * app/assets/stylesheets/simple.css (only for simple option)
-
-Renames the file:
-  * app/assets/stylesheets/application.css
-to:
-  * app/assets/stylesheets/application.css.scss
-
-Modifies the file:
-  * app/assets/javascripts/application.js
-
-Adds the file:
-  * app/assets/stylesheets/framework_and_overrides.css.scss