twitter-bootstrap-rails 2.0.2 → 2.0.4

data/README.md

@@ -6,11 +6,24 @@ twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails 3.1 A
 [![Build Status](https://secure.travis-ci.org/seyhunak/twitter-bootstrap-rails.png)](http://travis-ci.org/seyhunak/twitter-bootstrap-rails)
 [![Dependency Status](https://gemnasium.com/seyhunak/twitter-bootstrap-rails.png)](https://gemnasium.com/seyhunak/twitter-bootstrap-rails)
 
+
+## Screencasts
+#### Installing twitter-bootstrap-rails, generators, usage and more
+Screencasts provided by Railscasts (Ryan Bates)
+
+[Twitter Bootstrap Basics](http://railscasts.com/episodes/328-twitter-bootstrap-basics "Twitter Bootstrap Basics")
+in this episode you will learn how to include Twitter Bootstrap into Rails application with the twitter-bootstrap-rails gem.
+
+[More on Twitter Bootstrap](http://railscasts.com/episodes/329-more-on-twitter-bootstrap "More on Twitter Bootstrap")
+in this episode continues on the Twitter Bootstrap project showing how to display flash messages, add form validations with SimpleForm, customize layout with variables, and switch to using Sass.
+(Note: This episode is pro episode)
+
+
 ## Installing Gem
 
 Include Bootstrap in Gemfile;
 
-    gem 'twitter-bootstrap-rails'
+    gem "twitter-bootstrap-rails"
 
 or you can install from latest build;
 
@@ -74,24 +87,20 @@ Bootstrap was built with Preboot, an open-source pack of mixins and variables to
 
 ## Using stylesheets with Less
 
-You have to require Bootstrap LESS (bootstrap.less) in your application.css
+You have to require Bootstrap LESS (bootstrap_and_overrides.css.less) in your application.css
 
     /*
-     *= require twitter/bootstrap
-    */
+     *= require bootstrap_and_overrides
+     */
 
     /* Your stylesheets goes here... */
 
 
-Now, you can override LESS files provided by Twitter Bootstrap
-Also, you can import additional files (.ie responsive)
+If you'd like to alter Bootstrap's own variables, or define your LESS
+styles inheriting Bootstrap's mixins, you can do so inside bootstrap_and_overrides.css.less:
 
-    @import "twitter/bootstrap";
+    @linkColor: #ff0000;
 
-    // import responsive layout
-    @import "twitter/bootstrap/responsive";
-
-    // Your custom stylesheets goes here (override Less here)
 
 
 ## Using Javascripts
@@ -112,17 +121,9 @@ twitter-bootstrap-rails generates a "bootstrap.js.coffee" file for you
 to /app/assets/javascripts/ folder.
 
     jQuery ->
-      $(".alert-message").alert()
-      $(".tabs").button()
-      $(".carousel").carousel()
-      $(".collapse").collapse()
-      $(".dropdown-toggle").dropdown()
-      $(".modal").modal()
-      $("a[rel]").popover()
-      $(".navbar").scrollspy()
-      $(".tab").tab "show"
+      $("a[rel=popover]").popover()
       $(".tooltip").tooltip()
-      $(".typeahead").typeahead()
+      $("a[rel=tooltip]").tooltip()
 
 
 ## Using Static CSS, JS (w/o Less)
@@ -157,6 +158,9 @@ twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest s
   <li>Added Haml and Slim support</li>
   <li>Added Responsive layout support</li>
   <li>Fixes and release 2.0.0</li>
+  <li>Updated to v2.0.1, versioned v2.0.1.0</li>
+  <li>Released gem v.2.0.3</li>
+  <li>Released gem v.2.0.4</li>
 </ul>
 
 
@@ -173,6 +177,7 @@ twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest s
   <li>Masakuni Kato</li>
   <li>Gudleik Rasch</li>
   <li>Thomas Volkmar Worm</li>
+  <li>Thiago Almeida</li>
 </ul>
 
 
@@ -186,9 +191,15 @@ twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest s
 ## Credits
 Seyhun Akyürek - seyhunak [at] gmail com
 
-[Follow me on Twitter](http://twitter.com/seyhunak "Twitter")
+[Add Me On Twitter](http://twitter.com/seyhunak "Add Me On Twitter")
+
+[Add Me On Linkedin](http://tr.linkedin.com/in/seyhunak "Add Me On Linkedin")
+
+[Add Me On Facebook](https://www.facebook.com/seyhunak "Add Me On Facebook")
+
+[Add Me On Google+](http://plus.ly/seyhunak "Add Me On Google+")
 
-[Follow me on Google+](http://plus.ly/seyhunak "Google+")
+[Visit My Blog](http://www.seyhunakyurek.com/ "Visit My Blog")
 
 
 ## Thanks

data/lib/generators/bootstrap/install/install_generator.rb

@@ -3,25 +3,49 @@ require 'rails/generators'
 module Bootstrap
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
+
       source_root File.expand_path("../templates", __FILE__)
       desc "This generator installs Twitter Bootstrap to Asset Pipeline"
 
       def add_assets
-       if File.exist?('app/assets/javascripts/application.js')
-	      insert_into_file "app/assets/javascripts/application.js", "//= require twitter/bootstrap\n", :after => "jquery_ujs\n"
-	     else
-	      copy_file "application.js", "app/assets/javascripts/application.js"
-	     end
-       if File.exist?('app/assets/stylesheets/application.css')
-	      insert_into_file "app/assets/stylesheets/application.css", " *= require twitter/bootstrap\n", :after => "require_self\n"
-	     else
-	      copy_file "application.css", "app/assets/stylesheets/application.css"
-	     end
-  	  end
+
+        if File.exist?('app/assets/javascripts/application.js')
+          insert_into_file "app/assets/javascripts/application.js", "//= require twitter/bootstrap\n", :after => "jquery_ujs\n"
+        else
+          copy_file "application.js", "app/assets/javascripts/application.js"
+        end
+
+        if File.exist?('app/assets/stylesheets/application.css')
+          # Add our own require:
+          content = File.read("app/assets/stylesheets/application.css")
+          if content.match(/require_tree\s+\./)
+            # Good enough - that'll include our bootstrap_and_overrides.css.less
+          else
+            style_require_block = " *= require bootstrap_and_overrides\n"
+            insert_into_file "app/assets/stylesheets/application.css", style_require_block, :after => "require_self\n"
+          end
+        else
+          copy_file "application.css", "app/assets/stylesheets/application.css"
+        end
+
+      end
 
       def add_bootstrap
         copy_file "bootstrap.coffee", "app/assets/javascripts/bootstrap.js.coffee"
-        copy_file "bootstrap.less", "app/assets/stylesheets/bootstrap.css.less"
+        copy_file "bootstrap_and_overrides.less", "app/assets/stylesheets/bootstrap_and_overrides.css.less"
+      end
+
+      def cleanup_legacy
+        # Remove old requires (if any) that included twitter/bootstrap directly:
+        gsub_file("app/assets/stylesheets/application.css", %r|\s*\*=\s*twitter/bootstrap\s*\n|, "")
+        gsub_file("app/assets/stylesheets/application.css", %r|\s*\*=\s*twitter/bootstrap_responsive\s*\n|, "")
+        if File.exist?('app/assets/stylesheets/bootstrap_override.css.less')
+          puts <<-EOM
+          Warning:
+            app/assets/stylesheets/bootstrap_override.css.less exists
+            It should be removed, as it has been superceded by app/assets/stylesheets/bootstrap_and_overrides.css.less
+          EOM
+        end
       end
 
     end

data/lib/generators/bootstrap/install/templates/application.css

@@ -3,6 +3,5 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
- *= require twitter/bootstrap
  *= require_tree .
 */

data/lib/generators/bootstrap/install/templates/bootstrap.coffee

@@ -1,13 +1,4 @@
 jQuery ->
-  $(".alert-message").alert()
-  $(".tabs").button()
-  $(".carousel").carousel()
-  $(".collapse").collapse()
-  $(".dropdown-toggle").dropdown()
-  $(".modal").modal()
   $("a[rel=popover]").popover()
-  $(".navbar").scrollspy()
-  $(".tab").tab "show"
   $(".tooltip").tooltip()
-  $(".typeahead").typeahead()
-  $("a[rel=tooltip]").tooltip()
+  $("a[rel=tooltip]").tooltip()

data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less

@@ -0,0 +1,19 @@
+@import "twitter/bootstrap/bootstrap";
+body { padding-top: 60px; }
+
+@import "twitter/bootstrap/responsive";
+
+// Set the correct sprite paths
+@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png');
+@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png');
+
+// Your custom LESS stylesheets goes here
+//
+// Since bootstrap was imported above you have access to its mixins which
+// you may use and inherit here
+//
+// If you'd like to override bootstrap's own variables, you can do so here as well
+// See http://twitter.github.com/bootstrap/less.html for their names and documentation
+//
+// Example:
+// @linkColor: #ff0000;

data/lib/generators/bootstrap/layout/templates/layout.html.erb

@@ -2,6 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title><%= app_name %></title>
     <%%= csrf_meta_tags %>
 
@@ -11,12 +12,7 @@
     <![endif]-->
 
     <!-- Le styles -->
-    <%%= stylesheet_link_tag    "application", :media => "all" %>
-    <style>
-      body {
-        padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
-      }
-    </style>
+    <%%= stylesheet_link_tag "application", :media => "all" %>
 
     <!-- Le fav and touch icons -->
     <link href="images/favicon.ico" rel="shortcut icon">
@@ -34,9 +30,9 @@
           <div class="container">
         <%- end -%>
           <a class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse">
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
           </a>
           <a class="brand" href="#"><%= app_name %></a>
           <div class="<%= container_class %> nav-collapse">
@@ -52,14 +48,14 @@
 
     <div class="<%= container_class %>">
       <%- if layout_type == "fluid" -%>
-       <div class="row-fluid">
+      <div class="row-fluid">
         <div class="span3">
           <div class="well sidebar-nav">
             <ul class="nav nav-list">
               <li class="nav-header">Sidebar</li>
               <%- (1..3).each do |i| -%>
-              <li><%%= link_to "Link<%= i %>", "/path<%= i %>"  %></li>
-            <%- end -%>
+                <li><%%= link_to "Link<%= i %>", "/path<%= i %>"  %></li>
+              <%- end -%>
             </ul>
           </div><!--/.well -->
         </div><!--/span-->
@@ -68,25 +64,24 @@
         </div>
       </div><!--/row-->
       <%- else -%>
-        <div class="content">
-          <div class="row">
-            <div class="span9">
-            <%%= yield %>
+      <div class="content">
+        <div class="row">
+           <div class="span9">
+              <%%= yield %>
             </div>
-            <div class="span1">&nbsp;</div>
             <div class="span3">
               <div class="well sidebar-nav">
                 <h3>Sidebar</h3>
-                 <ul class="nav nav-list">
-                    <li class="nav-header">Sidebar</li>
+                <ul class="nav nav-list">
+                  <li class="nav-header">Sidebar</li>
                   <%- (1..3).each do |i| -%>
                     <li><%%= link_to "Link<%= i %>", "/path<%= i %>"  %></li>
                   <%- end -%>
                 </ul>
-            </div>
-           </div>
-          </div>
-        </div>
+              </div><!--/.well -->
+            </div><!--/span-->
+        </div><!--/row-->
+      </div><!--/content-->
       <%- end -%>
 
       <footer>

data/lib/generators/bootstrap/layout/templates/layout.html.haml

@@ -8,11 +8,7 @@
     /[if lt IE 9]
       = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
     / Le styles
-    = stylesheet_link_tag    "application"
-    :css
-      body {
-        padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
-      }
+    = stylesheet_link_tag "application", :media => "all"
     / Le fav and touch icons
     %link{:href => "images/favicon.ico", :rel => "shortcut icon"}/
     %link{:href => "images/apple-touch-icon.png", :rel => "apple-touch-icon"}/
@@ -29,9 +25,9 @@
         .container
         <%- end -%>
           %a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"}
-            %span.i-bar
-            %span.i-bar
-            %span.i-bar
+            %span.icon-bar
+            %span.icon-bar
+            %span.icon-bar
           %a.brand{:href => "#"}<%= app_name %>
           .<%=container_class%>.nav-collapse
             %ul.nav
@@ -57,7 +53,6 @@
         .row
           .span9
             = yield
-          .span1 &nbsp;
           .span3
             .well.sidebar-nav
               %h3 Sidebar

data/lib/generators/bootstrap/layout/templates/layout.html.slim

@@ -9,11 +9,7 @@ html lang="en"
     /[if lt IE 9]
       = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
     /! Le styles
-    = stylesheet_link_tag    "application"
-    css:
-      body {
-        padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
-      }
+      = stylesheet_link_tag "application", :media => "all"
     / Le fav and touch icons
     link href="images/favicon.ico" rel="shortcut icon"
     link href="images/apple-touch-icon.png" rel="apple-touch-icon"
@@ -30,9 +26,9 @@ html lang="en"
         .container
         <%- end -%>
           a.btn.btn-navbar data-target=".nav-collapse" data-toggle="collapse"
-            span.i-bar
-            span.i-bar
-            span.i-bar
+            span.icon-bar
+            span.icon-bar
+            span.icon-bar
           a.brand href="#"<%= app_name %>
           .<%=container_class%>.nav-collapse
             ul.nav
@@ -58,7 +54,6 @@ html lang="en"
         .row
           .span9
             = yield
-          .span1 &nbsp;
           .span3
             .well.sidebar-nav
               h3 Sidebar

data/lib/generators/bootstrap/themed/templates/_form.html.erb

@@ -1,12 +1,19 @@
-<% columns.each do |column| %>
-<div class="clearfix">
-   <%%= f.label :<%= column.name %>, t("activerecord.attributes.<%= model_name.underscore %>.<%= column.name %>", :default => "<%= column.name.humanize %>"), :class => :label %>
-  <div class="input">
-    <%%= f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>' %>
-  </div>
-</div>
-<%- end -%>
-<div class="form-actions">
-  <button class="btn primary" type="submit">Save</button> or
-	<%%= link_to "Cancel", <%= controller_routing_path %>_path %>
-</div>
+<%%= form_for @<%= resource_name %>, :html => { :class => 'form-horizontal' } do |f| %>
+  <fieldset>
+    <legend><%%= controller.action_name.capitalize %> <%= model_name.titleize %></legend>
+
+    <%- columns.each do |column| -%>
+    <div class="control-group">
+      <%%= f.label :<%= column.name %>, :class => 'control-label' %>
+      <div class="controls">
+        <%%= f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>' %>
+      </div>
+    </div>
+
+    <%- end -%>
+    <div class="form-actions">
+      <%%= f.submit nil, :class => 'btn btn-primary' %>
+      <%%= link_to 'Cancel', <%= controller_routing_path %>_path, :class => 'btn' %>
+    </div>
+  </fieldset>
+<%% end %>

data/lib/generators/bootstrap/themed/templates/_form.html.haml

@@ -1,11 +1,13 @@
-<%- columns.each do |column| -%>
-.clearfix
-  = f.label :<%= column.name %>, t("activerecord.attributes.<%= model_name.underscore %>.<%= column.name %>", :default => "<%= column.name.humanize %>"), :class => :label
-  .input
-    = f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>'
-<%- end -%>
-
-.form-actions
-  %button{:class => "btn primary", :type => "submit"} Save
-  or
-  = link_to "Cancel", <%= controller_routing_path %>_path
+%fieldset
+  %legend
+    = controller.action_name.capitalize
+    <%= model_name.titleize %>
+  <%- columns.each do |column| -%>
+  .control-group
+    = f.label :<%= column.name %>, :class => 'control-label'
+    .controls
+      = f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>'
+  <%- end -%>
+  .form-actions
+    = f.submit nil, :class => 'btn btn-primary'
+    = link_to "Cancel", <%= controller_routing_path %>_path, :class => 'btn'

data/lib/generators/bootstrap/themed/templates/edit.html.erb

@@ -1,4 +1 @@
-<%%= form_for @<%= model_name.underscore  %>, :url => <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :html => { :class => "edit_<%= model_name.underscore  %>", :id => "edit_<%= model_name.underscore %>" } do |f| -%>
-  <input name="_method" type="hidden" value="put" />
-  <%%= render :partial => "form", :locals => {:f => f} %>
-<%% end -%>
+<%%= render :partial => 'form' %>

data/lib/generators/bootstrap/themed/templates/edit.html.haml

@@ -1,3 +1,2 @@
-= form_for @<%= model_name.underscore  %>, :url => <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :html => { :class => "edit_<%= model_name.underscore  %>", :id => "edit_<%= model_name.underscore %>" } do |f|
-  %input{:name => "_method", :type => "hidden", :value =>"put"}
+= form_for @<%= resource_name %>, :html => { :class => "edit_<%= resource_name %> form-horizontal", :id => "edit_<%= resource_name %>" } do |f|
   = render :partial => "form", :locals => {:f => f}

data/lib/generators/bootstrap/themed/templates/edit.html.slim

@@ -1,3 +1,3 @@
-= form_for @<%= model_name.underscore  %>, :url => <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :html => { :class => "edit_<%= model_name.underscore  %>", :id => "edit_<%= model_name.underscore %>" } do |f|
+= form_for @<%= resource_name %>, :url => <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :html => { :class => "edit_<%= resource_name %>", :id => "edit_<%= resource_name %>" } do |f|
   input name="_method" type="hidden" value="put"
   = render :partial => "form", :locals => {:f => f}

data/lib/generators/bootstrap/themed/templates/index.html.erb

@@ -1,34 +1,30 @@
 <h1><%= resource_name.titleize %>s</h1>
 <table class="table table-striped">
- <thead>
-  <tr>
-    <th>ID</th>
-    <% unless columns.empty? -%>
-    <th>
-      <%%= t("activerecord.attributes.<%= singular_controller_routing_path %>.<%= columns.first.name %>", :default => t("activerecord.labels.<%= columns.first.name %>", :default => "<%= columns.first.name.capitalize %>")) %>
-    </th>
-    <% end -%>
-    <th>Created at</th>
-    <th>Actions</th>
-  </tr>
+  <thead>
+    <tr>
+      <th>ID</th>
+      <%- unless columns.empty? -%>
+      <th><%= columns.first.name.humanize %></th>
+      <%- end -%>
+      <th>Created at</th>
+      <th>Actions</th>
+    </tr>
   </thead>
   <tbody>
-  <%% @<%= plural_resource_name %>.each do |<%= resource_name %>| -%>
-   <tr>
-    <td><%%= <%= resource_name %>.id %></td>
-    <% unless columns.empty? -%>
-    <td><%%= link_to <%= resource_name %>.<%= columns.first.name %>, <%= singular_controller_routing_path %>_path(<%= resource_name %>) %>
-    </td>
-    <% end -%>
-    <td><%%= <%= resource_name %>.created_at %></td>
-    <td>
-      <%%= link_to "Show", <%= singular_controller_routing_path %>_path(<%= resource_name %>) %>
-      <%%= link_to "Edit", edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>) %>
-      <%%= link_to "Destroy", <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}" %>
-    </td>
-    </tr>
-    <%% end -%>
-   </tbody>
+    <%% @<%= plural_resource_name %>.each do |<%= resource_name %>| %>
+      <tr>
+        <td><%%= <%= resource_name %>.id %></td>
+        <%- unless columns.empty? -%>
+        <td><%%= link_to <%= resource_name %>.<%= columns.first.name %>, <%= singular_controller_routing_path %>_path(<%= resource_name %>) %></td>
+        <%- end -%>
+        <td><%%= <%= resource_name %>.created_at %></td>
+        <td>
+          <%%= link_to 'Edit', edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>), :class => 'btn btn-mini' %>
+          <%%= link_to 'Destroy', <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :confirm => 'Are you sure?', :class => 'btn btn-mini btn-danger' %>
+        </td>
+      </tr>
+    <%% end %>
+  </tbody>
 </table>
 
-<%%= link_to "New", new_<%= singular_controller_routing_path %>_path, :class => 'btn btn-primary' %>
+<%%= link_to 'New', new_<%= singular_controller_routing_path %>_path, :class => 'btn btn-primary' %>

data/lib/generators/bootstrap/themed/templates/index.html.haml

@@ -18,8 +18,8 @@
         <%- end -%>
         %td= <%= resource_name %>.created_at
         %td
-          = link_to "Show", <%= singular_controller_routing_path %>_path(<%= resource_name %>)
-          = link_to "Edit", edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>)
-          = link_to "Destroy", <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}"
+          = link_to "Show", <%= singular_controller_routing_path %>_path(<%= resource_name %>), :class => 'btn btn-mini'
+          = link_to "Edit", edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>), :class => 'btn btn-mini'
+          = link_to "Destroy", <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}", :class => 'btn btn-mini btn-danger' 
 
 = link_to "New", new_<%= singular_controller_routing_path %>_path, :class => 'btn btn-primary'

data/lib/generators/bootstrap/themed/templates/new.html.erb

@@ -1,3 +1 @@
-<%%= form_for @<%= model_name.underscore  %>, :url => <%= controller_routing_path %>_path, :html => { :class => :form } do |f| -%>
-  <%%= render :partial => "form", :locals => {:f => f} %>
-<%% end -%>
+<%%= render :partial => 'form' %>

data/lib/generators/bootstrap/themed/templates/new.html.haml

@@ -1,2 +1,2 @@
-= form_for @<%= model_name.underscore  %>, :url => <%= controller_routing_path %>_path, :html => { :class => :form } do |f|
+= form_for @<%= resource_name %>, :html => { :class => 'form-horizontal' } do |f|
   = render :partial => "form", :locals => {:f => f}

data/lib/generators/bootstrap/themed/templates/new.html.slim

@@ -1,2 +1,2 @@
-= form_for @<%= model_name.underscore  %>, :url => <%= controller_routing_path %>_path, :html => { :class => :form } do |f|
+= form_for @<%= resource_name %>, :url => <%= controller_routing_path %>_path, :html => { :class => :form } do |f|
   = render :partial => "form", :locals => {:f => f}

data/lib/generators/bootstrap/themed/templates/show.html.erb

@@ -1,10 +1,14 @@
-<% columns.each do |column| %>
-<label class="label"><%%= t("activerecord.attributes.<%= singular_controller_routing_path %>.<%= column.name %>", :default => t("activerecord.labels.<%= column.name %>", :default => "<%= column.name.humanize %>")) %>:</label>
-<p><%%= @<%= resource_name %>.<%= column.name %> %></p>
-<%- end -%>
+<h1><%= model_name.titleize %></h1>
+
+<%- columns.each do |column| -%>
+<p>
+  <b><%= column.name.humanize %></b><br>
+  <%%= @<%= resource_name %>.<%= column.name %> %>
+</p>
 
+<%- end -%>
 <div class="form-actions">
-<%%= link_to "Back", <%= controller_routing_path %>_path, :class => 'btn'  %>
-<%%= link_to "Edit", edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn' %>
-<%%= link_to "Delete", <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :method => "delete", :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}", :class => 'btn' %>
+  <%%= link_to 'Back', <%= controller_routing_path %>_path, :class => 'btn'  %>
+  <%%= link_to 'Edit', edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn' %>
+  <%%= link_to 'Delete', <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :method => 'delete', :confirm => 'Are you sure?', :class => 'btn btn-danger' %>
 </div>

data/lib/generators/bootstrap/themed/templates/show.html.haml

@@ -6,4 +6,4 @@
 .form-actions
   = link_to "Back", <%= controller_routing_path %>_path, :class => 'btn'
   = link_to "Edit", edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn'
-  = link_to "Delete", <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :method => "delete", :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}", :class => 'btn'
+  = link_to "Delete", <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :method => "delete", :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}", :class => 'btn btn-danger'

data/lib/generators/bootstrap/themed/themed_generator.rb

@@ -24,7 +24,7 @@ module Bootstrap
       def initialize_views_variables
         @base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(controller_path)
         @controller_routing_path = @controller_file_path.gsub(/\//, '_')
-        @model_name = @base_name.singularize unless @model_name
+        @model_name = @controller_class_nesting + "::#{@base_name.singularize}" unless @model_name
         @model_name = @model_name.camelize
       end
 
@@ -45,7 +45,7 @@ module Bootstrap
       end
 
       def resource_name
-        @model_name.underscore
+        @model_name.demodulize.underscore
       end
 
       def plural_resource_name
@@ -55,9 +55,9 @@ module Bootstrap
       def columns
         begin
           excluded_column_names = %w[id created_at updated_at]
-          Kernel.const_get(@model_name).columns.reject{|c| excluded_column_names.include?(c.name) }.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type)}
+          @model_name.constantize.columns.reject{|c| excluded_column_names.include?(c.name) }.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type)}
         rescue NoMethodError
-          Kernel.const_get(@model_name).fields.collect{|c| c[1]}.reject{|c| excluded_column_names.include?(c.name) }.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type.to_s)}
+          @model_name.constantize.fields.collect{|c| c[1]}.reject{|c| excluded_column_names.include?(c.name) }.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type.to_s)}
         end
       end
 

data/lib/twitter/bootstrap/rails/engine.rb

@@ -1,16 +1,22 @@
 require 'rails'
+require File.dirname(__FILE__) + '/twitter-bootstrap-breadcrumbs.rb'
 
 module Twitter
   module Bootstrap
     module Rails
       class Engine < ::Rails::Engine
-     
+
         initializer 'twitter-bootstrap-rails.setup', 
           :after => 'less-rails.after.load_config_initializers', 
           :group => :all do |app|
-            app.config.less.paths << File.join(config.root, 'vendor', 'toolkit')
-        end
+          app.config.less.paths << File.join(config.root, 'vendor', 'toolkit')
+          end
 
+        initializer 'twitter-bootstrap-rails.setup_helpers' do |app|
+          app.config.to_prepare do
+            ActionController::Base.send(:include, BreadCrumbs)
+          end
+        end
       end
     end
   end