RubyGems - twitter-bootstrap-rails - Versions diffs - 2.2.8 → 3.2.2 - Mend

twitter-bootstrap-rails 2.2.8 → 3.2.2

Potentially problematic release.

This version of twitter-bootstrap-rails might be problematic. Click here for more details.

Files changed (189) hide show

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

@@ -7,11 +7,6 @@
     <title><%%= content_for?(:title) ? yield(:title) : "<%= app_name %>" %></title>
     <%%= csrf_meta_tags %>
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-      <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js" type="text/javascript"></script>
-    <![endif]-->
     <%%= stylesheet_link_tag "application", :media => "all" %>
     <!-- For third-generation iPad with high-resolution Retina display: -->
@@ -35,34 +30,41 @@
     <%%= favicon_link_tag 'favicon.ico', :rel => 'shortcut icon' %>
     <%%= javascript_include_tag "application" %>
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js" type="text/javascript"></script>
+    <![endif]-->
   </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 CHANGED Viewed

@@ -6,9 +6,6 @@
     %meta(name="viewport" content="width=device-width, initial-scale=1.0")
     %title= content_for?(:title) ? yield(:title) : "<%= app_name %>"
     = csrf_meta_tags
-    / Le HTML5 shim, for IE6-8 support of HTML elements
-    /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"
     = stylesheet_link_tag "application", :media => "all"
     = favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144'
     = favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114'
@@ -16,43 +13,32 @@
     = favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png'
     = favicon_link_tag 'favicon.ico', :rel => 'shortcut icon'
     = javascript_include_tag "application"
+    / Le HTML5 shim, for IE6-8 support of HTML elements
+    /[if lt IE 9]
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"
   %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"
-    .<%= container_class %>
-    <%- if layout_type == "fluid" -%>
+    .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"
-      .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 CHANGED Viewed

@@ -6,10 +6,6 @@ html lang="en"
     meta name="viewport" content="width=device-width, initial-scale=1.0"
     title= content_for?(:title) ? yield(:title) : "<%= app_name %>"
     = csrf_meta_tags
-    /! Le HTML5 shim, for IE6-8 support of HTML elements
-    /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"
     = stylesheet_link_tag "application", :media => "all"
     = favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144'
     = favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114'
@@ -17,44 +13,31 @@ html lang="en"
     = favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png'
     = favicon_link_tag 'favicon.ico', :rel => 'shortcut icon'
     = javascript_include_tag "application"
+    /! Le HTML5 shim, for IE6-8 support of HTML elements
+    /[if lt IE 9]
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"
   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 +45,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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,16 +1,36 @@
-<%%= form_for @<%= resource_name %>, :html => { :class => 'form-horizontal' } do |f| %>
-  <%- 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 %>' %>
+<%%= 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="form-group">
+    <%%= f.label :<%= column.name %>, :class => 'control-label col-lg-2' %>
+    <div class="col-lg-10">
+      <%%= f.<%= column.field_type %> :<%= column.name %>, :class => 'form-control' %>
     </div>
+    <%%=f.error_span(:<%= 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 class="form-group">
+    <div class="col-lg-offset-2 col-lg-10">
+      <%%= f.submit nil, :class => 'btn btn-primary' %>
+      <%%= link_to t('.cancel', :default => t("helpers.links.cancel")),
+                <%= controller_routing_path %>_path, :class => 'btn btn-default' %>
+    </div>
   </div>
 <%% end %>

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

@@ -1,10 +1,12 @@
-= 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'
-    .controls
-      = f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>'
+  .form-group
+    = f.label :<%= column.name %>, class: 'control-label col-lg-2'
+    .col-lg-10
+      = f.<%= column.field_type %> :<%= column.name %>, class: 'form-control', required: true
+    = f.error_span(:<%= 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'
+  .form-group
+    .col-lg-offset-2.col-lg-10
+      = 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 CHANGED Viewed

@@ -1,11 +1,13 @@
-= 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'
-    .controls
-      = f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>'
+  .form-group
+    = f.label :<%= column.name %>, :class => 'control-label col-lg-2'
+    .col-lg-10
+      = f.<%= column.field_type %> :<%= column.name %>, :class => 'form-control'
+    = f.error_span(:<%= 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'
+  .form-group
+    .col-lg-offset-2.col-lg-10
+      = 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/edit.html.slim CHANGED Viewed

@@ -1,4 +1,4 @@
 - model_class = <%= resource_name.classify %>
-div class="page-header"
+.page-header
   h1=t '.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize
 = render :partial => "form"

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

@@ -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 CHANGED Viewed

@@ -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'

data/lib/generators/bootstrap/themed/templates/index.html.slim CHANGED Viewed

@@ -1,7 +1,7 @@
 - model_class = <%= resource_name.classify %>
-div class="page-header"
+.page-header
   h1=t '.title', :default => model_class.model_name.human.pluralize.titleize
-table class="table table-striped"
+table.table.table-striped
   thead
     tr
       th= model_class.human_attribute_name(:id)
@@ -19,9 +19,8 @@ table class="table table-striped"
         <%- 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('.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-mini btn-danger'
+          = 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'

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

@@ -1,4 +1,4 @@
 - model_class = <%= resource_name.classify %>
-div class="page-header"
+.page-header
   h1=t '.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize
 = render :partial => "form"

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

@@ -10,14 +10,12 @@
 <%- end -%>
 </dl>
-<div class="form-actions">
-  <%%= link_to t('.back', :default => t("helpers.links.back")),
-              <%= controller_routing_path %>_path, :class => 'btn'  %>
-  <%%= link_to t('.edit', :default => t("helpers.links.edit")),
-              edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn' %>
-  <%%= link_to t('.destroy', :default => t("helpers.links.destroy")),
+<%%= link_to t('.back', :default => t("helpers.links.back")),
+              <%= controller_routing_path %>_path, :class => 'btn btn-default'  %>
+<%%= link_to t('.edit', :default => t("helpers.links.edit")),
+              edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn btn-default' %>
+<%%= 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-danger' %>
-</div>

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

@@ -9,7 +9,7 @@
   = @<%= resource_name %>.<%= column.name %>
 <%- end -%>
-.form-actions
-  = link_to t('.back', :default => t("helpers.links.back")), <%= controller_routing_path %>_path, :class => 'btn'
-  = link_to t('.edit', :default => t("helpers.links.edit")), edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn'
-  = 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-danger'
+= link_to t('.back', :default => t("helpers.links.back")), <%= controller_routing_path %>_path, :class => 'btn btn-default'
+= link_to t('.edit', :default => t("helpers.links.edit")), edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn btn-default'
+= 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-danger'

data/lib/generators/bootstrap/themed/templates/show.html.slim CHANGED Viewed

@@ -1,5 +1,5 @@
 - model_class = <%= resource_name.classify %>
-div class="page-header"
+.page-header
   h1=t '.title', :default => model_class.model_name.human.titleize
 <%- columns.each do |column| -%>
@@ -9,9 +9,8 @@ p
   = @<%= resource_name %>.<%= column.name %>
 <%- end -%>
-.form-actions
-  = link_to t('.back', :default => t("helpers.links.back")), <%= controller_routing_path %>_path, :class => 'btn'
-  '
-  = link_to t('.edit', :default => t("helpers.links.edit")), edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn'
-  '
-  = 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-danger'
+= link_to t('.back', :default => t("helpers.links.back")), <%= controller_routing_path %>_path, :class => 'btn btn-default'
+'
+= link_to t('.edit', :default => t("helpers.links.edit")), edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn btn-default'
+'
+= 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-danger'

data/lib/generators/bootstrap/themed/templates/simple_form/_form.html.erb CHANGED Viewed

@@ -1,14 +1,14 @@
 <%%= simple_form_for @<%= resource_name %>, :html => { :class => 'form-horizontal' } do |f| %>
   <%- columns.each do |column| -%>
   <%%= f.input :<%= column.name %> %>
+  <%%= error_span(@<%= resource_name %>[:<%= column.name %>]) %>
   <%- end -%>
   <%- if ::SimpleForm::FormBuilder.instance_methods.include?(:wrapped_button) -%>
   <%%= f.button :wrapped, :cancel => <%= controller_routing_path %>_path %>
   <%- else -%>
-  <div class="form-actions">
-    <%%= f.button :submit, :class => 'btn-primary' %>
-    <%%= link_to t('.cancel', :default => t("helpers.links.cancel")),
-                <%= controller_routing_path %>_path, :class => 'btn' %>
-  </div>
+  <%%= f.button :submit, :class => 'btn-primary' %>
+  <%%= link_to t('.cancel', :default => t("helpers.links.cancel")),
+                <%= controller_routing_path %>_path, :class => 'btn btn-default' %>
   <%- end -%>
 <%% end %>

data/lib/generators/bootstrap/themed/templates/simple_form/_form.html.haml CHANGED Viewed

@@ -1,11 +1,11 @@
 = simple_form_for @<%= resource_name %>, :html => { :class => 'form-horizontal' } do |f|
 <%- columns.each do |column| -%>
   = f.input :<%= column.name %>
+  = f.error_span :<%= column.name %>
 <%- end -%>
 <%- if ::SimpleForm::FormBuilder.instance_methods.include?(:wrapped_button) -%>
   = f.button :wrapped, :cancel => <%= controller_routing_path %>_path
 <%- else -%>
-  .form-actions
-    = f.button :submit, :class => 'btn-primary'
-    = link_to t('.cancel', :default => t("helpers.links.cancel")), <%= controller_routing_path %>_path, :class => 'btn'
+  = f.button :submit, :class => '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/simple_form/_form.html.slim CHANGED Viewed

@@ -1,12 +1,12 @@
 = simple_form_for @<%= resource_name %>, :html => { :class => "form-horizontal" } do |f|
 <%- columns.each do |column| -%>
   = f.input :<%= column.name %>
+  = error_span(@<%= resource_name %>[:<%= column.name %>])
 <%- end -%>
 <%- if ::SimpleForm::FormBuilder.instance_methods.include?(:wrapped_button) -%>
   = f.button :wrapped, :cancel => <%= controller_routing_path %>_path
 <%- else -%>
-  .form-actions
-    = f.button :submit, :class => 'btn-primary'
-    '
-    = link_to t('.cancel', :default => t("helpers.links.cancel")), <%= controller_routing_path %>_path, :class => 'btn'
+  = f.button :submit, :class => '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/themed_generator.rb CHANGED Viewed

@@ -31,11 +31,11 @@ module Bootstrap
       end
       def controller_routing_path
-        @controller_routing_path
+        ActiveModel::Naming.route_key(@model_name.constantize)
       end
       def singular_controller_routing_path
-        @controller_routing_path.singularize
+        ActiveModel::Naming.singular_route_key(@model_name.constantize)
       end
       def model_name

data/lib/twitter/bootstrap/rails/breadcrumbs.rb ADDED Viewed

@@ -0,0 +1,69 @@
+module Twitter
+  module Bootstrap
+    # Keep current method calls as is using aliases
+    module Breadcrumbs
+      extend ActiveSupport::Concern
+      included do
+        # Used to provide compatibility with breadcrumbs-on-rails gem, if detected
+        # breadcrumbs controller methods won't be overridden.
+        if defined?(::BreadcrumbsOnRails)
+          ::Rails.logger.info <<-EOT.squish
+          BreadcrumbsOnRails detected it won't be overridden. To use methods from this gem you need to call them
+          using bootstrap prefix i.e. add_bootstrap_breadcrumb and render_bootstrap_breadcrumbs.
+          EOT
+        else
+          # Provide backward compatibility with existing code
+          alias_method :add_breadcrumb, :add_bootstrap_breadcrumb
+          class << self
+            alias_method :add_breadcrumb, :add_bootstrap_breadcrumb
+          end
+        end
+      end
+      module ClassMethods
+        def add_bootstrap_breadcrumb(name, url = '', options = {})
+          options.merge! :klass => self.name
+          before_filter options do |controller|
+            controller.send :add_bootstrap_breadcrumb, name, url, options
+          end
+        end
+      end
+      protected
+      def add_bootstrap_breadcrumb(name, url = '', options = {})
+        @__bs_breadcrumbs ||= []
+        class_name = options.delete(:klass) || self.class.name
+        if name.is_a? Symbol
+          if url.blank?
+            url_helper = :"#{name}_path"
+            url = url_helper if respond_to?(url_helper)
+          end
+          name = translate_breadcrumb name, class_name
+        end
+        unless name.is_a? String
+          url = polymorphic_path name if url.blank?
+          name = name.to_s
+        end
+        url = eval(url.to_s) if url.is_a?(Symbol) && url =~ /_path|_url|@/
+        @__bs_breadcrumbs << {:name => name, :url => url, :options => options}
+      end
+      def translate_breadcrumb(name, class_name)
+        scope = [:breadcrumbs]
+        namespace = class_name.underscore.split('/')
+        namespace.last.sub!('_controller', '')
+        scope += namespace
+        I18n.t name, :scope => scope
+      end
+    end
+  end
+end