Salome HOME
Fix for a study creation with a new simulation context when no "product" context...
[tools/siman.git] / Workspace / Siman / WebContent / study / newStudy.jsp
index e5b2c1a4e892c75ee74e90f410e04abc1ecce5d5..7fada946e6fd08c1f39864fcd492be8186658557 100644 (file)
@@ -1,91 +1,99 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="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">
+<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles"%>
+<tiles:importAttribute name="valid_action" scope="request" />
 
-<div>
-    <script language="JavaScript">
+<script language="JavaScript">
+       function initialize() {
+               create.elements[0].focus();
+       }
 
-    function initialize () {
-//  ----------------------
-      create.elements[0].focus();
-    }
+       function setValue() {
+               var select = create.projectContextId.value; // contextValue select input
+               if (select == "0") { // Creation of a new context type
+                       tds = document.getElementById("select");
+                       tde = document.getElementById("enter");
+                       tds.style.display = "none"; // Hides the select input
+                       tde.style.display = "block"; // Displays the text input
+               }
+               create.projectContext.focus();
+       }
 
-    function setValue () {
-//  -------------------
-      var select = create.elements[1].value;  // contextValue select input
-      if (select == "0") {                    // Creation of a new context type
-        tds = document.getElementById("select");
-        tde = document.getElementById("enter");
-        tds.style.display = "none";           // Hides the select input
-        tde.style.display = "block";          // Displays the text input
-      }
-      create.elements[2].focus();
-    }
-    </script>
+       $(document).ready(function() {
+        <s:if test="projectContextValues.size > 0">
+               create.projectContextId.value = <s:property value="projectContextId"/>;
+        </s:if>
+               setValue();
+       });
+</script>
 
 <!-- New study dialog
-     =============================================================================================================================
+     ===========================================================================
   -->
-    <div id=center-pane>
-      <div id=article-box>
-        <div id=section><s:text name="title.newstudy"/></div>
-        <div id=top-spacer></div>
-        <form name="create" action="valid-new" method="post">
-        <table class="text">
+<div id="article-box">
+       <div id="section">
+               <s:text name="title.newstudy" />
+       </div>
+       <div id="top-spacer"></div>
+       <form id="create" name="create"
+               action="<tiles:getAsString name="input_action"/>" method="post">
+               <table class="text">
 
-          <tr class="error">
-            <td colspan=3><s:text name="%{error}"/></td>
-          </tr>
+                       <tr class="error">
+                               <td colspan="3"><s:text name="%{error}" /></td>
+                       </tr>
 
-          <tr>
-            <td>
-              &nbsp;<s:text name="field.studytitle"/>*:&nbsp;
-            </td>
-            <td colspan=2>
-              <input type=text size="60" name=title value="<s:property value="title"/>">
-            </td>
-          </tr>
+                       <tr>
+                               <td>&nbsp;<s:text name="field.studytitle" />*:&nbsp;
+                               </td>
+                               <td><s:textfield theme="simple" size="60" name="title" /></td>
+                       </tr>
 
-          <tr>
-            <td>
-              &nbsp;<s:text name="field.product"/>*:&nbsp;
-            </td>
-            <s:if test="projectContextValues.size > 0">
-              <td id=select>
-                <select name="projectContext" style="width:214px" onChange="setValue()">
-                  <option value="-1"><s:text name="menu.select"/></option>
-                  <option value="0">&nbsp;<s:text name="menu.newproduct"/></option>
-                  <optgroup label="&nbsp;<s:text name="label.products"/>">
-                    <s:iterator value="projectContextValues">
-                      <option value="<s:property value="index"/>">&nbsp;<s:property value="value"/></option>
-                    </s:iterator>
-                  </optgroup>
-                </select>
-              </td>
-              <td id=enter style="display: none">
-                <input type=text size="30" name=projectContext>
-              </td>
-            </s:if>
-            <s:else>
-              <td>
-                <input type=hidden         name=projectContext value="0">
-                <input type=text size="30" name=projectContext>
-              </td>
-            </s:else>
-            <td align=right>
-              <input type="submit" value="<s:text name="button.newstudy"/>"/>
-            </td>
-          </tr>
+                       <tr>
+                               <td>&nbsp;<s:text name="field.product" />*:&nbsp;
+                               </td>
+                               <s:if test="projectContextValues.size > 0">
+                                       <td id="select"><select name="projectContextId"
+                                               style="width: 214px" onChange="setValue()">
+                                                       <option value="-1">
+                                                               <s:text name="menu.select" />
+                                                       </option>
+                                                       <option value="0">
+                                                               &nbsp;
+                                                               <s:text name="menu.newproduct" />
+                                                       </option>
+                                                       <optgroup label="&nbsp;<s:text name="label.products"/>">
+                                                               <s:iterator value="projectContextValues">
+                                                                       <option value="<s:property value="index"/>">
+                                                                               &nbsp;
+                                                                               <s:property value="value" />
+                                                                       </option>
+                                                               </s:iterator>
+                                                       </optgroup>
+                                       </select></td>
+                                       <td id="enter" style="display: none"><s:textfield
+                                                       theme="simple" size="30" name="projectContext" /></td>
+                               </s:if>
+                               <s:else>
+                                       <td><s:hidden name="projectContextId" value="0" /> <s:textfield
+                                                       theme="simple" size="30" name="projectContext" /></td>
+                               </s:else>
+                       </tr>
+                       <tiles:insertAttribute name="source_study" ignore="true" />
 
-        </table>
-        </form>
-        <div id=top-spacer></div>
-      </div>
-    </div>
+                       <tr>
+                               <td align="right" colspan="2"><s:submit
+                                               action="%{#request.valid_action}" theme="simple" type="button"
+                                               key="button.newstudy" /></td>
+                       </tr>
+
+               </table>
+       </form>
+       <div id="top-spacer"></div>
+</div>
 
 <!-- Reserved
   -->
-    <div id=right-pane></div>
-    <div id=bottom-spacer></div>
-
-</div>
\ No newline at end of file
+<div id="right-pane"></div>
+<div id="bottom-spacer"></div>