You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ch...@apache.org on 2006/09/10 09:29:29 UTC
svn commit: r441921 - in /lenya/trunk/src/modules:
bxe/config/cocoon-xconf/usecase-insertAsset.xconf bxe/module.xml
bxe/usecases/insertAsset.jx
editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java
Author: chestnut
Date: Sun Sep 10 00:29:28 2006
New Revision: 441921
URL: http://svn.apache.org/viewvc?view=rev&rev=441921
Log:
Added ability to add resource document via the insertAsset usecase
Modified:
lenya/trunk/src/modules/bxe/config/cocoon-xconf/usecase-insertAsset.xconf
lenya/trunk/src/modules/bxe/module.xml
lenya/trunk/src/modules/bxe/usecases/insertAsset.jx
lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java
Modified: lenya/trunk/src/modules/bxe/config/cocoon-xconf/usecase-insertAsset.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/bxe/config/cocoon-xconf/usecase-insertAsset.xconf?view=diff&rev=441921&r1=441920&r2=441921
==============================================================================
--- lenya/trunk/src/modules/bxe/config/cocoon-xconf/usecase-insertAsset.xconf (original)
+++ lenya/trunk/src/modules/bxe/config/cocoon-xconf/usecase-insertAsset.xconf Sun Sep 10 00:29:28 2006
@@ -28,6 +28,7 @@
<parameter name="callbackFunction" value="insertAsset"/>
</view>
<parameter name="asset-usecase" value="tab.assets"/>
+ <exit usecase="edit.insertAsset"/>
</component-instance>
</xconf>
Modified: lenya/trunk/src/modules/bxe/module.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/bxe/module.xml?view=diff&rev=441921&r1=441920&r2=441921
==============================================================================
--- lenya/trunk/src/modules/bxe/module.xml (original)
+++ lenya/trunk/src/modules/bxe/module.xml Sun Sep 10 00:29:28 2006
@@ -5,7 +5,6 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
@@ -21,6 +20,7 @@
<id>org.apache.lenya.modules.bxe</id>
<depends module="org.apache.lenya.modules.usecase"/>
<depends module="org.apache.lenya.modules.webdav"/>
+ <depends module="org.apache.lenya.modules.resource"/>
<package>org.apache.lenya.modules</package>
<version>0.1-dev</version>
<name>BXE Editor</name>
Modified: lenya/trunk/src/modules/bxe/usecases/insertAsset.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/bxe/usecases/insertAsset.jx?view=diff&rev=441921&r1=441920&r2=441921
==============================================================================
--- lenya/trunk/src/modules/bxe/usecases/insertAsset.jx (original)
+++ lenya/trunk/src/modules/bxe/usecases/insertAsset.jx Sun Sep 10 00:29:28 2006
@@ -97,40 +97,152 @@
</table>
</form>
<jx:if test="${usecase.getParameter('document').getArea().equals('authoring')}">
- <form method="POST" enctype="multipart/form-data" id="form-new_asset">
+ <form method="POST" enctype="multipart/form-data" id="form-add_asset">
<input type="hidden" name="lenya.usecase" value="${usecase.getName()}"/>
<input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
- <input type="hidden" name="upload" value="true"/>
<table class="lenya-table-noborder">
<tr>
<td colspan="2">
<jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
</td>
</tr>
+ <jx:choose>
+ <jx:when test="${usecase.getParameter('pathProvided')}">
+ <tr>
+ <td class="lenya-entry-caption">
+ <label for="nodeName"><i18n:text>Path</i18n:text>: </label>
+ </td>
+ <td>
+ <jx:out value="${usecase.getParameter('path')}"/>
+ </td>
+ </tr>
+ </jx:when>
+ <jx:otherwise>
+ <tr>
+ <td class="lenya-entry-caption">
+ <label for="nodeName"><i18n:text>Parent Path</i18n:text>: </label>
+ </td>
+ <td>
+ <jx:out value="${usecase.getParameter('parentPath')}"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="lenya-entry-caption">
+ <label for="nodeName"><i18n:text>Node Name</i18n:text>*: </label>
+ </td>
+ <td>
+ <input class="lenya-form-element" type="text" name="nodeName" value="${usecase.getParameter('nodeName')}"/>
+ <br/> (<i18n:text>No whitespace, no special characters</i18n:text>)
+ </td>
+ </tr>
+ </jx:otherwise>
+ </jx:choose>
<tr>
- <td class="lenya-entry-caption"><label for="file"><i18n:text>File</i18n:text> *</label></td>
+ <td class="lenya-entry-caption"><label for="file">
+ <i18n:text>File</i18n:text> *</label></td>
<td><input type="file" name="file" class="lenya-form-element"/></td>
</tr>
<tr>
- <td class="lenya-entry-caption"><label for="title"><i18n:text>Title</i18n:text></label></td>
- <td><input type="text" name="title" class="lenya-form-element" value="${usecase.getParameter('title')}"/></td>
+ <td class="lenya-entry-caption">
+ <label for="title"><i18n:text>Navigation Title</i18n:text>*:
+ </label></td>
+ <td>
+ <input class="lenya-form-element" type="text" name="title"
+ value="${usecase.getParameter('title')}"/>
+ </td>
</tr>
<tr>
- <td class="lenya-entry-caption"><label for="creator"><i18n:text>Creator</i18n:text></label></td>
- <td><input type="text" name="creator" class="lenya-form-element" value="${usecase.getParameter('creator')}"/></td>
+ <td class="lenya-entry-caption">
+ <label for="visibleinnav"><i18n:text>Document visible in
+ Navigation</i18n:text>*:
+ </label></td>
+ <jx:set var="visible" value="yes"/>
+ <jx:if
+ test="${usecase.getParameter('visibleInNav').equals('false')}">
+ <jx:set var="visible" value="no"/>
+ </jx:if>
+ <td>
+ <select class="lenya-form-element" name="visibleInNav">
+ <jx:choose>
+ <jx:when test="${visible.equals('yes')}">
+ <option value="true" selected="selected">
+ <i18n:text>yes</i18n:text></option>
+ <option value="false"><i18n:text>no</i18n:text></option>
+ </jx:when>
+ <jx:otherwise>
+ <option value="true"><i18n:text>yes</i18n:text></option>
+ <option value="false" selected="selected">
+ <i18n:text>no</i18n:text></option>
+ </jx:otherwise>
+ </jx:choose>
+ </select>
+ </td>
</tr>
+ <jx:if test="${!usecase.getParameter('documentIdProvided')}">
+ <tr>
+ <td class="lenya-entry-caption">
+ <label for="relation"><i18n:text>Relation</i18n:text>*:
+ </label>
+ </td>
+ <td>
+ <jx:forEach var="relation"
+ items="${usecase.getParameter('relations')}">
+ <jx:choose>
+ <jx:when
+ test="${relation.equals(usecase.getParameter('relation'))}">
+ <input type="radio" name="relation" value="${relation}"
+ checked="checked"/><i18n:text>${relation}</i18n:text>
+ </jx:when>
+ <jx:otherwise>
+ <input type="radio" name="relation" value="${relation}"/>
+ <i18n:text>${relation}</i18n:text>
+ </jx:otherwise>
+ </jx:choose>
+ </jx:forEach>
+ </td>
+ </tr>
+ </jx:if>
+ <jx:set var="languages" value="${usecase.getParameter('languages')}"/>
+ <jx:choose>
+ <jx:when test="${languages.size() > 1}">
+ <tr>
+ <td class="lenya-entry-caption">
+ <label for="language"><i18n:text>Language</i18n:text>*:
+ </label></td>
+ <td>
+ <select class="lenya-form-element" name="language">
+ <jx:forEach var="language"
+ items="${usecase.getParameter('languages')}">
+ <option value="${language}">${language}</option>
+ </jx:forEach>
+ </select>
+ </td>
+ </tr>
+ </jx:when>
+ <jx:otherwise>
+ <tr>
+ <td colspan="2">
+ <jx:set var="language" value="${languages[0]}"/>
+ <input type="hidden" name="language" value="${language}"/>
+ </td>
+ </tr>
+ </jx:otherwise>
+ </jx:choose>
+ <input type="hidden" name="doctype" value="resource" />
<tr>
- <td class="lenya-entry-caption"><label for="rights"><i18n:text>Rights</i18n:text></label></td>
- <td><input type="text" name="rights" class="lenya-form-element" value="${usecase.getParameter('rights')}"/></td>
+ <td class="lenya-entry-caption">*
+ <i18n:text>required fields</i18n:text>
+ </td>
</tr>
<tr>
<td/>
<td>
- <input i18n:attr="value" type="submit" value="New Asset" name="input-new_asset"/>
+ <input i18n:attr="value" name="submit" type="submit"
+ value="New Asset"/>
</td>
</tr>
</table>
- </form>
+ </form>
</jx:if>
</page:body>
</page:page>
Modified: lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java?view=diff&rev=441921&r1=441920&r2=441921
==============================================================================
--- lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java (original)
+++ lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java Sun Sep 10 00:29:28 2006
@@ -23,19 +23,21 @@
import org.apache.lenya.ac.User;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentException;
-import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
import org.apache.lenya.cms.usecase.UsecaseInvoker;
import org.apache.lenya.cms.usecase.UsecaseMessage;
import org.apache.lenya.util.ServletHelper;
+import org.apache.lenya.cms.site.usecases.CreateResource;
/**
* Usecase to insert an image into a document.
*
* @version $Id$
*/
-public class InsertAsset extends DocumentUsecase {
+public class InsertAsset extends CreateResource {
+ protected static final String DOCUMENT = "document";
+
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
*/
@@ -43,6 +45,7 @@
super.initParameters();
loadResources();
+ setParameter(DOCUMENT, getSourceDocument());
try {
User user = getSession().getIdentity().getUser();
if (user != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org