From fc603f85ab4523ae47a459df2b4349b29e29c8fe Mon Sep 17 00:00:00 2001 From: mka Date: Wed, 31 Oct 2012 12:09:30 +0000 Subject: [PATCH] Left menu is improved --- Workspace/Siman/WebContent/jsp/menuitem.jsp | 17 ++-- Workspace/Siman/WebContent/menu.jsp | 4 +- .../WebContent/sadmin/approveKnowelm.jsp | 4 +- .../WebContent/sadmin/approveSContext.jsp | 4 +- .../Siman/WebContent/sadmin/displayUser.jsp | 4 +- .../Siman/WebContent/sadmin/indexStudies.jsp | 4 +- Workspace/Siman/WebContent/sadmin/upload.jsp | 4 +- .../WebContent/study/displayKnowledge.jsp | 4 +- .../study/displayStudyProperties.jsp | 4 +- .../WebContent/study/displayStudyStep.jsp | 4 +- .../study/editScenarioProperties.jsp | 4 +- .../WebContent/study/editStudyProperties.jsp | 4 +- Workspace/Siman/WebContent/study/error.jsp | 4 +- .../Siman/WebContent/study/importDocument.jsp | 4 +- .../Siman/WebContent/study/importError.jsp | 4 +- .../Siman/WebContent/study/newScenario.jsp | 4 +- Workspace/Siman/WebContent/study/newStudy.jsp | 4 +- .../WebContent/study/searchKnowledge.jsp | 4 +- .../Siman/WebContent/study/searchStudy.jsp | 4 +- Workspace/Siman/WebContent/study/upload.jsp | 4 +- .../WebContent/study/versionDocument.jsp | 4 +- .../Siman/src/org/splat/simer/Action.java | 92 ++++++++++++++++++- .../splat/simer/DisplayKnowledgeAction.java | 34 ++++++- .../splat/simer/DisplayStudyStepAction.java | 36 +++++++- .../org/splat/simer/EditDocumentAction.java | 42 +++++++-- .../simer/EditKnowledgeElementAction.java | 57 ++++++++---- .../simer/EditScenarioPropertiesAction.java | 28 +++++- .../simer/EditSimulationContextAction.java | 37 +++++++- .../src/org/splat/simer/EditStudyAction.java | 25 ++++- .../org/splat/simer/ImportDocumentAction.java | 39 ++++++-- .../src/org/splat/simer/LeftMenuSettings.java | 85 +++++++++++++++++ .../org/splat/simer/NewScenarioAction.java | 31 ++++++- .../src/org/splat/simer/NewStudyAction.java | 28 +++++- .../splat/simer/NotYetImplementedAction.java | 25 ++++- .../splat/simer/SearchKnowledgeAction.java | 25 ++++- .../org/splat/simer/SearchStudyAction.java | 25 ++++- .../src/org/splat/simer/StartAction.java | 25 ++++- .../splat/simer/StudyPropertiesAction.java | 45 +++++++-- .../src/org/splat/simer/UploadAction.java | 30 +++++- .../splat/simer/VersionDocumentAction.java | 32 ++++++- .../simer/admin/DatabaseIndexingAction.java | 25 ++++- .../splat/simer/admin/ImportUserAction.java | 25 ++++- .../simer/admin/SimulationContextAction.java | 28 +++++- .../Siman/src/spring/applicationContext.xml | 5 + 44 files changed, 774 insertions(+), 147 deletions(-) create mode 100644 Workspace/Siman/src/org/splat/simer/LeftMenuSettings.java diff --git a/Workspace/Siman/WebContent/jsp/menuitem.jsp b/Workspace/Siman/WebContent/jsp/menuitem.jsp index 528ebd3..2eb236e 100644 --- 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" -%> - -<% String mename = request.getParameter("menu"); - Menu menu = (Menu)session.getAttribute("menu." + mename); -%> - <%=menu.getName()%> - <%=menu.getNamespace()%> +<%@ page import="org.splat.simer.Action"%> +<%@ taglib prefix="s" uri="/struts-tags"%> + + +
    
+