twitter-bootstrap-rails 2.2.8 → 3.2.0

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

@@ -1,146 +1 @@
-.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0;}
-.clearfix:after{clear:both;}
-.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0;}
-.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}
-[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("<%= asset_path 'twitter/bootstrap/glyphicons-halflings.png' %>");background-position:14px 14px;background-repeat:no-repeat;margin-top:1px;}
-.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:focus>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>li>a:focus>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:focus>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"],.dropdown-submenu:focus>a>[class*=" icon-"]{background-image:url("<%= asset_path 'twitter/bootstrap/glyphicons-halflings-white.png' %>");}
-.icon-glass{background-position:0 0;}
-.icon-music{background-position:-24px 0;}
-.icon-search{background-position:-48px 0;}
-.icon-envelope{background-position:-72px 0;}
-.icon-heart{background-position:-96px 0;}
-.icon-star{background-position:-120px 0;}
-.icon-star-empty{background-position:-144px 0;}
-.icon-user{background-position:-168px 0;}
-.icon-film{background-position:-192px 0;}
-.icon-th-large{background-position:-216px 0;}
-.icon-th{background-position:-240px 0;}
-.icon-th-list{background-position:-264px 0;}
-.icon-ok{background-position:-288px 0;}
-.icon-remove{background-position:-312px 0;}
-.icon-zoom-in{background-position:-336px 0;}
-.icon-zoom-out{background-position:-360px 0;}
-.icon-off{background-position:-384px 0;}
-.icon-signal{background-position:-408px 0;}
-.icon-cog{background-position:-432px 0;}
-.icon-trash{background-position:-456px 0;}
-.icon-home{background-position:0 -24px;}
-.icon-file{background-position:-24px -24px;}
-.icon-time{background-position:-48px -24px;}
-.icon-road{background-position:-72px -24px;}
-.icon-download-alt{background-position:-96px -24px;}
-.icon-download{background-position:-120px -24px;}
-.icon-upload{background-position:-144px -24px;}
-.icon-inbox{background-position:-168px -24px;}
-.icon-play-circle{background-position:-192px -24px;}
-.icon-repeat{background-position:-216px -24px;}
-.icon-refresh{background-position:-240px -24px;}
-.icon-list-alt{background-position:-264px -24px;}
-.icon-lock{background-position:-287px -24px;}
-.icon-flag{background-position:-312px -24px;}
-.icon-headphones{background-position:-336px -24px;}
-.icon-volume-off{background-position:-360px -24px;}
-.icon-volume-down{background-position:-384px -24px;}
-.icon-volume-up{background-position:-408px -24px;}
-.icon-qrcode{background-position:-432px -24px;}
-.icon-barcode{background-position:-456px -24px;}
-.icon-tag{background-position:0 -48px;}
-.icon-tags{background-position:-25px -48px;}
-.icon-book{background-position:-48px -48px;}
-.icon-bookmark{background-position:-72px -48px;}
-.icon-print{background-position:-96px -48px;}
-.icon-camera{background-position:-120px -48px;}
-.icon-font{background-position:-144px -48px;}
-.icon-bold{background-position:-167px -48px;}
-.icon-italic{background-position:-192px -48px;}
-.icon-text-height{background-position:-216px -48px;}
-.icon-text-width{background-position:-240px -48px;}
-.icon-align-left{background-position:-264px -48px;}
-.icon-align-center{background-position:-288px -48px;}
-.icon-align-right{background-position:-312px -48px;}
-.icon-align-justify{background-position:-336px -48px;}
-.icon-list{background-position:-360px -48px;}
-.icon-indent-left{background-position:-384px -48px;}
-.icon-indent-right{background-position:-408px -48px;}
-.icon-facetime-video{background-position:-432px -48px;}
-.icon-picture{background-position:-456px -48px;}
-.icon-pencil{background-position:0 -72px;}
-.icon-map-marker{background-position:-24px -72px;}
-.icon-adjust{background-position:-48px -72px;}
-.icon-tint{background-position:-72px -72px;}
-.icon-edit{background-position:-96px -72px;}
-.icon-share{background-position:-120px -72px;}
-.icon-check{background-position:-144px -72px;}
-.icon-move{background-position:-168px -72px;}
-.icon-step-backward{background-position:-192px -72px;}
-.icon-fast-backward{background-position:-216px -72px;}
-.icon-backward{background-position:-240px -72px;}
-.icon-play{background-position:-264px -72px;}
-.icon-pause{background-position:-288px -72px;}
-.icon-stop{background-position:-312px -72px;}
-.icon-forward{background-position:-336px -72px;}
-.icon-fast-forward{background-position:-360px -72px;}
-.icon-step-forward{background-position:-384px -72px;}
-.icon-eject{background-position:-408px -72px;}
-.icon-chevron-left{background-position:-432px -72px;}
-.icon-chevron-right{background-position:-456px -72px;}
-.icon-plus-sign{background-position:0 -96px;}
-.icon-minus-sign{background-position:-24px -96px;}
-.icon-remove-sign{background-position:-48px -96px;}
-.icon-ok-sign{background-position:-72px -96px;}
-.icon-question-sign{background-position:-96px -96px;}
-.icon-info-sign{background-position:-120px -96px;}
-.icon-screenshot{background-position:-144px -96px;}
-.icon-remove-circle{background-position:-168px -96px;}
-.icon-ok-circle{background-position:-192px -96px;}
-.icon-ban-circle{background-position:-216px -96px;}
-.icon-arrow-left{background-position:-240px -96px;}
-.icon-arrow-right{background-position:-264px -96px;}
-.icon-arrow-up{background-position:-289px -96px;}
-.icon-arrow-down{background-position:-312px -96px;}
-.icon-share-alt{background-position:-336px -96px;}
-.icon-resize-full{background-position:-360px -96px;}
-.icon-resize-small{background-position:-384px -96px;}
-.icon-plus{background-position:-408px -96px;}
-.icon-minus{background-position:-433px -96px;}
-.icon-asterisk{background-position:-456px -96px;}
-.icon-exclamation-sign{background-position:0 -120px;}
-.icon-gift{background-position:-24px -120px;}
-.icon-leaf{background-position:-48px -120px;}
-.icon-fire{background-position:-72px -120px;}
-.icon-eye-open{background-position:-96px -120px;}
-.icon-eye-close{background-position:-120px -120px;}
-.icon-warning-sign{background-position:-144px -120px;}
-.icon-plane{background-position:-168px -120px;}
-.icon-calendar{background-position:-192px -120px;}
-.icon-random{background-position:-216px -120px;width:16px;}
-.icon-comment{background-position:-240px -120px;}
-.icon-magnet{background-position:-264px -120px;}
-.icon-chevron-up{background-position:-288px -120px;}
-.icon-chevron-down{background-position:-313px -119px;}
-.icon-retweet{background-position:-336px -120px;}
-.icon-shopping-cart{background-position:-360px -120px;}
-.icon-folder-close{background-position:-384px -120px;width:16px;}
-.icon-folder-open{background-position:-408px -120px;width:16px;}
-.icon-resize-vertical{background-position:-432px -119px;}
-.icon-resize-horizontal{background-position:-456px -118px;}
-.icon-hdd{background-position:0 -144px;}
-.icon-bullhorn{background-position:-24px -144px;}
-.icon-bell{background-position:-48px -144px;}
-.icon-certificate{background-position:-72px -144px;}
-.icon-thumbs-up{background-position:-96px -144px;}
-.icon-thumbs-down{background-position:-120px -144px;}
-.icon-hand-right{background-position:-144px -144px;}
-.icon-hand-left{background-position:-168px -144px;}
-.icon-hand-up{background-position:-192px -144px;}
-.icon-hand-down{background-position:-216px -144px;}
-.icon-circle-arrow-right{background-position:-240px -144px;}
-.icon-circle-arrow-left{background-position:-264px -144px;}
-.icon-circle-arrow-up{background-position:-288px -144px;}
-.icon-circle-arrow-down{background-position:-312px -144px;}
-.icon-globe{background-position:-336px -144px;}
-.icon-wrench{background-position:-360px -144px;}
-.icon-tasks{background-position:-384px -144px;}
-.icon-filter{background-position:-408px -144px;}
-.icon-briefcase{background-position:-432px -144px;}
-.icon-fullscreen{background-position:-456px -144px;}
+@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"}

data/app/helpers/bootstrap_flash_helper.rb

@@ -1,20 +1,22 @@
 module BootstrapFlashHelper
-  ALERT_TYPES = [:error, :info, :success, :warning]
+  ALERT_TYPES = [:success, :info, :warning, :danger] unless const_defined?(:ALERT_TYPES)
 
-  def bootstrap_flash
+  def bootstrap_flash(options = {})
     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 = type.to_sym
       type = :success if type == :notice
-      type = :error   if type == :alert
+      type = :danger  if type == :alert
+      type = :danger  if type == :error
       next unless ALERT_TYPES.include?(type)
 
       Array(message).each do |msg|
         text = content_tag(:div,
                            content_tag(:button, raw("×"), :class => "close", "data-dismiss" => "alert") +
-                           msg.html_safe, :class => "alert fade in alert-#{type}")
+                           msg, :class => "alert fade in alert-#{type} #{options[:class]}")
         flash_messages << text if msg
       end
     end

data/app/helpers/form_errors_helper.rb

@@ -0,0 +1,22 @@
+module FormErrorsHelper
+
+  attr_reader :template
+  attr_reader :object
+
+  def error_span(attribute, options = {})
+    options[:class] ||= 'help-inline'
+
+    template.content_tag(
+      :span, self.errors_for(attribute),
+      :class => options[:class]
+    ) if self.errors_on?(attribute)
+  end
+
+  def errors_on?(attribute)
+    self.object.errors[attribute].present? if self.object.respond_to?(:errors)
+  end
+
+  def errors_for(attribute)
+    self.object.errors[attribute].try(:join, ', ')
+  end
+end

data/app/helpers/glyph_helper.rb

@@ -1,17 +1,19 @@
 module GlyphHelper
   # ==== Examples
   # glyph(:share_alt)
-  # # => <i class="icon-share-alt"></i>
+  # # => <span class="icon-share-alt"></span>
   # glyph(:lock, :white)
-  # # => <i class="icon-lock icon-white"></i>
+  # # => <span class="icon-lock icon-white"></span>
   # glyph(:thumbs_up, :pull_left)
   # # => <i class="icon-thumbs-up pull-left"></i>
-
-  def glyph(*names)
+  # glyph(:lock, {tag: :span})
+  # # => <span class="icon-lock"></span>
+  def glyph(*names, options)
     names.map! { |name| name.to_s.gsub('_','-') }
     names.map! do |name|
-      name =~ /pull-(?:left|right)/ ? name : "icon-#{name}"
+      name =~ /pull-(?:left|right)/ ? name : "glyphicon glyphicon-#{name}"
     end
-    content_tag :i, nil, :class => names
+    options[:tag] = options[:tag] ||= :i
+    content_tag options[:tag], nil, :class => names
   end
 end

data/app/helpers/modal_helper.rb

@@ -1,55 +1,63 @@
 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)
-    content_tag :div, :id => options[:id], :class => "bootstrap-modal modal hide fade" do
-      modal_header(options[:header]) +
-      modal_body(options[:body]) +
-      modal_footer(options[:footer])
+    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
+        content_tag :div, :class => "modal-content" do
+          modal_header(opts, &block) +
+          modal_body(opts, &block) +
+          modal_footer(opts, &block) 
+        end
+      end
     end
   end
 
