Salome HOME
projects
/
tools
/
siman.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 37d5b7943cb915a3c7755fcce3bad5d0413c96a3..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"
<%@ 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
=============================================================================================================================
-->
<!-- Initialization of the edit action, if any
=============================================================================================================================
-->
@@
-14,9
+9,8
@@
if (action == null) action = "display";
%>
<s:set var="todo"><%=action%></s:set>
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="/skin/default.css"/> rel="stylesheet" type="text/css">
+ <link href="<s:url value="/rtef/rte.css"/>" rel="stylesheet" type="text/css">
<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/lang/fr.js"/>"></script>
<script language="JavaScript" type="text/javascript" src="<s:url value="/rtef/richtext.js"/>"></script>
@@
-92,10
+86,11
@@
edit.knowledgeValue.value = clean(edit.knowledgeValue.value);
edit.submit();
}
edit.knowledgeValue.value = clean(edit.knowledgeValue.value);
edit.submit();
}
+ $(document).ready(function (){
+ initialize('<%=action%>');
+ });
</script>
</script>
- <body onLoad="initialize('<%=action%>')">
-
<!-- Description and simulation context sections
=============================================================================================================================
<!-- Description and simulation context sections
=============================================================================================================================
@@
-130,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">
<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>
</form>
</s:if>
<s:else>
@@
-204,6
+196,3
@@
</div>
</s:if>
</s:if>
</div>
</s:if>
</s:if>
-
- </body>
-</html>
\ No newline at end of file