twitter-bootstrap-rails 3.2.0 → 5.0.0

data/app/assets/stylesheets/twitter-bootstrap-static/sprites.css.erb

@@ -1 +1 @@
-@font-face{font-family:'Glyphicons Halflings';src:url('twitter/fonts/glyphicons-halflings-regular.eot');src:url('twitter/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('twitter/fonts/glyphicons-halflings-regular.woff') format('woff'),url('twitter/fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('twitter/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}
+@font-face{font-family:'Glyphicons Halflings';src:url('<%= asset_path 'glyphicons-halflings-regular.eot' %>');src:url('<%= asset_path 'glyphicons-halflings-regular.eot?#iefix' %>') format('embedded-opentype'),url('<%= asset_path 'glyphicons-halflings-regular.woff' %>') format('woff'),url('<%= asset_path 'glyphicons-halflings-regular.ttf' %>') format('truetype'),url('<%= asset_path 'glyphicons-halflings-regular.svg#glyphicons-halflingsregular' %>') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}

data/app/helpers/bootstrap_flash_helper.rb

@@ -13,10 +13,15 @@ module BootstrapFlashHelper
       type = :danger  if type == :error
       next unless ALERT_TYPES.include?(type)
 
+      tag_class = options.extract!(:class)[:class]
+      tag_options = {
+        class: "alert fade in alert-#{type} #{tag_class}"
+      }.merge(options)
+
+      close_button = content_tag(:button, raw("×"), type: "button", class: "close", "data-dismiss" => "alert")
+
       Array(message).each do |msg|
-        text = content_tag(:div,
-                           content_tag(:button, raw("×"), :class => "close", "data-dismiss" => "alert") +
-                           msg, :class => "alert fade in alert-#{type} #{options[:class]}")
+        text = content_tag(:div, close_button + msg, tag_options)
         flash_messages << text if msg
       end
     end

data/app/helpers/form_errors_helper.rb

@@ -1,22 +1,22 @@
 module FormErrorsHelper
-
-  attr_reader :template
-  attr_reader :object
+  include ActionView::Helpers::FormTagHelper
 
   def error_span(attribute, options = {})
-    options[:class] ||= 'help-inline'
+    options[:span_class] ||= 'help-block'
+    options[:error_class] ||= 'has-error'
 
-    template.content_tag(
-      :span, self.errors_for(attribute),
-      :class => options[:class]
-    ) if self.errors_on?(attribute)
+    if errors_on?(attribute)
+      @template.content_tag( :div, :class => options[:error_class] )  do
+        content_tag( :span, errors_for(attribute), :class => options[:span_class] )
+      end
+    end
   end
 
   def errors_on?(attribute)
-    self.object.errors[attribute].present? if self.object.respond_to?(:errors)
+    object.errors[attribute].present? if object.respond_to?(:errors)
   end
 
   def errors_for(attribute)
-    self.object.errors[attribute].try(:join, ', ')
+    object.errors[attribute].try(:join, ', ') || object.errors[attribute].try(:to_s)
   end
-end
+end

data/app/helpers/glyph_helper.rb

@@ -8,12 +8,16 @@ module GlyphHelper
   # # => <i class="icon-thumbs-up pull-left"></i>
   # glyph(:lock, {tag: :span})
   # # => <span class="icon-lock"></span>
-  def glyph(*names, options)
-    names.map! { |name| name.to_s.gsub('_','-') }
+  # glyph(:lock, {class: 'foo'})
+  # # => <i class="icon-lock foo"></i>
+  def glyph(*names)
+    options = names.last.kind_of?(Hash) ? names.pop : {}
+    names.map! { |name| name.to_s.tr('_', '-') }
     names.map! do |name|
       name =~ /pull-(?:left|right)/ ? name : "glyphicon glyphicon-#{name}"
     end
     options[:tag] = options[:tag] ||= :i
-    content_tag options[:tag], nil, :class => names
+    names.push options[:class] || ''
+    content_tag options[:tag], nil, class: names
   end
 end

data/app/helpers/modal_helper.rb

@@ -1,18 +1,14 @@
 module ModalHelper
-  
-  def default_options
-    return {:id => 'modal', :size => '', :show_close => true, :dismiss => true}
-  end
 
   #modals have a header, a body, a footer for options.
   def modal_dialog(options = {}, &block)
-    opts = default_options.merge(options)
-    content_tag :div, :id => options[:id], :class => "bootstrap-modal modal fade" do
-      content_tag :div, :class => "modal-dialog #{opts['size']}" do
+    options = {:id => 'modal', :size => '', :show_close => true, :dismiss => true}.merge options
+    content_tag :div, :class => "bootstrap-modal modal fade", :id => options[:id] do
+      content_tag :div, :class => "modal-dialog #{options['size']}" do
         content_tag :div, :class => "modal-content" do
-          modal_header(opts, &block) +
-          modal_body(opts, &block) +
-          modal_footer(opts, &block) 
+          modal_header(options[:header], &block) +
+          modal_body(options[:body], &block) +
+          modal_footer(options[:footer], &block)
         end
       end
     end
@@ -20,12 +16,12 @@ module ModalHelper
 
   def modal_header(options, &block)
     content_tag :div, :class => 'modal-header' do
-      if options[:show_close] 
+      if options[:show_close]
         close_button(options[:dismiss]) +
         content_tag(:h4, options[:title], :class => 'modal-title', &block)
       else
         content_tag(:h4, options[:title], :class => 'modal-title', &block)
-      end   
+      end
     end
   end
 
@@ -38,7 +34,7 @@ module ModalHelper
   end
 
   def close_button(dismiss)
-    #It doesn't seem to like content_tag, so we do this instead.    
+    #It doesn't seem to like content_tag, so we do this instead.
     raw("<button class=\"close\" data-dismiss=\"#{dismiss}\" aria-hidden=\"true\">&times;</button>")
   end
 

data/app/helpers/navbar_helper.rb

@@ -17,8 +17,11 @@ module NavbarHelper
     path = name || path if block_given?
     options = args.extract_options!
     content_tag :li, :class => is_active?(path, options) do
-      name, path = path, options if block_given?
-      link_to name, path, options, &block
+      if block_given?
+        link_to path, options, &block
+      else
+        link_to name, path, options, &block
+      end 
     end
   end
 

data/app/helpers/twitter_breadcrumbs_helper.rb

@@ -1,5 +1,5 @@
 module TwitterBreadcrumbsHelper
-  def render_breadcrumbs(divider = '/', options={}, &block)
+  def render_bootstrap_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?
@@ -8,4 +8,7 @@ module TwitterBreadcrumbsHelper
       content
     end
   end
+
+  # Add backward compatible alias unless BC on rails present
+  alias_method :render_breadcrumbs, :render_bootstrap_breadcrumbs unless defined?(::BreadcrumbsOnRails)
 end

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

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

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

@@ -1,7 +1,6 @@
 /*
   =require twitter-bootstrap-static/bootstrap
 
-  Use Font Awesome icons (default)
-  To use Glyphicons sprites instead of Font Awesome, replace with "require twitter-bootstrap-static/sprites"
-  =require twitter-bootstrap-static/fontawesome
-  */
+  Static version of css will use Glyphicons sprites by default
+  =require twitter-bootstrap-static/sprites
+*/

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

@@ -1,20 +1,12 @@
 @import "twitter/bootstrap/bootstrap";
 
-// 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: 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
+// Glyphicons are not required by default, uncomment the following lines to enable them.
+//@glyphiconsEotPath: font-url("glyphicons-halflings-regular.eot");
+//@glyphiconsEotPath_iefix: font-url("glyphicons-halflings-regular.eot?#iefix");
+//@glyphiconsWoffPath: font-url("glyphicons-halflings-regular.woff");
+//@glyphiconsTtfPath: font-url("glyphicons-halflings-regular.ttf");
+//@glyphiconsSvgPath: font-url("glyphicons-halflings-regular.svg#glyphicons_halflingsregular");
+//
 //@import "twitter/bootstrap/glyphicons.less";
 
 // Your custom LESS stylesheets goes here

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

@@ -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,6 +30,11 @@
     <%%= 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>
 

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

@@ -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,6 +13,9 @@
     = 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

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

@@ -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,7 +13,9 @@ 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

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

@@ -1,6 +1,6 @@
 <%%= form_for @<%= resource_name %>, :html => { :class => "form-horizontal <%= resource_name %>" } do |f| %>
 
-    <%% if @<%= resource_name %>.errors.any? %>
+  <%% 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>
@@ -16,18 +16,21 @@
   <%% end %>
 
 <%- columns.each do |column| -%>
-  <div class="control-group">
-    <%%= f.label :<%= column.name %>, :class => 'control-label' %>
-    <div class="controls">
+  <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>
-    <%%= error_span(@<%= resource_name %>[:<%= column.name %>]) %>
+    <%%=f.error_span(:<%= column.name %>) %>
   </div>
   <%- end -%>
 
-
-  <%%= 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 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

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

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

@@ -22,6 +22,8 @@
         <%- end -%>
         <td><%%=l <%= resource_name %>.created_at %></td>
         <td>
+          <%%= link_to t('.show', :default => t("helpers.links.show")),
+                      <%= singular_controller_routing_path %>_path(<%= resource_name %>), :class => 'btn btn-default btn-xs' %>
           <%%= 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")),

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

@@ -19,6 +19,7 @@
         <%- end -%>
         %td=l <%= resource_name %>.created_at
         %td
+          = link_to t('.show', :default => t("helpers.links.show")), <%= singular_controller_routing_path %>_path(<%= resource_name %>), :class => 'btn btn-default btn-xs'
           = 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'
 

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

@@ -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,10 @@ table class="table table-striped"
         <%- end -%>
         td=l <%= resource_name %>.created_at
         td
+          = link_to t('.show', :default => t("helpers.links.show")), <%= singular_controller_routing_path %>_path(<%= resource_name %>), :class => 'btn btn-default btn-xs'
+          '
           = 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/new.html.slim

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

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

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

@@ -1,7 +1,7 @@
 = 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 %>])
+  = f.error_span :<%= column.name %>
 <%- end -%>
 <%- if ::SimpleForm::FormBuilder.instance_methods.include?(:wrapped_button) -%>
   = f.button :wrapped, :cancel => <%= controller_routing_path %>_path

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

@@ -1,23 +1,39 @@
 module Twitter
   module Bootstrap
+
+    # Keep current method calls as is using aliases
     module Breadcrumbs
-      def self.included(base)
-        base.extend(ClassMethods)
+      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_breadcrumb(name, url = '', options = {})
+        def add_bootstrap_breadcrumb(name, url = '', options = {})
           options.merge! :klass => self.name
-          before_filter options do |controller|
-            controller.send :add_breadcrumb, name, url, options
+          before_action options do |controller|
+            controller.send :add_bootstrap_breadcrumb, name, url, options
           end
         end
       end
 
       protected
 
-      def add_breadcrumb(name, url = '', options = {})
-        @breadcrumbs ||= []
+      def add_bootstrap_breadcrumb(name, url = '', options = {})
+        @__bs_breadcrumbs ||= []
 
         class_name = options.delete(:klass) || self.class.name
 
@@ -37,7 +53,7 @@ module Twitter
 
         url = eval(url.to_s) if url.is_a?(Symbol) && url =~ /_path|_url|@/
 
-        @breadcrumbs << {:name => name, :url => url, :options => options}
+        @__bs_breadcrumbs << {:name => name, :url => url, :options => options}
       end
 
       def translate_breadcrumb(name, class_name)
@@ -48,11 +64,6 @@ module Twitter
 
         I18n.t name, :scope => scope
       end
-
-      def render_breadcrumbs(divider = '/')
-        s = render :partial => 'twitter-bootstrap/breadcrumbs', :locals => {:divider => divider}
-        s.first
-      end
     end
   end
 end

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

@@ -1,10 +1,12 @@
 require 'rails'
 
-require File.dirname(__FILE__) + '/breadcrumbs.rb'
-require File.dirname(__FILE__) + '/../../../../app/helpers/flash_block_helper.rb'
-require File.dirname(__FILE__) + '/../../../../app/helpers/modal_helper.rb'
-require File.dirname(__FILE__) + '/../../../../app/helpers/navbar_helper.rb'
-require File.dirname(__FILE__) + '/../../../../app/helpers/bootstrap_flash_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'
+require_relative '../../../../app/helpers/badge_label_helper.rb'
 
 module Twitter
   module Bootstrap
@@ -21,14 +23,17 @@ 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, BootstrapFlashHelper
-            ActionController::Base.send :helper, FormErrorsHelper
-            ActionController::Base.send :helper, ModalHelper
-            ActionController::Base.send :helper, NavbarHelper
-            ActionController::Base.send :helper, BadgeLabelHelper
-            #ActionController::Base.send :helper_method, :render_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 = "3.2.0"
+      VERSION = "5.0.0"
     end
   end
 end