-  def modal_header(options = {}, &block)
+  def modal_header(options, &block)
     content_tag :div, :class => 'modal-header' do
       if options[:show_close] 
         close_button(options[:dismiss]) +
-        content_tag(:h3, options[:title], &block)
+        content_tag(:h4, options[:title], :class => 'modal-title', &block)
       else
-        content_tag(:h3, options[:title], &block)
-      end	
+        content_tag(:h4, options[:title], :class => 'modal-title', &block)
+      end   
     end
   end
 
-  def modal_body(options = {}, &block)
-    content_tag :div, options, :class => 'modal-body', &block
+  def modal_body(options, &block)
+    content_tag :div, options[:content], :class => 'modal-body', :style => options[:style], &block
   end
 
-  def modal_footer(options = {}, &block)
-    content_tag :div, options, :class => 'modal-footer', &block
+  def modal_footer(options, &block)
+    content_tag :div, options[:content], :class => 'modal-footer', &block
   end
 
   def close_button(dismiss)
-    #It doesn't seem to like content_tag, so we do this instead.	
-    raw("<button class=\"close\" data-dismiss=\"#{dismiss}\">&times;</button>")
+    #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
 
-  def modal_toggle(content_or_options = nil, options = {}, &block)
+  def modal_toggle(content_or_options = nil, options, &block)
     if block_given?
       options = content_or_options if content_or_options.is_a?(Hash)
-      default_options = { :class => 'btn', "data-toggle" => "modal", "href" => options[:dialog] }.merge(options)
+      default_options = { :class => 'btn btn-default', "data-toggle" => "modal", "href" => options[:dialog] }.merge(options)
 
       content_tag :a, nil, default_options, true, &block
     else
-      default_options = { :class => 'btn', "data-toggle" => "modal", "href" => options[:dialog] }.merge(options)
+      default_options = { :class => 'btn btn-default', "data-toggle" => "modal", "href" => options[:dialog] }.merge(options)
       content_tag :a, content_or_options, default_options, true
     end
   end
 
-  def modal_cancel_button content, options = {}
-    default_options = { :class => "btn bootstrap-modal-cancel-button" }
+  def modal_cancel_button(content, options)
+    default_opts = { :class => "btn bootstrap-modal-cancel-button" }
 
-    content_tag_string "a", content, default_options.merge(options)
+    content_tag_string "a", content, default_opts.merge(options)
   end
 
 end
-

data/app/helpers/navbar_helper.rb

@@ -1,18 +1,16 @@
 #Credit for this goes to https://github.com/julescopeland/Rails-Bootstrap-Navbar
 module NavbarHelper
   def nav_bar(options={}, &block)
-    nav_bar_div(options) do
-      navbar_inner_div do
-        container_div(options[:brand], options[:brand_link], options[:responsive], options[:fluid]) do
-          yield if block_given?
-        end
+    nav_bar_nav(options) do
+      container_div(options[:brand], options[:brand_link], options[:responsive], options[:fluid], options[:no_turbolink]) do
+        yield if block_given?
       end
     end
   end
 
   def menu_group(options={}, &block)
-    pull_class = "pull-#{options[:pull].to_s}" if options[:pull].present?
-    content_tag(:ul, :class => "nav #{pull_class}", &block)
+    pull_class = "navbar-#{options[:pull].to_s}" if options[:pull].present?
+    content_tag(:ul, :class => "nav navbar-nav #{pull_class}", &block)
   end
 
   def menu_item(name=nil, path="#", *args, &block)
@@ -76,6 +74,8 @@ module NavbarHelper
   #   uri_state('/blog/categories/test', {method: delete}) # :inactive
   #   uri_state('/blog/categories/test/3', {})             # :inactive
   def uri_state(uri, options={})
+    return options[:status] if options.key?(:status)
+
     root_url = request.host_with_port + '/'
     root = uri == '/' || uri == root_url
 
