You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2005/04/19 10:16:33 UTC
svn commit: r161854 - in lenya/trunk/src/webapp/lenya:
resources/javascript/usecases/ resources/javascript/usecases/edit/
resources/javascript/usecases/edit/insertAsset.js
resources/misc/bxe/inc/config.xml usecases/edit/insertAsset.jx
Author: andreas
Date: Tue Apr 19 01:16:31 2005
New Revision: 161854
URL: http://svn.apache.org/viewcvs?view=rev&rev=161854
Log:
using usecase framework for BXE image upload
Added:
lenya/trunk/src/webapp/lenya/resources/javascript/usecases/
lenya/trunk/src/webapp/lenya/resources/javascript/usecases/edit/
lenya/trunk/src/webapp/lenya/resources/javascript/usecases/edit/insertAsset.js
Modified:
lenya/trunk/src/webapp/lenya/resources/misc/bxe/inc/config.xml
lenya/trunk/src/webapp/lenya/usecases/edit/insertAsset.jx
Added: lenya/trunk/src/webapp/lenya/resources/javascript/usecases/edit/insertAsset.js
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/resources/javascript/usecases/edit/insertAsset.js?view=auto&rev=161854
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/javascript/usecases/edit/insertAsset.js (added)
+++ lenya/trunk/src/webapp/lenya/resources/javascript/usecases/edit/insertAsset.js Tue Apr 19 01:16:31 2005
@@ -0,0 +1,19 @@
+ ext = '';
+
+ function insertImage(nodeid) {
+ // var link = document.forms['image'].link.value;
+ var link = '';
+ var src = document.forms['image'].assetName.value;
+ var title = document.forms['image'].caption.value;
+ var type = document.forms['image'].type.value;
+ var content = '<object xmlns="'+window.opener.XHTMLNS+'" href="'+link+'" title="'+title+'" type="'+type+'" data="'+nodeid + '/' + src+'">'+src+'</object>';
+ window.opener.bxe_insertContent(content,window.opener.bxe_ContextNode);
+ window.close();
+ }
+
+ function insertCaption(name, caption, type) {
+ document.forms['image'].assetName.value = name;
+ document.forms['image'].caption.value = caption;
+ document.forms['image'].type.value = type;
+ focus();
+ }
Modified: lenya/trunk/src/webapp/lenya/resources/misc/bxe/inc/config.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/resources/misc/bxe/inc/config.xml?view=diff&r1=161853&r2=161854
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/misc/bxe/inc/config.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/misc/bxe/inc/config.xml Tue Apr 19 01:16:31 2005
@@ -138,10 +138,10 @@
<button name="Asset" col="2" row="6" action="InsertAsset"/>
</buttons>
<callbacks>
- <element name="object" ns="http://www.w3.org/1999/xhtml" type="popup">?lenya.usecase=bxe&lenya.step=image-upload-show</element>
- <element name="img" ns="http://www.w3.org/1999/xhtml" type="popup">?lenya.usecase=bxe&lenya.step=image-upload-show</element>
+ <element name="object" ns="http://www.w3.org/1999/xhtml" type="popup">?lenya.usecase=edit.insertImage</element>
+ <element name="img" ns="http://www.w3.org/1999/xhtml" type="popup">?lenya.usecase=edit.insertImage</element>
<element name="table" ns="http://www.w3.org/1999/xhtml" type="function">bxe_InsertTableCallback</element>
- <element name="asset" ns="http://apache.org/cocoon/lenya/page-envelope/1.0" type="popup">?lenya.usecase=bxe&lenya.step=asset-upload-show</element>
+ <element name="asset" ns="http://apache.org/cocoon/lenya/page-envelope/1.0" type="popup">?lenya.usecase=edit.insertAsset</element>
<element name="a" ns="http://www.w3.org/1999/xhtml" precheck="bxe_checkIfNotALink" type="popup">?lenya.usecase=bxe&lenya.step=link-show</element>
</callbacks>
<options>
Modified: lenya/trunk/src/webapp/lenya/usecases/edit/insertAsset.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/edit/insertAsset.jx?view=diff&r1=161853&r2=161854
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/edit/insertAsset.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/edit/insertAsset.jx Tue Apr 19 01:16:31 2005
@@ -23,30 +23,7 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
<page:head>
- <script>
- ext = '';
-
- function insertImage() {
- var nodeid = '<jx:out value="${usecase.getParameter('document').getNodeId()}"/>/';
- // var link = document.forms['image'].link.value;
- var link = '';
- var src = document.forms['image'].name.value;
- var title = document.forms['image'].caption.value;
- var type = document.forms['image'].type.value;
- <![CDATA[
- var content = '<object xmlns="'+window.opener.XHTMLNS+'" href="'+link+'" title="'+title+'" type="'+type+'" data="'+nodeid + src+'">'+src+'</object>';
- ]]>
- window.opener.bxe_insertContent(content,window.opener.bxe_ContextNode);
- window.close();
- }
-
- function insertCaption(name, caption, type) {
- document.forms['image'].name.value = name;
- document.forms['image'].caption.value = caption;
- document.forms['image'].type.value = type;
- focus();
- }
- </script>
+ <script src="${request.contextPath}/lenya/javascript/usecases/edit/insertAsset.js"/>
</page:head>
<page:body>
@@ -85,10 +62,11 @@
<div style="margin: 10px">
<i18n:text>Caption</i18n:text>: <input class="lenya-form-element" type="text" name="caption"/>
<input type="hidden" name="type" value=""/>
+ <input type="hidden" name="assetName" value=""/>
</div>
<div style="margin: 10px">
<input i18n:attr="value" type="submit" name="submit" value="Submit"
- onClick="javascript:insertImage();" />
+ onClick="javascript:insertImage('${usecase.getParameter('document').getName()}');" />
 
<input i18n:attr="value" type="submit" name="cancel" value="Cancel"
onClick="location.href='javascript:window.close();';" />
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org