bootstrap-view-helpers 0.0.13 → 0.0.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a35b9241c628b52551279929f4bbd3827d1e01b6
+  data.tar.gz: 3af5d1f897639a97e0060a9fd29ea11b85442e2f
+SHA512:
+  metadata.gz: b3d2bb44b86c9e8f3ec60ec1488b7eaaa5ad0b583af3e44c300deb2e4433990a0426d123a59bd995750bedf0ccd4dbd0ea1dc779547ef571157947ab342de14f
+  data.tar.gz: 9b64cdb58379cf244e59f9e26c1ec033a47d6ecfccc1d3fbff643db98218bb99f93d5b39c76e0736b2b583b039ca66e8ab04e70ee44e73b55ec2bb757b47991d

data/app/helpers/bootstrap/accordion_helper.rb

@@ -26,7 +26,7 @@ module Bootstrap::AccordionHelper
     options = canonicalize_options(options)
     options = ensure_accordion_id(options)
     @accordion_id = options[:id]
-    options = ensure_class(options, 'accordion')
+    options = ensure_class(options, 'panel-group')
     
     content_tag(:div, options) do
       yield
@@ -47,7 +47,7 @@ module Bootstrap::AccordionHelper
     # options = ensure_accordion_group_id(options)
     @accordion_group_id = get_next_group_id
 
-    options = ensure_class(options, 'accordion-group')
+    options = ensure_class(options, 'panel panel-default')
     
     content_tag(:div, options) do
       accordion_group_heading(text) + accordion_group_body(open) { yield }
@@ -57,17 +57,19 @@ module Bootstrap::AccordionHelper
   private
   
   def accordion_group_heading(text)
-    content_tag(:div, class: 'accordion-heading') do
-      content_tag(:a, text, class: %(accordion-toggle), href: "##{@accordion_group_id}", data: {toggle: 'collapse', parent: "##{@accordion_id}" })
+    content_tag(:div, class: 'panel-heading') do
+      content_tag(:h4, class: 'panel-title') do 
+        content_tag(:a, text, href: "##{@accordion_group_id}", data: {toggle: 'collapse', parent: "##{@accordion_id}" })
+      end
     end
   end
   
   def accordion_group_body(open)
-    classes = %w(accordion-body collapse)
+    classes = %w(panel-collapse collapse)
     classes << 'in' if open
     
     content_tag(:div, id: @accordion_group_id, class: classes) do
-      content_tag(:div, class: 'accordion-inner') do
+      content_tag(:div, class: 'panel-body') do
         yield
       end
     end

data/app/helpers/bootstrap/alert_helper.rb

@@ -19,8 +19,9 @@
 module Bootstrap::AlertHelper
   InvalidAlertTypeError = Class.new(StandardError)
   
-  ALERT_ATTRIBUTES = %w(error success info block)
-  
+  ALERT_ATTRIBUTES = %w(default success info warning danger)
+  COMPILED_ALERT_CLASSES = ALERT_ATTRIBUTES.map{|a| "alert-#{a}"}
+
   # @overload alert(text, alert_type, options={})
   #   @param text [String] text of the label
   #   @param alert_type [Symbol, String] if present must be one of {Bootstrap::AlertHelper::ALERT_ATTRIBUTES}
@@ -35,6 +36,7 @@ module Bootstrap::AlertHelper
     options = add_alert_classes(options, args)
     heading = options.delete(:heading)
     show_close = options.delete(:close) != false 
+    options = ensure_class(options, 'alert-dismissible') if show_close
     
     content_tag(:div, options) do
       alert_close(show_close) + 
@@ -48,7 +50,7 @@ module Bootstrap::AlertHelper
   # @return [String] html for alert close button unless _show_ is +false+
   def alert_close(show=true)
     return '' unless show
-    content_tag(:button, '×'.html_safe, class: 'close', data: {dismiss: 'alert'})
+    content_tag(:button, '×'.html_safe, class: 'close', data: {dismiss: 'alert'}, aria: {label: "Close"})
   end
 
   # Return an alert heading
@@ -72,6 +74,7 @@ module Bootstrap::AlertHelper
   def add_alert_classes(options, alert_attributes)
     validate_alert_attributes(alert_attributes)
     classes = ['alert'] + alert_attributes.map { |e| "alert-#{e}" }
+    classes << "alert-default" if is_default?(classes, options, alert_attributes)
     ensure_class(options, classes)
   end
   
@@ -79,5 +82,9 @@ module Bootstrap::AlertHelper
     alert_attributes.each { |e| raise(InvalidAlertTypeError, e.inspect) unless ALERT_ATTRIBUTES.include?(e.to_s) }
   end
   
+  def is_default?(classes, options, alert_attributes)
+    classes == ['alert'] &&
+     !options[:class].any?{|c| COMPILED_ALERT_CLASSES.include?(c)}
+  end
   
 end

data/app/helpers/bootstrap/badge_helper.rb

@@ -14,8 +14,8 @@
 module Bootstrap::BadgeHelper
   InvalidBadgeTypeError = Class.new(StandardError)
   
-  BADGE_TYPES = %w(default success warning important info inverse)
-  
+  BADGE_TYPES = %w(default primary success info warning danger)
+
   # Returns html for a Bootstrap badge.
   #
   # @overload badge(text, options={})
@@ -40,7 +40,8 @@ module Bootstrap::BadgeHelper
   def add_badge_classes(*args)
     options = canonicalize_options(args.extract_options!)
     validate_badge_types(args)
-    classes = ['badge'] + args.map { |arg| "badge-#{arg}" }
+    classes = ['label', 'label-pill'] + args.map { |arg| "label-#{arg}" }
+    classes << 'label-default' if classes == ['label', 'label-pill']
     ensure_class(options, classes)
   end
   

data/app/helpers/bootstrap/button_helper.rb

@@ -44,7 +44,7 @@ module Bootstrap::ButtonHelper
 
   BUTTON_TYPES = %w(default primary info success warning danger inverse link)
   BUTTON_SIZES = %w(default large small mini)
-  BUTTON_OTHERS = %w(block)
+  BUTTON_OTHERS = %w()
   
   BUTTON_ALL = BUTTON_TYPES + BUTTON_SIZES + BUTTON_OTHERS
   
@@ -76,11 +76,13 @@ module Bootstrap::ButtonHelper
   #   @option options [String] :url if present, return a <a> styled as a button
   # @return [String] Html for a <button> (or <a> if +url+ option passed in)
   def button(*args)
-    text = args.shift
     options = canonicalize_options(args.extract_options!)
+    text = args.shift
     href = options.delete(:url)
     options = add_button_classes(options, args)
 
+    text = yield if block_given?
+    
     if href.present?
       link_to(text, href, options)
     else
@@ -132,8 +134,22 @@ module Bootstrap::ButtonHelper
   
   def add_button_classes(options, button_types_and_sizes)
     validate_button_types_and_sizes(button_types_and_sizes)
+    map_button_types_and_sizes(button_types_and_sizes)
     classes = ['btn'] + button_types_and_sizes.map { |e| "btn-#{e}" }
+    classes << 'btn-default' if classes == ['btn']
     ensure_class(options, classes)
   end
+
+  BUTTON_TYPES_AND_SIZES_MAP = {
+    :default => :default,
+    :mini => :xs,
+    :small => :sm,
+    :large => :lg
+  }
+  def map_button_types_and_sizes(button_types_and_sizes)
+    button_types_and_sizes.map! do |e|
+      (BUTTON_TYPES_AND_SIZES_MAP[e.to_sym] || e).to_s
+    end
+  end
   
 end

data/app/helpers/bootstrap/common_helper.rb

@@ -58,7 +58,7 @@ module Bootstrap::CommonHelper
   # @param [String, Array] klasses one or more classes to add to the +:class+ key of _hash_
   # @return [Hash]
   def ensure_class(hash, klasses)
-    canonicalize_options(hash)
+    hash = canonicalize_options(hash)
     
     hash.dup.tap do |h|
       Array(klasses).map(&:to_s).each do |k|

data/app/helpers/bootstrap/dropdown_helper.rb

@@ -24,6 +24,7 @@
 #   <% end %>#
 #
 module Bootstrap::DropdownHelper
+  include ActionView::Helpers::SanitizeHelper
   
   # Returns a drop-down menu of links
   #
@@ -34,7 +35,7 @@ module Bootstrap::DropdownHelper
   # @return [String] '<li class='dropdown'><ul class='dropdown-menu'> with contents of yielded block
   def nav_dropdown(text, options={})
     options = canonicalize_options(options)
-    options = ensure_class(options, 'dropdown')
+    options = ensure_class(options, 'nav-item dropdown')
     
     content_tag(:li, options) do
       nav_dropdown_link(text) + dropdown_ul { yield }
@@ -82,6 +83,8 @@ module Bootstrap::DropdownHelper
     text = args.shift or raise "Need text to link to"
     url = args.shift || 'javascript:void(0)'
     
+    options = ensure_class(options, 'dropdown')
+
     content_tag(:li) do
       link_to(text, url, options)
     end
@@ -96,8 +99,8 @@ module Bootstrap::DropdownHelper
   private
   
   def nav_dropdown_link(text)
-    content_tag(:a, class: "dropdown-toggle", data: {toggle: "dropdown"}, href: "#") do
-      safe_join( [ h(text), caret ], ' ' )
+    content_tag(:a, class: "nav-link dropdown-toggle", data: {toggle: "dropdown"}, href: "#") do
+      safe_join( [ sanitize(text), caret ], ' ' )
     end    
   end
 
@@ -105,7 +108,7 @@ module Bootstrap::DropdownHelper
     text = args.shift
     classes = %w(btn dropdown-toggle) + args.map { |e| "btn-#{e}" }
     content_tag(:a, class: classes, data: {toggle: "dropdown"}, href: "#") do
-      safe_join( [ h(text), caret ], ' ' )
+      safe_join( [ sanitize(text), caret ], ' ' )
     end
   end
   

data/app/helpers/bootstrap/form_helper.rb

@@ -87,7 +87,12 @@ module Bootstrap::FormHelper
     end
     options = ensure_class(options, button_classes)
 
-    options[:disable_with] = "Processing ..." unless options.has_key?(:disable_with)
+    disable_or_remove = options[:data] && options[:data].delete(:disable_with)
+
+    unless disable_or_remove === false
+      options[:data] ||= {}
+      options[:data][:disable_with] = disable_or_remove || "Processing ..."
+    end
 
     submit_tag(value, options)
   end

data/app/helpers/bootstrap/icon_renderer.rb

@@ -1,6 +1,7 @@
 # @private
 class Bootstrap::IconRenderer
   ArgumentError = Class.new(StandardError)
+  include ActionView::Helpers::SanitizeHelper
   
   delegate :canonicalize_options, :content_tag, :ensure_class, :h, to: :template
   attr_accessor :template, :options, :args, :text
@@ -33,7 +34,7 @@ class Bootstrap::IconRenderer
   
   def process_icon_type
     icon_type = args.shift.presence or raise(ArgumentError, "must pass an icon type")
-    icon_class = icon_type == 'blank' ? 'icon-search' : "icon-#{icon_type.gsub("_", "-")}"
+    icon_class = icon_type == 'blank' ? 'glyphicon glyphicon-search' : "glyphicon glyphicon-#{icon_type.gsub("_", "-")}"
     self.options = ensure_class(self.options, icon_class)
     
     if icon_type == 'blank'
@@ -51,7 +52,7 @@ class Bootstrap::IconRenderer
     self.text = if args.size == 0
       nil
     elsif args.size == 1
-      h(" #{args.first}")
+      sanitize(" #{args.first}")
     else
       raise ArgumentError, 'too many arguments'
     end 

data/app/helpers/bootstrap/modal_helper.rb

@@ -16,11 +16,15 @@ module Bootstrap::ModalHelper
   def modal(options={})
     options = canonicalize_options(options)
     options.has_key?(:id) or raise(ArgumentError, "missing :id option")
-    options = ensure_class(options, %w(modal hide fade))
+    options = ensure_class(options, %w(modal fade))
     options.merge!(tabindex: "-1", role: "dialog")
     
     content_tag(:div, options) do
-      yield
+      content_tag(:div, class: "modal-dialog") do 
+        content_tag(:div, class: "modal-content") do 
+          yield
+        end
+      end
     end
   end
   
@@ -34,7 +38,7 @@ module Bootstrap::ModalHelper
   
     content_tag(:div, options) do
       modal_header_close_button(show_close) +
-      content_tag(:h3) do
+      content_tag(:h4, class: "modal-title") do
         content
       end
     end
@@ -73,7 +77,9 @@ module Bootstrap::ModalHelper
   # Returns a Bootstrap modal close button
   def modal_header_close_button(show=true)
     return ''.html_safe unless show
-    button("×".html_safe, type: 'button', class: 'close modal-close modal-header-close', data: {dismiss: 'modal'})
+    button(type: 'button', class: 'close', data: {dismiss: 'modal'}) do
+      content_tag(:span, "×".html_safe)
+    end
   end
 
   # Returns a close button for Bootstrap modal footer.

data/app/helpers/bootstrap/nav_helper.rb

@@ -29,14 +29,14 @@
 #     <%= dropdown_item('Labels', 'butons')%>
 #   <% end %>
 module Bootstrap::NavHelper
-  
+  include ActionView::Helpers::SanitizeHelper
   # Returns a Bootstrap navigation bar
   # @yield yield block usually consists of other {Bootstrap::NavHelper} helpers
   # @yieldreturn the contents of the navigation bar
   # @return [String]
   def nav_bar()
-    content_tag(:header, class: 'navbar') do
-      content_tag(:nav, class: 'navbar-inner') do
+    content_tag(:nav, class: 'navbar navbar-default') do
+      content_tag(:div, class: 'container-fluid') do
         yield
       end
     end
@@ -52,40 +52,51 @@ module Bootstrap::NavHelper
   # @return [String] <a> if +:url+ option present, else <span>
   def brand(text, options = {})
     options = canonicalize_options(options)
-    options = ensure_class(options, 'brand')
+    options = ensure_class(options, 'navbar-brand')
 
     with_environment = options.delete(:with_environment)
     if with_environment && Rails.env != 'production'
-      text = "#{text} - #{Rails.env}"
+      if text.present?
+        text = "#{text} - #{Rails.env}"
+      else
+        text = Rails.env
+      end
       options = ensure_class(options, "rails-#{Rails.env}") 
     end
 
     url = options.delete(:url)
-    
-    if url.present?
-      link_to(text, url, options)
-    else
-      content_tag(:span, text, options)
+    content_tag(:div, class: "navbar-header") do 
+      if url.present?
+        link_to(text, url, options)
+      else
+        content_tag(:span, text, options)
+      end
     end
   end
   
   # Returns <div> for a group of nav bar links, <ul>s.
   #
+  def nav_bar_wrapper(options = {})
+    content_tag(:div, class: "navbar-collapse collapse sidebar-navbar-collapse") do
+      yield
+    end
+  end
+
   # Usually called in +yield+ block of {Bootstrap::NavHelper#nav_bar}
   #
   # @param options [Hash] options except for +:pull+ become html attributes of generated <div>
   # @option options [:left, :right] pull will add class of "pull-left|right" for Bootstrap nav bar positioning
   # @yield block usually consists of calls to {Bootstrap::NavHelper#nav_bar_link} and {Bootstrap::NavHelper#nav_bar_divider}
   # @return [String] <div class='nav'> containing results of yielded block
-  def nav_bar_links(options={})
+  def nav_bar_links(options = {})
     options = canonicalize_options(options)
-    options = ensure_class(options, 'nav')
+    options = ensure_class(options, 'nav navbar-nav')
     
     if pull = options.delete(:pull)
-      options = ensure_class(options, "pull-#{pull}")
+      options = ensure_class(options, "navbar-#{pull}")
     end
     
-    content_tag(:div, options) do
+    content_tag(:ul, options) do
       yield
     end
   end
@@ -103,8 +114,8 @@ module Bootstrap::NavHelper
     a_options = canonicalize_options(options)
     active = a_options.delete(:active)
     
-    li_options = {class: ('active' if active)}
-    
+    li_options = ensure_class({class: ('active' if active)}, "")
+
     content_tag(:li, li_options) do
       link_to(text, url, a_options)
     end
@@ -112,9 +123,9 @@ module Bootstrap::NavHelper
   
   # Returns divider (vertical bar) for separating items in a nav_bar
   #
-  # @return [String] <li class="divider-vertical"></li>
+  # @return [String] <li class="divider"></li>
   def nav_bar_divider
-    content_tag(:li, nil, class: "divider-vertical")
+    content_tag(:li, nil, class: "divider")
   end
   
   # Returns nav list
@@ -126,7 +137,7 @@ module Bootstrap::NavHelper
     options = canonicalize_options(options)
     options = ensure_class(options, 'well')
     content_tag(:div, options) do
-      content_tag(:ul, class: 'nav nav-list') do
+      content_tag(:ul, class: 'nav nav-stacked') do
         yield
       end
     end
@@ -137,7 +148,7 @@ module Bootstrap::NavHelper
   # @param text [String] text of header
   # @return [String] <li.nav-header>text</li>
   def nav_list_header(text)
-    content_tag(:li, text, class: 'nav-header')
+    content_tag(:li, text, class: '')
   end
   
   # Wraps _text_ so it has proper leading and color for text in a nav bar.  Usually
@@ -151,12 +162,12 @@ module Bootstrap::NavHelper
   # @option options [:left, :right] :pull (:left) adds the Boostrap positioning class
   # @option options [Boolean] :pad (true) include padding around text
   # @return [String]
-  def nav_bar_text(text, options={})
+  def nav_bar_text(text, options = {})
     options = canonicalize_options(options)
 
     unless options.delete(:pad) == false
       padding = ("&nbsp;" * 3).html_safe
-      text = padding + h(text) + padding
+      text = padding + sanitize(text) + padding
     end
     
     pull_class = (options.delete(:pull).to_s == 'right' ? 'pull-right' : 'pull-left')
@@ -164,4 +175,10 @@ module Bootstrap::NavHelper
     
     content_tag(:p, text, options)
   end
-end
+
+  def vertical_nav(options = {})
+    content_tag(:div, class: "sidebar-nav") do 
+      yield
+    end
+  end
+end

data/app/helpers/bootstrap/stamp_helper.rb

@@ -11,7 +11,7 @@
 module Bootstrap::StampHelper
   InvalidStampTypeError = Class.new(StandardError)
   
-  LABEL_TYPES = %w(default success warning important info inverse)
+  LABEL_TYPES = %w(default primary success info warning danger)
 
   #=> see {Bootstrap::StampHelper::LABEL_TYPES}
 
@@ -39,6 +39,7 @@ module Bootstrap::StampHelper
     options = canonicalize_options(args.extract_options!)
     validate_label_types(args)
     classes = ['label'] + args.map { |arg| "label-#{arg}" }
+    classes << 'label-default' if classes == ['label']
     ensure_class(options, classes)
   end
   

data/app/views/application/_bootstrap_view_helper_nav_bar.html.erb

@@ -2,20 +2,24 @@
 
   <%= brand('Bootstrap View Helpers', url: bvh_path) %>
 
-  <%= nav_bar_links do %>
-    <%= nav_bar_link('Application Home', bvh_app_home_link) %>
-    <%= nav_bar_link('Active', '#', active: true) %>
-    <%= nav_bar_link('Link 1', '#') %>
-    <%= nav_bar_divider %>
-    <%= nav_bar_link('Link 2', '#') %>
-  <% end %>
-  
-  <%= nav_bar_links(pull: 'right') do %>
-    <%= nav_dropdown('Dropdown 1') do %>
-      <%= dropdown_item('One', '#') %>
+  <%= nav_bar_wrapper do %>
+    <%= nav_bar_links do %>
+      <%= nav_bar_link('Application Home', bvh_app_home_link) %>
+      <%= nav_bar_link('Active', '#', active: true) %>
+      <%= nav_bar_link('Link 1', '#') %>
+      <%= nav_bar_divider %>
+      <%= nav_bar_link('Link 2', '#') %>
+      <%= nav_dropdown('Dropdown A') do %>
+        <%= dropdown_item('Bee', '#') %>
+      <% end %>
+    <% end %>
+    
+    <%= nav_bar_links(pull: 'right') do %>
+      <%= nav_dropdown('Dropdown 1') do %>
+        <%= dropdown_item('One', '#') %>
+      <% end %>
     <% end %>
+    
+    <%= nav_bar_text("Logged in as admin", pull: 'right') %>
   <% end %>
-  
-  <%= nav_bar_text("Logged in as admin", pull: 'right') %>
-
 <% end %>

data/app/views/application/_bootstrap_view_helper_side_bar.html.erb

@@ -1,16 +1,17 @@
-<%= nav_list do %>
-  
-  <%= nav_list_header('Sidebar Header') %>
+<%= vertical_nav do %>
+  <%= nav_list do %>
+    
+    <%= nav_list_header('Sidebar Header') %>
 
-  <%= dropdown_item('Accordions', bvh_path('accordions')) %>
-  <%= dropdown_item('Alerts', bvh_path('alerts')) %>
-  <%= dropdown_item('Buttons', bvh_path('buttons')) %>
-  <%= dropdown_item('Icons', bvh_path('icons')) %>
-  <%= dropdown_item('Form helpers', bvh_path('form_helpers')) %>
-  <%= dropdown_item('Flash', bvh_path('flash_helper')) %>
-  <%= dropdown_item('Labels and badges', bvh_path('labels_and_badges')) %>
-  <%= dropdown_item('Modal Helpers', bvh_path('modal')) %>
-  <%= dropdown_item('Nav Helpers', bvh_path) %>
-  <%= dropdown_item('Table Helpers', bvh_path('tables')) %>
-  
+    <%= dropdown_item('Accordions', bvh_path('accordions')) %>
+    <%= dropdown_item('Alerts', bvh_path('alerts')) %>
+    <%= dropdown_item('Buttons', bvh_path('buttons')) %>
+    <%= dropdown_item('Icons', bvh_path('icons')) %>
+    <%= dropdown_item('Form helpers', bvh_path('form_helpers')) %>
+    <%= dropdown_item('Flash', bvh_path('flash_helper')) %>
+    <%= dropdown_item('Labels and badges', bvh_path('labels_and_badges')) %>
+    <%= dropdown_item('Modal Helpers', bvh_path('modal')) %>
+    <%= dropdown_item('Nav Helpers', bvh_path) %>
+    <%= dropdown_item('Table Helpers', bvh_path('tables')) %>
+  <% end %>
 <% end %>

data/app/views/bootstrap_view_helpers/_alert_options.html.erb

@@ -2,7 +2,5 @@
 
 <%= alert('No close button', close: false) %>
 
-<%= alert("Type :block gives some more padding", :block ) %>
-
 <%= alert("Unknown options are html attributes", id: 'my-id', class: 'my-class') %>
 