@@ -87,7 +87,7 @@ module NavbarHelper
 
     if !options[:method].nil? || !options["data-method"].nil?
       :inactive
-    elsif uri == request_uri
+    elsif uri == request_uri || (options[:root] && (request_uri == '/') || (request_uri == root_url))
       :active
     else
       if request_uri.start_with?(uri) and not(root)
@@ -96,73 +96,85 @@ module NavbarHelper
         :inactive
       end
     end
-  end  
+  end
 
   private
 
-  def nav_bar_div(options, &block)
+  def nav_bar_nav(options, &block)
 
     position = "static-#{options[:static].to_s}" if options[:static]
     position = "fixed-#{options[:fixed].to_s}" if options[:fixed]
     inverse = (options[:inverse].present? && options[:inverse] == true) ? true : false
 
-    content_tag :div, :class => nav_bar_css_class(position, inverse) do
+    content_tag :nav, :class => nav_bar_css_class(position, inverse), :role => "navigation" do
       yield
     end
   end
 
-  def navbar_inner_div(&block)
-    content_tag :div, :class => "navbar-inner" do
-      yield
-    end
-  end
+  def container_div(brand, brand_link, responsive, fluid, no_turbolink, &block)
+    div_container_class = fluid ? "container-fluid" : "container"
+    no_turbolink ||= false
 
-  def container_div(brand, brand_link, responsive, fluid, &block)
-    content_tag :div, :class => "container#{"-fluid" if fluid}" do
-      container_div_with_block(brand, brand_link, responsive, &block)
+    content_tag :div, :class => div_container_class do
+      container_div_with_block(brand, brand_link, responsive, no_turbolink, &block)
     end
   end
 
-  def container_div_with_block(brand, brand_link, responsive, &block)
+  def container_div_with_block(brand, brand_link, responsive, no_turbolink, &block)
     output = []
     if responsive == true
-      output << responsive_button
-      output << brand_link(brand, brand_link)
+      output << responsive_nav_header(brand, brand_link, no_turbolink)
       output << responsive_div { capture(&block) }
     else
-      output << brand_link(brand, brand_link)
+      output << brand_link(brand, brand_link, no_turbolink)
       output << capture(&block)
     end
     output.join("\n").html_safe
   end
 
+  def responsive_nav_header(brand, brand_link, no_turbolink)
+    content_tag(:div, :class => "navbar-header") do
+      output = []
+      output << responsive_button
+      output << brand_link(brand, brand_link, no_turbolink)
+      output.join("\n").html_safe
+    end
+  end
+
   def nav_bar_css_class(position, inverse = false)
-    css_class = ["navbar"]
+    css_class = ["navbar", "navbar-default"]
     css_class << "navbar-#{position}" if position.present?
     css_class << "navbar-inverse" if inverse
     css_class.join(" ")
   end
 
-  def brand_link(name, url)
+  def brand_link(name, url, no_turbolink)
     return "" if name.blank?
     url ||= root_url
-    link_to(name, url, :class => "brand")
+
+    if no_turbolink
+      link_to(name, url, :class => "navbar-brand", :data => { :no_turbolink => true})
+    else
+      link_to(name, url, :class => "navbar-brand")
+    end
   end
 
   def responsive_button
-    %{<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+    %{<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+          <span class="sr-only">Toggle navigation</span>
 	        <span class="icon-bar"></span>
 	        <span class="icon-bar"></span>
 	        <span class="icon-bar"></span>
-	      </a>}
+	      </button>}
   end
 
   def responsive_div(&block)
-    content_tag(:div, :class => "nav-collapse collapse", &block)
+    content_tag(:div, :class => "navbar-collapse collapse", &block)
   end
 
   def is_active?(path, options={})
-    "active" if uri_state(path, options).in?([:active, :chosen])
+    state = uri_state(path, options)
+    "active" if state.in?([:active, :chosen]) || state === true
   end
 
   def name_and_caret(name)