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/02/06 20:23:08 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/blog/config/menus entry.xsp feed.xsp archive.xsp
gregor 2004/02/06 11:23:08
Modified: src/webapp/lenya/pubs/blog/config/menus entry.xsp feed.xsp
archive.xsp
Log:
cleanup:
no more xsp-lenya
Revision Changes Path
1.24 +1 -26 cocoon-lenya/src/webapp/lenya/pubs/blog/config/menus/entry.xsp
Index: entry.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/blog/config/menus/entry.xsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- entry.xsp 28 Jan 2004 16:27:17 -0000 1.23
+++ entry.xsp 6 Feb 2004 19:23:08 -0000 1.24
@@ -12,24 +12,14 @@
<menu>
- <xsp-lenya:util/>
-
<url-info>
<context-prefix><xsp-request:get-context-path/></context-prefix>
<publication-id><input:get-attribute module="page-envelope" as="string" name="publication-id"/></publication-id>
<area><input:get-attribute module="page-envelope" as="string" name="area"/></area>
<document-id><input:get-attribute module="page-envelope" as="string" name="document-id"/></document-id>
<document-url><input:get-attribute module="page-envelope" as="string" name="document-url"/></document-url>
-<!--
- <servlet-context-path><xsp:expr>publication.getServletContext().getCanonicalPath()</xsp:expr></servlet-context-path>
- <publication><input:get-attribute module="page-envelope" as="object" name="publication"/></publication>
--->
</url-info>
-<!--
- <live_uri>/index.html</live_uri>
--->
-
<xsp:logic>
String source = <input:get-attribute module="page-envelope" as="string" name="document-id"/>;
source = source.substring(1); // Remove leading slash
@@ -47,18 +37,7 @@
<item uc:usecase="edit" href="?lenya.step=open&form=entry">Edit with Forms</item>
<item href="index-bxeng.html">Edit with BXE</item>
<item uc:usecase="1formedit" href="?lenya.step=open">Edit with one Form</item>
-<!--
- <item>Edit with Midas</item>
--->
-<!--
- <item>Edit with Epoz</item>
--->
- </block>
-<!--
- <block>
- <item uc:usecase="rollback" href="?lenya.step=showscreen">Revisions</item>
</block>
--->
<block>
<item uc:usecase="publish" uc:step="showscreen"><xsp:attribute name="href">?sources=<xsp:expr>source</xsp:expr>&uris=<xsp:expr>uri</xsp:expr>,feeds/all/index.html</xsp:attribute>Publish</item>
</block>
@@ -77,7 +56,7 @@
<menu name="Help" label="Help">
<block>
- <item><xsp:attribute name="href"><xsp:expr>xsp_lenya_context</xsp:expr>/docs-new/docs/index.html</xsp:attribute>Documentation</item>
+ <item><xsp:attribute name="href"><xsp-request:get-context-path/>/docs-new/docs/index.html</xsp:attribute>Documentation</item>
<item href="http://wiki.cocoondev.org/Wiki.jsp?page=Lenya">Wiki Documentation</item>
</block>
<block>
@@ -90,9 +69,6 @@
<block>
<item href="index.xml">Feed</item>
<item href="lenya-page-body.xml">Body</item>
-<!--
- <item href="?cocoon-view=pagexml">Page</item>
--->
</block>
<block>
<item href="http://www.feedvalidator.org">Feed Validator</item>
@@ -100,7 +76,6 @@
<block>
<item href="index-bxeng.html">HTML for BXE</item>
<item href="config-bxeng.xml">Config for BXE</item>
- <item href="/lenya/blog/webdav/entries/2003/07/28/1/index.xml">XML for BXE</item>
<item href="entry-bxeng.xsl">XSLT for BXE</item>
<item href="entry-bxeng.css">CSS for BXE</item>
<item href="entry-relaxng-bxeng.xml">RelaxNG for BXE</item>
1.12 +2 -14 cocoon-lenya/src/webapp/lenya/pubs/blog/config/menus/feed.xsp
Index: feed.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/blog/config/menus/feed.xsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- feed.xsp 17 Jan 2004 10:02:59 -0000 1.11
+++ feed.xsp 6 Feb 2004 19:23:08 -0000 1.12
@@ -11,27 +11,15 @@
>
<menu>
-
- <xsp-lenya:util/>
-
+
<url-info>
<context-prefix><xsp-request:get-context-path/></context-prefix>
<publication-id><input:get-attribute module="page-envelope" as="string" name="publication-id"/></publication-id>
<area><input:get-attribute module="page-envelope" as="string" name="area"/></area>
<document-id><input:get-attribute module="page-envelope" as="string" name="document-id"/></document-id>
<document-url><input:get-attribute module="page-envelope" as="string" name="document-url"/></document-url>
-<!--
-
-<servlet-context-path><xsp:expr>publication.getServletContext().getCanonicalPath()</xsp:expr></servlet-context-path>
- <publication><input:get-attribute module="page-envelope" as="object"
-name="publication"/></publication>
--->
</url-info>
-<!--
- <live_uri>/index.html</live_uri>
--->
-
<tabs>
<tab label="info" show="false"/>
</tabs>
@@ -57,7 +45,7 @@
<menu name="Help" label="Help">
<block>
- <item><xsp:attribute name="href"><xsp:expr>xsp_lenya_context</xsp:expr>/docs-new/docs/index.html</xsp:attribute>Documentation</item>
+ <item><xsp:attribute name="href"><xsp-request:get-context-path/>/docs-new/docs/index.html</xsp:attribute>Documentation</item>
<item href="http://wiki.cocoondev.org/Wiki.jsp?page=Lenya">Wiki Documentation</item>
</block>
<block>
1.5 +0 -8 cocoon-lenya/src/webapp/lenya/pubs/blog/config/menus/archive.xsp
Index: archive.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/blog/config/menus/archive.xsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- archive.xsp 14 Jan 2004 00:58:23 -0000 1.4
+++ archive.xsp 6 Feb 2004 19:23:08 -0000 1.5
@@ -20,15 +20,7 @@
<area><input:get-attribute module="page-envelope" as="string" name="area"/></area>
<document-id><input:get-attribute module="page-envelope" as="string" name="document-id"/></document-id>
<document-url><input:get-attribute module="page-envelope" as="string" name="document-url"/></document-url>
-<!--
- <servlet-context-path><xsp:expr>publication.getServletContext().getCanonicalPath()</xsp:expr></servlet-context-path>
- <publication><input:get-attribute module="page-envelope" as="object" name="publication"/></publication>
--->
</url-info>
-
-<!--
- <live_uri>/index.html</live_uri>
--->
<tabs>
<tab label="info" show="false"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org