bootstrap-generators 2.3.2 → 3.0.0

data/lib/generators/bootstrap/install/templates/assets/stylesheets/{fluid.css → starter.css}

@@ -1,16 +1,10 @@
 /*
  *= require bootstrap
  *= require_self
- *= require bootstrap-responsive
 */
 
 body {
   padding-top: 60px;
-  padding-bottom: 40px;
-}
-
-.sidebar-nav {
-  padding: 9px 0;
 }
 
 .page-header a.btn {
@@ -20,3 +14,9 @@ body {
 .page-header a.btn + a.btn {
   margin-right: 8px;
 }
+
+input[type="radio"], input[type="checkbox"] {
+  width: initial;
+  height: initial;
+  margin-top: 7px;
+}

data/lib/generators/bootstrap/install/templates/assets/stylesheets/{fluid.css.less → starter.less}

@@ -1,17 +1,11 @@
 @import "bootstrap";
 
 body {
-  padding-top: @navbarHeight + 20px;
-  padding-bottom: 40px;
+  padding-top: @navbar-height + 10px;
 }
 
-@import "responsive";
 @import "bootstrap-variables";
 
-.sidebar-nav {
-  padding: 9px 0;
-}
-
 .page-header {
   a.btn {
     float: right;
@@ -21,3 +15,9 @@ body {
     margin-right: 8px;
   }
 }
+
+input[type="radio"], input[type="checkbox"] {
+  width: initial;
+  height: initial;
+  margin-top: 7px;
+}

data/lib/generators/bootstrap/install/templates/assets/stylesheets/{fluid.css.scss → starter.scss}

@@ -2,14 +2,7 @@
 @import "bootstrap.scss";
 
 body {
-  padding-top: $navbarHeight + 20px;
-  padding-bottom: 40px;
-}
-
-@import "responsive";
-
-.sidebar-nav {
-  padding: 9px 0;
+  padding-top: $navbar-height + 10px;
 }
 
 .page-header {
@@ -21,3 +14,9 @@ body {
     margin-right: 8px;
   }
 }
+
+input[type="radio"], input[type="checkbox"] {
+  width: initial;
+  height: initial;
+  margin-top: 7px;
+}

data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.erb

@@ -1,8 +1,8 @@
 <%%= form_for(@<%= singular_table_name %>, :html => { :class => "form-horizontal" }) do |f| %>
   <%% if @<%= singular_table_name %>.errors.any? %>
-    <div class="alert alert-error">
-      <a class="close" data-dismiss="alert" href="#">×</a>
-      <h4 class="alert-heading"><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h4>
+    <div class="alert alert-danger alert-dismissable">
+      <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+      <h4><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h4>
 
       <ul>
       <%% @<%= singular_table_name %>.errors.full_messages.each do |msg| %>
@@ -13,14 +13,16 @@
   <%% end %>
 
 <% attributes.each do |attribute| -%>
-  <div class="control-group">
-    <%%= f.label :<%= attribute.name %>, :class => "control-label" %>
-    <div class="controls">
-      <%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :class => "input-xxlarge" %>
+  <div class="form-group">
+    <%%= f.label :<%= attribute.name %>, :class => "col-lg-2 control-label" %>
+    <div class="col-lg-10">
+      <%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :class => "form-control" %>
     </div>
   </div>
 <% end -%>
-  <div class="form-actions">
-    <%%= f.submit :class => "btn btn-primary" %>
+  <div class="form-group">
+    <div class="col-lg-offset-2 col-lg-10">
+      <%%= f.submit :class => "btn btn-primary" %>
+    </div>
   </div>
 <%% end %>

data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.haml

@@ -1,7 +1,7 @@
 = form_for @<%= singular_table_name %>, :html => { :class => "form-horizontal" } do |f|
   -if @<%= singular_table_name %>.errors.any?
-    .alert.alert-error
-      %a.close{:href => "#", :"data-dismiss" => "alert"} ×
+    .alert.alert-danger.alert-dismissable
+      %button.close{"aria-hidden" => "true", "data-dismiss" => "alert", :type => "button"} &times;
       %h4= "#{pluralize(@<%= singular_table_name %>.errors.count, "error")} prohibited this <%= singular_table_name %> from being saved:"
 
       %ul
@@ -9,10 +9,11 @@
           %li= msg
 
 <% for attribute in attributes -%>
-  .control-group
-    = f.label :<%= attribute.name %>, :class => 'control-label'
-    .controls
-      = f.<%= attribute.field_type %> :<%= attribute.name %>, :class => 'input-xxlarge'
+  .form-group
+    = f.label :<%= attribute.name %>, :class => 'col-lg-2 control-label'
+    .col-lg-10
+      = f.<%= attribute.field_type %> :<%= attribute.name %>, :class => 'form-control'
 <% end -%>
-  .actions
-    = f.submit :class => 'btn btn-primary'
+  .form-group
+    .col-lg-offset-2 col-lg-10
+      = f.submit :class => 'btn btn-primary'

data/lib/generators/bootstrap/install/templates/layouts/starter.html.erb

@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Starter Template for Bootstrap</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+  <meta name="description" content="">
+  <meta name="author" content="">
+
+  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+  <!--[if lt IE 9]>
+    <%%= javascript_include_tag "bootstrap-ie" %>
+  <![endif]-->
+
+  <%%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
+  <%%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+  <%%= csrf_meta_tags %>
+</head>
+<body>
+  <div class="navbar navbar-inverse navbar-fixed-top">
+    <div class="container">
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <%%= link_to "Project name", "#", :class => "navbar-brand" %>
+      </div>
+      <div class="collapse navbar-collapse">
+        <ul class="nav navbar-nav">
+          <li class="active"><a href="#">Home</a></li>
+          <li><a href="#about">About</a></li>
+          <li><a href="#contact">Contact</a></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+  <div class="container">
+    <%% flash.each do |name, msg| %>
+      <%%= content_tag :div, :class => "alert alert-#{ name == :error ? "danger" : "success" } alert-dismissable" do %>
+        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+        <%%= msg %>
+      <%% end %>
+    <%% end %>
+
+    <%%= yield %>
+  </div>
+</body>
+</html>

data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/edit.html.erb

@@ -1,10 +1,10 @@
 <div class="page-header">
-  <%%= link_to <%= index_helper %>_path, :class => 'btn' do %>
-    <i class="icon-list-alt"></i>
+  <%%= link_to <%= index_helper %>_path, :class => 'btn btn-default' do %>
+    <span class="glyphicon glyphicon-list-alt"></span>
     Back
   <%% end %>
   <%%= link_to @<%= singular_table_name %>, :class => 'btn btn-primary' do %>
-    <i class="icon-info-sign icon-white"></i>
+    <span class="glyphicon glyphicon-info-sign"></span>
     Show
   <%% end %>
   <h1>Editing <%= singular_table_name %></h1>

data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/index.html.erb

@@ -1,33 +1,33 @@
 <div class="page-header">
   <%%= link_to new_<%= singular_table_name %>_path, :class => 'btn btn-primary' do %>
-    <i class="icon-plus icon-white"></i>
+    <span class="glyphicon glyphicon-plus"></span>
     New <%= human_name %>
   <%% end %>
   <h1>Listing <%= plural_table_name %></h1>
 </div>
 
-<table class="table table-bordered table-striped">
-  <thead>
-    <tr>
-<% attributes.each do |attribute| -%>
-      <th><%= attribute.human_name %></th>
-<% end -%>
-      <th></th>
-      <th></th>
-      <th></th>
-    </tr>
-  </thead>
+<div class="table-responsive">
+  <table class="table table-striped table-bordered table-hover">
+    <thead>
+      <tr>
+    <% attributes.each do |attribute| -%>
+        <th><%= attribute.human_name %></th>
+    <% end -%>
+        <th></th>
+        <th></th>
+        <th></th>
+      </tr>
+    </thead>
 
-  <tbody>
-<%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
-    <tr>
-<% attributes.each do |attribute| -%>
-      <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
-<% end -%>
-      <td><%%= link_to 'Show', <%= singular_table_name %> %></td>
-      <td><%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
-      <td><%%= link_to 'Destroy', <%= singular_table_name %>, data: { confirm: 'Are you sure?' }, method: :delete %></td>
-    </tr>
-<%% end %>
-  </tbody>
-</table>
+    <tbody>
+      <%%= content_tag_for(:tr, @<%= plural_table_name %>) do |<%= singular_table_name %>| %>
+    <% attributes.each do |attribute| -%>
+        <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
+    <% end -%>
+        <td><%%= link_to 'Show', <%= singular_table_name %> %></td>
+        <td><%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
+        <td><%%= link_to 'Destroy', <%= singular_table_name %>, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      <%% end %>
+    </tbody>
+  </table>
+</div>

data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/new.html.erb

@@ -1,6 +1,6 @@
 <div class="page-header">
-  <%%= link_to <%= index_helper %>_path, :class => 'btn' do %>
-    <i class="icon-list-alt"></i>
+  <%%= link_to <%= index_helper %>_path, :class => 'btn btn-default' do %>
+    <span class="glyphicon glyphicon-list-alt"></span>
     Back
   <%% end %>
   <h1>New <%= singular_table_name %></h1>

data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/show.html.erb

@@ -1,16 +1,16 @@
 <div class="page-header">
-  <%%= link_to <%= index_helper %>_path, :class => 'btn' do %>
-    <i class="icon-list-alt"></i>
+  <%%= link_to <%= index_helper %>_path, :class => 'btn btn-default' do %>
+    <span class="glyphicon glyphicon-list-alt"></span>
     Back
   <%% end %>
   <%%= link_to edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), :class => 'btn btn-primary' do %>
-    <i class="icon-pencil icon-white"></i>
+    <span class="glyphicon glyphicon-pencil"></span>
     Edit
   <%% end %>
-  <h1>Listing <%= plural_table_name %></h1>
+  <h1>Show <%= singular_table_name %></h1>
 </div>
 
-<dl>
+<dl class="dl-horizontal">
   <%- attributes.each do |attribute| -%>
   <dt><%= attribute.human_name %>:</dt>
   <dd><%%= @<%= singular_table_name %>.<%= attribute.name %> %></dd>

data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/edit.html.haml

@@ -1,9 +1,9 @@
 .page-header
-  = link_to <%= index_helper %>_path, :class => 'btn' do
-    %i.icon-list-alt
+  = link_to <%= index_helper %>_path, :class => 'btn btn-default' do
+    %span.glyphicon.glyphicon-list-alt
     Back
   = link_to @<%= singular_table_name %>, :class => 'btn btn-primary' do
-    %i.icon-info-sign.icon-white
+    %span.glyphicon.glyphicon-info-sign
     Show
   %h1 Editing <%= singular_table_name %>
 

data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/index.html.haml

@@ -1,25 +1,26 @@
 .page-header
   = link_to new_<%= singular_table_name %>_path, :class => 'btn btn-primary' do
-    %i.icon-plus.icon-white
+    %span.glyphicon.glyphicon-plus
     New <%= human_name %>
   %h1 Listing <%= plural_table_name %>
 
-%table.table.table-bordered.table-striped
-  %thead
-    %tr
-<% for attribute in attributes -%>
-      %th <%= attribute.human_name %>
-<% end -%>
-      %th
-      %th
-      %th
-
-  %tbody
-    - @<%= plural_table_name %>.each do |<%= singular_table_name %>|
+.table-responsive
+  %table.table.table-striped.table-bordered.table-hover
+    %thead
       %tr
-<% for attribute in attributes -%>
-        %td= <%= singular_table_name %>.<%= attribute.name %>
-<% end -%>
-        %td= link_to 'Show', <%= singular_table_name %>
-        %td= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>)
-        %td= link_to 'Destroy', <%= singular_table_name %>, :data => { confirm: 'Are you sure?' }, :method => :delete
+  <% for attribute in attributes -%>
+        %th <%= attribute.human_name %>
+  <% end -%>
+        %th
+        %th
+        %th
+
+    %tbody
+      - @<%= plural_table_name %>.each do |<%= singular_table_name %>|
+        %tr
+  <% for attribute in attributes -%>
+          %td= <%= singular_table_name %>.<%= attribute.name %>
+  <% end -%>
+          %td= link_to 'Show', <%= singular_table_name %>
+          %td= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>)
+          %td= link_to 'Destroy', <%= singular_table_name %>, :data => { confirm: 'Are you sure?' }, :method => :delete

