# HG changeset patch
# User Mike Wolfe <f8_to_blak@yahoo.com>
# Date 1287774666 14400
# Node ID 1566ed7dccbefa49c4bfb4118f2abfa68e91542f
# Parent  902f1986a45690ab4f3bb2bfc8dfc4c76bcebd81
add support for 'no_link_url' and 'active_url' to MENU helper

diff -r 902f1986a456 -r 1566ed7dccbe applications/welcome/static/base.css
--- a/applications/welcome/static/base.css	Fri Oct 29 08:56:31 2010 -0500
+++ b/applications/welcome/static/base.css	Fri Oct 22 15:11:06 2010 -0400
@@ -216,9 +216,12 @@
 .sf-menu {
 	float:	left;
 }
-.sf-menu a {
+.sf-menu a, .sf-menu div {
 	padding: 5px 15px;
 }
+.sf-menu div {
+        color: white;
+}
 .sf-menu li {
 	background: #333333;
 }
diff -r 902f1986a456 -r 1566ed7dccbe gluon/html.py
--- a/gluon/html.py	Fri Oct 29 08:56:31 2010 -0500
+++ b/gluon/html.py	Fri Oct 22 15:11:06 2010 -0400
@@ -1713,14 +1713,16 @@
             ul = UL(_class=self['ul_class'])
         for item in data:
             (name, active, link) = item[:3]
-            if link:
+            if 'no_link_url' in self.attributes and self['no_link_url']==link:
+                li = LI(DIV(name))
+            elif link:
                 li = LI(A(name, _href=link))
             else:
                 li = LI(A(name, _href='#null'))
             if len(item) > 3 and item[3]:
                 li['_class'] = self['li_class']
                 li.append(self.serialize(item[3], level+1))
-            if active:
+            if active or 'active_url' in self.attributes and self['active_url']==link:
                 if li['_class']:
                     li['_class'] = li['_class']+' '+self['li_active']
                 else: