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 2003/08/11 16:46:28 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/default/config publication.xconf
gregor 2003/08/11 07:46:28
Modified: src/webapp/lenya navigation.xmap
src/java/org/apache/lenya/cms/cocoon/components/modules/input
PageEnvelopeModule.java
src/webapp/lenya/pubs/oscom/config publication.xconf
src/webapp/lenya/xslt/navigation breadcrumb.xsl
src/webapp/lenya/pubs/docs-new/config publication.xconf
src/webapp/lenya/pubs/blog/config publication.xconf
src/java/org/apache/lenya/cms/publication Publication.java
PageEnvelope.java
src/webapp/lenya/pubs/unipublic/config publication.xconf
src/webapp/lenya/pubs/default/config publication.xconf
Log:
started breadcrumb-prefix support
this allows to have a prefix per publication that gets prepended to the breadcrumb path. useful for publications that are part of a larger site
Revision Changes Path
1.11 +2 -0 cocoon-lenya/src/webapp/lenya/navigation.xmap
Index: navigation.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/navigation.xmap,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- navigation.xmap 7 Aug 2003 15:38:57 -0000 1.10
+++ navigation.xmap 11 Aug 2003 14:46:27 -0000 1.11
@@ -28,6 +28,7 @@
<map:transform src="pubs/{../publication-id}/lenya/xslt/navigation/{../stylesheet}.xsl">
<map:parameter name="url" value="{../url}"/>
<map:parameter name="chosenlanguage" value="{page-envelope:document-language}"/>
+ <map:parameter name="breadcrumbprefix" value="{page-envelope:breadcrumb-prefix}"/>
</map:transform>
<map:serialize type="xml"/>
</map:act>
@@ -36,6 +37,7 @@
<map:transform src="xslt/navigation/{stylesheet}.xsl">
<map:parameter name="url" value="{url}"/>
<map:parameter name="chosenlanguage" value="{page-envelope:document-language}"/>
+ <map:parameter name="breadcrumbprefix" value="{page-envelope:breadcrumb-prefix}"/>
</map:transform>
<map:serialize type="xml"/>
1.19 +3 -1 cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
Index: PageEnvelopeModule.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- PageEnvelopeModule.java 8 Aug 2003 16:38:42 -0000 1.18
+++ PageEnvelopeModule.java 11 Aug 2003 14:46:27 -0000 1.19
@@ -146,6 +146,8 @@
value = envelope.getDocument().getDublinCore().getRights();
} else if (name.equals(PageEnvelope.DOCUMENT_LASTMODIFIED)) {
value = envelope.getDocument().getLastModified();
+ } else if (name.equals(PageEnvelope.BREADCRUMB_PREFIX)) {
+ value = envelope.getPublication().getBreadcrumbPrefix();
}
} catch (Exception e) {
throw new ConfigurationException(
1.3 +1 -0 cocoon-lenya/src/webapp/lenya/pubs/oscom/config/publication.xconf
Index: publication.xconf
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/oscom/config/publication.xconf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- publication.xconf 29 Jul 2003 15:53:45 -0000 1.2
+++ publication.xconf 11 Aug 2003 14:46:28 -0000 1.3
@@ -7,4 +7,5 @@
<language>de</language>
</languages>
<path-mapper>org.apache.lenya.cms.publication.DefaultDocumentIdToPathMapper</path-mapper>
+ <breadcrumb-prefix/>
</publication>
1.7 +2 -1 cocoon-lenya/src/webapp/lenya/xslt/navigation/breadcrumb.xsl
Index: breadcrumb.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/navigation/breadcrumb.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- breadcrumb.xsl 29 Jul 2003 14:52:07 -0000 1.6
+++ breadcrumb.xsl 11 Aug 2003 14:46:28 -0000 1.7
@@ -17,10 +17,11 @@
<xsl:param name="url"/>
<xsl:param name="chosenlanguage"/>
+<xsl:param name="breadcrumbprefix"/>
<xsl:template match="nav:site">
<div id="breadcrumb">
- <xsl:apply-templates select="nav:node"/>
+ <xsl:value-of select="$breadcrumbprefix"/><xsl:apply-templates select="nav:node"/>
</div>
</xsl:template>
1.2 +1 -0 cocoon-lenya/src/webapp/lenya/pubs/docs-new/config/publication.xconf
Index: publication.xconf
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/docs-new/config/publication.xconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- publication.xconf 22 Jul 2003 09:37:56 -0000 1.1
+++ publication.xconf 11 Aug 2003 14:46:28 -0000 1.2
@@ -6,4 +6,5 @@
<language>de</language>
</languages>
<path-mapper>org.apache.lenya.cms.publication.DefaultDocumentIdToPathMapper</path-mapper>
+ <breadcrumb-prefix/>
</publication>
1.2 +1 -0 cocoon-lenya/src/webapp/lenya/pubs/blog/config/publication.xconf
Index: publication.xconf
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/blog/config/publication.xconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- publication.xconf 5 Aug 2003 19:50:48 -0000 1.1
+++ publication.xconf 11 Aug 2003 14:46:28 -0000 1.2
@@ -6,4 +6,5 @@
<language>de</language>
</languages>
<path-mapper>org.apache.lenya.cms.publication.DefaultDocumentIdToPathMapper</path-mapper>
+ <breadcrumb-prefix/>
</publication>
1.24 +17 -2 cocoon-lenya/src/java/org/apache/lenya/cms/publication/Publication.java
Index: Publication.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/publication/Publication.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Publication.java 8 Aug 2003 09:07:32 -0000 1.23
+++ Publication.java 11 Aug 2003 14:46:28 -0000 1.24
@@ -86,6 +86,8 @@
public static final String LANGUAGE = "language";
public static final String DEFAULT_LANGUAGE_ATTR = "default";
+ public static final String BREADCRUMB_PREFIX = "breadcrumb-prefix";
+
public static final String PUBLICATION_PREFIX =
"lenya" + File.separator + "pubs";
public static final String PUBLICATION_PREFIX_URI = "lenya/pubs";
@@ -103,6 +105,7 @@
private DocumentIdToPathMapper mapper = new DefaultDocumentIdToPathMapper();
private ArrayList languages = new ArrayList();
private String defaultLanguage = null;
+ private String breadcrumbprefix = null;
private HashMap siteTrees = new HashMap();
/**
@@ -160,6 +163,9 @@
defaultLanguage = language;
}
}
+ breadcrumbprefix =
+ config.getChild(BREADCRUMB_PREFIX).getValue("");
+
} catch (ConfigurationException e) {
throw new PublicationException(
@@ -276,11 +282,20 @@
/**
* Get all available languages for this publication
*
- * @return an <code>Arrary</code> of languages
+ * @return an <code>Array</code> of languages
*/
public String[] getLanguages() {
return (String[])languages.toArray(new String[languages.size()]);
}
+
+ /**
+ * Get the breadcrumb prefix. It can be used as a prefix if a publication is part of a larger site
+ *
+ * @return the breadcrumb prefix
+ */
+ public String getBreadcrumbPrefix() {
+ return breadcrumbprefix;
+ }
/**
* Get the sitetree for a specific area of this publication.
1.38 +4 -2 cocoon-lenya/src/java/org/apache/lenya/cms/publication/PageEnvelope.java
Index: PageEnvelope.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/publication/PageEnvelope.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- PageEnvelope.java 8 Aug 2003 16:38:42 -0000 1.37
+++ PageEnvelope.java 11 Aug 2003 14:46:28 -0000 1.38
@@ -89,6 +89,7 @@
public static final String DOCUMENT_DC_DESCRIPTION = "document-dc-description";
public static final String DOCUMENT_DC_RIGHTS = "document-dc-rights";
public static final String DOCUMENT_LASTMODIFIED = "document-lastmodified";
+ public static final String BREADCRUMB_PREFIX = "breadcrumb-prefix";
private String context;
/**
@@ -269,7 +270,8 @@
PageEnvelope.DOCUMENT_DC_SUBJECT,
PageEnvelope.DOCUMENT_DC_DESCRIPTION,
PageEnvelope.DOCUMENT_DC_RIGHTS,
- PageEnvelope.DOCUMENT_LASTMODIFIED };
+ PageEnvelope.DOCUMENT_LASTMODIFIED,
+ PageEnvelope.BREADCRUMB_PREFIX };
/**
* @param string The context.
1.2 +1 -0 cocoon-lenya/src/webapp/lenya/pubs/unipublic/config/publication.xconf
Index: publication.xconf
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/unipublic/config/publication.xconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- publication.xconf 22 Jul 2003 09:37:56 -0000 1.1
+++ publication.xconf 11 Aug 2003 14:46:28 -0000 1.2
@@ -6,4 +6,5 @@
<language>de</language>
</languages>
<path-mapper>org.apache.lenya.cms.publication.DefaultDocumentIdToPathMapper</path-mapper>
+ <breadcrumb-prefix/>
</publication>
1.4 +1 -0 cocoon-lenya/src/webapp/lenya/pubs/default/config/publication.xconf
Index: publication.xconf
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/publication.xconf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- publication.xconf 23 Jul 2003 13:31:08 -0000 1.3
+++ publication.xconf 11 Aug 2003 14:46:28 -0000 1.4
@@ -6,4 +6,5 @@
<language>de</language>
</languages>
<path-mapper>org.apache.lenya.cms.publication.DefaultDocumentIdToPathMapper</path-mapper>
+ <breadcrumb-prefix/>
</publication>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org