You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2004/11/14 20:41:48 UTC
svn commit: rev 65617 - cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples
Author: vgritsenko
Date: Sun Nov 14 11:41:48 2004
New Revision: 65617
Removed:
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/TaglibTest.xhtml
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-s.xhtml
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/parent.xhtml
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/samples.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-p.xhtml
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-r.xhtml
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable.xhtml
Log:
more cleanup
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/parent.xhtml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/parent.xhtml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/parent.xhtml Sun Nov 14 11:41:48 2004
@@ -108,6 +108,6 @@
</i18n:locale>
<p>
- <a href="TaglibTest.xhtml">Back</a>
+ <a href="welcome">Back</a>
</p>
</html>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/samples.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/samples.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/samples.xml Sun Nov 14 11:41:48 2004
@@ -25,11 +25,11 @@
</group>
<group name="Taglib Samples">
- <sample name="Parent" href="parent.xhtml">
- ParentResolving and Iteration. Uses LocaleTag in combination with MonthTag
- </sample>
<sample name="Variables" href="variable-p.xhtml">
XPath-Resolving and Variables. Uses OutTag.
+ </sample>
+ <sample name="Parent" href="parent.xhtml">
+ ParentResolving and Iteration. Uses LocaleTag in combination with MonthTag
</sample>
</group>
</samples>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-p.xhtml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-p.xhtml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-p.xhtml Sun Nov 14 11:41:48 2004
@@ -15,45 +15,43 @@
limitations under the License.
-->
-<html xmlns:core="urn:apache:taglib:core" xmlns:dt="urn:apache:taglib:datetime"
- xmlns:i18n="urn:apache:taglib:i18n" xmlns:jxpath="urn:apache:taglib:jxpath:core"
- xmlns:string="urn:apache:taglib:string" xmlns:test="urn:apache:taglib:test">
+<html xmlns:core="urn:apache:taglib:core"
+ xmlns:string="urn:apache:taglib:string"
+ xmlns:jxpath="urn:apache:taglib:jxpath:core">
- <title>Tag Test</title>
- <h2>tag test</h2>
+ <title>Taglib Test: Setting and getting variables</title>
+ <h2>Taglib Test: Setting and getting variables</h2>
- <string:trim var="p">pipeline</string:trim>
- <string:trim var="$request/r">request</string:trim>
- <string:trim var="$session/s">session</string:trim>
- <string:trim var="$application/a">application</string:trim>
+ <!-- string:trim var="p">Variable pipeline</string:trim -->
+ <string:trim var="$request/r">Variable declared in request</string:trim>
+ <string:trim var="$session/s">Variable declared in session</string:trim>
+ <string:trim var="$application/a">Variable declared in application</string:trim>
- <h3>variables in pipeline</h3>
<p>
- <table>
- <tr>
+ <table cellpadding="5" border="1">
+ <!-- tr>
<td>pipeline:</td>
<td><jxpath:out value="p" /></td>
- </tr>
+ </tr -->
<tr>
- <td>request:</td>
+ <td>Get variable from request:</td>
<td><jxpath:out value="$request/r" /></td>
</tr>
<tr>
- <td>session:</td>
+ <td>Get variable from session:</td>
<td><jxpath:out value="$session/s" /></td>
</tr>
<tr>
- <td>application:</td>
+ <td>Get variable from application:</td>
<td><jxpath:out value="$application/a" /></td>
</tr>
</table>
</p>
- <a href="variable-p.xhtml">pipeline</a>
- <a href="variable-r.xhtml">request</a>
- <a href="variable-s.xhtml">session & application</a>
+ <a href="variable-p.xhtml">Variables</a>
+ <a href="variable-r.xhtml">Include</a>
<p>
- <a href="TaglibTest.xhtml">Back</a>
+ <a href="welcome">Back</a>
</p>
</html>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-r.xhtml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-r.xhtml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-r.xhtml Sun Nov 14 11:41:48 2004
@@ -15,26 +15,24 @@
limitations under the License.
-->
-<html xmlns:core="urn:apache:taglib:core" xmlns:dt="urn:apache:taglib:datetime"
- xmlns:i18n="urn:apache:taglib:i18n" xmlns:jxpath="urn:apache:taglib:jxpath:core"
- xmlns:string="urn:apache:taglib:string" xmlns:test="urn:apache:taglib:test">
+<html xmlns:core="urn:apache:taglib:core"
+ xmlns:string="urn:apache:taglib:string">
- <title>Tag Test</title>
- <h2>tag test</h2>
+ <title>Taglib Test: Include Source</title>
+ <h2>Taglib Test: Include Source</h2>
- <string:trim var="p">pipeline</string:trim>
+ <!-- string:trim var="p">pipeline</string:trim -->
<string:trim var="$request/r">request</string:trim>
- <h3>variables in request</h3>
+ <h3>Included Content</h3>
<p>
<core:source src="variable.xhtml"/>
</p>
- <a href="variable-p.xhtml">pipeline</a>
- <a href="variable-r.xhtml">request</a>
- <a href="variable-s.xhtml">session & application</a>
+ <a href="variable-p.xhtml">Variables</a>
+ <a href="variable-r.xhtml">Include</a>
<p>
- <a href="TaglibTest.xhtml">Back</a>
+ <a href="welcome">Back</a>
</p>
</html>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable.xhtml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable.xhtml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable.xhtml Sun Nov 14 11:41:48 2004
@@ -19,7 +19,7 @@
xmlns:i18n="urn:apache:taglib:i18n" xmlns:jxpath="urn:apache:taglib:jxpath:core"
xmlns:string="urn:apache:taglib:string" xmlns:test="urn:apache:taglib:test">
- <table>
+ <table cellpadding="5" border="1">
<!-- tr>
<td>pipeline: </td><td><jxpath:out value="p" /></td>
</tr -->