twitter-bootstrap-rails 2.2.8 → 3.2.0

data/app/helpers/twitter_breadcrumbs_helper.rb

@@ -1,6 +1,7 @@
 module TwitterBreadcrumbsHelper
-  def render_breadcrumbs(divider = '/', &block)
-    content = render :partial => 'twitter-bootstrap/breadcrumbs', :layout => false, :locals => { :divider => divider }
+  def render_breadcrumbs(divider = '/', options={}, &block)
+    default_options = { :class => '', :item_class => '', :divider_class => '', :active_class => 'active' }.merge(options)
+    content = render :partial => 'twitter-bootstrap/breadcrumbs', :layout => false, :locals => { :divider => divider, options: options }
     if block_given?
       capture(content, &block)
     else

data/app/views/twitter-bootstrap/_breadcrumbs.html.erb

@@ -1,13 +1,13 @@
 <% if @breadcrumbs.present? %>
-  <ul class="breadcrumb">
+  <ul class="breadcrumb <%= options[:class] %>">
     <% separator = divider.html_safe %>
     <% @breadcrumbs[0..-2].each do |crumb| %>
-      <li>
+      <li class="<%= options[:item_class] %>">
         <%= link_to crumb[:name], crumb[:url], crumb[:options] %>
-        <span class="divider"><%= separator %></span>
+        <span class="divider <%= options[:divider_class] %>"><%= separator %></span>
       </li>
     <% end %>
-    <li class="active">
+    <li class="<%= options[:active_class] %>">
       <%= @breadcrumbs.last[:name] %>
     </li>
   </ul>

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

@@ -5,8 +5,9 @@ module Bootstrap
     class InstallGenerator < ::Rails::Generators::Base
 
       source_root File.expand_path("../templates", __FILE__)
-      desc "This generator installs Twitter Bootstrap to Asset Pipeline"
+      desc "This generator installs Bootstrap to Asset Pipeline"
       argument :stylesheets_type, :type => :string, :default => 'less', :banner => '*less or static'
+      class_option :'no-coffeescript', :type => :boolean, :default => false, :desc => 'Skips coffeescript replacement into app generators'
 
       def add_assets
 
@@ -60,7 +61,6 @@ module Bootstrap
       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:
@@ -76,6 +76,7 @@ module Bootstrap
       end
 
       def use_coffeescript?
+        return false if options[:'no-coffeescript']
         ::Rails.configuration.app_generators.rails[:javascript_engine] == :coffee
       end
     end

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

@@ -1,22 +1,21 @@
 @import "twitter/bootstrap/bootstrap";
-@import "twitter/bootstrap/responsive";
 
 // Set the correct sprite paths
 @iconSpritePath: image-url("twitter/bootstrap/glyphicons-halflings.png");
 @iconWhiteSpritePath: image-url("twitter/bootstrap/glyphicons-halflings-white.png");
 
 // Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
-@fontAwesomeEotPath: asset-url("fontawesome-webfont.eot");
-@fontAwesomeEotPath_iefix: asset-url("fontawesome-webfont.eot?#iefix");
-@fontAwesomeWoffPath: asset-url("fontawesome-webfont.woff");
-@fontAwesomeTtfPath: asset-url("fontawesome-webfont.ttf");
-@fontAwesomeSvgPath: asset-url("fontawesome-webfont.svg#fontawesomeregular");
+@fontAwesomeEotPath: font-url("fontawesome-webfont.eot");
+@fontAwesomeEotPath_iefix: font-url("fontawesome-webfont.eot?#iefix");
+@fontAwesomeWoffPath: font-url("fontawesome-webfont.woff");
+@fontAwesomeTtfPath: font-url("fontawesome-webfont.ttf");
+@fontAwesomeSvgPath: font-url("fontawesome-webfont.svg#fontawesomeregular");
 
 // Font Awesome
 @import "fontawesome/font-awesome";
 
 // Glyphicons
-//@import "twitter/bootstrap/sprites.less";
+//@import "twitter/bootstrap/glyphicons.less";
 
 // Your custom LESS stylesheets goes here
 //
@@ -27,4 +26,4 @@
 // See http://twitter.github.com/bootstrap/customize.html#variables for their names and documentation
 //
 // Example:
-// @linkColor: #ff0000;
+// @link-color: #ff0000;

data/lib/generators/bootstrap/install/templates/en.bootstrap.yml

@@ -2,6 +2,11 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
+  breadcrumbs:
+    application:
+      root: "Index"
+    pages:
+      pages: "Pages"
   helpers:
     actions: "Actions"
     links:

data/lib/generators/bootstrap/layout/layout_generator.rb

@@ -6,15 +6,12 @@ module Bootstrap
       source_root File.expand_path("../templates", __FILE__)
       desc "This generator generates layout file with navigation."
       argument :layout_name, :type => :string, :default => "application"
-      argument :layout_type, :type => :string, :default => "fixed",
-               :banner => "*fixed or fluid"
 
-      attr_reader :app_name, :container_class
+      attr_reader :app_name
 
       def generate_layout
         app = ::Rails.application
         @app_name = app.class.to_s.split("::").first
-        @container_class = layout_type == "fluid" ? "container-fluid" : "container"
         ext = app.config.generators.options[:rails][:template_engine] || :erb
         template "layout.html.#{ext}", "app/views/layouts/#{layout_name}.html.#{ext}"
       end

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

@@ -38,31 +38,33 @@
   </head>
   <body>
 
-    <div class="navbar navbar-<%= layout_type %>-top">
-      <div class="navbar-inner">
-        <div class="<%= container_class %>">
-          <a class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse">
-            <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">
-            <ul class="nav">
-              <li><%%= link_to "Link1", "/path1"  %></li>
-              <li><%%= link_to "Link2", "/path2"  %></li>
-              <li><%%= link_to "Link3", "/path3"  %></li>
-            </ul>
-          </div><!--/.nav-collapse -->
+    <div class="navbar navbar-default navbar-static-top">
+      <div class="container">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand" href="#"><%= app_name %></a>
+        <div class="navbar-collapse collapse navbar-responsive-collapse">
+          <ul class="nav navbar-nav">
+            <li><%%= link_to "Link1", "/path1"  %></li>
+            <li><%%= link_to "Link2", "/path2"  %></li>
+            <li><%%= link_to "Link3", "/path3"  %></li>
+          </ul>
         </div>
       </div>
     </div>
 
-    <div class="<%= container_class %>">
-      <%- if layout_type == "fluid" -%>
-      <div class="row-fluid">
-        <div class="span3">
+    <div class="container">
+      <div class="row">
+        <div class="col-lg-9">
+          <%%= bootstrap_flash %>
+          <%%= yield %>
+        </div>
+        <div class="col-lg-3">
           <div class="well sidebar-nav">
+            <h3>Sidebar</h3>
             <ul class="nav nav-list">
               <li class="nav-header">Sidebar</li>
               <li><%%= link_to "Link1", "/path1"  %></li>
@@ -71,30 +73,7 @@
             </ul>
           </div><!--/.well -->
         </div><!--/span-->
-        <div class="span9">
-          <%%= bootstrap_flash %>
-          <%%= yield %>
-        </div>
       </div><!--/row-->
-      <%- else -%>
-        <div class="row">
-          <div class="span9">
-            <%%= bootstrap_flash %>
-            <%%= yield %>
-          </div>
-          <div class="span3">
-            <div class="well sidebar-nav">
-              <h3>Sidebar</h3>
-              <ul class="nav nav-list">
-                <li class="nav-header">Sidebar</li>
-                <li><%%= link_to "Link1", "/path1"  %></li>
-                <li><%%= link_to "Link2", "/path2"  %></li>
-                <li><%%= link_to "Link3", "/path3"  %></li>
-              </ul>
-            </div><!--/.well -->
-          </div><!--/span-->
-        </div><!--/row-->
-      <%- end -%>
 
       <footer>
         <p>&copy; Company <%= Date.today.year %></p>

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

@@ -19,40 +19,26 @@
 
 
   %body
-    .navbar.navbar-<%= layout_type %>-top
-      .navbar-inner
-        .<%= container_class %>
-          %a.btn.btn-navbar(data-target=".nav-collapse" data-toggle="collapse")
-            %span.icon-bar
-            %span.icon-bar
-            %span.icon-bar
-          %a.brand(href="#") <%= app_name %>
-          .container.nav-collapse
-            %ul.nav
-              %li= link_to "Link 1", "/path1"
-              %li= link_to "Link 2", "/path2"
-              %li= link_to "Link 3", "/path3"
+    .navbar.navbar-default.navbar-static-top
+      .container
+        %button.navbar-toggle(type="button" data-toggle="collapse" data-target=".navbar-responsive-collapse")
+          %span.icon-bar
+          %span.icon-bar
+          %span.icon-bar
+        %a.navbar-brand(href="#") <%= app_name %>
+        .navbar-collapse.collapse.navbar-responsive-collapse
+          %ul.nav.navbar-nav
+            %li= link_to "Link 1", "/path1"
+            %li= link_to "Link 2", "/path2"
+            %li= link_to "Link 3", "/path3"
+            %li= link_to "Link 3", "/path3"
 
