radiant-navigation-extension 2.0.1 → 2.0.2

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/navigation/tags/core.rb

@@ -40,8 +40,8 @@ module Navigation
           css_class = [("current" if tag.locals.page == root), "first"].compact
           first_set = true
           
-          tree << %{<li class="#{css_class.join(' ') unless css_class.empty?}" id="#{(root.slug == '/' ? 'home' : root.slug) if tag.attr['ids_for_lis']}">}
-          tree << %{<a href="#{root.url}" id="link_#{(child_page.slug == '/' ? 'home' : root.slug) if tag.attr['ids_for_links']}">}
+          tree << %{<li#{" class='#{css_class.join(' ')}'" unless css_class.empty?}#{" id='#{(root.slug == '/' ? 'home' : root.slug)}'" if tag.attr['ids_for_lis']}>}
+          tree << %{<a href="#{root.url}"#{" id='link_#{(child_page.slug == '/' ? 'home' : root.slug)}'" if tag.attr['ids_for_links']}>}
           tree << %{#{root.breadcrumb}}
           tree << %{</a></li>}
         end
@@ -53,6 +53,13 @@ module Navigation
           end
         end
         
+        ['only','except','expand_all','include_root'].each do |key| #'root','depth'
+          tag.attr.delete(key) 
+        end
+        
+        tag.attr.delete('only')
+        tag.attr.delete('except')
+        
         if tag.attr
           html_options = tag.attr.stringify_keys
           tag_options = tag_options(html_options)
@@ -60,9 +67,9 @@ module Navigation
           tag_options = nil
         end
         
-        %{<ul#{tag_options}>
+        %{<ol#{tag_options}>
         #{tree}
-        </ul>}
+        </ol>}
         
       end
       

data/lib/navigation/tags/helpers.rb

@@ -19,8 +19,8 @@ module Navigation
           css_class << "parent_of_current" if current_page.url.starts_with?(child_page.url) and current_page != child_page
           css_class.compact!
           
-          r =  %{<li class="#{css_class.join(' ') unless css_class.empty?}" id="nav_#{child_page.slug if tag.attr['ids_for_lis']}">}
-          r << %{<a href="#{child_page.url}" id="link_#{(child_page.slug == '/' ? 'home' : child_page.slug) if tag.attr['ids_for_links']}">}
+          r =  %{<li#{" class='#{css_class.join(' ')}'" unless css_class.empty?}#{" id='nav_#{child_page.slug}'" if tag.attr['ids_for_lis']}>}
+          r << %{<a href="#{child_page.url}"#{" id='link_#{(child_page.slug == '/' ? 'home' : child_page.slug)}'" if tag.attr['ids_for_links']}>}
           r << %{#{child_page.breadcrumb}}
           r << %{</a>}
           

data/radiant-navigation-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-navigation-extension}
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phil Schilter", "Dirk Kelly"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-navigation-extension
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Phil Schilter