Update of
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/webapp/editors/repository
In directory
james.mmbase.org:/tmp/cvs-serv13229/openofficeintegration/src/webapp/editors/repository
Modified Files:
uploadodt.jsp attachmentupload.jsp
Log Message:
CMSC-472.
Add enter point in content.jsp.
implement Openoffice export function ,server side function.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/openofficeintegration/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-472
Index: uploadodt.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/webapp/editors/repository/uploadodt.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- uploadodt.jsp 21 Jan 2008 07:35:30 -0000 1.2
+++ uploadodt.jsp 22 Jan 2008 10:26:11 -0000 1.3
@@ -1,29 +1,29 @@
-<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"%>
-<[EMAIL PROTECTED] file="globals.jsp" %>
-<[EMAIL PROTECTED]
import="com.finalist.util.http.BulkUploadUtil,com.finalist.cmsc.openoffice.service.OODocUploadUtil"%>
+<%@ page language="java" contentType="text/html;charset=utf-8" %>
+<%@ include file="globals.jsp" %>
+<%@ page
import="com.finalist.util.http.BulkUploadUtil,com.finalist.cmsc.openoffice.service.OODocUploadUtil"
%>
<mm:content type="text/html" encoding="UTF-8" expires="0">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html:html xhtml="true">
-<cmscedit:head title="attachments.upload.title">
- <script src="../repository/search.js"type="text/javascript" ></script>
+<cmscedit:head title="odtupload.title">
+ <script src="../repository/search.js" type="text/javascript"></script>
<script language="javascript" type="text/javascript">
function upload() {
- var f=document.forms[0];
+ var f = document.forms[0];
f.submit();
- setTimeout('sayWait();',0);
+ setTimeout('sayWait();', 0);
}
function sayWait() {
- document.getElementById("busy").style.visibility="visible";
- document.getElementById("notbusy").style.visibility="hidden";
+ document.getElementById("busy").style.visibility = "visible";
+ document.getElementById("notbusy").style.visibility = "hidden";
}
function showInfo(objectnumber) {
- openPopupWindow('attachmentinfo', '500', '500',
'attachmentinfo.jsp?objectnumber='+objectnumber);
+ openPopupWindow('attachmentinfo', '500', '500',
'attachmentinfo.jsp?objectnumber=' + objectnumber);
}
@@ -31,15 +31,16 @@
</cmscedit:head>
+
<body>
-<mm:cloud jspvar="cloud" >
+<mm:cloud jspvar="cloud">
<div class="tabs">
<div class="tab_active">
<div class="body">
<div>
- <a href="#"><fmt:message key="attachments.upload.title"
/></a>
+ <a href="#"><fmt:message key="odtupload.title"/></a>
</div>
</div>
</div>
@@ -53,43 +54,64 @@
<input type="hidden" name="channelbak" value="${parent
}"/>
<table border="0">
<tr>
- <td><fmt:message key="attachments.upload.explanation"
/></td>
+ <td><fmt:message key="odtupload.explanation"/></td>
</tr>
<tr>
- <td><input type="file" name="odtfile"/></td>
+ <td><input type="file" name="odtfile"/>
+ <c:if test="${odtDoc == false}">
+ <span style="color:red">The file must be
OpenOffice odt type!</span>
+ </c:if></td>
</tr>
<tr>
<td><input type="button" name="uploadButton"
onclick="upload();"
- value="<fmt:message
key="attachments.upload.submit" />"/></td>
+ value="<fmt:message
key="attachments.upload.submit" />"/>
+ </td>
</tr>
</table>
</form>
</div>
- <div class="ruler_green"><div><fmt:message
key="attachments.upload.results" /></div></div>
+ <div class="ruler_green">
+ <div><fmt:message key="odtupload.attachmentlist"/></div>
+ </div>
<div class="body">
<div id="busy">
- <fmt:message key="uploading.message.wait"/><br />
+ <fmt:message key="uploading.message.wait"/><br/>
</div>
-<c:if test="${not empty binaries}">
-<table width="100%">
-<tr><td></td><td>Title</td></tr>
-<c:forEach var="entity" items="${binaries}">
-<tr>
- <td><a href="DeleteOdt.do?parent=${parent}&name=${entity.title}"><img
src="../gfx/icons/delete.png" width="16" height="16" title="delete"
alt="delete"/></a></td><td><c:out value="${entity.title}"/></td>
-</tr>
-</c:forEach>
-</table>
+ <c:if test="${not empty binaries}">
+ <table width="100%" border="0">
+ <tr>
+ <td></td>
+ <td><fmt:message key="odtupload.file.title"/></td>
+ </tr>
+ <c:forEach var="entity" items="${binaries}"
varStatus="status">
-<form action="../upload/OdtStore.do">
-<p><input type="submit" value="submit"/>
+ <c:choose><c:when test="${status.count % 2 != 0}">
+ <tr class="swap">
+ </c:when>
+ <c:otherwise>
+ <tr>
+ </c:otherwise>
+ </c:choose>
+ <td><a
href="DeleteOdt.do?parent=${parent}&name=${entity.title}"><img
+ src="../gfx/icons/delete.png" width="16"
height="16" title="delete"
+ alt="delete"/></a></td>
+ <td><c:out value="${entity.title}"/></td>
+ </tr>
+ </c:forEach>
+ </table>
+
+ <form action="../upload/OdtStore.do">
+ <input type="submit" value="<fmt:message
key="odtupload.file.save"/>"/>
<input type="hidden" name="parent" value="${parent}"/>
-</form>
+ </form>
-</c:if>
-</div>
-</div>
+ </c:if>
+ </div>
+ </div>
</mm:cloud>
+
+
</body>
</html:html>
</mm:content>
\ No newline at end of file
Index: attachmentupload.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/webapp/editors/repository/attachmentupload.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- attachmentupload.jsp 21 Jan 2008 07:35:30 -0000 1.2
+++ attachmentupload.jsp 22 Jan 2008 10:26:11 -0000 1.3
@@ -1,158 +1,19 @@
-<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"%>
+<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"%>
<[EMAIL PROTECTED] file="globals.jsp" %>
-<[EMAIL PROTECTED]
import="com.finalist.util.http.BulkUploadUtil,com.finalist.cmsc.openoffice.service.OODocUploadUtil"%>
+<[EMAIL PROTECTED]
import="com.finalist.cmsc.openoffice.service.OODocUploadUtil,com.finalist.cmsc.repository.RepositoryUtil"%>
<mm:content type="text/html" encoding="UTF-8" expires="0">
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html:html xhtml="true">
-<cmscedit:head title="attachments.upload.title">
- <script src="../repository/search.js"type="text/javascript" ></script>
- <script language="javascript" type="text/javascript">
- function upload() {
- var f=document.forms[0];
- f.submit();
- setTimeout('sayWait();',0);
-
- }
-
- function sayWait() {
- document.getElementById("busy").style.visibility="visible";
- document.getElementById("notbusy").style.visibility="hidden";
- }
-
- function showInfo(objectnumber) {
- openPopupWindow('attachmentinfo', '500', '500',
'attachmentinfo.jsp?objectnumber='+objectnumber);
- }
- </script>
-</cmscedit:head>
-<body>
<mm:cloud jspvar="cloud" >
- <div class="tabs">
- <div class="tab">
- <div class="body">
- <div>
- <a
href="attachmentsearch.jsp?action=${param.uploadAction}"><fmt:message
key="attachments.title" /></a>
- </div>
- </div>
- </div>
- <div class="tab_active">
- <div class="body">
- <div>
- <a href="#"><fmt:message key="attachments.upload.title"
/></a>
- </div>
- </div>
- </div>
- </div>
-
- <div class="editor" style="height:500px">
- <div class="body">
- <form action="" enctype="multipart/form-data" method="post">
- <input type="hidden" name="uploadAction"
value="${param.uploadAction}"/>
- <table border="0">
- <tr>
- <td><fmt:message key="attachments.upload.explanation"
/></td>
- </tr>
- <tr>
- <td><input type="file" name="zipfile"/></td>
- </tr>
- <tr>
- <td><input type="button" name="uploadButton"
onclick="upload();"
- value="<fmt:message
key="attachments.upload.submit" />"/></td>
- </tr>
- </table>
- </form>
- </div>
- <div class="ruler_green"><div><fmt:message
key="attachments.upload.results" /></div></div>
- <div class="body">
- <div id="busy">
- <fmt:message key="uploading.message.wait"/><br />
- </div>
-<%
- // retrieve list op node id's from either the recent openoffice
+<% // retrieve list op node id's from either the recent upload
// or from the request url to enable a return url
// TODO move this to a struts action there are some issue with HttpUpload
// in combination with struts which have to be investigated first
- String uploadedNodes = "";
- int numberOfUploadedNodes = -1;
if ("post".equalsIgnoreCase(request.getMethod())) {
String dir =
pageContext.getServletContext().getRealPath("/")+"tempDir";
-
+ request.setAttribute("root", RepositoryUtil.getRoot(cloud));
OODocUploadUtil docUpload = OODocUploadUtil.getInstance();
docUpload.upload(request,dir);
-
- } else {
- if (request.getParameter("uploadedNodes") != null) {
- uploadedNodes = request.getParameter("uploadedNodes");
- }
- if (request.getParameter("numberOfUploadedNodes") != null) {
- numberOfUploadedNodes =
Integer.parseInt(request.getParameter("numberOfUploadedNodes"));
- }
+ out.println("root="+RepositoryUtil.getRoot(cloud));
}
%>
-<% if (numberOfUploadedNodes == 0) { %>
- <p><fmt:message key="attachments.upload.error"/></p>
-<% } else if (numberOfUploadedNodes > 0) { %>
- <p id="notbusy"><fmt:message key="attachments.upload.result">
- <fmt:param value="<%= numberOfUploadedNodes %>"/>
- </fmt:message>
- </p>
- <table>
- <tr class="listheader">
- <th></th>
- <th nowrap="true"><fmt:message
key="attachmentsearch.titlecolumn" /></th>
- <th><fmt:message key="attachmentsearch.filenamecolumn" /></th>
- </tr>
- <tbody class="hover">
- <c:set var="useSwapStyle">true</c:set>
-
- <mm:listnodescontainer path="attachments" nodes="<%=
uploadedNodes %>">
- <mm:listnodes>
-
- <mm:field name="title"
escape="js-single-quotes" jspvar="title">
- <mm:attachment
escape="js-single-quotes" jspvar="attachment">
- <%
- title =
((String)title).replaceAll("[\"]","@quot;");
- attachment =
((String)attachment).replaceAll("[\"]","@quot;");
- %>
- <mm:import
id="url">javascript:selectElement('<mm:field name="number"/>', '<%=title%>',
'<%=attachment%>');</mm:import>
- </mm:attachment>
- </mm:field>
- <tr <c:if test="${useSwapStyle}">class="swap"</c:if>
href="<mm:write referid="url"/>">
- <td>
- <%-- use uploadedNodes and numberOfUploadedNodes in
return url --%>
-
- <c:set
var="returnUrl">/editors/resources/attachmentupload.jsp?uploadedNodes=<%=uploadedNodes%>&numberOfUploadedNodes=<%=numberOfUploadedNodes%>&uploadAction=${param.uploadAction}</c:set>
- <c:choose>
- <c:when
test="${param.uploadAction == 'select'}">
- <a href="<mm:url
page="SecondaryEditAction.do">
- <mm:param name="action"
value="init"/>
- <mm:param
name="number"><mm:field name="number" /></mm:param>
- <mm:param name="returnUrl"
value="${returnUrl}"/>
- </mm:url>"
onclick="blockSelect = true">
- </c:when>
- <c:otherwise>
- <a href="<mm:url
page="../WizardInitAction.do">
- <mm:param
name="objectnumber"><mm:field name="number" /></mm:param>
- <mm:param name="returnurl"
value="${returnUrl}" />
- </mm:url>">
- </c:otherwise>
- </c:choose>
- <img src="../gfx/icons/page_edit.png"
title="<fmt:message key="images.upload.edit"/>" alt="<fmt:message
key="images.upload.edit"/>"/></a>
- <a href="javascript:showInfo(<mm:field name="number"
/>)">
- <img src="../gfx/icons/info.png"
title="<fmt:message key="images.upload.info"/>" alt="<fmt:message
key="images.upload.info"/>"/></a>
- </td>
- <td onMouseDown="objClick(this);"><mm:field
name="title"/></td>
- <td onMouseDown="objClick(this);"><mm:field
name="filename"/></td>
- </tr>
- <c:set var="useSwapStyle">${!useSwapStyle}</c:set>
- </mm:listnodes>
- </mm:listnodescontainer>
-
- </tbody>
- </table>
-<% } %>
-</div>
-</div>
</mm:cloud>
-</body>
-</html:html>
</mm:content>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
