Integration of ISR fixes:

[tools/siman.git] / Workspace / Siman / WebContent / study / editStudyProperties.jsp

diff --git a/Workspace/Siman/WebContent/study/editStudyProperties.jsp b/Workspace/Siman/WebContent/study/editStudyProperties.jsp
index 7ade4c75bb1fdfd658ac4e8954abb3a719e325fd..b51afebae8e3e8ba6cb48b6999da07b38eb63eef 100644 (file)
--- a/Workspace/Siman/WebContent/study/editStudyProperties.jsp
+++ b/Workspace/Siman/WebContent/study/editStudyProperties.jsp
@@ -52,7 +52,7 @@
         </div>
         <div id=article-body class=text>
 
-          <form name="edit" action="valid-edit" method="post">
+          <s:form name="edit" action="valid-edit" method="post" validate="true">
           <table width=100% cellpadding=0 cellspacing=0 border=0 class=text>
 
             <tr height=10><td width=20></td></tr>
@@ -72,12 +72,12 @@
                 <s:a href="%{#undo}"><img src="<s:url value="/skin/icon.undo.png"/>" border="none" title="<s:text name="button.cancel"/>"/></s:a>
               </td>
               <td colspan=4>
-                <input type=text size="108" name=title value="<s:property value="studyTitle"/>">
+                <s:textfield size="108" name="title" value="%{studyTitle}" theme="simple"/>
               </td>
               <td align=right>
-                <button type="submit" name="saveTitle" value="" style="width:24px; height:16px; border:0; cursor:pointer; cursor:hand; background:transparent">
+                <s:submit type="button" name="saveTitle" value="" cssStyle="width:24px; height:16px; border:0; cursor:pointer; cursor:hand; background:transparent" theme="simple">
                   <img src="<s:url value="/skin/image.export.png"/>" title="<s:text name="button.save"/>"/>
-                </button>
+                </s:submit>
               </td>
               </s:if>
               <s:else>
@@ -123,7 +123,7 @@
             User  user = members.next();
             out.print("<td><input type=checkbox name=\"members\" value=\"" + String.valueOf(String.valueOf(user.getIndex())) + "\" checked/></td>");
             out.print("<td>");
-              out.print(user.toString());
+              out.print(controler.getText(user.getDisplayName()));
             out.print("</td>");
          } else {
             out.print("<td></td><td></td>");
@@ -132,7 +132,7 @@
           if (staff.hasNext()) {
                  User user = staff.next();
             out.print("<td><input type=checkbox name=\"candidates\" value=\"" + String.valueOf(user.getIndex()) + "\" />&nbsp;");
-              out.print(user.toString());
+              out.print(controler.getText(user.getDisplayName()));
             out.print("</td>");
           } else {
             out.print("<td></td>");
@@ -145,7 +145,7 @@
         out.print("<tr>");
           out.print("<td><input type=checkbox name=\"members\" value=\"" + String.valueOf(user.getIndex()) + "\" checked/></td>");
           out.print("<td>");
-            out.print(user.toString());
+            out.print(controler.getText(user.getDisplayName()));
           out.print("</td>");
         out.print("</tr>");
       }%>
@@ -166,14 +166,14 @@
               <td colspan=3>
                     <s:if test="contributors.size > 0">
                       <s:iterator value="contributors" status="counter">
-                        <s:if test="#counter.last"><s:property value="toString()"/></s:if>
-                        <s:else><s:property value="toString()"/>,</s:else>
+                        <s:if test="#counter.last"><s:property value="getText(displayName)"/></s:if>
+                        <s:else><s:property value="getText(displayName)"/>,</s:else>
                       </s:iterator>
                     </s:if><s:else>
                       <s:property value="%{'-'}"/>
                     </s:else>
               </td>
-              <td><s:property value="%{author.toString()}"/></td>
+              <td><s:property value="%{getText(author.displayName)}"/></td>
             </tr>
             </s:else>
 
@@ -211,7 +211,7 @@
                     <tr>
                       <td>
                         <s:checkbox name="readerIds" fieldValue="%{index}" theme="simple" checked="checked" /> &nbsp;
-                        <s:property value="%{displayName}"/>
+                        <s:property value="%{getText(displayName)}"/>
                       </td>
                     </tr>
                   </s:iterator>
@@ -224,7 +224,7 @@
                       <s:iterator value="candidates" status="status">
                         <td>
                           <s:checkbox name="readerIds" fieldValue="%{index}" theme="simple"/> &nbsp;
-                          <s:property value="%{displayName}"/>
+                          <s:property value="%{getText(displayName)}"/>
                         </td>
                         <s:if test="%{(#status.index + 1) % 3 == 0}">
                             </tr>
@@ -249,8 +249,8 @@
                 </td>
                 <td colspan="4">
                   <s:iterator value="readers" status="counter">
-                    <s:if test="#counter.last"><s:property value="%{displayName}"/></s:if>
-                    <s:else><s:property value="%{displayName}"/>,</s:else>
+                    <s:if test="#counter.last"><s:property value="%{getText(displayName)}"/></s:if>
+                    <s:else><s:property value="%{getText(displayName)}"/>,</s:else>
                   </s:iterator>
                 </td>
               </tr>
@@ -336,8 +336,8 @@
                 <select name="reviewer">
                   <option value="0">-&nbsp;<s:text name="label.skipped"/>&nbsp;-</option>
                   <s:iterator value="validationActors">         
-                    <s:if test="%{index == #selection}"><option value="<s:property value="index"/>" selected><s:property value="toString()"/></option></s:if>
-                    <s:else><option value="<s:property value="index"/>"><s:property value="toString()"/></option></s:else>
+                    <s:if test="%{index == #selection}"><option value="<s:property value="index"/>" selected><s:property value="getText(displayName)"/></option></s:if>
+                    <s:else><option value="<s:property value="index"/>"><s:property value="getText(displayName)"/></option></s:else>
                   </s:iterator>   
                 </select>
               </s:if><s:else>
@@ -351,8 +351,8 @@
                 <select name="approver">
                   <option value="0">-&nbsp;<s:text name="label.skipped"/>&nbsp;-</option>
                   <s:iterator value="validationActors">         
-                    <s:if test="%{index == #selection}"><option value="<s:property value="index"/>" selected><s:property value="toString()"/></option></s:if>
-                    <s:else><option value="<s:property value="index"/>"><s:property value="toString()"/></option></s:else>
+                    <s:if test="%{index == #selection}"><option value="<s:property value="index"/>" selected><s:property value="getText(displayName)"/></option></s:if>
+                    <s:else><option value="<s:property value="index"/>"><s:property value="getText(displayName)"/></option></s:else>
                   </s:iterator>   
                 </select>
               </s:if><s:else>
@@ -371,7 +371,7 @@
             </s:iterator>
             <tr height=3><td></td></tr>
             </table>
-          </form>
+          </s:form>
         </div>
       </div>