data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/new.html.haml

@@ -1,6 +1,6 @@
 .page-header
-  = link_to <%= index_helper %>_path, :class => 'btn' do
-    %i.icon-list-alt
+  = link_to <%= index_helper %>_path, :class => 'btn btn-default' do
+    %span.glyphicon.glyphicon-list-alt
     Back
   %h1 New <%= singular_table_name %>
 

data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/show.html.haml

@@ -1,13 +1,13 @@
 .page-header
-  = link_to <%= index_helper %>_path, :class => 'btn' do
-    %i.icon-list-alt
+  = link_to <%= index_helper %>_path, :class => 'btn btn-default' do
+    %span.glyphicon.glyphicon-list-alt
     Back
   = link_to edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), :class => 'btn btn-primary' do
-    %i.icon-pencil.icon-white
+    %span.glyphicon.glyphicon-pencil
     Edit
-  %h1 Listing <%= plural_table_name %>
+  %h1 Show <%= singular_table_name %>
 
-%dl
+%dl.dl-horizontal
   <%- for attribute in attributes -%>
   %dt <%= attribute.human_name %>:
   %dd= @<%= singular_table_name %>.<%= attribute.name %>

data/readme-template.md.erb

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/decioferreira/bootstrap-generators.png?branch=master)](https://travis-ci.org/decioferreira/bootstrap-generators)
 
-Bootstrap-generators provides [Twitter Bootstrap](http://twitter.github.com/bootstrap/) generators for Rails 4 (supported Rails >= 3.1). Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
+Bootstrap-generators provides [Twitter Bootstrap](http://twitter.github.com/bootstrap/) generators for Rails 4 (supported Rails >= 3.1). Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites. Checkout http://decioferreira.github.com/bootstrap-generators.
 
 ## Current Twitter Bootstrap version
 
@@ -18,14 +18,6 @@ Or you can install from latest build:
 
     gem 'bootstrap-generators', :git => 'git://github.com/decioferreira/bootstrap-generators.git'
 
-By default Bootstrap Generators requires [SimpleForm 2.0](https://github.com/plataformatec/simple_form). Add the dependency on your Gemfile:
-
-    gem 'simple_form'
-
-If you don't want to use SimpleForm, just pass the `--form_builder=form_builder` option:
-
-    rails generate bootstrap:install --form_builder=form_builder
-
 Run bundle install:
 
     bundle install
@@ -40,7 +32,7 @@ Once you've done that, any time you generate a controller or scaffold, you'll ge
 
 ### Give it a try
 
-    rails generate scaffold post title:string body:text published:boolean
+    rails generate scaffold post title body:text published:boolean
 
 You can easily customize colors, grid system, fonts, and much more by editing `bootstrap-variables.[less|scss]` on your application assets folder.
 
@@ -51,10 +43,6 @@ To print the options and usage run the command `rails generate bootstrap:install
     rails generate bootstrap:install [options]
 
     Options:
-          [--layout=LAYOUT]                         # Bootstrap layout templates (hero or fluid)
-                                                    # Default: hero
-          [--form-builder=FORM_BUILDER]             # Select your form builder (simple_form or form_builder)
-                                                    # Default: simple_form
       -e, [--template-engine=TEMPLATE_ENGINE]       # Indicates when to generate template engine
                                                     # Default: erb
       -se, [--stylesheet-engine=STYLESHEET_ENGINE]  # Indicates when to generate stylesheet engine
@@ -70,33 +58,6 @@ To print the options and usage run the command `rails generate bootstrap:install
 
 ### Options
 
-#### Layouts
-
-There are the two available layouts, based on Bootstrap's quick-start examples:
-
-* [Basic marketing site](http://getbootstrap.com/<%= bootstrap_version %>/examples/hero.html) (default)
-* [Fluid layout](http://getbootstrap.com/<%= bootstrap_version %>/examples/fluid.html)
-
-To select one of these layouts just pass the option `--layout=LAYOUT` to the install generator.
-
-#### Form builders
-
-* SimpleForm
-
-By default Bootstrap Generators requires SimpleForm 2.0. Add the dependency on your Gemfile:
-
-    gem 'simple_form'
-
-And then run:
-
-    rails generate bootstrap:install --form_builder=simple_form
-
-* Default Rails form builder
-
-If you don't want to use SimpleForm, just pass the `--form_builder=form_builder` option:
-
-    rails generate bootstrap:install --form_builder=form_builder
-
 #### Template engines
 
 Supported template engines:
@@ -104,8 +65,6 @@ Supported template engines:
 * ERB
 * Haml
 
-##### Haml
-
 Add the dependency on your Gemfile:
 
     gem 'haml-rails'
@@ -122,8 +81,6 @@ Supported stylesheet engines:
 * SCSS
 * LESS
 
-##### SCSS
-
 Make sure you have `sass-rails` dependency on your Gemfile:
 
     gem 'sass-rails'
@@ -134,10 +91,11 @@ And then run:
 
 Now you can customize the look and feel of Bootstrap.
 
-##### LESS
+* LESS
 
 Add the dependency on your Gemfile:
 
+    gem 'therubyracer', platforms: :ruby
     gem 'less-rails'
 
 And then run:
@@ -152,7 +110,7 @@ Now you can customize the look and feel of Bootstrap.
 
 ### Customize and extend Bootstrap
 
-In Rails 3.0 and above, generators don’t just look in the source root for templates, they also search for templates in other paths. And one of them is lib/templates.
+If you select LESS or SCSS as your stylesheet engine, you will get an `app/assets/stylesheets/bootstrap-variables.[less|scss]` file with all of the default variables of Bootstrap. This way you can customize the look and feel of Bootstrap without having to download any extra file.
 
 ### Javascript
 
@@ -174,6 +132,5 @@ Since Bootstrap Generators installs its templates under lib/templates, you can g
 
 * [Twitter Bootstrap](http://twitter.github.com/bootstrap)
 * [Twitter Bootstrap - Sass Conversion](https://github.com/jlong/sass-twitter-bootstrap)
-* [SimpleForm](https://github.com/plataformatec/simple_form)
 
 [customize]: #customize