bootstrap-view-helpers 0.0.10 → 0.0.11

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## v 0.0.11
+
+* added `nav_bar_text`
+* added `:pull` option to `nav_bar_links`
+
+## v 0.0.10
+
+* added alert support
+
 ## v 0.0.9
 
 * fixed bug in view path for examples page

data/README.md

@@ -83,17 +83,19 @@ Complete [API documentation](http://rubydoc.info/gems/bootstrap-view-helpers/fra
   <%= brand('MyApp', with_environment: true) %>
 
   <%= nav_bar_links do %>
-
     <%= nav_bar_link('Active', '#', active: true) %>
-    <%= nav_bar_link('Link1', '/link1') %>
-
+    <%= nav_bar_link('Link 1', '/link1') %>
     <%= nav_bar_divider %>
+    <%= nav_bar_link('Link 2', '/link2') %>
+  <% end %>
 
+  <%= nav_bar_links(pull: 'right') do %>
+    <%= nav_bar_text('logged in as admin') %>
     <%= nav_dropdown('Foo') do %>
       <%= dropdown_item('One', 'foo')%>
     <% end %>
-
   <% end %>
+  
 <% end %>
 ```
 

data/app/helpers/bootstrap/alert_helper.rb

@@ -23,7 +23,7 @@ module Bootstrap::AlertHelper
   # @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}
-  #   @param options [Hash] html attributes for returned alert <div>
+  #   @param options [Hash] unrecognized options become html attributes for returned alert <div>
   #   @option options [String] :heading if present, include a heading in the alert
   #   @option options [Boolean] :close if +false+, don't include a close link ('x')
   # @return [String] Returns html for alert

data/app/helpers/bootstrap/dropdown_helper.rb

@@ -32,8 +32,11 @@ module Bootstrap::DropdownHelper
   # @param [String] text text of dropdown link
   # @yield yielded block is usually calls to {Bootstrap::NavHelper#dropdown_item} or {Bootstrap::NavHelper#dropdown_divider}
   # @return [String] '<li class='dropdown'><ul class='dropdown-menu'> with contents of yielded block
-  def nav_dropdown(text)
-    content_tag(:li, class: 'dropdown') do
+  def nav_dropdown(text, options={})
+    options = canonicalize_options(options)
+    options = ensure_class(options, 'dropdown')
+    
+    content_tag(:li, options) do
       nav_dropdown_link(text) + dropdown_ul { yield }
     end
   end

data/app/helpers/bootstrap/nav_helper.rb

@@ -8,17 +8,18 @@
 #     <%= brand('Link Brand', url: '#')%>
 #
 #     <%= nav_bar_links do %>
-#
 #       <%= nav_bar_link('Active', '#', active: true) %>
-#       <%= nav_bar_link('Link1', '/link1') %>
-#
+#       <%= nav_bar_link('Link 1', '/link1') %>
 #       <%= nav_bar_divider %>
-#
+#       <%= nav_bar_link('Link 2', '/link2') %>
+#     <% end >
+# 
+#     <%= nav_dropdown(pull: 'right') %>
 #       <%= nav_dropdown('Foo') do %>
 #         <%= dropdown_item('One', 'foo')%>
 #       <% end %>
-#
 #     <% end %>
+#
 #   <% end %>
 #
 # @example navigation list (e.g., in sidebar)
@@ -68,16 +69,22 @@ module Bootstrap::NavHelper
     end
   end
   
-  # Returns <ul> for a group of nav bar links.
+  # Returns <div> for a group of nav bar links, <ul>s.
   #
   # 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={})
     options = canonicalize_options(options)
     options = ensure_class(options, 'nav')
     
+    if pull = options.delete(:pull)
+      options = ensure_class(options, "pull-#{pull}")
+    end
+    
     content_tag(:div, options) do
       yield
     end
@@ -132,4 +139,29 @@ module Bootstrap::NavHelper
   def nav_list_header(text)
     content_tag(:li, text, class: 'nav-header')
   end
+  
+  # Wraps _text_ so it has proper leading and color for text in a nav bar.  Usually
+  # in a +nav_bar_links+ block
+  #
+  # Note that the Bootstrap CSS has no horizontal margins or padding.  This method
+  # pads with three +\&nbsp;+ at front and back.  Use +pad: false+ to suppress padding.
+  #
+  # @param text [String] text to display
+  # @param options [Hash] unknown options become html attributes for the <p>
+  # @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={})
+    options = canonicalize_options(options)
+
+    unless options.delete(:pad) == false
+      padding = ("&nbsp;" * 3).html_safe
+      text = padding + h(text) + padding
+    end
+    
+    pull_class = (options.delete(:pull).to_s == 'right' ? 'pull-right' : 'pull-left')
+    options = ensure_class(options, [pull_class, 'navbar-text'])
+    
+    content_tag(:p, text, options)
+  end
 end

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

@@ -5,11 +5,17 @@
   <%= nav_bar_links do %>
     <%= nav_bar_link('Application Home', bvh_app_home_link) %>
     <%= nav_bar_link('Active', '#', active: true) %>
-    <%= nav_bar_link('Link1', '/link1') %>
+    <%= nav_bar_link('Link 1', '#') %>
     <%= nav_bar_divider %>
+    <%= nav_bar_link('Link 2', '#') %>
+  <% end %>
+  
+  <%= nav_bar_links(pull: 'right') do %>
     <%= nav_dropdown('Foo') do %>
       <%= dropdown_item('One', 'foo') %>
     <% end %>
   <% end %>
+  
+  <%= nav_bar_text("Logged in as admin", pull: 'right') %>
 
 <% end %>

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

@@ -1,7 +1,7 @@
 <h1>Form Helpers</h1>
 
 <p>
-  <%= link_to('API Documentation', 'http://rubydoc.info/gems/bootstrap-view-helpers/frames/file/README.md') %>
+  <%= link_to('API Documentation', 'http://rubydoc.info/gems/bootstrap-view-helpers/Bootstrap/FormHelper') %>
 </p>
 
 <h2>Example</h2>

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

@@ -1,3 +1,3 @@
 module BootstrapViewHelpers
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-view-helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors: