displayStudy.jsp is removed, markup is fixed. KnowledgeElement deleting is fixed.

[tools/siman.git] / Workspace / Siman / WebContent / study / displayStudyStep.jsp
diff --git a/Workspace/Siman/WebContent/study/displayStudyStep.jsp b/Workspace/Siman/WebContent/study/displayStudyStep.jsp

index 26c49bc60d0cecb65c9fc8b533bf8c3bbb0877da..8039f65f6d2a165cc4cd15ec51ed8c77ce591bad 100644 (file)
--- a/Workspace/Siman/WebContent/study/displayStudyStep.jsp
+++ b/Workspace/Siman/WebContent/study/displayStudyStep.jsp
@@ -1,11 +1,6 @@
  <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"
-%>
-<%@
-    taglib prefix="s" uri="/struts-tags"
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-
+    pageEncoding="ISO-8859-1"%>
+<%@ taglib prefix="s" uri="/struts-tags"%>
  <!-- Initialization of the edit action, if any
       =============================================================================================================================
    -->
@@ -14,18 +9,14 @@
      if (action == null) action = "display";
  %>
  <s:set var="todo"><%=action%></s:set>
-<html>
+       <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
+    <link href="<s:url value="/rtef/rte.css"/>" rel="stylesheet" type="text/css">
  
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
-    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
-    <link href="../rtef/rte.css" rel="stylesheet" type="text/css">
-    <script language="JavaScript" type="text/javascript" src="../rtef/lang/fr.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../rtef/richtext.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../rtef/xhtml.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../js/popup.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../js/action.js"></script>
+    <script language="JavaScript" type="text/javascript" src="<s:url value="/rtef/lang/fr.js"/>"></script>
+    <script language="JavaScript" type="text/javascript" src="<s:url value="/rtef/richtext.js"/>"></script>
+    <script language="JavaScript" type="text/javascript" src="<s:url value="/rtef/xhtml.js"/>"></script>
+    <script language="JavaScript" type="text/javascript" src="<s:url value="/js/popup.js"/>"></script>
+    <script language="JavaScript" type="text/javascript" src="<s:url value="/js/action.js"/>"></script>
  
      <script language="JavaScript">
      
@@ -95,33 +86,10 @@
        edit.knowledgeValue.value = clean(edit.knowledgeValue.value);
        edit.submit();
      }
+    $(document).ready(function (){
+        initialize('<%=action%>');
+    });
      </script>
-  </head>
-
-  <body onLoad="initialize('<%=action%>')">
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-
-<!-- Title-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/titlebar.jsp" />
-
-<!-- Left pane
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />          
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="study" />
-      </jsp:include>
-      <jsp:include page="/jsp/studyProperties.jsp" />
-    </div>
-
-    <div id=main-pane>
  
  <!-- Description and simulation context sections
       =============================================================================================================================
@@ -157,10 +125,7 @@
              <div id="article-body">
                <s:if test="%{#todo == 'newContext' || #todo == 'selectContext' || #todo == 'setContext'}">
                  <form name="edit" action="<%=action%>?selection=<s:property value="selection"/>" method="post">
-                  <jsp:include page="/jsp/editContext.jsp">
-                    <jsp:param name="action" value="<%=action%>" />
-                    <jsp:param name="type"   value="<%=type%>" />
-                  </jsp:include>
+                  <jsp:include page="/jsp/editContext.jsp"/>
                  </form>
                </s:if>
                <s:else>
@@ -231,7 +196,3 @@
        </div>
        </s:if>
        </s:if>
-
-    </div>
-  </body>
-</html>
-\ No newline at end of file