-    .<%= container_class %>
-    <%- if layout_type == "fluid" -%>
-
-      .row-fluid
-        .span3
-          .well.sidebar-nav
-            %ul.nav.nav-list
-              %li.nav-header Sidebar
-              %li= link_to "Link 1", "/path1"
-              %li= link_to "Link 2", "/path2"
-              %li= link_to "Link 3", "/path3"
-        .span9
-          = bootstrap_flash
-          = yield
-    <% else %>
+    .container
       .row
-        .span9
+        .col-lg-9
           = bootstrap_flash
           = yield
-        .span3
+        .col-lg-3
           .well.sidebar-nav
             %h3 Sidebar
             %ul.nav.nav-list
@@ -60,6 +46,5 @@
               %li= link_to "Link 1", "/path1"
               %li= link_to "Link 2", "/path2"
               %li= link_to "Link 3", "/path3"
-    <% end %>
       %footer
         %p &copy; Company <%= Date.today.year %>

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

@@ -21,40 +21,25 @@ html lang="en"
 
 
   body
-    .navbar.navbar-<%= layout_type %>-top
-      .navbar-inner
-        .<%= container_class %>
-          a.btn.btn-navbar data-target=".nav-collapse" data-toggle="collapse"
+    .navbar.navbar-default.navbar-static-top
+        .container
+          button.navbar-toggle type="button" data-toggle="collapse" data-target=".navbar-responsive-collapse"
             span.icon-bar
             span.icon-bar
             span.icon-bar
-          a.brand href="#"<%= app_name %>
-          .<%=container_class%>.nav-collapse
-            ul.nav
+          a.navbar-brand href="#"<%= app_name %>
+          .navbar-collapse.collapse.navbar-responsive-collapse
+            ul.nav.navbar-nav
               li= link_to "Link 1", "/path1"
               li= link_to "Link 2", "/path2"
               li= link_to "Link 3", "/path3"
 
-    .<%= container_class %>
-    <%- if layout_type == "fluid" -%>
-
-      .row-fluid
-        .span3
-          .well.sidebar-nav
-            ul.nav.nav-list
-              li.nav-header Sidebar
-              li= link_to "Link 1", "/path1"
-              li= link_to "Link 2", "/path2"
-              li= link_to "Link 3", "/path3"
-        .span9
-          = bootstrap_flash
-          = yield
-    <% else %>
+    .container
       .row
-        .span9
+        .col-lg-9
           = bootstrap_flash
           = yield
-        .span3
+        .col-lg-3
           .well.sidebar-nav
             h3 Sidebar
             ul.nav.nav-list
@@ -62,6 +47,6 @@ html lang="en"
               li= link_to "Link 1", "/path1"
               li= link_to "Link 2", "/path2"
               li= link_to "Link 3", "/path3"
-    <% end %>
+
       footer
         p &copy; Company <%= Date.today.year %>

data/lib/generators/bootstrap/partial/templates/_login.html.erb

@@ -21,9 +21,8 @@
     </div>
   <% end -%>
 
-  <div class="form-actions">
-    <%= f.submit "Sign in", :class => 'btn' %>
-  </div>
+  <%= f.submit "Sign in", :class => 'btn btn-default' %>
+
 <% end %>
 
 <%= render :partial => "devise/shared/links" %>

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

@@ -1,16 +1,33 @@
-<%%= form_for @<%= resource_name %>, :html => { :class => 'form-horizontal' } do |f| %>
-  <%- columns.each do |column| -%>
+<%%= form_for @<%= resource_name %>, :html => { :class => "form-horizontal <%= resource_name %>" } do |f| %>
+
+    <%% if @<%= resource_name %>.errors.any? %>
+    <div id="error_expl" class="panel panel-danger">
+      <div class="panel-heading">
+        <h3 class="panel-title"><%%= pluralize(@<%= resource_name %>.errors.count, "error") %> prohibited this <%= resource_name %> from being saved:</h3>
+      </div>
+      <div class="panel-body">
+        <ul>
+        <%% @<%= resource_name %>.errors.full_messages.each do |msg| %>
+          <li><%%= msg %></li>
+        <%% end %>
+        </ul>
+      </div>
+    </div>
+  <%% end %>
+
+<%- 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 %>' %>
+      <%%= f.<%= column.field_type %> :<%= column.name %>, :class => 'form-control' %>
     </div>
