rails_layout 1.0.28 → 1.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e34a5527bcaa16a6da0667377342295fa77fec8
-  data.tar.gz: 1a989c4335301f2c027268b18d0265894b76bca1
+  metadata.gz: 9a81da5a5b87f9b5caef0f99f4ca16d6dc6b18fd
+  data.tar.gz: b3fcb507662f6b38a9e718f368756059aa19d202
 SHA512:
-  metadata.gz: b5d2bb04acea7cae6d71d9745a0a15ba41401cebaa8aa034c8fb95b112c3e00790a9f153d5bde7c03f68626789677a745b20fb66fe8e9b1cde568ba2c0b9925f
-  data.tar.gz: cab3b7902c13feaee4d87ed4b1259c54b0c6e6e1f249c83159b9a8b3ebc23e8081fecaf72aa82b9c4031b0daab4920604a209bfe3ab9acc524aa5f0855c14193
+  metadata.gz: fb3a46aef15cd0c0d0cbc24829e9d6af3d44dd4b274ba8f94622229c0678e74153c75629382a9a70aca51e35320451ea76a631adb41e5261bae02beeadef0c45
+  data.tar.gz: 860e87b2b84cb74c7bb21d19147ce97dca96bdba1c4dbe2af378ca9433f7810f8f27659b1749d4358030a4bcc9cfb61db905c1f1c24c605c30b3c4cd2f0bd728

data/CHANGELOG.textile

@@ -1,5 +1,9 @@
 h1. CHANGELOG
 
+h3. 1.0.29 November 23, 2015
+
+* add navlink for an admin interface if Thoughbot Administrate gem was selected in Rails Composer
+
 h3. 1.0.28 November 4, 2015
 
 * move navigation auth links to a new partial 'app/views/layouts/_nav_links_for_auth.html.erb'

data/README.textile

@@ -3,7 +3,7 @@ h1. !http://railsapps.github.io/images/rails-36x36.jpg(RailsLayout Gem)! RailsLa
 Use this gem to set up layout files for your choice of front-end framework:
 
 * Zurb Foundation 5.3
-* Bootstrap 3.2
+* Bootstrap 3.3
 
 It also will set up "Devise":https://github.com/plataformatec/devise views with styling for Bootstrap or Foundation.
 
@@ -19,7 +19,7 @@ h4. !http://railsapps.github.io/images/join/join-railsapps.png(Join RailsApps)!:
 
 h4. Support the RailsApps Project
 
-If the RailsLayout gem is useful to you, please accept our invitation to "join the RailsApps project":http://railsapps.github.io/. The RailsApps project provides example applications, tutorials, and starter tools, including the RailsLayout gem.
+If the RailsLayout gem is useful to you, please "support the RailsApps project":http://railsapps.github.io/ by purchasing our tutorials. The RailsApps project provides example applications, tutorials, and starter tools, including the RailsLayout gem.
 
 h2. Command Summary
 
@@ -67,7 +67,7 @@ gem 'compass-rails'
 gem 'zurb-foundation'
 </pre>
 
-h4. Bootstrap 3.2
+h4. Bootstrap 3.3
 
 <pre>
 gem 'bootstrap-sass'
@@ -142,7 +142,7 @@ You can generate layout files suitable for use with the following front-end fram
 
 * @foundation5@ - Zurb Foundation 5.3
 * @foundation4@ - Zurb Foundation 4.0
-* @bootstrap3@ - Bootstrap 3.2
+* @bootstrap3@ - Bootstrap 3.3
 * @bootstrap2@ - Bootstrap 2.3
 * @simple@ - simple layout
 * @none@ - removes all changes
@@ -156,20 +156,21 @@ The RailsLayout gem generates application layout files:
 * app/views/layouts/_navigation.html.erb
 * app/views/layouts/_navigation_links.html.erb
 
+If Devise or OmniAuth is installed, there will be an additional file:
+
+* app/views/layouts/_nav_links_for_auth.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 *_navigation.html.erb* file contains framework-specific styling. Separating the files makes it easy to change the front-end framework without disturbing the links.
 
 The *_navigation_links.html.erb* file is only a list of links. You can add additional links to this file as needed. It contains no framework-specific styling.
 
-The *_navigation.html.erb* file contains framework-specific styling. Separating the files makes it easy to change the front-end framework without disturbing the links.
+The *_nav_links_for_auth.html.erb* file is created if Devise or OmniAuth is installed.
 
 h4. Support for ERB, Haml, or Slim
 
@@ -264,9 +265,9 @@ and modify the file:
 
 * "app/assets/javascripts/application.js":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation4-application.js
 
-h3. Bootstrap 3.2 Layout
+h3. Bootstrap 3.3 Layout
 
-To create layout files for use with Bootstrap 3.2:
+To create layout files for use with Bootstrap 3.3:
 
 <pre>
 $ rails generate layout:install bootstrap3
@@ -379,7 +380,7 @@ This command is used to populate the navigation bar in starter applications crea
 $ rails generate layout:navigation --force
 </pre>
 
-Here's an example of a file *app/views/layouts/_navigation_links.html.erb* appropriate for Devise:
+Here's an example of a file *app/views/layouts/_nav_links_for_auth.html.erb* appropriate for Devise:
 
 <pre>
 <%# add navigation links to this file %>
@@ -400,11 +401,7 @@ Here's an example of a file *app/views/layouts/_navigation_links.html.erb* appro
 <% end %>
 </pre>
 
-The full set of links will be created if the following files are found in your application:
-
-* app/views/devise/sessions/new.html.erb
-* app/views/devise/registrations/new.html.erb
-* app/views/users/index.html.erb
+The full set of links will be created if initialization files are found for Devise or OmniAuth.
 
 h2. The "layout:devise" Command
 

data/lib/generators/layout/navigation/navigation_generator.rb

@@ -67,6 +67,13 @@ LINKS
           navlink = "    <li><%= link_to 'Admin', '/admin' %></li>"
           inject_into_file 'app/views/layouts/_nav_links_for_auth.html.erb', navlink + "\n", :after => "<% if current_user.try(:admin?) %>\n"
         end
+        # ADMINSTRATE (administrative dashboard)
+        if File.exists?('config/railscomposer.yml')
+          if Rails.application.config_for(:railscomposer)['dashboard'] == 'administrate'
+            navlink = "    <li><%= link_to 'Admin', '/admin' %></li>"
+            inject_into_file 'app/views/layouts/_nav_links_for_auth.html.erb', navlink + "\n", :after => "<% if current_user.try(:admin?) %>\n"
+          end
+        end
       end
 
       def modify_layout_for_auth_links

data/lib/rails_layout/version.rb

@@ -1,3 +1,3 @@
 module RailsLayout
-  VERSION = "1.0.28"
+  VERSION = "1.0.29"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_layout
 version: !ruby/object:Gem::Version
-  version: 1.0.28
+  version: 1.0.29
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler