twitter-bootstrap-rails 2.2.3 → 3.2.2

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

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

@@ -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.erb

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

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

@@ -1,4 +1,4 @@
 - model_class = <%= resource_name.classify %>
 .page-header
-  %h1=t '.title', :default => t('helpers.titles.edit', :model => model_class.model_name.human, :default => "Edit #{model_class.model_name.human}")
+  %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/edit.html.slim

@@ -1,4 +1,4 @@
 - model_class = <%= resource_name.classify %>
-div class="page-header"
-  h1=t '.title', :default => t('helpers.titles.edit', :model => model_class.model_name.human, :default => "Edit #{model_class.model_name.human}")
+.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

@@ -1,6 +1,6 @@
 <%%- model_class = <%= resource_name.classify %> -%>
 <div class="page-header">
-  <h1><%%=t '.title', :default => model_class.model_name.human.pluralize %></h1>
+  <h1><%%=t '.title', :default => model_class.model_name.human.pluralize.titleize %></h1>
 </div>
 <table class="table table-striped">
   <thead>
@@ -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

@@ -1,6 +1,6 @@
 - model_class = <%= resource_name.classify %>
 .page-header
-  %h1=t '.title', :default => model_class.model_name.human.pluralize
+  %h1=t '.title', :default => model_class.model_name.human.pluralize.titleize
 %table.table.table-striped
   %thead
     %tr
@@ -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

@@ -1,7 +1,7 @@
 - model_class = <%= resource_name.classify %>
-div class="page-header"
-  h1=t '.title', :default => model_class.model_name.human.pluralize
-table class="table table-striped"
+.page-header
+  h1=t '.title', :default => model_class.model_name.human.pluralize.titleize
+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.erb

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

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

@@ -1,4 +1,4 @@
 - model_class = <%= resource_name.classify %>
 .page-header
-  %h1=t '.title', :default => t('helpers.titles.new', :model => model_class.model_name.human, :default => "New #{model_class.model_name.human}")
+  %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/new.html.slim

@@ -1,4 +1,4 @@
 - model_class = <%= resource_name.classify %>
-div class="page-header"
-  h1=t '.title', :default => t('helpers.titles.new', :model => model_class.model_name.human, :default => "New #{model_class.model_name.human}")
+.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

@@ -1,6 +1,6 @@
 <%%- model_class = <%= resource_name.classify %> -%>
 <div class="page-header">
-  <h1><%%=t '.title', :default => model_class.model_name.human %></h1>
+  <h1><%%=t '.title', :default => model_class.model_name.human.titleize %></h1>
 </div>
 
 <dl class="dl-horizontal">
@@ -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

@@ -1,6 +1,6 @@
 - model_class = <%= resource_name.classify %>
 .page-header
-  %h1=t '.title', :default => model_class.model_name.human
+  %h1=t '.title', :default => model_class.model_name.human.titleize
 
 <%- columns.each do |column| -%>
 %p
@@ -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

@@ -1,6 +1,6 @@
 - model_class = <%= resource_name.classify %>
-div class="page-header"
-  h1=t '.title', :default => model_class.model_name.human
+.page-header
+  h1=t '.title', :default => model_class.model_name.human.titleize
 
 <%- columns.each do |column| -%>
 p
@@ -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

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

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

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

@@ -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
@@ -61,7 +61,7 @@ module Bootstrap
       end
 
       def excluded_columns_names
-        %w[id created_at updated_at]
+        %w[_id _type id created_at updated_at]
       end
 
       def excluded_columns_pattern
@@ -82,7 +82,7 @@ module Bootstrap
       end
 
       def retrieve_columns
-        if defined?(ActiveRecord) == "constant" && ActiveRecord.class == Class 
+        if defined?(ActiveRecord) == "constant" && ActiveRecord.class == Module 
           rescue_block ActiveRecord::StatementInvalid do
             @model_name.constantize.columns
           end

data/lib/twitter-bootstrap-rails.rb

@@ -1,9 +1,9 @@
 module Twitter
   module Bootstrap
-      module Rails
-        require 'twitter/bootstrap/rails/engine' if defined?(Rails)
-      end
-   end
+    module Rails
+      require 'twitter/bootstrap/rails/engine' if defined?(Rails)
+    end
+  end
 end
 
 #require 'less-rails'

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

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

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

@@ -1,8 +1,11 @@
 require 'rails'
 
-require File.dirname(__FILE__) + '/twitter-bootstrap-breadcrumbs.rb'
-require File.dirname(__FILE__) + '/../../../../app/helpers/flash_block_helper.rb'
-require File.dirname(__FILE__) + '/../../../../app/helpers/modal_helper.rb'
+require_relative 'breadcrumbs.rb'
+require_relative '../../../../app/helpers/flash_block_helper.rb'
+require_relative '../../../../app/helpers/modal_helper.rb'
+require_relative '../../../../app/helpers/navbar_helper.rb'
+require_relative '../../../../app/helpers/bootstrap_flash_helper.rb'
+require_relative '../../../../app/helpers/form_errors_helper.rb'
 
 module Twitter
   module Bootstrap
@@ -18,11 +21,18 @@ module Twitter
 
         initializer 'twitter-bootstrap-rails.setup_helpers' do |app|
           app.config.to_prepare do
-            ActionController::Base.send :include, BreadCrumbs
-            ActionController::Base.send :helper, FlashBlockHelper
-            ActionController::Base.send :helper, ModalHelper
-            #ActionController::Base.send :helper_method, :render_breadcrumbs
+            ActionController::Base.send :include, Breadcrumbs
           end
+          [FlashBlockHelper,
+          BootstrapFlashHelper,
+          ModalHelper,
+          NavbarHelper,
+          BadgeLabelHelper].each do |h|
+            app.config.to_prepare do
+              ActionController::Base.send :helper, h
+            end
+          end
+          ActionView::Helpers::FormBuilder.send :include, FormErrorsHelper
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module Twitter
   module Bootstrap
     module Rails
-      VERSION = "2.2.3"
+      VERSION = "3.2.2"
     end
   end
 end