lenya/src/webapp/lenya/pubs/default/content/authoring create.xsp,1.4,1.5
Christian Egli <[email protected]> Tue, 20 May 2003 20:23:42 +0200
| Newsgroups | gmane.comp.cms.wyona.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /repository/lenya/src/webapp/lenya/pubs/default/content/authoring
In directory erbium:/tmp/cvs-serv21527/src/webapp/lenya/pubs/default/content/authoring
Modified Files:
create.xsp
Log Message:
Removed the usage of util.xsl as it didn't work when invoked from the
global sitemap. Use the PageEnvelope input module instead.
Index: create.xsp
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/content/authoring/create.xsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** create.xsp 14 May 2003 10:18:20 -0000 1.4
--- create.xsp 20 May 2003 18:23:39 -0000 1.5
***************
*** 4,16 ****
language="java"
xmlns:xsp="http://apache.org/xsp"
- xmlns:xsp-lenya="http://www.lenya.org/xsp/lenya/1.0"
xmlns:xsp-request="http://apache.org/xsp/request/2.0"
>
<parent-child>
- <!-- Import Lenya Page Envelope -->
- <xsp-lenya:util/>
-
<xsp:logic>
String status = <xsp-request:get-parameter name="status"/>;
--- 4,13 ----
language="java"
xmlns:xsp="http://apache.org/xsp"
xmlns:xsp-request="http://apache.org/xsp/request/2.0"
+ xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
>
<parent-child>
<xsp:logic>
String status = <xsp-request:get-parameter name="status"/>;
***************
*** 19,23 ****
String parentId = <xsp-request:get-parameter name="parent-uri"/>;
if (parentId == null) {
! parentId = <xsp-lenya:document-id/>;
// for creation purposes the parentid "/index" (the home page) is special.
if (parentId.equals("/index")) {
--- 16,20 ----
String parentId = <xsp-request:get-parameter name="parent-uri"/>;
if (parentId == null) {
! parentId = <input:get-attribute module="page-envelope" as="string" name="document-id"/>;
// for creation purposes the parentid "/index" (the home page) is special.
if (parentId.equals("/index")) {
***************
*** 29,39 ****
<xsp:content><exception/></xsp:content>
}
- <xsp:content>
- <parentid><xsp:expr>parentId</xsp:expr></parentid>
- </xsp:content>
- <xsp:content>
- <doctype><xsp:expr><xsp-request:get-parameter name="doctype"/></xsp:expr></doctype>
- </xsp:content>
</xsp:logic>
</parent-child>
--- 26,35 ----
<xsp:content><exception/></xsp:content>
}
</xsp:logic>
+
+ <parentid><xsp:expr>parentId</xsp:expr></parentid>
+ <referer><xsp-request:get-uri/></referer>
+ <doctype><xsp:expr><xsp-request:get-parameter name="doctype"/></xsp:expr></doctype>
+
</parent-child>