You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/01/29 18:13:58 UTC
cvs commit: cocoon-lenya/src/templates/forrest/resources/misc/bxeng content-bxeng.css
gregor 2004/01/29 09:13:58
Modified: src/templates/forrest/resources/schema/xhtml
xhtml-strict.rng xhtml.rng xhtml-basic.rng
src/templates/forrest/resources/schema/xhtml/modules
nameident.rng table.rng image.rng script.rng
link.rng pres.rng hypertext.rng base.rng
basic-table.rng iframe.rng object.rng datatypes.rng
struct.rng events.rng csismap.rng applet.rng
frames.rng attribs.rng ssismap.rng ruby.rng
legacy.rng inlstyle.rng target.rng edit.rng
list.rng bdo.rng text.rng meta.rng basic-form.rng
style.rng param.rng form.rng
src/templates/forrest/resources/schema/xhtml/exclude
basic-table.rng basic.rng form.rng
src/templates/forrest/config/menus generic.xsp
src/templates/forrest/config publication.xconf
src/templates/forrest/resources/misc/bxeng content-bxeng.css
Log:
some were binary
Revision Changes Path
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/xhtml-strict.rng
Index: xhtml-strict.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/xhtml-strict.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/xhtml.rng
Index: xhtml.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/xhtml.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/xhtml-basic.rng
Index: xhtml-basic.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/xhtml-basic.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/nameident.rng
Index: nameident.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/nameident.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/table.rng
Index: table.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/table.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/image.rng
Index: image.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/image.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/script.rng
Index: script.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/script.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/link.rng
Index: link.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/link.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/pres.rng
Index: pres.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/pres.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/hypertext.rng
Index: hypertext.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/hypertext.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/base.rng
Index: base.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/base.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/basic-table.rng
Index: basic-table.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/basic-table.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/iframe.rng
Index: iframe.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/iframe.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/object.rng
Index: object.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/object.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/datatypes.rng
Index: datatypes.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/datatypes.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/struct.rng
Index: struct.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/struct.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/events.rng
Index: events.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/events.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/csismap.rng
Index: csismap.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/csismap.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/applet.rng
Index: applet.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/applet.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/frames.rng
Index: frames.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/frames.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/attribs.rng
Index: attribs.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/attribs.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/ssismap.rng
Index: ssismap.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/ssismap.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/ruby.rng
Index: ruby.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/ruby.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/legacy.rng
Index: legacy.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/legacy.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/inlstyle.rng
Index: inlstyle.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/inlstyle.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/target.rng
Index: target.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/target.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/edit.rng
Index: edit.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/edit.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/list.rng
Index: list.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/list.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/bdo.rng
Index: bdo.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/bdo.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/text.rng
Index: text.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/text.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/meta.rng
Index: meta.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/meta.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/basic-form.rng
Index: basic-form.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/basic-form.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/style.rng
Index: style.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/style.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/param.rng
Index: param.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/param.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/form.rng
Index: form.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/modules/form.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/exclude/basic-table.rng
Index: basic-table.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/exclude/basic-table.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/exclude/basic.rng
Index: basic.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/exclude/basic.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-lenya/src/templates/forrest/resources/schema/xhtml/exclude/form.rng
Index: form.rng
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/schema/xhtml/exclude/form.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.4 +211 -211 cocoon-lenya/src/templates/forrest/config/menus/generic.xsp
Index: generic.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/config/menus/generic.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- generic.xsp 21 Oct 2003 15:11:16 -0000 1.3
+++ generic.xsp 29 Jan 2004 17:13:58 -0000 1.4
@@ -1,211 +1,211 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<xsp:page
- 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"
- xmlns:wf="http://apache.org/cocoon/lenya/workflow/1.0"
- xmlns:uc="http://apache.org/cocoon/lenya/usecase/1.0"
- xmlns="http://apache.org/cocoon/lenya/menubar/1.0"
->
-
- <xsp:structure>
- <xsp:include>org.apache.lenya.cms.publication.Publication</xsp:include>
- </xsp:structure>
-
- <menu>
-
- <xsp:logic>
- String projectid = parameters.getParameter("projectid","null");
- </xsp:logic>
-
- <xsp:logic>
- String xmlSource = <input:get-attribute module="page-envelope" as="string" name="document-path"/>;
-
- String documentId =
- <input:get-attribute module="page-envelope" as="string" name="context-prefix"/>
- + "/"
- + <input:get-attribute module="page-envelope" as="string" name="publication-id"/>
- + "/authoring"
- + <input:get-attribute module="page-envelope" as="string" name="document-id"/>;
-
- String urisParameter = "uris=" + <input:get-attribute module="page-envelope" as="string" name="document-url"/>;
- </xsp:logic>
-
- <menus>
- <menu name="File" label="File">
- <block>
-
- <xsp:logic>
- {
- String area = <input:get-attribute module="page-envelope" as="string" name="area"/>;
- if (Publication.ARCHIVE_AREA.equals(area) || Publication.TRASH_AREA.equals(area)) {
- <item>New Content Document</item>
- }
- else {
- <item uc:usecase="create" uc:step="showscreen" href="?doctype=xhtml">New Content Document</item>
- }
- }
- </xsp:logic>
-
-<!--
- <item uc:usecase="create" uc:step="showscreen" href="?doctype=xhtml">New Homepage</item>
- <item uc:usecase="create" uc:step="showscreen" href="?doctype=xhtml">New Section Page</item>
--->
- </block>
- <block info="false">
- <item uc:usecase="create-language" uc:step="showscreen" href="?">New language version</item>
- <xsp:logic>
- {
- String[] availableLanguages = (String[])<input:get-attribute module="page-envelope" as="object" name="document-languages"/>;
- if (availableLanguages.length > 1) {
- <xsp:content>
- <item uc:usecase="removelabel" uc:step="showscreen" href="?">Remove language version</item>
- </xsp:content>
- } else {
- <xsp:content>
- <item uc:usecase="removelabel" uc:step="showscreen">Remove language version</item>
- </xsp:content>
- }
- }
- </xsp:logic>
- </block>
- <block>
- <item uc:usecase="logout" href="?">Logout</item>
- </block>
- </menu>
-
- <menu name="Edit" label="Search">
- <block info="false">
- <item wf:event="edit"><xsp:attribute name="href"><xsp:expr>documentId + "-bxeng.html?"</xsp:expr></xsp:attribute>Edit with BXENG</item>
- <item wf:event="edit" uc:usecase="edit" uc:step="open" href="?doctype=content">Edit with Forms</item>
- </block>
- <block info="false">
- <item wf:event="edit" uc:usecase="info-meta" uc:step="showscreen"><xsp:attribute name="href"><xsp-request:get-context-path/>/<input:get-attribute module="page-envelope" as="string" name="publication-id"/>/info-<input:get-attribute module="page-envelope" as="string" name="area"/><input:get-attribute module="page-envelope" as="string" name="document-url"/>?</xsp:attribute>Edit Metadata</item>
- <item wf:event="edit" uc:usecase="rename-label" uc:step="showscreen"><xsp:attribute name="href"><xsp-request:get-uri/>?</xsp:attribute>Edit Navigation Title</item>
- <item>XML Upload</item>
- </block>
-
- <block authoring="false">
-
- <xsp:logic>
-
- {
- String area = <input:get-attribute module="page-envelope" as="string" name="area"/>;
-
- if ("".equals(<input:get-attribute module="sitetree" as="string" name="live-node"/>)
- && Publication.AUTHORING_AREA.equals(area)) {
- <item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=cut&lenya.step=showscreen</xsp:attribute>Cut</item>
- }
- else {
- <item>Cut</item>
- }
-
- if (Publication.AUTHORING_AREA.equals(area)) {
- <item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=copy&lenya.step=showscreen</xsp:attribute>Copy</item>
- }
- else {
- <item>Copy</item>
- }
-
- String clipboard = (String) <input:get-attribute module="session-attr" as="object" name="org.apache.lenya.cms.info.firstdocid"/>;
- if (clipboard != null && !"".equals(clipboard)
- && Publication.AUTHORING_AREA.equals(area)) {
- <xsp:content><item href="?lenya.usecase=paste&lenya.step=showscreen">Paste</item></xsp:content>
- }
- else {
- <xsp:content><item>Paste</item></xsp:content>
- }
- }
- </xsp:logic>
-
- </block>
- <block authoring="false">
- <xsp:logic>
- if ("".equals(<input:get-attribute module="sitetree" as="string" name="live-node"/>)) {
- <item uc:usecase="rename" uc:step="showscreen"><xsp:attribute name="href"><xsp-request:get-uri/></xsp:attribute>Rename</item>
- }
- else {
- <item>Rename</item>
- }
- </xsp:logic>
- <item wf:event="edit" uc:usecase="rename-label" uc:step="showscreen"><xsp:attribute name="href"><xsp-request:get-uri/></xsp:attribute>Edit Navigation Title</item>
- </block>
- <block authoring="false">
- <xsp:logic>
- if ("".equals(<input:get-attribute module="sitetree" as="string" name="live-node"/>)) {
- <item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=move-node&lenya.step=move-node&properties.movenode.direction=up</xsp:attribute>Move Up</item>
- <item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=move-node&lenya.step=move-node&properties.movenode.direction=down</xsp:attribute>Move Down</item>
- }
- else {
- <item>Move Up</item>
- <item>Move Down</item>
- }
- </xsp:logic>
- </block>
- <block authoring="false">
- <item wf:event="delete" uc:usecase="delete" uc:step="showscreen" href="?">Delete</item>
- <item wf:event="archive" uc:usecase="archive" uc:step="showscreen" href="?">Archive</item>
-
- <xsp:logic>
- {
- String area = <input:get-attribute module="page-envelope" as="string" name="area"/>;
- if (area.equals(Publication.TRASH_AREA) || area.equals(Publication.ARCHIVE_AREA)) {
- <item wf:event="restore" uc:usecase="restore" uc:step="showscreen" href="?">Restore</item>
- }
- else {
- <item>Restore</item>
- }
- }
- </xsp:logic>
-
- </block>
-
- </menu>
-
- <menu name="Workflow" label="Help">
- <block>
- <item uc:usecase="submit" uc:step="showscreen" wf:event="submit" href="?">Submit</item>
- <item uc:usecase="reject" uc:step="showscreen" wf:event="reject" href="?">Reject</item>
- <item uc:usecase="publish" uc:step="showscreen" wf:event="publish"><xsp:attribute name="href">?<xsp:expr>urisParameter</xsp:expr>&sources=<xsp:expr>xmlSource</xsp:expr>&task-id=publish</xsp:attribute>Publish</item>
- <item uc:usecase="deactivate" uc:step="showscreen" wf:event="deactivate" href="?task-id=deactivateDocument">Deactivate</item>
- </block>
- </menu>
-
- <menu name="Help" label="Debug">
- <block>
- <item><xsp:attribute name="href"><xsp-request:get-context-path/>/docs-new/docs/index.html</xsp:attribute>User Documentation</item>
- <item>System Documentation</item>
- <item>Support</item>
- </block>
- <block>
- <item href="http://cocoon.apache.org/lenya">About Apache Lenya</item>
- </block>
-<!--
- <block>
- <item><xsp:attribute name="href">../xopus<xsp:expr>xsp_lenya_pub_url.replaceFirst("\\.html", ".xml")</xsp:expr></xsp:attribute>View XML</item>
- <item href="../xopus/simple.xsd">View Xopus XSD</item>
- <item href="../xopus/simple.xsl">View Xopus XSLT</item>
- </block>
--->
- <block>
- <item uc:usecase="view-logs" uc:step="overview" href="?">View Task Logs</item>
- <item uc:usecase="schedule" uc:step="showscreen" href="?">Scheduler</item>
-<!--
- <item><xsp:attribute name="href">?lenya.usecase=rollback&lenya.step=showscreen&documentid=<xsp:expr>xmlSource</xsp:expr></xsp:attribute>Rollback</item>
--->
- </block>
- <block>
- <item><xsp:attribute name="href"><xsp:expr>documentId + "-bxeng.html"</xsp:expr></xsp:attribute>HTML for BXENG</item>
- <item><xsp:attribute name="href"><xsp:expr>documentId + "-config-bxeng.xml"</xsp:expr></xsp:attribute>Config for BXENG</item>
- <item><xsp:attribute name="href"><xsp:expr>documentId + "-bxeng.xml"</xsp:expr></xsp:attribute>XML for BXENG</item>
- <item href="content-bxeng.xsl">XSLT for BXENG</item>
- <item href="content-bxeng.css">CSS for BXENG</item>
- <item href="xhtml.rng">RelaxNG for BXENG</item>
- </block>
- </menu>
- </menus>
-
- </menu>
-</xsp:page>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xsp:page
+ 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"
+ xmlns:wf="http://apache.org/cocoon/lenya/workflow/1.0"
+ xmlns:uc="http://apache.org/cocoon/lenya/usecase/1.0"
+ xmlns="http://apache.org/cocoon/lenya/menubar/1.0"
+>
+
+ <xsp:structure>
+ <xsp:include>org.apache.lenya.cms.publication.Publication</xsp:include>
+ </xsp:structure>
+
+ <menu>
+
+ <xsp:logic>
+ String projectid = parameters.getParameter("projectid","null");
+ </xsp:logic>
+
+ <xsp:logic>
+ String xmlSource = <input:get-attribute module="page-envelope" as="string" name="document-path"/>;
+
+ String documentId =
+ <input:get-attribute module="page-envelope" as="string" name="context-prefix"/>
+ + "/"
+ + <input:get-attribute module="page-envelope" as="string" name="publication-id"/>
+ + "/authoring"
+ + <input:get-attribute module="page-envelope" as="string" name="document-id"/>;
+
+ String urisParameter = "uris=" + <input:get-attribute module="page-envelope" as="string" name="document-url"/>;
+ </xsp:logic>
+
+ <menus>
+ <menu name="File" label="File">
+ <block>
+
+ <xsp:logic>
+ {
+ String area = <input:get-attribute module="page-envelope" as="string" name="area"/>;
+ if (Publication.ARCHIVE_AREA.equals(area) || Publication.TRASH_AREA.equals(area)) {
+ <item>New Content Document</item>
+ }
+ else {
+ <item uc:usecase="create" uc:step="showscreen" href="?doctype=xhtml">New Content Document</item>
+ }
+ }
+ </xsp:logic>
+
+<!--
+ <item uc:usecase="create" uc:step="showscreen" href="?doctype=xhtml">New Homepage</item>
+ <item uc:usecase="create" uc:step="showscreen" href="?doctype=xhtml">New Section Page</item>
+-->
+ </block>
+ <block info="false">
+ <item uc:usecase="create-language" uc:step="showscreen" href="?">New language version</item>
+ <xsp:logic>
+ {
+ String[] availableLanguages = (String[])<input:get-attribute module="page-envelope" as="object" name="document-languages"/>;
+ if (availableLanguages.length > 1) {
+ <xsp:content>
+ <item uc:usecase="removelabel" uc:step="showscreen" href="?">Remove language version</item>
+ </xsp:content>
+ } else {
+ <xsp:content>
+ <item uc:usecase="removelabel" uc:step="showscreen">Remove language version</item>
+ </xsp:content>
+ }
+ }
+ </xsp:logic>
+ </block>
+ <block>
+ <item uc:usecase="logout" href="?">Logout</item>
+ </block>
+ </menu>
+
+ <menu name="Edit" label="Search">
+ <block info="false">
+ <item wf:event="edit"><xsp:attribute name="href"><xsp:expr>documentId + "-bxeng.html?"</xsp:expr></xsp:attribute>Edit with BXENG</item>
+ <item wf:event="edit" uc:usecase="edit" uc:step="open" href="?doctype=content">Edit with Forms</item>
+ </block>
+ <block info="false">
+ <item wf:event="edit" uc:usecase="info-meta" uc:step="showscreen"><xsp:attribute name="href"><xsp-request:get-context-path/>/<input:get-attribute module="page-envelope" as="string" name="publication-id"/>/info-<input:get-attribute module="page-envelope" as="string" name="area"/><input:get-attribute module="page-envelope" as="string" name="document-url"/>?</xsp:attribute>Edit Metadata</item>
+ <item wf:event="edit" uc:usecase="rename-label" uc:step="showscreen"><xsp:attribute name="href"><xsp-request:get-uri/>?</xsp:attribute>Edit Navigation Title</item>
+ <item>XML Upload</item>
+ </block>
+
+ <block authoring="false">
+
+ <xsp:logic>
+
+ {
+ String area = <input:get-attribute module="page-envelope" as="string" name="area"/>;
+
+ if ("".equals(<input:get-attribute module="sitetree" as="string" name="live-node"/>)
+ && Publication.AUTHORING_AREA.equals(area)) {
+ <item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=cut&lenya.step=showscreen</xsp:attribute>Cut</item>
+ }
+ else {
+ <item>Cut</item>
+ }
+
+ if (Publication.AUTHORING_AREA.equals(area)) {
+ <item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=copy&lenya.step=showscreen</xsp:attribute>Copy</item>
+ }
+ else {
+ <item>Copy</item>
+ }
+
+ String clipboard = (String) <input:get-attribute module="session-attr" as="object" name="org.apache.lenya.cms.info.firstdocid"/>;
+ if (clipboard != null && !"".equals(clipboard)
+ && Publication.AUTHORING_AREA.equals(area)) {
+ <xsp:content><item href="?lenya.usecase=paste&lenya.step=showscreen">Paste</item></xsp:content>
+ }
+ else {
+ <xsp:content><item>Paste</item></xsp:content>
+ }
+ }
+ </xsp:logic>
+
+ </block>
+ <block authoring="false">
+ <xsp:logic>
+ if ("".equals(<input:get-attribute module="sitetree" as="string" name="live-node"/>)) {
+ <item uc:usecase="rename" uc:step="showscreen"><xsp:attribute name="href"><xsp-request:get-uri/></xsp:attribute>Rename</item>
+ }
+ else {
+ <item>Rename</item>
+ }
+ </xsp:logic>
+ <item wf:event="edit" uc:usecase="rename-label" uc:step="showscreen"><xsp:attribute name="href"><xsp-request:get-uri/></xsp:attribute>Edit Navigation Title</item>
+ </block>
+ <block authoring="false">
+ <xsp:logic>
+ if ("".equals(<input:get-attribute module="sitetree" as="string" name="live-node"/>)) {
+ <item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=move-node&lenya.step=move-node&properties.movenode.direction=up</xsp:attribute>Move Up</item>
+ <item><xsp:attribute name="href"><xsp-request:get-uri/>?lenya.usecase=move-node&lenya.step=move-node&properties.movenode.direction=down</xsp:attribute>Move Down</item>
+ }
+ else {
+ <item>Move Up</item>
+ <item>Move Down</item>
+ }
+ </xsp:logic>
+ </block>
+ <block authoring="false">
+ <item wf:event="delete" uc:usecase="delete" uc:step="showscreen" href="?">Delete</item>
+ <item wf:event="archive" uc:usecase="archive" uc:step="showscreen" href="?">Archive</item>
+
+ <xsp:logic>
+ {
+ String area = <input:get-attribute module="page-envelope" as="string" name="area"/>;
+ if (area.equals(Publication.TRASH_AREA) || area.equals(Publication.ARCHIVE_AREA)) {
+ <item wf:event="restore" uc:usecase="restore" uc:step="showscreen" href="?">Restore</item>
+ }
+ else {
+ <item>Restore</item>
+ }
+ }
+ </xsp:logic>
+
+ </block>
+
+ </menu>
+
+ <menu name="Workflow" label="Help">
+ <block>
+ <item uc:usecase="submit" uc:step="showscreen" wf:event="submit" href="?">Submit</item>
+ <item uc:usecase="reject" uc:step="showscreen" wf:event="reject" href="?">Reject</item>
+ <item uc:usecase="publish" uc:step="showscreen" wf:event="publish"><xsp:attribute name="href">?<xsp:expr>urisParameter</xsp:expr>&sources=<xsp:expr>xmlSource</xsp:expr>&task-id=publish</xsp:attribute>Publish</item>
+ <item uc:usecase="deactivate" uc:step="showscreen" wf:event="deactivate" href="?task-id=deactivateDocument">Deactivate</item>
+ </block>
+ </menu>
+
+ <menu name="Help" label="Debug">
+ <block>
+ <item><xsp:attribute name="href"><xsp-request:get-context-path/>/docs-new/docs/index.html</xsp:attribute>User Documentation</item>
+ <item>System Documentation</item>
+ <item>Support</item>
+ </block>
+ <block>
+ <item href="http://cocoon.apache.org/lenya">About Apache Lenya</item>
+ </block>
+<!--
+ <block>
+ <item><xsp:attribute name="href">../xopus<xsp:expr>xsp_lenya_pub_url.replaceFirst("\\.html", ".xml")</xsp:expr></xsp:attribute>View XML</item>
+ <item href="../xopus/simple.xsd">View Xopus XSD</item>
+ <item href="../xopus/simple.xsl">View Xopus XSLT</item>
+ </block>
+-->
+ <block>
+ <item uc:usecase="view-logs" uc:step="overview" href="?">View Task Logs</item>
+ <item uc:usecase="schedule" uc:step="showscreen" href="?">Scheduler</item>
+<!--
+ <item><xsp:attribute name="href">?lenya.usecase=rollback&lenya.step=showscreen&documentid=<xsp:expr>xmlSource</xsp:expr></xsp:attribute>Rollback</item>
+-->
+ </block>
+ <block>
+ <item><xsp:attribute name="href"><xsp:expr>documentId + "-bxeng.html"</xsp:expr></xsp:attribute>HTML for BXENG</item>
+ <item><xsp:attribute name="href"><xsp:expr>documentId + "-config-bxeng.xml"</xsp:expr></xsp:attribute>Config for BXENG</item>
+ <item><xsp:attribute name="href"><xsp:expr>documentId + "-bxeng.xml"</xsp:expr></xsp:attribute>XML for BXENG</item>
+ <item href="content-bxeng.xsl">XSLT for BXENG</item>
+ <item href="content-bxeng.css">CSS for BXENG</item>
+ <item href="xhtml.rng">RelaxNG for BXENG</item>
+ </block>
+ </menu>
+ </menus>
+
+ </menu>
+</xsp:page>
1.2 +10 -10 cocoon-lenya/src/templates/forrest/config/publication.xconf
Index: publication.xconf
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/config/publication.xconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- publication.xconf 26 Sep 2003 11:16:07 -0000 1.1
+++ publication.xconf 29 Jan 2004 17:13:58 -0000 1.2
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<publication>
- <languages>
- <language default="true">en</language>
- <language>de</language>
- </languages>
- <path-mapper>org.apache.lenya.cms.publication.SingleLanguageIdentityMapper</path-mapper>
- <breadcrumb-prefix/>
-</publication>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<publication>
+ <languages>
+ <language default="true">en</language>
+ <language>de</language>
+ </languages>
+ <path-mapper>org.apache.lenya.cms.publication.SingleLanguageIdentityMapper</path-mapper>
+ <breadcrumb-prefix/>
+</publication>
1.2 +6 -6 cocoon-lenya/src/templates/forrest/resources/misc/bxeng/content-bxeng.css
Index: content-bxeng.css
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/templates/forrest/resources/misc/bxeng/content-bxeng.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- content-bxeng.css 6 Oct 2003 16:12:23 -0000 1.1
+++ content-bxeng.css 29 Jan 2004 17:13:58 -0000 1.2
@@ -1,6 +1,6 @@
-.title {
- font-size: x-large;
- font-weight: bold;
- display: block;
- border: 1pt solid red;
-}
+.title {
+ font-size: x-large;
+ font-weight: bold;
+ display: block;
+ border: 1pt solid red;
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org