re-synced with trunk r527913.
git-svn-id: https://svn.apache.org/repos/asf/lenya/branches/trunk-rework-pubconf@528481 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java b/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java
index 6af7bcc..e137d03 100644
--- a/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java
+++ b/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java
@@ -153,15 +153,6 @@
}
/**
- * @see org.apache.lenya.cms.publication.Document#getId()
- */
- public String getId() {
- // throw new IllegalStateException("Use getUUID() or getPath()
- // instead");
- return this.identifier.getUUID();
- }
-
- /**
* @see org.apache.lenya.cms.publication.Document#getName()
*/
public String getName() {
@@ -354,7 +345,7 @@
public int hashCode() {
String key = getPublication().getId() + ":" + getPublication().getServletContext() + ":"
- + getArea() + ":" + getId() + ":" + getLanguage();
+ + getArea() + ":" + getUUID() + ":" + getLanguage();
return key.hashCode();
}
diff --git a/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java b/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
index 6c7a691..243cd51 100644
--- a/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
+++ b/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
@@ -94,7 +94,7 @@
getLogger().warn(
"This attribute is deprecated."
+ " Use document-path or document-uuid instead!");
- value = document.getId();
+ value = document.getUUID();
} else if (name.equals(PageEnvelope.DOCUMENT_PARENT)) {
value = document.getLocator().getParent().getPath();
} else if (name.equals(PageEnvelope.DOCUMENT_NAME)) {
diff --git a/src/java/org/apache/lenya/cms/publication/Document.java b/src/java/org/apache/lenya/cms/publication/Document.java
index dbd7c54..87761b2 100644
--- a/src/java/org/apache/lenya/cms/publication/Document.java
+++ b/src/java/org/apache/lenya/cms/publication/Document.java
@@ -63,13 +63,6 @@
Date getExpires() throws DocumentException;
/**
- * Returns the document ID of this document.
- * @return the document-id of this document.
- * @deprecated use {@link #getUUID()} or {@link #getPath()}, respectively, instead.
- */
- String getId();
-
- /**
* Returns the document name of this document.
* @return the document-name of this document.
*/
diff --git a/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/source/DocumentSourceFactory.java b/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/source/DocumentSourceFactory.java
index 397ce5c..d178b97 100644
--- a/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/source/DocumentSourceFactory.java
+++ b/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/source/DocumentSourceFactory.java
@@ -88,6 +88,8 @@
public void contextualize(Context context) throws ContextException {
this.context = context;
}
+
+ private SourceResolver sourceResolver;
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
@@ -108,7 +110,7 @@
*/
public Source getSource(String location, Map parameters) throws MalformedURLException,
IOException, SourceException {
-
+
Map objectModel = ContextHelper.getObjectModel(this.context);
Request request = ObjectModelHelper.getRequest(objectModel);
@@ -122,6 +124,10 @@
LinkResolver resolver = null;
try {
+ if (this.sourceResolver == null) {
+ this.sourceResolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+ }
+
resolver = (LinkResolver) this.manager.lookup(LinkResolver.ROLE);
DocumentFactory factory = DocumentUtil.getDocumentFactory(this.manager, request);
String webappUrl = ServletHelper.getWebappURI(request);
@@ -131,21 +137,18 @@
Document doc = target.getDocument();
String format = null;
- String sessionName = null;
if (queryString != null) {
Query query = new Query(queryString);
format = query.getValue("format");
- sessionName = query.getValue("session");
}
if (format != null) {
return getFormatSource(doc, format);
} else {
String lenyaURL = doc.getSourceURI();
- if (target.isRevisionSpecified()) {
- lenyaURL += "?rev=" + target.getRevisionNumber();
+ if (queryString != null) {
+ lenyaURL += "?" + queryString;
}
- Session session = getSession(objectModel, sessionName);
- return new RepositorySource(manager, lenyaURL, session, getLogger());
+ return this.sourceResolver.resolveURI(lenyaURL);
}
} catch (Exception e) {
@@ -186,22 +189,14 @@
String formatUri = formatBaseUri + "/" + doc.getPublication().getId() + "/" + doc.getArea()
+ "/" + doc.getUUID() + "/" + doc.getLanguage();
- SourceResolver resolver = null;
- try {
- resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
- return resolver.resolveURI(formatUri);
- } finally {
- if (resolver != null) {
- this.manager.release(resolver);
- }
- }
+ return this.sourceResolver.resolveURI(formatUri);
}
/**
* @see org.apache.excalibur.source.SourceFactory#release(org.apache.excalibur.source.Source)
*/
public void release(Source source) {
- // Source will be released by delegated source factory.
+ this.sourceResolver.release(source);
}
}
diff --git a/src/modules/collection/sitemap.xmap b/src/modules/collection/sitemap.xmap
index 4f9a02a..6df694b 100644
--- a/src/modules/collection/sitemap.xmap
+++ b/src/modules/collection/sitemap.xmap
@@ -36,13 +36,6 @@
<map:transform src="fallback://lenya/modules/collection/xslt/sitetree2children.xsl">
<map:parameter name="language" value="{2}"/>
</map:transform>
- <!--
- <map:transform src="fallback://lenya/modules/collection/xslt/collection2cinclude.xsl">
- <map:parameter name="uuid" value="{1}"/>
- <map:parameter name="language" value="{2}"/>
- </map:transform>
- <map:transform type="cinclude"/>
- -->
<map:serialize type="xml"/>
</map:match>
diff --git a/src/modules/development/config/menu.xsp b/src/modules/development/config/menu.xsp
index 0676ad1..b14d874 100644
--- a/src/modules/development/config/menu.xsp
+++ b/src/modules/development/config/menu.xsp
@@ -29,17 +29,17 @@
xmlns="http://apache.org/cocoon/lenya/menubar/1.0"
>
- <xsp:structure>
- <xsp:include>org.apache.lenya.cms.publication.Document</xsp:include>
- <xsp:include>org.apache.lenya.cms.publication.Publication</xsp:include>
- </xsp:structure>
-
<menu>
+
+ <xsp:logic>
+ String baseUrl = (String) <input:get-attribute module="request" name="contextPath"/>;
+ </xsp:logic>
<menus>
<menu i18n:attr="name" name="Help">
<block areas="site authoring">
<item href="?lenya.module=development&lenya.action=showLog">
+ <xsp:attribute name="href"><xsp:expr>baseUrl</xsp:expr>/modules/development/log4j.log</xsp:attribute>
<i18n:text>Show Log</i18n:text>
</item>
</block>
diff --git a/src/modules/development/sitemap.xmap b/src/modules/development/sitemap.xmap
index 6a1fd9b..5199e46 100644
--- a/src/modules/development/sitemap.xmap
+++ b/src/modules/development/sitemap.xmap
@@ -23,13 +23,8 @@
<map:pipelines>
<map:pipeline>
- <map:match pattern="**">
- <map:select type="request-parameter">
- <map:parameter name="parameter-name" value="lenya.action"/>
- <map:when test="showLog">
- <map:read mime-type="text/plain" src="context://WEB-INF/logs/log4j.log"/>
- </map:when>
- </map:select>
+ <map:match pattern="log4j.log">
+ <map:read mime-type="text/plain" src="context://WEB-INF/logs/log4j.log"/>
</map:match>
</map:pipeline>
diff --git a/src/modules/languageselector/xslt/languageselector.xsl b/src/modules/languageselector/xslt/languageselector.xsl
index 315a00a..28c02f0 100644
--- a/src/modules/languageselector/xslt/languageselector.xsl
+++ b/src/modules/languageselector/xslt/languageselector.xsl
@@ -155,7 +155,6 @@
<xsl:choose>
<xsl:when test="$flagsize = 'none'"/>
<xsl:when test="number($flagsize) > 0">
- <xsl:text> </xsl:text>
<img src="{$context}/modules/languageselector/flag-{$lang}-{$flagsize}.png" alt="{$lang}"/>
</xsl:when>
</xsl:choose>
diff --git a/src/modules/lucene/sitemap.xmap b/src/modules/lucene/sitemap.xmap
index ed64b40..691ea9a 100644
--- a/src/modules/lucene/sitemap.xmap
+++ b/src/modules/lucene/sitemap.xmap
@@ -113,7 +113,6 @@
<map:transform type="cinclude"/>
<map:transform type="uuid2url"/>
- <map:transform type="i18n"/>
<map:serialize type="xml"/>
</map:match>
diff --git a/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/Edit.java b/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/Edit.java
index 4e73319..c423254 100644
--- a/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/Edit.java
+++ b/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/Edit.java
@@ -37,11 +37,11 @@
NewsWrapper news = new NewsWrapper(getSourceDocument(), getLogger());
setParameter(NEWS_WRAPPER, news);
- setParameter(INCLUDE_ITEM_NUMBER, Short.valueOf(news.getIncludeItemNumber()));
+ setParameter(INCLUDE_ITEM_NUMBER, new Short(news.getIncludeItemNumber()));
List numbers = new ArrayList();
for (int i = 1; i <= 10; i++) {
- numbers.add(Integer.valueOf(i));
+ numbers.add(new Integer(i));
}
setParameter(NUMBERS, numbers);
}
diff --git a/src/modules/news/sitemap.xmap b/src/modules/news/sitemap.xmap
index 0500e93..651c350 100644
--- a/src/modules/news/sitemap.xmap
+++ b/src/modules/news/sitemap.xmap
@@ -46,7 +46,19 @@
</map:match>
<map:match pattern="*.xml/*/*/*/*">
+
+ <!-- This is a workaround (see below). -->
+ <map:generate src="lenya-document:{4},pub={2},area={3},lang={5}{link:rev}"/>
+ <map:transform src="fallback://lenya/modules/collection/xslt/prepareCinclude.xsl">
+ <map:parameter name="uuid" value="{4}"/>
+ <map:parameter name="language" value="{5}"/>
+ </map:transform>
+ <map:transform type="cinclude"/>
+
+ <!-- This would be a nicer way, but causes NPES in AbstractEnvironment.release(AbstractEnvironment.java:561)
<map:generate src="{resource-type:collection:format-collection}/{2}/{3}/{4}/{5}"/>
+ -->
+
<map:transform src="fallback://lenya/modules/collection/xslt/collection2cinclude.xsl">
<map:parameter name="uuid" value="{4}"/>
<map:parameter name="language" value="{5}"/>
@@ -58,7 +70,7 @@
<map:parameter name="title" value=""/>
<map:parameter name="area" value="{3}"/>
<map:parameter name="uuid" value="{4}"/>
- <map:parameter name="baseUrl" value="{base-url:{2}:{3}:false}"/>
+ <map:parameter name="baseUrl" value="{base-url:{2}:{3}}"/>
</map:transform>
<map:match pattern="rss.xml/**">
<map:transform type="uuid2url"/>
diff --git a/src/pubs/default/config/menus/generic.xsp b/src/pubs/default/config/menus/generic.xsp
index d517724..916332b 100644
--- a/src/pubs/default/config/menus/generic.xsp
+++ b/src/pubs/default/config/menus/generic.xsp
@@ -47,7 +47,7 @@
document = (Document) documentObject;
visible = <input:get-attribute module="doc-info" as="string">
- <input:param name="name"><xsp:expr>document.getPublication().getId() + ":" + document.getArea() + ":" + document.getId() + ":" + document.getLanguage() + ":visibleInNav"</xsp:expr></input:param>
+ <input:param name="name"><xsp:expr>document.getPublication().getId() + ":" + document.getArea() + ":" + document.getUUID() + ":" + document.getLanguage() + ":visibleInNav"</xsp:expr></input:param>
</input:get-attribute>;
}
diff --git a/src/pubs/default/example-content/concepts/index_de b/src/pubs/default/example-content/concepts/index_de
index bfea09c..45f37f8 100644
--- a/src/pubs/default/example-content/concepts/index_de
+++ b/src/pubs/default/example-content/concepts/index_de
@@ -28,37 +28,50 @@
<body>
<h1>Konzepte</h1>
- <h2>Publications</h2>
+ <h2>Publikationen</h2>
- <p>In Apache Lenya, a website is called a
- <strong>publication</strong>.</p>
+ <p>
+ Eine Website wird in Apache Lenya als <em>Publikation</em> bezeichnet.
+ </p>
- <h2>Areas: Authoring and Live</h2>
-
- <p>Apache Lenya separates between different areas:</p>
+ <h2>Areas: Authoring, Live, ...</h2>
+
+ <p>
+ Lenya unterscheidet zwischen verschiedenen <em>Areas</em>, in denen
+ sich Dokumente befinden können:
+ </p>
<ul>
- <li>The authoring area is for creating and editing of
- content. All CMS functions are available here.</li>
-
- <li>Once the content has been published it is moved to the live
- area. The live area can be served by a web server directly or
- you can add another intermediate step where the content is
- replicated from the live area to the actual web server. In any
- case the live area simply serves as a preview to the content
- that will be served by the web server.</li>
+ <li>
+ Die Authoring-Area dient dazu, Dokumente zu erstellen und zu editieren.
+ Hier sind alle CMS-Funktionen verfügbar.
+ </li>
+ <li>
+ Sobald ein Dokument publiziert ist, wird es in die Live-Area kopiert.
+ Die Live-Area kann direkt durch einen Web-Server veröffentlicht werden,
+ oder Sie können in einem weiteren Zwischenschritt die Inhalte von
+ der Live-Area zum eigentlichen Web-Server replizieren. In diesem Fall dient
+ die Live-Area als Vorschau auf den Inhalt, der vom eigentlichen Webserver
+ veröffentlicht wird.
+ </li>
+ <li>
+ Weitere Standard-Areas sind Trash und Archive. Bei Bedarf können zusätzliche
+ Areas definiert werden.
+ </li>
</ul>
- <h2>Document types</h2>
-
- <p>As Apache Lenya is based on Apache Cocoon, it has strong XML and
- XSLT foundations. It is possible to ensure that a document
- conforms to an XML schema. Typically you define different types of
- documents, like an news article or an opinion piece, conforming to
- different XML schemas. These different types are referred to as
- document types. They are used to ensure the XML schema conformance
- when editing and typically also when preparing a presentation of
- the document, where an opinion piece has a different layout than a
- news article.</p>
+ <h2>Ressource-Typen</h2>
+
+ <p>
+ Da Apache Lenya auf Cocoon basiert, verfügt es über ein mächtiges
+ XML- und XSLT-Fundament. Dokumente können auf ihre Konformität zu
+ einem XSD- oder Relax-NG-Schema überprüft werden. Typischerweise
+ werden verschiedene Typen von Dokumenten definiert (z.B. Artikel,
+ Dossiers, ...), deren XML-Struktur durch unterschiedlichen Schemata
+ spezifiziert werden. Beim Editieren wird die Konformität zum XML-Schema
+ überprüft. Bei der Aufbereitung eines Dokumentes zur Darstellung
+ können verschiedene XML-Strukturen durch XSLT-Stylesheets auf
+ unterschiedliche Weise in verschiedene Layouts transformiert werden.
+ </p>
</body>
</html>
diff --git a/src/pubs/default/example-content/concepts/index_en b/src/pubs/default/example-content/concepts/index_en
index 78bf7eb..1d7d22d 100644
--- a/src/pubs/default/example-content/concepts/index_en
+++ b/src/pubs/default/example-content/concepts/index_en
@@ -31,7 +31,7 @@
<p>In Apache Lenya, a website is called a
<strong>publication</strong>.</p>
- <h2>Areas: Authoring and Live</h2>
+ <h2>Areas: Authoring, Live, ...</h2>
<p>Apache Lenya separates between different areas:</p>
<ul>
@@ -44,9 +44,13 @@
replicated from the live area to the actual web server. In any
case the live area simply serves as a preview to the content
that will be served by the web server.</li>
+ <li>
+ Other standard areas are and archive. If necessary, further
+ areas can be declared.
+ </li>
</ul>
- <h2>Document types</h2>
+ <h2>Resource Types</h2>
<p>As Apache Lenya is based on Apache Cocoon, it has strong XML and
XSLT foundations. It is possible to ensure that a document
diff --git a/src/pubs/default/example-content/doctypes/cforms/index_de b/src/pubs/default/example-content/doctypes/cforms/index_de
new file mode 100644
index 0000000..4eadc59
--- /dev/null
+++ b/src/pubs/default/example-content/doctypes/cforms/index_de
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data>
+ <contacts>
+ </contacts>
+</data>
diff --git a/src/pubs/default/example-content/doctypes/cforms/index_de.meta b/src/pubs/default/example-content/doctypes/cforms/index_de.meta
new file mode 100644
index 0000000..7735caa
--- /dev/null
+++ b/src/pubs/default/example-content/doctypes/cforms/index_de.meta
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lenya:document xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0">
+<lenya:meta>
+<lenya:dc>
+<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">CForms-Ressource-Typ</dc:title>
+<dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">lenya</dc:creator>
+<dc:subject xmlns:dc="http://purl.org/dc/elements/1.1/"/>
+<dc:publisher xmlns:dc="http://purl.org/dc/elements/1.1/"/>
+<dc:date xmlns:dc="http://purl.org/dc/elements/1.1/">2005-10-13 11:19:30</dc:date>
+<dc:language xmlns:dc="http://purl.org/dc/elements/1.1/">de</dc:language>
+<dc:rights xmlns:dc="http://purl.org/dc/elements/1.1/"/>
+</lenya:dc>
+<lenya:internal>
+<lenya:resourceType>cforms</lenya:resourceType>
+<lenya:contentType>xml</lenya:contentType>
+</lenya:internal>
+</lenya:meta>
+</lenya:document>
diff --git a/src/pubs/default/example-content/doctypes/cforms/index_en.meta b/src/pubs/default/example-content/doctypes/cforms/index_en.meta
index 047a8ef..70c4c18 100644
--- a/src/pubs/default/example-content/doctypes/cforms/index_en.meta
+++ b/src/pubs/default/example-content/doctypes/cforms/index_en.meta
@@ -2,7 +2,7 @@
<lenya:document xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0">
<lenya:meta>
<lenya:dc>
-<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">CForms Doctype</dc:title>
+<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">CForms Resource Type</dc:title>
<dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">lenya</dc:creator>
<dc:subject xmlns:dc="http://purl.org/dc/elements/1.1/"/>
<dc:publisher xmlns:dc="http://purl.org/dc/elements/1.1/"/>
diff --git a/src/pubs/default/example-content/doctypes/index_de b/src/pubs/default/example-content/doctypes/index_de
index 6541230..f7681e7 100644
--- a/src/pubs/default/example-content/doctypes/index_de
+++ b/src/pubs/default/example-content/doctypes/index_de
@@ -22,17 +22,40 @@
<!-- $Id$ -->
<head>
- <title>Dokumenttyp Beispiele</title>
+ <title>Beispiele für Ressource-Typen</title>
</head>
<body>
- <h1>Dokumenttyp Beispiele</h1>
+ <h1>Beispiele für Ressource-Typen</h1>
- <p>The default publication comes with the <a href="doctypes/xhtml-document.html">XHTML Doctype.</a></p>
+ <p>
+ Die Default-Publikation umfasst den <a href="doctypes/xhtml-document_de.html">XHTML-Ressource-Typ</a>,
+ den <a href="doctypes/links.html">Links-Ressource-Typ</a>,
+den <a href="doctypes/opendocument_de.html">OpenDocument-Ressource-Typ</a> und
+den <a href="doctypes/cforms.html">CForms-Ressource-Typ</a>.
+ </p>
- <p>The XHTML Doctype is for situations where
- users ask for complete freedom on what information can be inserted
- into a document. While this approach doesn't restrict you, it also
- looses some of the major benefits of well defined document types.</p>
-
+ <p>
+ Der <strong>XHTML-Ressource-Typ</strong> empfiehlt sich insbesondere dann, wenn dem Nutzer vollständige
+ Freiheit in Bezug auf die einzufügenden Informationen gewährt werden soll.
+ Dieser Ressource-Typ macht zwar wenige Einschränkungen, allerdings verliert
+ man dadurch einige der wichtigsten Vorteile restriktiverer Ressource-Typen.
+ </p>
+
+ <p>
+ Der <strong>Links-Ressource-Typ</strong> erlaubt es, Listen von Links zu verwalten. Er dient
+ hauptsächlich dazu, zu zeigen, dass Lenya mit beliebigen Ressource-Typen umgehen kann.
+ </p>
+
+ <p>
+ Der <strong>OpenDocument-Ressource-Typ</strong> ist ein standardisiertes XML-basiertes Dateiformat
+ für Office-Anwendungen. Er wurde von <a href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=office">OASIS</a>
+ entwickelt.
+ </p>
+
+ <p>
+ Der <strong>CForms-Ressource-Typ</strong> ist ein Beispiel, wie Lenya mit Formular-Daten auf der
+ Basis von Cocoon's CForms in Verbindung mit Ajax umgeht.
+ </p>
+
</body>
</html>
diff --git a/src/pubs/default/example-content/doctypes/index_en b/src/pubs/default/example-content/doctypes/index_en
index 86eb221..e77518b 100644
--- a/src/pubs/default/example-content/doctypes/index_en
+++ b/src/pubs/default/example-content/doctypes/index_en
@@ -22,38 +22,39 @@
<!-- $Id$ -->
<head>
- <title>Document Type Examples</title>
+ <title>Ressource Type Examples</title>
</head>
<body>
- <h1>Document Type Examples</h1>
+ <h1>Ressource Type Examples</h1>
<p>
-The default publication comes with the <a href="doctypes/xhtml-document.html">XHTML Doctype</a>, the <a href="doctypes/links.html">Links Doctype</a>, the <a href="doctypes/opendocument.html">OpenDocument Doctype</a> and the <a href="doctypes/cforms.html">CForms Doctype</a>.
+The default publication comes with the <a href="doctypes/xhtml-document.html">XHTML resource type</a>,
+the <a href="doctypes/links.html">Links resource type</a>,
+the <a href="doctypes/opendocument.html">OpenDocument resource type</a> and
+the <a href="doctypes/cforms.html">CForms resource type</a>.
</p>
<p>
-A tutorial on creating/adding new doctypes can be found <a href="tutorial/new_doctype.html">here</a>.
-</p>
-
-<p>
-The <strong>XHTML Doctype</strong> is for situations where
+The <strong>XHTML resource type</strong> is suitable for situations where
users ask for complete freedom on what information can be inserted
into a document. While this approach doesn't restrict you, it also
looses some of the major benefits of well defined document types.
</p>
<p>
-The <strong>Links Doctype</strong> is mainly to show that Lenya is able to handle
-arbitrary doctypes but can also be used for link-lists.
+The <strong>Links resource type</strong> is mainly to show that Lenya is able to handle
+arbitrary resource types but can also be used for link-lists.
</p>
<p>
-The <strong>OpenDocument Doctype</strong> is a standardized XML-based file format specification suitable for office applications and has been developed by <a href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=office">OASIS</a>.
+The <strong>OpenDocument resource type</strong> is a standardized XML-based
+file format specification suitable for office applications and has been developed
+by <a href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=office">OASIS</a>.
</p>
<p>
-The <strong>CForms Doctype</strong> is an example of how Lenya manages formular data based on Cocoon's CForms in conjunction
-with Ajax.
+The <strong>CForms resource type</strong> is an example of how Lenya manages formular data
+based on Cocoon's CForms in conjunction with Ajax.
</p>
</body>
diff --git a/src/pubs/default/example-content/doctypes/links/index_de b/src/pubs/default/example-content/doctypes/links/index_de
new file mode 100644
index 0000000..39c7069
--- /dev/null
+++ b/src/pubs/default/example-content/doctypes/links/index_de
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<links xmlns="http://apache.org/lenya/pubs/default/1.0">
+ <title>Der Links-Ressource-Typ</title>
+ <link href="http://lenya.apache.org">Apache Lenya Website</link>
+ <link href="http://wiki.apache.org/lenya/">Apache Lenya Wiki</link>
+</links>
diff --git a/src/pubs/default/example-content/doctypes/links/index_de.meta b/src/pubs/default/example-content/doctypes/links/index_de.meta
new file mode 100644
index 0000000..cdcaf87
--- /dev/null
+++ b/src/pubs/default/example-content/doctypes/links/index_de.meta
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lenya:document xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0">
+<lenya:meta>
+<lenya:dc>
+<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Links</dc:title>
+<dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">lenya</dc:creator>
+<dc:subject xmlns:dc="http://purl.org/dc/elements/1.1/"/>
+<dc:publisher xmlns:dc="http://purl.org/dc/elements/1.1/"/>
+<dc:date xmlns:dc="http://purl.org/dc/elements/1.1/">2005-10-02 12:50:27</dc:date>
+<dc:language xmlns:dc="http://purl.org/dc/elements/1.1/">de</dc:language>
+<dc:rights xmlns:dc="http://purl.org/dc/elements/1.1/"/>
+</lenya:dc>
+<lenya:internal>
+<lenya:resourceType>links</lenya:resourceType>
+<lenya:contentType>xml</lenya:contentType>
+</lenya:internal>
+</lenya:meta>
+</lenya:document>
diff --git a/src/pubs/default/example-content/doctypes/links/index_en b/src/pubs/default/example-content/doctypes/links/index_en
index f8560b5..51e1c95 100644
--- a/src/pubs/default/example-content/doctypes/links/index_en
+++ b/src/pubs/default/example-content/doctypes/links/index_en
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<links xmlns="http://apache.org/lenya/pubs/default/1.0">
- <title>The Links Document Doctype</title>
+ <title>The Links Resource Type</title>
<link href="http://lenya.apache.org">Apache Lenya Website</link>
<link href="http://wiki.apache.org/lenya/">Apache Lenya Wiki</link>
</links>
diff --git a/src/pubs/default/example-content/doctypes/xhtml-document/index_de b/src/pubs/default/example-content/doctypes/xhtml-document/index_de
index 9d48c38..2cb7d01 100644
--- a/src/pubs/default/example-content/doctypes/xhtml-document/index_de
+++ b/src/pubs/default/example-content/doctypes/xhtml-document/index_de
@@ -22,15 +22,17 @@
<!-- $Id$ -->
<head>
- <title>Der XHTML Dokumenttyp</title>
+ <title>Der XHTML-Ressource-Typ</title>
</head>
<body>
- <h1>Der XHTML Dokumenttyp</h1>
+ <h1>Der XHTML-Ressource-Typ</h1>
- <p>The XHTML Document Doctype is simply a XHTML document that
- conforms to the <a href="http://www.w3.org/TR/xhtml1/">XHTML 1.0
- definition</a> of the <a href="http://www.w3.org/">World Wide Web
- Consortium (W3C)</a>.</p>
+ <p>
+ Der XHTML-Ressource-Typ erlaubt es, XHTML-Dokumente zu verwalten,
+ die der <a href="http://www.w3.org/TR/xhtml1/">XHTML-1.0-Definition</a>
+ des <a href="http://www.w3.org/">World Wide Web Consortium (W3C)</a>
+ entsprechen.
+ </p>
</body>
</html>
diff --git a/src/pubs/default/example-content/doctypes/xhtml-document/index_en b/src/pubs/default/example-content/doctypes/xhtml-document/index_en
index 9420a99..e6946c7 100644
--- a/src/pubs/default/example-content/doctypes/xhtml-document/index_en
+++ b/src/pubs/default/example-content/doctypes/xhtml-document/index_en
@@ -22,13 +22,13 @@
<!-- $Id$ -->
<head>
- <title>The XHTML Document Doctype</title>
+ <title>The XHTML Resource Type</title>
</head>
<body>
- <h1>The XHTML Document Doctype</h1>
+ <h1>The XHTML Resource Type</h1>
- <p>The XHTML Document Doctype is simply a XHTML document that
- conforms to the <a href="http://www.w3.org/TR/xhtml1/">XHTML 1.0
+ <p>The XHTML resource type supports to maintain XHTML documents which
+ conform to the <a href="http://www.w3.org/TR/xhtml1/">XHTML 1.0
definition</a> of the <a href="http://www.w3.org/">World Wide Web
Consortium (W3C)</a>.</p>
diff --git a/src/pubs/default/example-content/features/index_de b/src/pubs/default/example-content/features/index_de
index eb9a439..bfe680a 100644
--- a/src/pubs/default/example-content/features/index_de
+++ b/src/pubs/default/example-content/features/index_de
@@ -26,40 +26,50 @@
</head>
<body>
<h1>Funktionen</h1>
-
- <p>Apache Lenya comes with the features you would expect of a
- modern Content Management System, such as Revision Control,
- Scheduling, a built-in Search Engine, separate Staging Areas and
- Workflow. Because Apache Lenya uses XML throughout, it can offer
- much more than other CMS that use XML only marginally. Some
- notable features include:</p>
-
- <h2>Browser-based WYSIWYG Editing</h2>
- <p>Apache Lenya comes with Browser-based WYSIWYG Editors that
- validate input against a W3C XML Schema. This prevents the invalid
- markup that other editors produce. Schema-based editors also allow
- to enforce web site style guidelines.</p>
+ <p>
+ Apache Lenya bietet die Features, die Sie von einem modernen
+ Content-Management-System erwarten, z.B. Versionierung, Zeitsteuerung,
+ eine eingebaute Suchmaschine, Staging und Workflow.
+ Da es durchgängig auf XML basiert, können mehr Funktionalitäten
+ realisiert werden als mit CMS, die XML nur ansatzweise verwenden.
+ Einige erwähnenswerte Funktionalitäten sind:
+ </p>
- <h2>XML Publishing</h2>
-
- <p>As Apache Lenya is based on Apache Cocoon it leverages all the
- benefits from a powerful XML Publishing framework such as
- multi-channel publishing, content aggregation even from external
- sources such as RSS.</p>
-
- <h2>The Publication Concept</h2>
+ <h2>Browser-basiertes Editieren im WYSIWYG-Modus</h2>
- <p>The publication concept allows for reuse of the information
- architecture of a site and brings modularity to the content
- level.</p>
-
- <h2>Future-proof Solution</h2>
+ <p>
+ Apache Lenya verfügt über Browser-basierte WYSIWYG-Editoren die
+ gegen W3C XML Schemas bzw. Relax-NG-Schemas validieren. Dadurch wird
+ das nicht-konforme Markup, das andere Editoren produzieren, vermieden.
+ Schema-basierte Editoren erlauben es außerdem, Website-Style-Guidelines
+ durchzusetzen.
+ </p>
- <p>The Apache Software Stack is quickly becoming the preeminent
- platform for building Internet applications. By leveraging the
- Apache Software Stack, Apache Lenya offers a robust, future-proof
- solution that preserves technology investments.</p>
+ <h2>XML-Publishing</h2>
+
+ <p>
+ Da Apache Lenya auf Apache Cocoon basiert, kann es auf alle Vorteile
+ eines mächtigen XML-Publishing-Frameworks zurückgreifen, darunter
+ Multi-Channel- / Cross-Platform-Publishing und Content-Aggregation
+ von externen Quellen wie RSS-Feeds.
+ </p>
+
+ <h2>Das Publikationskonzept</h2>
+
+ <p>
+ Das Publikationskonzept erlaubt es, Informations-Architekturen von
+ Websites wiederzuverwenden und die Informationen auf der Ebene des
+ Inhalts zu modularisieren.
+ </p>
+
+ <h2>Eine zukunftssichere Lösung</h2>
+
+ <p>
+ Der Apache Software-Stack ist eine der bewährtesten Plattformen zur
+ Erstellung von Internet-Applikationen. Auf dieser Basis bietet Apache
+ Lenya eine robuste, zukunfts- und investitionssichere Lösung.
+ </p>
</body>
</html>
diff --git a/src/pubs/default/example-content/index/index_de b/src/pubs/default/example-content/index/index_de
index a4de5cc..02602cc 100644
--- a/src/pubs/default/example-content/index/index_de
+++ b/src/pubs/default/example-content/index/index_de
@@ -21,42 +21,51 @@
<!-- $Id$ -->
<head>
- <title>Welcome to the Default publication</title>
+ <title>Willkommen zur Default-Publikation!</title>
</head>
<body>
- <p>Hallo und herzlich willkommen bei der Lenya Default Publikation!</p>
+ <h1>Hallo und herzlich Willkommen bei der Lenya Default-Publikation!</h1>
+
+ <p>
+ Apache Lenya ist ein in Java implementiertes Open-Source Content Management System,
+ das auf offenen Standards wie XML und XSLT sowie dem bewährten Apache
+ Software-Stack basiert. Sein Fundament bildet das XML-Publishing-Framework
+ Apache Cocoon.
+ </p>
- <p>Apache Lenya is a Java Open-Source Content Management System
- based on open standards such as XML and XSLT and the Apache
- Software Stack, in particular the XML publishing framework Apache
- Cocoon.</p>
+ <p>
+ Im Artikel <a href="/default/authoring/concepts_de.html">Konzepte</a> erhalten Sie
+ einen Überblick über die in Lenya verwendeteen Konzepte und Begriffe.
+ Der Artikel <a href="/default/authoring/features_de.html">Features</a> bietet
+ einen Überblick über die in Lenya verfügbaren Funktionen.
+ </p>
+
+ <p>
+ Für eine schnelle Einführung in die Verwendung des Apache Lenya CMS empfehlen
+ wir das <a href="/default/authoring/tutorial_de.html">Tutorial</a>.
+ </p>
- <p>For an overview of the concepts and the terminology used in
- Apache Lenya please see the <a href="/default/authoring/concepts.html">Concepts
- section</a>. To see what you can do with Apache Lenya please
- refer to the <a href="/default/authoring/features.html">Features
- section</a>.</p>
-
- <p>If you'd like to get a quick introduction on how to use Apache
- Lenya CMS please go through the <a
- href="/default/authoring/tutorial.html">tutorial</a>.</p>
-
- <p>The purpose of this publication is</p>
+ <p>Der Zweck dieser Publikation ist es,</p>
<ul>
- <li>to show beginners the basic functionality of the Apache
- Lenya CMS,</li>
-
- <li>to provide an "out of the box" publication that can be
- easily adapted and used,</li>
-
- <li>and to provide a basis for reference implementations of new
- concepts and best practices.</li>
+ <li>
+ die Grundfunktionalität des Apache Lenya CMS zu präsentieren,
+ </li>
+ <li>
+ eine Publikation "von der Stange" anzubieten, die auf einfache
+ Weise angepasst und genutzt werden kann, und
+ </li>
+ <li>
+ eine Basis für Referenzimplementation neuer Konzepte und Best-Practises
+ zur Verfügung zu stellen.
+ </li>
</ul>
-
- <p>This publication does not go to the limit of what's possible
- with Apache Lenya CMS, there are no fancy bells and whistles to
- confuse you, this publication simply contains everything you need
- to get started.</p>
- </body>
+
+ <p>
+ Diese Publikation reizt die Möglichkeiten von Apache Lenya nicht aus;
+ es gibt keine Spielereien, die Sie verwirren könnten. Diese Publikation enthält
+ nur, was Sie für einen schnellen Einstieg benötigen.
+ </p>
+
+ </body>
</html>
diff --git a/src/pubs/default/example-content/links/index_de b/src/pubs/default/example-content/links/index_de
new file mode 100644
index 0000000..af1d0d1
--- /dev/null
+++ b/src/pubs/default/example-content/links/index_de
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<links xmlns="http://apache.org/lenya/pubs/default/1.0">
+ <title>Links zu Apache Lenya</title>
+ <link href="http://lenya.apache.org/">Apache Lenya Website</link>
+ <link href="http://wiki.apache.org/lenya/">Apache Lenya Wiki</link>
+</links>
diff --git a/src/pubs/default/example-content/links/index_de.meta b/src/pubs/default/example-content/links/index_de.meta
new file mode 100644
index 0000000..18c1882
--- /dev/null
+++ b/src/pubs/default/example-content/links/index_de.meta
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id: index_en.meta 473861 2006-11-12 03:51:14Z gregor $ -->
+<lenya:document xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0">
+<lenya:meta>
+<lenya:internal>
+<lenya:resourceType>links</lenya:resourceType>
+<lenya:contentType>xml</lenya:contentType>
+</lenya:internal>
+<lenya:dc>
+ <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Lenya links</dc:title>
+ <dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Lenya Development Team</dc:creator>
+</lenya:dc>
+</lenya:meta>
+</lenya:document>
diff --git a/src/pubs/default/example-content/news/index_de b/src/pubs/default/example-content/news/index_de
index 43c96ad..54c87ea 100644
--- a/src/pubs/default/example-content/news/index_de
+++ b/src/pubs/default/example-content/news/index_de
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<collection xmlns="http://apache.org/cocoon/lenya/collection/1.0" type="children" includeItems="3"/>
+<col:collection xmlns:col="http://apache.org/cocoon/lenya/collection/1.0" type="children" includeItems="3"/>
diff --git a/src/pubs/default/example-content/news/index_en b/src/pubs/default/example-content/news/index_en
index 43c96ad..54c87ea 100644
--- a/src/pubs/default/example-content/news/index_en
+++ b/src/pubs/default/example-content/news/index_en
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<collection xmlns="http://apache.org/cocoon/lenya/collection/1.0" type="children" includeItems="3"/>
+<col:collection xmlns:col="http://apache.org/cocoon/lenya/collection/1.0" type="children" includeItems="3"/>
diff --git a/src/pubs/default/example-content/search/index_de b/src/pubs/default/example-content/search/index_de
new file mode 100644
index 0000000..39088ea
--- /dev/null
+++ b/src/pubs/default/example-content/search/index_de
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<usecase xmlns="http://apache.org/lenya/usecase/1.0" name="lucene.search"/>
diff --git a/src/pubs/default/example-content/search/index_de.meta b/src/pubs/default/example-content/search/index_de.meta
new file mode 100644
index 0000000..c9dcef8
--- /dev/null
+++ b/src/pubs/default/example-content/search/index_de.meta
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lenya:document xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0">
+<lenya:meta>
+<lenya:custom>
+<lenya:myMeta/>
+</lenya:custom>
+<lenya:dc>
+<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Suche</dc:title>
+<dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">lenya</dc:creator>
+<dc:subject xmlns:dc="http://purl.org/dc/elements/1.1/"/>
+<dc:publisher xmlns:dc="http://purl.org/dc/elements/1.1/"/>
+<dc:date xmlns:dc="http://purl.org/dc/elements/1.1/">2006-06-12 13:43:14</dc:date>
+<dc:language xmlns:dc="http://purl.org/dc/elements/1.1/">de</dc:language>
+<dc:rights xmlns:dc="http://purl.org/dc/elements/1.1/"/>
+</lenya:dc>
+<lenya:internal>
+<lenya:resourceType>usecase</lenya:resourceType>
+<lenya:contentType>xml</lenya:contentType>
+<lenya:extension>xml</lenya:extension>
+</lenya:internal>
+</lenya:meta>
+</lenya:document>
diff --git a/src/pubs/default/example-content/sitetree.xml b/src/pubs/default/example-content/sitetree.xml
index 11eb01e..b7965d0 100644
--- a/src/pubs/default/example-content/sitetree.xml
+++ b/src/pubs/default/example-content/sitetree.xml
@@ -16,10 +16,6 @@
<node id="tutorial">
<label xml:lang="en">Tutorial</label>
<label xml:lang="de">Tutorial</label>
-
- <node id="new_doctype">
- <label xml:lang="en">Create new doctype</label>
- </node>
</node>
<node id="concepts">
@@ -29,6 +25,7 @@
<node id="links">
<label xml:lang="en">Apache Lenya Links</label>
+ <label xml:lang="de">Links zu Apache Lenya</label>
</node>
<node id="features">
@@ -37,30 +34,33 @@
</node>
<node id="doctypes">
- <label xml:lang="en">Document Type Examples</label>
- <label xml:lang="de">Dokumenttyp Beispiele</label>
+ <label xml:lang="en">Resource Type Examples</label>
+ <label xml:lang="de">Beispiele für Ressource-Typen</label>
<node id="xhtml-document">
- <label xml:lang="en">XHTML Doctype</label>
- <label xml:lang="de">XHTML Dokumenttyp</label>
+ <label xml:lang="en">XHTML Resource Type</label>
+ <label xml:lang="de">XHTML-Ressource-Typ</label>
</node>
<node id="links">
- <label xml:lang="en">Links Doctype</label>
+ <label xml:lang="en">Links Resource Type</label>
+ <label xml:lang="de">Links-Ressource-Typ</label>
</node>
<node id="opendocument">
- <label xml:lang="en">OpenDocument Doctype</label>
- <label xml:lang="de">OpenDocument Dokumenttyp</label>
+ <label xml:lang="en">OpenDocument Resource Type</label>
+ <label xml:lang="de">OpenDocument-Ressource-Typ</label>
</node>
<node id="cforms" visibleinnav="true">
- <label xml:lang="en">CForms Doctype</label>
+ <label xml:lang="en">CForms Resource Type</label>
+ <label xml:lang="de">CForms-Ressource-Typ</label>
</node>
</node>
<node id="search" visibleinnav="false">
<label xml:lang="en">Search</label>
+ <label xml:lang="de">Suche</label>
</node>
<node id="news" visibleinnav="true">
diff --git a/src/pubs/default/example-content/tutorial/index_de b/src/pubs/default/example-content/tutorial/index_de
index 228dc4c..1569f01 100644
--- a/src/pubs/default/example-content/tutorial/index_de
+++ b/src/pubs/default/example-content/tutorial/index_de
@@ -27,107 +27,115 @@
<body>
<h1>Tutorial</h1>
- <p>Das folgende Tutorial gibt eine kurze Einfuehrung in das Content Management
- System Apache Lenya. Wir betrachten typische Anwendungsfaelle,
- wie zum Beispiel ein neues Dokument kreieren, bearbeiten und publizieren</p>
+ <p>Das folgende Tutorial gibt eine kurze Einführung in das Content Management
+ System Apache Lenya. Wir betrachten typische Anwendungsfälle,
+ wie zum Beispiel ein neues Dokument erstellen, bearbeiten und publizieren.</p>
- <h2>Ein neues Dokument kreieren</h2>
-
- <p>To create a new document goto the <code>File->New
- Document</code> menu entry. You'll get a new screen that asks you
- for an id and a name for this new document. The id will be used
- internally as an identifier for the document and the name will be
- used in the navigation. Let's use "foo" as id and "Foo" as the
- name of the new document. Now press <code>Create</code>. You will
- be redirected back to the page where you originally invoked the
- creation and you'll notice that the new document "Foo" now shows
- up as a sub-document of the Tutorial document in the
- navigation.</p>
-
- <p>This illustrates the fact that a new document is always created
- as a sub-document of the document you're currently looking at. You
- also notice how the navigation is built automatically.</p>
+ <h2>Ein neues Dokument erstellen</h2>
+
+ <p>
+ Um ein neues Dokument zu erstellen, klicken Sie auf den Menüpunkt
+ <em>Datei -> Neues XHTML-Dokument</em>. Sie erhalten ein Formular,
+ das Sie auffordert, einen Knoten-Namen und Navigationstitel für das
+ neue Dokument einzugeben. Der Knoten-Name wird zur Identifikation des
+ Dokumentes in der URL verwendet. Der Navigationstitel wird links im
+ Menü erscheinen.
+ </p>
+ <p>
+ Geben Sie "helloworld" als Knoten-Name und "Hello World" als Navigationstitel
+ ein und klicken Sie auf den "Erstellen"-Button. Sie werden zur neu erstellten
+ "Hello World"-Seite weitergeleitet. Links im Navigationsmenü können Sie
+ den neuen Eintrag sehen. Da Sie im "Erstellen"-Formular die Standard-Einstellung
+ "child" gewählt haben, wurde das neue Dokument als Kind-Dokument des
+ Ausgangs-Dokumentes eingefügt.
+ </p>
<h2>Ein Dokument bearbeiten</h2>
-
- <p>To look at the newly created document click on the "Foo" entry
- in the navigation. You'll notice that the "Foo" document already
- contains some content. It was created from a sample XML
- document. To change this sample content you will have to edit the
- document. You can pick on of the following web-based WYSIWYG
- editors:</p>
+
+ <p>
+ Wie Sie sehen enthält das "Hello World"-Dokument bereits ein wenig
+ Beispiel-Inhalt. Um diesen zu ändern, können Sie das Dokument mit einem
+ der eingebauten Editoren bearbeiten:
+ </p>
<ul>
- <li>HTML Forms: This is a good choice for users of Mosaic ;-)</li>
- <li>Bitflux: This is a good choice for users of Mozilla.</li>
- <li>One Form: For the power user who needs all the control</li>
+ <li>Kupu: Eine gute Wahl für Internet-Explorer-Nutzer.</li>
+ <li>BXE: Eine gute Wahl für Firefox-Nutzer.</li>
+ <li>Formwizard: Eine gute Wahl für Mosaic-Nutzer. ;-)</li>
+ <li>Formulareditor: Für Nutzer, die die volle Kontrolle benötigen.</li>
</ul>
+
+ <p>
+ Wählen Sie einen Editor aus dem "Bearbeiten"-Menü (abhängig von Ihrer Plattform)
+ und beginnen Sie, das neu erstellte Dokument zu bearbeiten.
+ In diesem Beispiel verwenden wir den BXE-Editor.
+ Das Lenya-Menü wird verschwinden und der BXE-Toolbar erscheint stattdessen.
+ Mit der rechten Maustaste erhalten Sie ein Kontext-Menü,
+ mit Hilfe dessen Sie Textbausteine kopieren, ausschneiden und einfügen können.
+ Sie können auch neue Elemente mittels des Kontext-Menüs in das Dokument
+ einfügen. Sobald Sie ihre Änderungen abgeschlossen haben, klicken Sie auf
+ "Save & Exit" um zurück zur Lenya-Ansicht des Dokumentes zu gelangen.
+ Dort können Sie Ihre Änderungen betrachten.
+ </p>
- <p>Pick your choice of editor (based on your platform) and start
- editing the newly created document by selecting the
- <code>Edit->Edit with BXE</code> menu button. The Lenya menu will
- disappear and the Bitflux toolbar will appear instead. You can use
- the left mouse button to get a context sensitive menu from where
- you can copy, cut and paste. You're also able to insert new
- elements into the document from the context sensitive menu. Once
- you're done with all your changes, press
- <code>Save&Exit</code> to get back. You'll see your changes in
- the document.</p>
-
- <h2>Ein Dokument bearbeiten</h2>
-
- <p>Once you are satisfied with the content of the document you
- want to publish it to make it visible in the live area.</p>
+ <h2>Ein Dokument veröffentlichen</h2>
+
+ <p>
+ Sobald Sie mit dem Inhalt Ihres Dokumentes zufrieden sind, können Sie
+ es publizieren, um es in der Live-Umgebung sichtbar zu machen.
+ </p>
<h3>Workflow</h3>
-
- <p>The default publication has a simple workflow configured which
- involves an author and a reviewer. The author creates and edits a
- new document and submits it for approval. The reviewer (obviously
- :-)) reviews the document and publishes it so that it will appear
- on the live site.
-
- The user lenya (which you are probably currently logged in as) has
- the role edit, i.e. he can create new documents and submit them
- for approval (with <code>Workflow->Submit for review</code>). The
- user alice has the role review which allows her to approve,
- i.e. publish documents.</p>
-
- <p>In order to publish your newly created document simply press
- <code>Workflow->Sumbit</code> (as user lenya) to submit the
- current document for approval. Now log out
- (<code>File->Logout</code>), log back in as alice (use the same
- password as for user lenya) and publish the current document by
- selecting <code>Workflow->Publish</code>. You will get a
- confirmation screen where you confirm your intention to publish
- the document "Foo" by pressing <code>Publish Now</code>. You might
- have to publish the parent document ("Tutorial") first, as the
- "Foo" document will not be published if the parent document is not
- in the live area yet.</p> <p>To check how the "Foo" document looks
- like in the live site click on the <code>live</code> tab in the
- Lenya menu. This will open a new browser window showing you the
- live site.</p>
- <h2>Scheduling</h2>
+ <p>
+ Die Default-Publikation verwendet einen einfachen Workflow, der die Rollen
+ eines Editors und einen Prüfers involviert. Der Editor erstellt und
+ bearbeitet neue Dokumente und reicht sie zur Prüfung ein. Der Prüfer
+ überprüft das Dokument und publiziert es, so dass es auf der Live-Website
+ erscheint.
+ </p>
- <p>Apache Lenya allows you to publish a document at a specific
- date. To do this select the <code>Workflow->Publish</code> menu
- entry. Now instead of pressing <code>Publish</code>, specify the
- date and the time at which you wish to publish the document and
- press <code>Schedule</code>. Your document will be published at
- the specified date. Use the <code>Scheduler</code> tab in the site
- area to see the pending tasks and their status.</p>
+ <p>
+ Der Nutzer <em>lenya</em>, mit dem Sie sich wahrscheinlich eingeloggt
+ haben, besitzt die Editor-Rolle, d.h. er kann neue Dokumente erstellen und
+ zur Prüfung einreichen. Die Nutzerin <em>alice</em> besitzt die Prüfer-Rolle,
+ die es ihr erlaubt, Dokumente zu prüfen und zu publizieren.
+ </p>
+
+ <p>
+ Um Ihr neu erstelltes Dokument zu veröffentlichen, loggen Sie sich (falls
+ nötig) als Nutzer <em>lenya</em> ein und klicken Sie auf den Menüpunkt
+ <em>Arbeitsfluss -> Einreichen</em>. Loggen Sie sich nun aus (<em>Datei
+ -> Abmelden</em>) und loggen Sie sich als Nutzer <em>alice</em> ein.
+ Nun können Sie das Dokument mittels des Menüpunkts <em>Arbeitsfluss ->
+ Publizieren</em> veröffentlichen. Gegebenenfalls werden Sie auf dem
+ Bestätigungs-Bildschirm darauf hingewiesen, dass die zuerst das übergeordnete
+ Dokument publizieren müssen, da es sich noch nicht in der Live-Area
+ befindet. Um zu sehen, wie das Dokument in der Live-Ansicht aussieht,
+ klicken Sie auf den "Live"-Reiter im Lenya-Menü. Dieser wird ein neues
+ Browser-Fenster bzw. -Tab öffnen, das Ihnen die Seite in der Live-Area
+ zeigt.
+ </p>
- <h2>Revision Control</h2>
-
- <p>Every time you edit a document and exit the editor a new
- revision of the document is stored. Old versions of the document
- are kept and you can go back to an older version if you want to
- undo some of the changes you applied to it. To see all available
- versions of the current document press
- <code>Tools->Rollback</code>. This will give you a list of all
- previous versions. You can view a specific old version or rollback
- to a specific old version by clicking on the appropriate links.</p>
+ <h2>Zeitsteuerung</h2>
+
+ <p>
+ Apache Lenya erlaubt es, ein Dokument zu einem spezifischen Zeitpunkt zu
+ veröffentlichen. Wählen Sie dazu den Menüpunkt <em>Arbeitsfluss ->
+ Publizieren</em>. Anstatt jedoch unmittelbar auf "Publizieren" zu klicken,
+ geben Sie zunächst eine Zeit ein, zu der das Dokument veröffentlicht werden
+ soll. Im Reiter "Zeitsteuerung" in der Site-Area erhalten Sie einen Überblick
+ über die anstehenden Aufträge und deren Status.
+ </p>
+
+ <h2>Versionierung</h2>
+
+ <p>
+ Jedes Mal wenn Sie ein Dokument editieren und den Editor verlassen, wird
+ eine neue Revision des Dokumentes angelegt. Alte Revisionen werden
+ aufbewahrt, Sie können sie auf dem Reiter "Revisionen" in der Site-Area
+ betrachten und ggf. das Dokument durch eine ältere Revision ersetzen.
+ </p>
</body>
</html>
diff --git a/src/pubs/default/example-content/tutorial/index_en b/src/pubs/default/example-content/tutorial/index_en
index 1baf3c1..10b13fd 100644
--- a/src/pubs/default/example-content/tutorial/index_en
+++ b/src/pubs/default/example-content/tutorial/index_en
@@ -33,14 +33,14 @@
<h2>Creating a new document</h2>
- <p>To create a new document goto the <code>File->New
- Document</code> menu entry. You'll get a new screen that asks you
+ <p>To create a new document, go to the <code>File -> New
+ XHTML Document</code> menu entry. You'll get a new screen that asks you
for an id and a name for this new document. The id will be used
internally as an identifier for the document and the name will be
- used in the navigation. Let's use "foo" as id and "Foo" as the
+ used in the navigation. Let's use "helloworld" as id and "Hello World" as the
name of the new document. Now press <code>Create</code>. You will
be redirected back to the page where you originally invoked the
- creation and you'll notice that the new document "Foo" now shows
+ creation and you'll notice that the new document "Hello World" now shows
up as a sub-document of the Tutorial document in the
navigation.</p>
@@ -50,16 +50,17 @@
<h2>Editing a document</h2>
- <p>To look at the newly created document click on the "Foo" entry
- in the navigation. You'll notice that the "Foo" document already
+ <p>To look at the newly created document click on the "Hello World" entry
+ in the navigation. You'll notice that the "Hello World" document already
contains some content. It was created from a sample XML
document. To change this sample content you will have to edit the
document. You can pick on of the following web-based WYSIWYG
editors:</p>
<ul>
+ <li>Kupu: This is a good choice for users of Internet Explorer.</li>
+ <li>BXE: This is a good choice for users of Mozilla.</li>
<li>HTML Forms: This is a good choice for users of Mosaic ;-)</li>
- <li>Bitflux: This is a good choice for users of Mozilla.</li>
<li>One Form: For the power user who needs all the control</li>
</ul>
@@ -67,7 +68,7 @@
editing the newly created document by selecting the
<code>Edit->Edit with BXE</code> menu button. The Lenya menu will
disappear and the Bitflux toolbar will appear instead. You can use
- the left mouse button to get a context sensitive menu from where
+ the right mouse button to get a context sensitive menu from where
you can copy, cut and paste. You're also able to insert new
elements into the document from the context sensitive menu. Once
you're done with all your changes, press
@@ -108,10 +109,10 @@
password as for user lenya) and publish the current document by
selecting <code>Workflow->Publish</code>. You will get a
confirmation screen where you confirm your intention to publish
- the document "Foo" by pressing <code>Publish Now</code>. You might
+ the document "Hello World" by pressing <code>Publish Now</code>. You might
have to publish the parent document ("Tutorial") first, as the
- "Foo" document will not be published if the parent document is not
- in the live area yet.</p> <p>To check how the "Foo" document looks
+ "Hello World" document will not be published if the parent document is not
+ in the live area yet.</p> <p>To check how the "Hello World" document looks
like in the live site click on the <code>live</code> tab in the
Lenya menu. This will open a new browser window showing you the
live site.</p>
@@ -120,9 +121,9 @@
<p>Apache Lenya allows you to publish a document at a specific
date. To do this select the <code>Workflow->Publish</code> menu
- entry. Now instead of pressing <code>Publish</code>, specify the
- date and the time at which you wish to publish the document and
- press <code>Schedule</code>. Your document will be published at
+ entry. Now instead of pressing <code>Publish</code> immediately,
+ specify the date and the time at which you wish to publish the
+ document first. Your document will be published at
the specified date. Use the <code>Scheduler</code> tab in the site
area to see the pending tasks and their status.</p>
diff --git a/src/pubs/default/example-content/tutorial/new_doctype/index_en b/src/pubs/default/example-content/tutorial/new_doctype/index_en
deleted file mode 100644
index 9cde2ef..0000000
--- a/src/pubs/default/example-content/tutorial/new_doctype/index_en
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml"
-xmlns:xhtml="http://www.w3.org/1999/xhtml"
-xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0">
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Id: index_en.xml 169299 2005-05-09 12:00:43Z jwkaltz $ -->
- <head>
- <title>Lenya Tutorial - How to create a new doctype</title>
- </head>
- <body>
- <h1>Lenya Tutorial - How to create a new doctype</h1>
-
- <p>NOTE: Also see the <a href="http://wiki.apache.org/lenya/AddingCustomDocType">Wiki</a></p>
-
- <h2>The standard way</h2>
-
- <p>
- Add a link where people can click on: <em>config/menus/menu.xsp</em>
- </p>
-
- <p>
- Create a usecase sitemap where the "flow" is defined: <em>usecase-create-my_doctype.xmap</em>
- </p>
-
- <p>
- Define what class shall be used for the actual creation: <em>config/doctypes/doctypes.xconf</em>
- </p>
-
- <p>
- In many cases a new document is created based on a sample: <em>config/doctypes/samples/my_doctype.xml</em>
- The name of the sample needs to be configured within <em>config/doctypes/doctypes.xconf</em>
- </p>
-
- <p>
- Add doctype such that XSLT can be found: <em>parameter-doctype.xmap</em>
- </p>
-
- <p>
- Create XSLT: <em>xslt/my_doctype2xhtml.xsl</em>
- </p>
-
- <p>
- OPTIONAL: Create new menu: <em>menus.xmap</em>, <em>config/menus/my_doctype.xsp</em>
- </p>
-
- <p>
- Create workflow: <em>config/workflow/my_doctype.xml</em>, <em>config/doctypes/doctypes.xconf</em>
- </p>
-
- </body>
-</html>
diff --git a/src/pubs/default/example-content/tutorial/new_doctype/index_en.meta b/src/pubs/default/example-content/tutorial/new_doctype/index_en.meta
deleted file mode 100644
index 6a8a811..0000000
--- a/src/pubs/default/example-content/tutorial/new_doctype/index_en.meta
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<lenya:document xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0">
-<lenya:meta>
-<lenya:internal>
-<lenya:resourceType>xhtml</lenya:resourceType>
-<lenya:contentType>xml</lenya:contentType>
-</lenya:internal>
-<lenya:dc>
- <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">How to create a new doctype</dc:title>
- <dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Lenya Development Team</dc:creator>
- <dc:subject xmlns:dc="http://purl.org/dc/elements/1.1/">New doctype</dc:subject>
- <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/">Tutorial for new doctype creation</dc:description>
- <dc:publisher xmlns:dc="http://purl.org/dc/elements/1.1/">Apache Software Foundation</dc:publisher>
- <dc:contributor xmlns:dc="http://purl.org/dc/elements/1.1/"/>
- <dc:date xmlns:dc="http://purl.org/dc/elements/1.1/">2005-01-31</dc:date>
- <dc:type xmlns:dc="http://purl.org/dc/elements/1.1/"/>
- <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/"/>
- <dc:identifier xmlns:dc="http://purl.org/dc/elements/1.1/"/>
- <dc:source xmlns:dc="http://purl.org/dc/elements/1.1/"/>
- <dc:language xmlns:dc="http://purl.org/dc/elements/1.1/">en</dc:language>
- <dc:relation xmlns:dc="http://purl.org/dc/elements/1.1/"/>
- <dc:coverage xmlns:dc="http://purl.org/dc/elements/1.1/"/>
- <dc:rights xmlns:dc="http://purl.org/dc/elements/1.1/">All rights reserved</dc:rights>
-</lenya:dc>
-</lenya:meta>
-</lenya:document>
\ No newline at end of file
diff --git a/src/pubs/default/lenya/resources/i18n/cmsui.xml b/src/pubs/default/lenya/resources/i18n/cmsui.xml
index 9a339fd..6831bb5 100644
--- a/src/pubs/default/lenya/resources/i18n/cmsui.xml
+++ b/src/pubs/default/lenya/resources/i18n/cmsui.xml
@@ -23,6 +23,8 @@
-->
<catalogue xml:lang="en">
+
+ <message key="publication-title">Welcome to the Default Publication from {0}!</message>
<message key="default.createdoc.idtaken">The ID you've entered is already taken. Please choose another one.</message>
diff --git a/src/pubs/default/lenya/resources/i18n/cmsui_de.xml b/src/pubs/default/lenya/resources/i18n/cmsui_de.xml
index 2d62816..d45cb3c 100644
--- a/src/pubs/default/lenya/resources/i18n/cmsui_de.xml
+++ b/src/pubs/default/lenya/resources/i18n/cmsui_de.xml
@@ -24,6 +24,8 @@
<catalogue xml:lang="de">
+ <message key="publication-title">Willkommen zur Default-Publikation von {0}!</message>
+
<message key="default.doc.create.idtaken">Die eingebene ID ist schon vergeben. Bitte wä;hlen Sie eine andere ID.</message>
<message key="Create new language version">Neue Sprachversion anlegen</message>
diff --git a/src/pubs/default/modules/homepage/xslt/homepage2xhtml.xsl b/src/pubs/default/modules/homepage/xslt/homepage2xhtml.xsl
index 28812f8..364729d 100644
--- a/src/pubs/default/modules/homepage/xslt/homepage2xhtml.xsl
+++ b/src/pubs/default/modules/homepage/xslt/homepage2xhtml.xsl
@@ -39,11 +39,11 @@
<ci:include src="cocoon:/news-header_{$language}.xml"/>
</head>
<body>
+ <ci:include src="cocoon:/news-include_{$language}.xml"/>
<div id="body">
<xsl:if test="$rendertype = 'edit'">
<xsl:attribute name="bxe_xpath">/xhtml:html/xhtml:body</xsl:attribute>
</xsl:if>
- <ci:include src="cocoon:/news-include_{$language}.xml"/>
<xsl:apply-templates select="xhtml:body/node()"/>
</div>
</body>
diff --git a/src/pubs/default/resources/shared/css/homepage.css b/src/pubs/default/resources/shared/css/homepage.css
index 86ea730..7ba2ecd 100644
--- a/src/pubs/default/resources/shared/css/homepage.css
+++ b/src/pubs/default/resources/shared/css/homepage.css
@@ -1 +1,5 @@
-/* Put your doctype-specific CSS here */
\ No newline at end of file
+/* Put your doctype-specific CSS here */
+
+div#body {
+ margin-right: 300px;
+}
\ No newline at end of file
diff --git a/src/pubs/default/resources/shared/css/news.css b/src/pubs/default/resources/shared/css/news.css
index 28b368f..eb36604 100644
--- a/src/pubs/default/resources/shared/css/news.css
+++ b/src/pubs/default/resources/shared/css/news.css
@@ -23,9 +23,10 @@
div#news {
+ font-family: Verdana, Arial, Sans-serif;
clear: both;
float: right;
- width: 30%;
+ width: 250px;
border: solid 1px #BB9999;
margin: 0px 10px 10px 10px;
padding: 10px;
diff --git a/src/pubs/default/resources/shared/css/page.xml b/src/pubs/default/resources/shared/css/page.xml
index e7292cf..18ddd46 100644
--- a/src/pubs/default/resources/shared/css/page.xml
+++ b/src/pubs/default/resources/shared/css/page.xml
@@ -113,31 +113,48 @@
}
#languageselector {
- font-size:80%;
+ font-size: 80%;
+ padding-top: 8px;
}
#languageselector a img {
- border:none;
- margin:0;
- padding:0;
+ border: none;
+ margin: 0;
+ padding: 0;
+ border: solid 5px #DDBBBB;
+ vertical-align: middle;
}
+
#menu a, #languageselector a {
text-decoration: none;
color: Maroon;
}
+#languageselector a {
+ padding: 2px;
+}
+
+#languageselector a:hover {
+ text-decoration: none;
+}
+
#languageselector a.lenya-language-isCurrent {
font-weight:bold;
}
+
#languageselector a.lenya-language-isCurrent img {
- border: solid 2px Maroon;
+ border: solid 5px #FFEEEE;
}
+
#languageselector a.lenya-language-isAvailable {
}
+
#languageselector a.lenya-language-isUnavailable {
color:#aaaaaa;
+ opacity: 0.5;
}
-#menu a:hover, #languageselector a:hover {
+
+#menu a:hover {
text-decoration: underline;
}
@@ -153,23 +170,33 @@
.menublock-1 .menublock-2 { display: none; }
-.menublock-selected-1 .menuitem-1 { background-color: #FFEEEE; }
.menublock-1 .menuitem-1 { }
.menuitem-1 { padding: 5px 5px 5px 5px; font-size: 80%; }
.menuitem-2 { padding: 2px 5px 2px 25px; font-size: 80%; }
-.menuitem-selected-2 { padding: 2px 5px 2px 25px; font-size: 80%; color: black; }
+
.menuitem-2 a { }
.menuitem-selected-1 {
- background-color: #FFEEEE;
- padding: 5px 5px 5px 5px;
- font-size: 80%;
+ background-color: #FFEEEE;
+ padding: 5px 5px 5px 5px;
+ font-size: 80%;
}
+.menuitem-selected-2 {
+ padding: 2px 5px 2px 25px;
+ font-size: 80%;
+ background-color: #FFEEEE;
+}
+
+.menuitem-3, .menuitem-selected-3 {
+ padding: 2px 5px 2px 45px;
+ font-size: 80%;
+}
-.menuitem-3 { padding: 2px 5px 2px 25px; font-size: 60%; }
-.menuitem-selected-3 { padding: 2px 5px 2px 25px; font-size: 60%; }
+.menuitem-selected-3 {
+ background-color: #FFEEEE;
+}
/* breadcrumb */
diff --git a/src/pubs/default/xslt/page2xhtml.xsl b/src/pubs/default/xslt/page2xhtml.xsl
index b32827a..49fc9e3 100644
--- a/src/pubs/default/xslt/page2xhtml.xsl
+++ b/src/pubs/default/xslt/page2xhtml.xsl
@@ -74,14 +74,10 @@
<table width="100%" cellpadding="0" cellspacing="0" border="0">
<tr>
<td id="publication-title">
- <xsl:choose>
- <xsl:when test="$language = 'de'">
- Willkommen zur Default Publikation von <xsl:value-of select="$author"/>!
- </xsl:when>
- <xsl:otherwise>
- Welcome to the Default Publication from <xsl:value-of select="$author"/>!
- </xsl:otherwise>
- </xsl:choose>
+ <i18n:translate>
+ <i18n:text>publication-title</i18n:text>
+ <i18n:param><xsl:value-of select="$author"/></i18n:param>
+ </i18n:translate>
</td>
<td id="project-logo"><img src="{$root}/images/project-logo.png" alt="project logo"/></td>
</tr>
