You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2003/08/31 21:47:13 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/blog/content/live sidebar.xml
michi 2003/08/31 12:47:13
Modified: src/webapp/lenya/pubs/blog sitemap.xmap
src/webapp/lenya/pubs/blog/content/authoring sidebar.xml
src/webapp/lenya/pubs/blog/content/live sidebar.xml
Added: src/webapp/lenya/pubs/blog/config/menus archive.xsp
Log:
archives implemented
Revision Changes Path
1.1 cocoon-lenya/src/webapp/lenya/pubs/blog/config/menus/archive.xsp
Index: archive.xsp
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp"
xmlns:xsp-lenya="http://apache.org/cocoon/lenya/xsp/1.0"
xmlns:xsp-request="http://apache.org/xsp/request/2.0"
xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
xmlns:uc="http://apache.org/cocoon/lenya/usecase/1.0"
>
<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>
<menus>
<menu name="File" label="File">
<block>
<item><xsp:attribute name="href">?lenya.usecase=logout</xsp:attribute>Logout</item>
</block>
</menu>
<menu name="Search" label="Search">
<block>
<item><xsp:attribute name="href">http://www.google.com</xsp:attribute>Google</item>
<item href="http://dict.leo.org">Translate E2G or G2E</item>
</block>
</menu>
<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 href="http://wiki.cocoondev.org/Wiki.jsp?page=Lenya">Wiki Documentation</item>
</block>
<block>
<item href="http://cocoon.apache.org/lenya/">About Lenya</item>
</block>
</menu>
<menu name="Debug" label="Debug">
<block>
<item href="index.xml">Feed</item>
<item href="lenya-page-body.xml">Body</item>
</block>
</menu>
</menus>
</menu>
</xsp:page>
1.28 +25 -2 cocoon-lenya/src/webapp/lenya/pubs/blog/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/blog/sitemap.xmap,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sitemap.xmap 31 Aug 2003 19:30:21 -0000 1.27
+++ sitemap.xmap 31 Aug 2003 19:47:13 -0000 1.28
@@ -164,8 +164,11 @@
</map:pipeline>
<!-- Archives -->
+ <map:pipeline>
+<!--
<map:pipeline type="noncaching">
- <map:match pattern="*/archives/*/*/">
+-->
+ <map:match pattern="*/*/*/index.xml">
<map:generate type="directory" src="content/{1}/entries/{2}/{3}/">
<map:parameter name="depth" value="2"/>
<map:parameter name="reverse" value="true"/>
@@ -178,6 +181,21 @@
</map:transform>
<map:serialize type="xml"/>
</map:match>
+ <map:match pattern="*/*/*/lenya-page-body.xml">
+ <map:aggregate element="cmsbody">
+ <map:part src="cocoon:/{1}/{2}/{3}/index.xml"/>
+ <map:part src="content/{1}/sidebar.xml"/>
+ </map:aggregate>
+ <map:serialize type="xml"/>
+ </map:match>
+ <map:match pattern="*/*/*/">
+ <map:aggregate element="lenya">
+ <map:part src="cocoon:/{1}/menubar/archive.xml"/>
+ <map:part src="cocoon:/{1}/{2}/{3}/lenya-page-body.xml"/>
+ </map:aggregate>
+ <map:transform src="xslt/feed/main-{1}.xsl"/>
+ <map:serialize type="html"/>
+ </map:match>
<map:handle-errors type="500">
<map:serialize type="xml"/>
</map:handle-errors>
@@ -192,6 +210,11 @@
</map:match>
<map:match pattern="authoring/menubar/feed.xml">
<map:generate type="serverpages" src="config/menus/feed.xsp"/>
+ <map:transform type="usecasemenu"/>
+ <map:serialize type="xml"/>
+ </map:match>
+ <map:match pattern="authoring/menubar/archive.xml">
+ <map:generate type="serverpages" src="config/menus/archive.xsp"/>
<map:transform type="usecasemenu"/>
<map:serialize type="xml"/>
</map:match>
1.4 +4 -4 cocoon-lenya/src/webapp/lenya/pubs/blog/content/authoring/sidebar.xml
Index: sidebar.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/blog/content/authoring/sidebar.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sidebar.xml 30 Aug 2003 23:31:45 -0000 1.3
+++ sidebar.xml 31 Aug 2003 19:47:13 -0000 1.4
@@ -12,10 +12,10 @@
<block>
<title>Archives by Date</title>
<content>
-<a href="/lenya/blog/authoring/archives/2003/07/">July 2003</a>
-<br /><a href="/lenya/blog/authoring/archives/2001/07/">July 2001</a>
-<br /><a href="/lenya/blog/authoring/archives/1998/10/">October 1998</a>
-<br /><a href="/lenya/blog/authoring/archives/1969/02/">February 1969</a>
+<a href="/lenya/blog/authoring/2003/07/">July 2003</a>
+<br /><a href="/lenya/blog/authoring/2001/07/">July 2001</a>
+<br /><a href="/lenya/blog/authoring/1998/10/">October 1998</a>
+<br /><a href="/lenya/blog/authoring/1969/02/">February 1969</a>
</content>
</block>
1.3 +3 -10 cocoon-lenya/src/webapp/lenya/pubs/blog/content/live/sidebar.xml
Index: sidebar.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/blog/content/live/sidebar.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sidebar.xml 29 Aug 2003 08:27:23 -0000 1.2
+++ sidebar.xml 31 Aug 2003 19:47:13 -0000 1.3
@@ -4,7 +4,7 @@
<block>
<title>Feeds</title>
<content>
-<a href="index.xml">Echo Feed</a>
+<a href="index.xml">Echo/Atom Feed</a>
<br />RSS Feed
</content>
</block>
@@ -12,15 +12,7 @@
<block>
<title>Archives by Date</title>
<content>
-August 2003
-<br />July 2003
-<br />June 2003
-<br />May 2003
-<br />April 2003
-<br />March 2003
-<br />February 2003
-<br />January 2003
-<br />December 2002
+<a href="/lenya/blog/live/2003/07/">July 2003</a>
</content>
</block>
@@ -29,6 +21,7 @@
<content>
<a href="http://cocoon.apache.org/lenya/">Lenya</a>
<br /><a href="http://cocoon.apache.org">Cocoon</a>
+<br /><a href="http://www.apache.org">Apache</a>
</content>
</block>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org