+    <%%= error_span(@<%= resource_name %>[:<%= column.name %>]) %>
   </div>
   <%- end -%>
 
-  <div class="form-actions">
-    <%%= f.submit nil, :class => 'btn btn-primary' %>
-    <%%= link_to t('.cancel', :default => t("helpers.links.cancel")),
-                <%= controller_routing_path %>_path, :class => 'btn' %>
-  </div>
+
+  <%%= f.submit nil, :class => 'btn btn-primary' %>
+  <%%= link_to t('.cancel', :default => t("helpers.links.cancel")),
+            <%= controller_routing_path %>_path, :class => 'btn btn-default' %>
+
 <%% end %>

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

@@ -1,10 +1,10 @@
-= form_for @<%= resource_name %>, :html => { :class => 'form-horizontal' } do |f|
+= form_for @<%= resource_name %>, html: { class: "form form-horizontal <%= resource_name %>" } do |f|
   <%- columns.each do |column| -%>
-  .control-group
-    = f.label :<%= column.name %>, :class => 'control-label'
+  .form-group
+    = f.label :<%= column.name %>, class: 'control-label'
     .controls
-      = f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>'
+      = f.<%= column.field_type %> :<%= column.name %>, class: 'form-control', required: true
+    = error_span(@<%= resource_name %>[:<%= column.name %>])
   <%- end -%>
-  .form-actions
-    = f.submit nil, :class => 'btn btn-primary'
-    = link_to t('.cancel', :default => t("helpers.links.cancel")), <%= controller_routing_path %>_path, :class => 'btn'
+  = f.submit nil,class: 'btn btn-primary'
+  = link_to t('.cancel', :default => t("helpers.links.cancel")), <%= controller_routing_path %>_path, :class => 'btn btn-default'

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

@@ -1,11 +1,11 @@
-= form_for @<%= resource_name %>, :html => { :class => "form-horizontal" } do |f|
+= form_for @<%= resource_name %>, html: { class: "form form-horizontal <%= resource_name %>" } do |f|
   <%- columns.each do |column| -%>
-  .control-group
+  .form-group
     = f.label :<%= column.name %>, :class => 'control-label'
     .controls
-      = f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>'
+      = f.<%= column.field_type %> :<%= column.name %>, :class => 'form-control'
+    = error_span(@<%= resource_name %>[:<%= column.name %>])
   <%- end -%>
-  .form-actions
-    = f.submit nil, :class => 'btn btn-primary'
-    '
-    = link_to t('.cancel', :default => t("helpers.links.cancel")), <%= controller_routing_path %>_path, :class => 'btn'
+  = f.submit nil, :class => 'btn btn-primary'
+  '
+  = link_to t('.cancel', :default => t("helpers.links.cancel")), <%= controller_routing_path %>_path, :class => 'btn'

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

@@ -23,12 +23,12 @@
         <td><%%=l <%= resource_name %>.created_at %></td>
         <td>
           <%%= link_to t('.edit', :default => t("helpers.links.edit")),
-                      edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>), :class => 'btn btn-mini' %>
+                      edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>), :class => 'btn btn-default btn-xs' %>
           <%%= link_to t('.destroy', :default => t("helpers.links.destroy")),
                       <%= singular_controller_routing_path %>_path(<%= resource_name %>),
                       :method => :delete,
                       :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) },
-                      :class => 'btn btn-mini btn-danger' %>
+                      :class => 'btn btn-xs btn-danger' %>
         </td>
       </tr>
     <%% end %>

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

@@ -19,7 +19,7 @@
         <%- end -%>
         %td=l <%= resource_name %>.created_at
         %td
-          = link_to t('.edit', :default => t("helpers.links.edit")), edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>), :class => 'btn btn-mini'
-          = link_to t('.destroy', :default => t("helpers.links.destroy")), <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-mini btn-danger'
+          = link_to t('.edit', :default => t("helpers.links.edit")), edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>), :class => 'btn btn-default btn-xs'
+          = link_to t('.destroy', :default => t("helpers.links.destroy")), <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-xs btn-danger'
 
 = link_to t('.new', :default => t("helpers.links.new")), new_<%= singular_controller_routing_path %>_path, :class => 'btn btn-primary'