data/app/views/bootstrap_view_helpers/_alert_types.html.erb

@@ -4,5 +4,7 @@
 
 <%= alert('Type :success', :success) %>
 
-<%= alert('Type :error', :error) %>
+<%= alert('Type :warning', :warning) %>
+
+<%= alert('Type :danger', :danger) %>
 

data/app/views/bootstrap_view_helpers/buttons.html.erb

@@ -109,12 +109,6 @@
         <code>button('Mini', :mini)</code>
       </td>
     </tr>
-    <tr>
-      <td><%= button('Block', :block) %></td>
-      <td>
-        <code>button('Block', :block) # (occupies 100% width of container)</code>
-      </td>
-    </tr>
     <tr>
       <td><%= button('Small Info', :small, :info) %></td>
       <td>

data/app/views/bootstrap_view_helpers/labels_and_badges.html.erb

@@ -32,9 +32,9 @@
       </td>
     </tr>
     <tr>
-      <td><%= stamp('Important', :important) %>
+      <td><%= stamp('Danger', :danger) %>
       <td>
-        <code>stamp('Important', :important)</code>
+        <code>stamp('Danger', :danger)</code>
       </td>
     </tr>
     <tr>
@@ -44,9 +44,9 @@
       </td>
     </tr>
     <tr>
-      <td><%= stamp('Inverse', :inverse) %>
+      <td><%= stamp('Primary', :primary) %>
       <td>
-        <code>stamp('Inverse', :inverse)</code>
+        <code>stamp('Primary', :primary)</code>
       </td>
     </tr>
     <tr>
@@ -89,9 +89,9 @@
       </td>
     </tr>
     <tr>
-      <td><%= badge('4', :important) %>
+      <td><%= badge('4', :danger) %>
       <td>
-        <code>badge('4', :important)</code>
+        <code>badge('4', :danger)</code>
       </td>
     </tr>
     <tr>
@@ -101,9 +101,9 @@
       </td>
     </tr>
     <tr>
-      <td><%= badge('10', :inverse) %>
+      <td><%= badge('10', :primary) %>
       <td>
-        <code>badge('10', :inverse)</code>
+        <code>badge('10', :primary)</code>
       </td>
     </tr>
     <tr>

data/app/views/layouts/bootstrap_view_helpers.html.erb

@@ -9,13 +9,11 @@
   <body>
     <%= render partial: 'bootstrap_view_helper_nav_bar' %>
     <div class='container-fluid'>
-      <div class='row-fluid'>
-        <div class='span3'>
-          <%= render partial: 'bootstrap_view_helper_side_bar' %>
-        </div>
-        <div class='span9'>
-          <%= yield %>
-        </div>
+      <div class='col-md-3'>
+        <%= render partial: 'bootstrap_view_helper_side_bar' %>
+      </div>
+      <div class='col-md-9'>
+        <%= yield %>
       </div>
     </div>
   </body>

data/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
 
-  match 'bootstrap_view_helpers(/:action)' => 'bootstrap_view_helpers', :as => :bvh
+  match 'bootstrap_view_helpers(/:action)' => 'bootstrap_view_helpers', :as => :bvh, via: :get
   
 end

data/lib/bootstrap-view-helpers/version.rb

@@ -1,3 +1,3 @@
 module BootstrapViewHelpers
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,270 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-view-helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.13
-  prerelease: 
+  version: 0.0.14
 platform: ruby
 authors:
 - Steve Downey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 5.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 5.0.4
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.1.0
-  type: :development
+        version: 3.3.6
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.1.0
+        version: 3.3.6
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-spork
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: better_errors
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: binding_of_caller
+  name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: quiet_assets
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thin
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Produce Bootstrap html with semantic helper methods.
@@ -330,27 +227,25 @@ files:
 - README.md
 homepage: https://github.com/stevedowney/bootstrap-view-helpers
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails view helpers for Bootstrap
 test_files: []
-has_rdoc: