twitter-bootstrap-rails 2.2.3 → 2.2.4

data/README.md

@@ -307,6 +307,7 @@ for handling flash messages, even if those messages are blank. See https://githu
   <li>Released gem v.2.2.1 (minor fixes and updates)</li>
   <li>Released gem v.2.2.2 (Bootstrap 2.3.0)</li>
   <li>Released gem v.2.2.3 (Minor fixes)</li>
+  <li>Released gem v.2.2.4 (Minor fixes)</li>
 
 </ul>
 

data/app/helpers/bootstrap_flash_helper.rb

@@ -1,15 +1,22 @@
 module BootstrapFlashHelper
+  ALERT_TYPES = [:error, :info, :success, :warning]
+
   def bootstrap_flash
     flash_messages = []
     flash.each do |type, message|
       # Skip empty messages, e.g. for devise messages set to nothing in a locale file.
       next if message.blank?
+      
       type = :success if type == :notice
       type = :error   if type == :alert
-      text = content_tag(:div,
-               content_tag(:button, raw("×"), :class => "close", "data-dismiss" => "alert") +
-               message, :class => "alert fade in alert-#{type}")
-      flash_messages << text if message
+      next unless ALERT_TYPES.include?(type)
+
+      Array(message).each do |msg|
+        text = content_tag(:div,
+                           content_tag(:button, raw("&times;"), :class => "close", "data-dismiss" => "alert") +
+                           msg, :class => "alert fade in alert-#{type}")
+        flash_messages << text if message
+      end
     end
     flash_messages.join("\n").html_safe
   end

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

@@ -7,7 +7,7 @@ en:
     links:
       back: "Back"
       cancel: "Cancel"
-      confirm: "Confirm"
+      confirm: "Are you sure?"
       destroy: "Delete"
       new: "New"
     titles:

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 %></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
 = 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}")
+  h1=t '.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human
 = render :partial => "form"

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 %></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
 = 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}")
+  h1=t '.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human
 = render :partial => "form"

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

@@ -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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter-bootstrap-rails
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70335346832680 !ruby/object:Gem::Requirement
+  requirement: &70247462427720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70335346832680
+  version_requirements: *70247462427720
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70335346830960 !ruby/object:Gem::Requirement
+  requirement: &70247462319320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70335346830960
+  version_requirements: *70247462319320
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70335346830560 !ruby/object:Gem::Requirement
+  requirement: &70247462316540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70335346830560
+  version_requirements: *70247462316540
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70335346829940 !ruby/object:Gem::Requirement
+  requirement: &70247462312840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70335346829940
+  version_requirements: *70247462312840
 - !ruby/object:Gem::Dependency
   name: less
-  requirement: &70335346829360 !ruby/object:Gem::Requirement
+  requirement: &70247462306720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335346829360
+  version_requirements: *70247462306720
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &70335346828540 !ruby/object:Gem::Requirement
+  requirement: &70247462302840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,7 +76,7 @@ dependencies:
         version: 0.11.1
   type: :development
   prerelease: false
-  version_requirements: *70335346828540
+  version_requirements: *70247462302840
 description: twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for
   Rails 3.1 Asset Pipeline
 email: