|
From: Matt R. <mr...@us...> - 2007-08-28 04:52:06
|
Update of /cvsroot/struts-menu/navigator/web/templates In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24731/web/templates Modified Files: cssMenu.html Log Message: SM-84: Changed closing tag logic to key off of the number of items rendered, rather than the number available (which doesn't check permissions) Index: cssMenu.html =================================================================== RCS file: /cvsroot/struts-menu/navigator/web/templates/cssMenu.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** cssMenu.html 31 May 2007 19:23:03 -0000 1.7 --- cssMenu.html 28 Aug 2007 04:52:00 -0000 1.8 *************** *** 3,12 **** ## set menu title #set ($title = $displayer.getMessage($menu.title)) - #if (!$menu.url) #set ($url="javascript:void(0)") #else #set ($url=$menu.url) #end ## create a single menu item #if ($menu.components.size() == 0) ! #if ($velocityCount == $menu.parent.components.size()) <li class="last"> #else --- 3,11 ---- ## set menu title #set ($title = $displayer.getMessage($menu.title)) #if (!$menu.url) #set ($url="javascript:void(0)") #else #set ($url=$menu.url) #end ## create a single menu item #if ($menu.components.size() == 0) ! #if ($velocityCount == $renderedChildren) <li class="last"> #else *************** *** 16,27 **** <a href="$url" title="$title" class="current" #if($menu.target)target="$menu.target" #end#if($menu.width)style="width: ${menu.width}px"#end>${title}</a> #else ! <a href="$url" title="$title" #if($menu.target)target="$menu.target"#end#if($menu.width)style="width: ${menu.width}px"#end>${title}</a> #end #else ## create multiple menu items in a menu #if ($menu.components.size() > 0) #set ($hasViewableChildren = false) #foreach ($menuIt in $menu.components) #if ($displayer.isAllowed($menuIt)) #set($hasViewableChildren = true) #end #end --- 15,28 ---- <a href="$url" title="$title" class="current" #if($menu.target)target="$menu.target" #end#if($menu.width)style="width: ${menu.width}px"#end>${title}</a> #else ! <a href="$url" title="$title" #if($menu.target)target="$menu.target" #end#if($menu.width)style="width: ${menu.width}px"#end>${title}</a> #end #else ## create multiple menu items in a menu #if ($menu.components.size() > 0) #set ($hasViewableChildren = false) + #set ($renderedChildren = 0) #foreach ($menuIt in $menu.components) #if ($displayer.isAllowed($menuIt)) #set($hasViewableChildren = true) + #set($renderedChildren = $renderedChildren + 1) #end #end *************** *** 41,48 **** #end ! #if ($hasViewableChildren && ($velocityCount == $menu.parent.components.size())) ! </ul> #else </li> #end #else --- 42,52 ---- #end ! #if ($hasViewableChildren && ($velocityCount == $renderedChildren)) ! </li> #else + </ul> + #if ($velocityCount > $renderedChildren) </li> + #end #end #else *************** *** 55,57 **** #end ! #displayCssMenu($menu) --- 59,61 ---- #end ! #displayCssMenu($menu) \ No newline at end of file |