leather 0.2.3 → 0.2.4

data/app/helpers/navigation_helper.rb

@@ -1,6 +1,6 @@
 module NavigationHelper
   def active_class(href, options)
-    if (@current_nav.present? && options[:current_nav].present? && @current_nav == options[:current_nav]) || current_page?(href)
+    if (@current_navs.present? && options[:current_nav].present? && @current_navs[options[:current_nav][0]] == options[:current_nav][1]) || current_page?(href)
       'active'
     else
       ''

data/app/views/leather/_dropdown_nav_item.html.haml

@@ -1,7 +1,7 @@
 - id = Time.now.to_f
 %li{ class: "#{active_class(href, options)} dropdown" }
-  %a.dropdown-toggle{:id => id, :href=>href, :data => {:target => '#', :toggle => 'dropdown'}}
+  %a.dropdown-toggle{ id: id, href: href, data: { target: '#', toggle: 'dropdown'} }
     = text
     %b.caret
-  %ul.dropdown-menu{:role => 'menu', :aria => {:labelledby => id}}
+  %ul.dropdown-menu{ role: 'menu', aria: { labelledby: id } }
     = block

data/app/views/leather/_modal_footer.html.haml

@@ -1,3 +1,2 @@
 .modal-footer
-  %button.btn.btn-default{ data: { dismiss: "modal" }, type: "button" }= close_text
-  %button.btn.btn-primary{ type: "button" } Save changes
+  = block

data/lib/leather/leather_helpers.rb

@@ -16,8 +16,8 @@ module Leather
       render partial: 'leather/modal_body', locals: { block: capture(&block) }
     end
 
-    def modal_footer(close_text = '')
-      render partial: 'leather/modal_footer', locals: { close_text: close_text }
+    def modal_footer(&block)
+      render partial: 'leather/modal_footer', locals: { block: capture(&block) }
     end
 
     def navbar(title, brand_link, html_options = {}, &block)

data/lib/leather/version.rb

@@ -1,3 +1,3 @@
 module Leather
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leather
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -189,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3058274935175038772
+      hash: -214643346293144590
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3058274935175038772
+      hash: -214643346293144590
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24