Left menu is improved

[tools/siman.git] / Workspace / Siman / WebContent / jsp / menuitem.jsp

diff --git a/Workspace/Siman/WebContent/jsp/menuitem.jsp b/Workspace/Siman/WebContent/jsp/menuitem.jsp
index 528ebd30d8c967d68af933fff80ca8ea1eca84e0..2eb236ee822b0886c87bac375dd1cf26e713bd0b 100644 (file)
--- a/Workspace/Siman/WebContent/jsp/menuitem.jsp
+++ b/Workspace/Siman/WebContent/jsp/menuitem.jsp
@@ -4,27 +4,24 @@
 <%@ page import="java.util.Iterator"%>
 <%@ page import="org.splat.wapp.Menu"%>
 <%@ page import="org.splat.wapp.MenuItem"%>
-<%@
-    taglib prefix="s" uri="/struts-tags"
-%>
-<!-- Initialization of the context
-  -->
-<%  String  mename = request.getParameter("menu");       
-    Menu    menu   = (Menu)session.getAttribute("menu." + mename);
-%>
-  <s:set var="menuname"><%=menu.getName()%></s:set>
-  <s:set var="namespace"><%=menu.getNamespace()%></s:set>
+<%@ page import="org.splat.simer.Action"%>
+<%@ taglib prefix="s" uri="/struts-tags"%>
+
+  <s:set var="menuname" value="leftMenuSettings.menuName" />
+  <s:set var="namespace" value="leftMenuSettings.menuNamespace" />
 
 <!-- Display of the menu tab
   -->
   <div id="tab-bar">
     <span id="tab-front">&nbsp;&nbsp;<s:text name="title.%{#menuname}"/>&nbsp;&nbsp;</span>
   </div>
+  
 
 <!-- Display of menu items
   -->
   <div id=menuitem-box>
 <%
+       Menu menu = Action.getStaticMenu();
     boolean submenu = false;
     for (Iterator<MenuItem> listem = menu.asList().iterator(); listem.hasNext(); ) {
        MenuItem item  = listem.next();