You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2008/04/11 01:29:30 UTC
svn commit: r647009 [2/2] - in /lenya/sandbox/modules/diff: ./ config/
config/cocoon-xconf/ java/ java/src/ java/src/org/ java/src/org/apache/
java/src/org/apache/lenya/ java/src/org/apache/lenya/modules/
java/src/org/apache/lenya/modules/diff/ java/sr...
Added: lenya/sandbox/modules/diff/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/sandbox/modules/diff/resources/i18n/cmsui.xml?rev=647009&view=auto
==============================================================================
--- lenya/sandbox/modules/diff/resources/i18n/cmsui.xml (added)
+++ lenya/sandbox/modules/diff/resources/i18n/cmsui.xml Thu Apr 10 16:29:24 2008
@@ -0,0 +1,33 @@
+<?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: cmsui.xml 447395 2006-09-18 13:01:33Z andreas $ -->
+
+<catalogue xml:lang="en" xmlns:xhtml="http://www.w3.org/1999/xhtml"
+ xmlns="http://apache.org/cocoon/i18n/2.1">
+
+ <message key="change-notification-subject">Document changed: {0}</message>
+ <message key="change-notification-body">
+Document: {0}
+URL: {1}
+Changed by user: {2}
+
+{3}
+ </message>
+
+</catalogue>
Added: lenya/sandbox/modules/diff/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/sandbox/modules/diff/resources/i18n/cmsui_de.xml?rev=647009&view=auto
==============================================================================
--- lenya/sandbox/modules/diff/resources/i18n/cmsui_de.xml (added)
+++ lenya/sandbox/modules/diff/resources/i18n/cmsui_de.xml Thu Apr 10 16:29:24 2008
@@ -0,0 +1,33 @@
+<?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: cmsui.xml 447395 2006-09-18 13:01:33Z andreas $ -->
+
+<catalogue xml:lang="de" xmlns:xhtml="http://www.w3.org/1999/xhtml"
+ xmlns="http://apache.org/cocoon/i18n/2.1">
+
+ <message key="change-notification-subject">Dokument geändert: {0}</message>
+ <message key="change-notification-body">
+ Dokument: {0}
+ URL: {1}
+ Geändert von Benutzer: {2}
+
+ {3}
+ </message>
+
+</catalogue>
Added: lenya/sandbox/modules/diff/usecases/diff.jx
URL: http://svn.apache.org/viewvc/lenya/sandbox/modules/diff/usecases/diff.jx?rev=647009&view=auto
==============================================================================
--- lenya/sandbox/modules/diff/usecases/diff.jx (added)
+++ lenya/sandbox/modules/diff/usecases/diff.jx Thu Apr 10 16:29:24 2008
@@ -0,0 +1,86 @@
+<?xml version="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: revisions.jx 564507 2007-08-10 08:33:31Z andreas $ -->
+
+<page:page xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+ xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
+
+ <jx:import uri="fallback://lenya/modules/sitemanagement/usecases/tab/head.jx"/>
+
+ <page:body>
+
+ <jx:import uri="fallback://lenya/modules/sitemanagement/usecases/tab/sitetree.jx"/>
+ <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
+
+ <jx:set var="rev1" value="${usecase.getParameter('rev1')}"/>
+ <jx:set var="rev2" value="${usecase.getParameter('rev2')}"/>
+
+ <div id="contentblock1" class="lenya-tab-sitetree">
+ <h1>
+ <i18n:translate>
+ <i18n:text>difference-between</i18n:text>
+ <i18n:param>${rev1}</i18n:param>
+ <i18n:param>${rev2}</i18n:param>
+ </i18n:translate>
+ </h1>
+
+ <jx:set var="differences" value="${usecase.getParameter('differences')}"/>
+ <jx:choose>
+ <jx:when test="${differences.size() == 0}">
+ <p>
+ <i18n:text>no-differences</i18n:text>
+ </p>
+ </jx:when>
+ <jx:otherwise>
+ <table class="lenya-table-list">
+ <tr>
+ <th><i18n:text>Revision</i18n:text> ${rev1}</th>
+ <th><i18n:text>Revision</i18n:text> ${rev2}</th>
+ <!--
+ <th><i18n:text>Location</i18n:text></th>
+ <th><i18n:text>Type</i18n:text></th>
+ <th><i18n:text>Revision</i18n:text> ${rev1}</th>
+ <th><i18n:text>Revision</i18n:text> ${rev2}</th>
+ -->
+ </tr>
+ <jx:forEach var="difference" items="${differences}">
+ <tr>
+ <td style="padding-left: ${difference.getDepth()}em;">
+ ${difference.getLeft()}
+ </td>
+ <td style="padding-left: ${difference.getDepth()}em;">
+ ${difference.getRight()}
+ </td>
+ <!--
+ <td>${difference.getControlNodeDetail().getXpathLocation()}</td>
+ <td>${difference.getDescription()}</td>
+ <td>${difference.getControlNodeDetail().getValue()}</td>
+ <td>${difference.getTestNodeDetail().getValue()}</td>
+ -->
+ </tr>
+ </jx:forEach>
+ </table>
+ </jx:otherwise>
+ </jx:choose>
+
+ </div>
+ </page:body>
+</page:page>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org