|
From: Matt R. <mr...@us...> - 2007-06-01 22:58:32
|
Update of /cvsroot/struts-menu/navigator/web In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20962/web Modified Files: cssHorizontal.jsp cssVertical.jsp Log Message: SM-82: Changed from JSTL to scriplets to solve issue on Resin Index: cssHorizontal.jsp =================================================================== RCS file: /cvsroot/struts-menu/navigator/web/cssHorizontal.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cssHorizontal.jsp 13 May 2006 00:31:05 -0000 1.2 --- cssHorizontal.jsp 1 Jun 2007 22:58:28 -0000 1.3 *************** *** 67,71 **** ul#primary-nav li ul li a { padding: 2px 5px; } /* Sub Menu Styles */ - ul#primary-nav li:hover ul ul, ul#primary-nav li:hover ul ul ul, ul#primary-nav li.over ul ul, --- 67,70 ---- *************** *** 91,95 **** <div id="topMenu"> ! <c:if test="${not empty param.velocity}"> <menu:useMenuDisplayer name="Velocity" config="/templates/cssMenu.html"> <ul id="primary-nav" class="menuList"> --- 90,94 ---- <div id="topMenu"> ! <% if (request.getParameter("velocity") != null) { %> <menu:useMenuDisplayer name="Velocity" config="/templates/cssMenu.html"> <ul id="primary-nav" class="menuList"> *************** *** 100,106 **** </ul> </menu:useMenuDisplayer> ! </c:if> ! <c:if test="${empty param.velocity}"> <menu:useMenuDisplayer name="CSSListMenu" id="primary-nav"> <menu:displayMenu name="ToDoListMenuFile"/> --- 99,105 ---- </ul> </menu:useMenuDisplayer> ! <% } %> ! <% if (request.getParameter("velocity") == null) { %> <menu:useMenuDisplayer name="CSSListMenu" id="primary-nav"> <menu:displayMenu name="ToDoListMenuFile"/> *************** *** 109,113 **** <menu:displayMenu name="Standalone"/> </menu:useMenuDisplayer> ! </c:if> </div> --- 108,112 ---- <menu:displayMenu name="Standalone"/> </menu:useMenuDisplayer> ! <% } %> </div> Index: cssVertical.jsp =================================================================== RCS file: /cvsroot/struts-menu/navigator/web/cssVertical.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cssVertical.jsp 13 May 2006 00:31:05 -0000 1.2 --- cssVertical.jsp 1 Jun 2007 22:58:28 -0000 1.3 *************** *** 108,112 **** <div id="topMenu"> ! <c:if test="${not empty param.velocity}"> <menu:useMenuDisplayer name="Velocity" config="/templates/cssMenu.html"> <ul id="primary-nav" class="menuList"> --- 108,112 ---- <div id="topMenu"> ! <% if (request.getParameter("velocity") != null) { %> <menu:useMenuDisplayer name="Velocity" config="/templates/cssMenu.html"> <ul id="primary-nav" class="menuList"> *************** *** 117,123 **** </ul> </menu:useMenuDisplayer> ! </c:if> ! <c:if test="${empty param.velocity}"> <menu:useMenuDisplayer name="CSSListMenu" id="primary-nav"> <menu:displayMenu name="ToDoListMenuFile"/> --- 117,123 ---- </ul> </menu:useMenuDisplayer> ! <% } %> ! <% if (request.getParameter("velocity") == null) { %> <menu:useMenuDisplayer name="CSSListMenu" id="primary-nav"> <menu:displayMenu name="ToDoListMenuFile"/> *************** *** 126,130 **** <menu:displayMenu name="Standalone"/> </menu:useMenuDisplayer> ! </c:if> </div> --- 126,130 ---- <menu:displayMenu name="Standalone"/> </menu:useMenuDisplayer> ! <% } %> </div> |