radiant-navigation_tags-extension 0.2.6 → 0.2.7

data/lib/navigation_tags.rb

@@ -10,16 +10,23 @@ module NavigationTags
     <pre><code><r:nav [id="subnav"] [root=\"/products\"] [append_urls=\"/,/about-us/contact\"] [labels=\"/:Home,/about-us/contact:Contact us\"] [depth=\"2\"] [expand_all=\"true\"]/></code></pre> 
     *Attributes:*
 
-    root: defaults to "/", where to start building the navigation from, you can i.e. use "/products" to build a subnav
-    append_urls: urls of pages to add to the end of the navigation ul seperated by a comma
-    prepend_urls: urls of pages to add to the beginning of the navigation ul seperated by a comma
-    ids_for_lis: defaults to false, enable this to give each li an id (it's slug prefixed with nav_)
-    ids_for_links: defaults to false, enable this to give each link an id (it's slug prefixed with nav_)
-
-    labels: defaults to nil, use to overwrite the link text for given pages, otherwise the breadcrumb is used.
-    depth: defaults to 1, which means no sub-ul's, set to 2 or more for a nested list
-    expand_all: defaults to false, enable this to have all li's create sub-ul's of their children, i.o. only the currently active li
-    id, class,..: go as html attributes of the outer ul
+    *root*: defaults to "/", where to start building the navigation from, you can i.e. use "/products" to build a subnav
+
+    *append_urls*: urls of pages to add to the end of the navigation ul seperated by a comma. For external links, you can provide a label text after the link with a semicolon. E.g. append_urls="/,http://example.com;Other site"
+
+    *prepend_urls*: urls of pages to add to the beginning of the navigation ul seperated by a comma. For external links, you can provide a label text after the link with a semicolon. E.g. prepend_urls="/,http://example.com;Other site"
+
+    *ids_for_lis*: defaults to false, enable this to give each li an id (it's slug prefixed with nav_)
+
+    *ids_for_links*: defaults to false, enable this to give each link an id (it's slug prefixed with nav_)
+
+    *labels*: defaults to nil, use to overwrite the link text for given pages, otherwise the breadcrumb is used.
+
+    *depth*: defaults to 1, which means no sub-ul's, set to 2 or more for a nested list
+
+    *expand_all*: defaults to false, enable this to have all li's create sub-ul's of their children, i.o. only the currently active li
+
+    *id, class,..*: go as html attributes of the outer ul
   }
 
   tag "nav" do |tag|
@@ -45,6 +52,8 @@ module NavigationTags
         page = Page.find_by_path(url)
         if page.class_name != "FileNotFoundPage"
           lis << li_for_current_page_vs_navigation_item(tag.locals.page, page)
+        else
+          lis << li_for_external_link(url)
         end
       end
     end
@@ -58,6 +67,8 @@ module NavigationTags
         page = Page.find_by_path(url)
         if page.class_name != "FileNotFoundPage"
           lis << li_for_current_page_vs_navigation_item(tag.locals.page, page)
+        else
+          lis << li_for_external_link(url)
         end
       end
     end
@@ -121,11 +132,37 @@ module NavigationTags
     "<li#{li_attrs_for_current_page_vs_navigation_item(current_page, child_page)}>#{link_for_page(child_page)}</li>"
   end
   
+  def li_attrs_for_external_link link, label
+    classes = ["external"]
+    (classes << "first" && @first_set = true) unless @first_set
+    result = " class=\"#{classes.compact.join(" ")}\""
+    if @ids_for_lis
+      result << " id=\"nav_" + label.slugify + "\""
+    end
+  end
+  
+  def li_for_external_link link
+    if @labels && 
+      matched_label = @labels.split(',').map{|l| l[0..6] == 'http://' ? l[7..-1] : l }.select{|l| l.split(':').first == link}.first.try(:split, ':').try(:last)
+    else
+      matched_label = link[0..6] == 'http://' ? link[7..-1] : link
+    end
+    "<li#{li_attrs_for_external_link(link, matched_label)}>#{external_link(link, matched_label)}</li>"
+  end
+  
+  def external_link link, label
+    if @ids_for_links
+      "<a href=\"#{link}\" id=\"link_#{ label.slugify }\">#{label}</a>"
+    else
+      "<a href=\"#{link}\">#{label}</a>"
+    end
+  end
+  
   def link_for_page page
     if @ids_for_links
-      "<a href=\"#{page.url}\" id=\"#{("link_" + (page.slug == "/" ? 'home' : page.slug))}\">#{label_for_page(page)}</a>"
+      "<a href=\"#{page.path}\" id=\"#{("link_" + (page.slug == "/" ? 'home' : page.slug))}\">#{label_for_page(page)}</a>"
     else
-      "<a href=\"#{page.url}\">#{label_for_page(page)}</a>"
+      "<a href=\"#{page.path}\">#{label_for_page(page)}</a>"
     end
   end
   

data/lib/radiant-navigation_tags-extension.rb

@@ -1,5 +1,5 @@
 module RadiantNavigationTagsExtension
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
   AUTHORS = ['Benny Degezelle', 'Marty Haught', 'Ryan Heneise']
   EMAIL = 'benny@gorilla-webdesign.be'
   URL  = "https://github.com/jomz/navigation_tags"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-navigation_tags-extension
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Benny Degezelle
@@ -17,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-08 00:00:00 +01:00
-default_executable: 
+date: 2012-05-05 00:00:00 Z
 dependencies: []
 
 description: Adds an r:nav radius tag to Radiant CMS. This tag helps you build css-able navigation menus with ease.
@@ -39,7 +38,6 @@ files:
 - radiant-navigations_tags-extension.gemspec
 - Rakefile
 - README
-has_rdoc: true
 homepage: https://github.com/jomz/navigation_tags
 licenses: []
 
@@ -69,9 +67,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Makes building navigations much easier.
 test_files: []
 
+has_rdoc: