Show URLs for previous versions of the document's files.

[tools/siman.git] / Workspace / Siman / WebContent / jsp / editContents.jsp

diff --git a/Workspace/Siman/WebContent/jsp/editContents.jsp b/Workspace/Siman/WebContent/jsp/editContents.jsp
index 6929ecebc2e238857f5028e575c2338bec09115f..f443ec255b0d7cdc46f218b16b882d98949cd36c 100644 (file)
--- a/Workspace/Siman/WebContent/jsp/editContents.jsp
+++ b/Workspace/Siman/WebContent/jsp/editContents.jsp
@@ -2,13 +2,7 @@
     pageEncoding="ISO-8859-1"
 %>
 <%@ taglib prefix="s" uri="/struts-tags"
-%><%
-    String action = request.getParameter("action");
-    String index  = request.getParameter("index");
 %>
-<s:set var="todo"><%=action%></s:set>
-<s:set var="edit"><%=index%></s:set>
-
 <s:url id="develop" namespace="/study" action="document-study">
   <s:param name="action">develop</s:param>
 </s:url>
@@ -30,17 +24,18 @@
     <td width=18></td>
     <td><s:text name="label.title"/></td>
     <td width=120 align=center>&nbsp;<s:text name="label.version"/>&nbsp;</td>
-    <td width=80 align=right><s:text name="label.size"/>&nbsp;&nbsp;&nbsp;</td>
+    <td width=80 align="right"><s:text name="label.size"/>&nbsp;&nbsp;&nbsp;</td>
     <td width=75 align=left>&nbsp;&nbsp;&nbsp;&nbsp;<s:text name="label.date"/><img src="<s:url value="/skin/icon.sortdown.png"/>" border="none"/></td>
   </tr>
   <tr height=1 bgcolor=#AAAAAA><td colspan=7></td></tr>
   <s:if test="documents.size > 0">
+  <s:set var="selectedDocIndex" value="%{index}"/>
     <s:iterator value="documents">
       <s:set var="docindex" value="%{index}"/>
       <tr height=18>
         <td>
-          <s:if test="%{#todo == 'renameDocument'}">
-            <s:if test="%{#edit == #docindex}">
+          <s:if test="%{curAction == 'renameDocument'}">
+            <s:if test="%{#selectedDocIndex == #docindex}">
               <s:a href="%{undo}"><img src="<s:url value="/skin/icon.undo.png"/>" border="none" title="<s:text name="tooltip.cancel"/>" /></s:a>
             </s:if><s:else>
               <img src="<s:url value="/skin/image.box.png"/>"  border="none" title=""/>
@@ -52,7 +47,7 @@
           </s:else>
         </td>
         <td>
-          <s:if test="%{#todo != 'renameDocument'}">
+          <s:if test="%{curAction != 'renameDocument'}">
             <div id="popdoc<s:property value="%{#docindex}"/>" style="position:absolute; display:none; top:0px; left:0px; z-index:10000;" onmouseover="javascript:_mouseOverContext=true;" onmouseout="javascript:_mouseOverContext=false;">
               <jsp:include page="/jsp/menupopup.jsp"/>
             </div>
@@ -64,13 +59,19 @@
             <img src="<s:url value="/skin/%{stateIcon}"/>" width=14 height=14 border="none" title=""/>
           </s:else>
         </td>
-        <td><img src="<s:url value="/skin/%{fileIcon}"/>" border="none" title=""/></td>
         <td>
-          <s:if test="%{#todo == 'renameDocument'}">
-            <s:if test="%{#edit == #docindex}">
+          <s:a href="%{URL}" target="_blank" cssClass="link"> 
+            <img src="<s:url value="/skin/%{fileIcon}"/>" border="none" title=""/>  </s:a>
+        </td>
+        <td>
+          <s:if test="%{curAction == 'renameDocument'}">
+            <s:if test="%{#selectedDocIndex == #docindex}">
               <input type="hidden" name="action" value="renameDocument" />
-              <input type="hidden" name="index" value="<%=index%>" />
+              <input type="hidden" name="index" value="<s:property value="index"/>" />
               <input type="text"   name="documentTitle" size="60" value="<s:property value="title"/>" />
+              <button type="submit" value="" style="width:24px; height:16px; border:0; cursor:pointer; cursor:hand; background:transparent">
+                  <img src="<s:url value="/skin/image.export.png"/>" title="<s:text name="button.save"/>"/>
+              </button>
             </s:if><s:else>
               <s:property value="title"/>
             </s:else>
@@ -90,8 +91,8 @@
           </table>
           </s:else>
         </td>
-        <td align=right><s:property value="size"/>&nbsp;&nbsp;</td>
-        <td align=right><s:property value="date"/></td>
+        <td align="right"><s:property value="size"/>&nbsp;&nbsp;</td>
+        <td align="right"><s:property value="date"/></td>
       </tr>
       <s:if test="%{presentationState == 'open' || presentationState == 'deepopen'}">
         <s:iterator value="uses">
@@ -99,10 +100,14 @@
             <td></td>
             <td></td>
             <td><img src="<s:url value="/skin/icon.relation.png"/>" border="none" title=""/></td>
-            <td><i><s:text name="label.uses"/>:</i>&nbsp;<s:property value="title"/></td>
+            <td>
+              <s:a href="%{URL}" target="_blank" cssClass="link">
+                <i><s:text name="label.uses"/>:</i>&nbsp;<s:property value="title"/>
+              </s:a>
+            </td>
             <td align=center><s:property value="version"/></td>
-            <td align=right><s:property value="size"/>&nbsp;&nbsp;</td>
-            <td align=right><s:property value="date"/></td>
+            <td align="right"><s:property value="size"/>&nbsp;&nbsp;</td>
+            <td align="right"><s:property value="date"/></td>
           </tr>
         </s:iterator>
         <s:iterator value="attachments">
@@ -111,12 +116,14 @@
             <td></td>
             <td><img src="<s:url value="/skin/image.attach.png"/>" border="none" title=""/></td>
             <td>
-              <i><s:text name="label.converts"/>:</i>&nbsp;
-              <s:property value="format"/>&nbsp;<s:property value="description"/>
+              <s:a href="%{URL}" target="_blank" cssClass="link">
+                <i><s:text name="label.converts"/>:</i>&nbsp;
+                <s:property value="format"/>&nbsp;<s:property value="description"/>
+              </s:a>
             </td>
             <td align=center></td>
-            <td align=right><s:property value="size"/>&nbsp;&nbsp;</td>
-            <td align=right><s:property value="date"/></td>
+            <td align="right"><s:property value="size"/>&nbsp;&nbsp;</td>
+            <td align="right"><s:property value="date"/></td>
           </tr>
         </s:iterator>
         <s:if test="%{history != null}">
@@ -143,7 +150,16 @@
                 <table cellpadding=0 cellspacing=0 border=0>
                   <tr>
                     <td width=18><img src="<s:url value="/skin/%{fileIcon}"/>" border="none" title=""/></td>
-                    <td><s:property value="description"/></td>
+                    <td>
+                      <s:if test="%{!URL.equals(prevUrl)}">
+                          <s:a href="%{URL}" target="_blank" cssClass="link">
+                            <s:property value="description"/>
+                          </s:a>
+                      </s:if><s:else>
+                        <s:property value="description"/>
+                      </s:else>
+                    </td>
+                    <s:set name="prevUrl" value="%{URL}"/>
                   </tr>
                 </table>
               </td>
@@ -156,8 +172,8 @@
                   </tr>
                 </table>
               </td>
-              <td align=right><s:property value="size"/>&nbsp;&nbsp;</td>
-              <td align=right><s:property value="date"/></td>
+              <td align="right"><s:property value="size"/>&nbsp;&nbsp;</td>
+              <td align="right"><s:property value="date"/></td>
             </tr>
             </s:iterator>
           </s:if>
@@ -165,7 +181,7 @@
       </s:if>
     </s:iterator>
   </s:if>
-  <s:if test="%{#todo != 'renameDocument' && userRights.canCreateDocument()}">
+  <s:if test="%{curAction != 'renameDocument' && userRights.canCreateDocument()}">
     <tr height=22 valign=bottom>
       <td align=center>
         <s:a href="%{addocument}">