You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jo...@apache.org on 2012/10/19 20:49:48 UTC

svn commit: r1400220 [7/9] - in /struts/struts2/trunk/apps/showcase: ./ src/main/java/org/apache/struts2/showcase/ src/main/java/org/apache/struts2/showcase/action/ src/main/java/org/apache/struts2/showcase/actionchaining/ src/main/java/org/apache/stru...

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/methodPrefix.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/methodPrefix.ftl?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/methodPrefix.ftl (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/methodPrefix.ftl Fri Oct 19 18:49:39 2012
@@ -1,18 +1,24 @@
-
-
 <html>
 <head>
-	<title>Showcase - Tags - Non UI - Action Prefix (freemarker)</title>
+	<title>Struts2 Showcase - Non UI Tags - Action Prefix (Freemarker)</title>
 </head>
 <body>
+<div class="page-header">
+	<h1>Non Ui Tag - Action Prefix (Freemarker)</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<p>You have come to this page because you used an <strong>method</strong> prefix.<p/>
 	
-	You have come to this page because you used an 'method' prefix.<p/>
-	
-	The text you've enter is ${text?default('')?html}<p/>
-	
-	<@s.url id="url" action="actionPrefixExampleUsingFreemarker" namespace="/tags/non-ui/actionPrefix" />
-	<@s.a href="%{#url}">Back</...@s.a>
-	
+			<p>The text you've enter is ${text?default('')?html}<p/>
+
+			<@s.a href="javascript:history.back();" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back</...@s.a>
+		</div>
+	</div>
+</div>
 </body>
 </html>
 

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/normalSubmit.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/normalSubmit.ftl?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/normalSubmit.ftl (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/normalSubmit.ftl Fri Oct 19 18:49:39 2012
@@ -1,17 +1,24 @@
-
 <html>
 <head>
-	<title>Showcase - Tags - Non UI - Action Prefix (freemarker)</title>
+	<title>Struts2 Showcase - Non UI Tags - Action Prefix (Freemarker)</title>
 </head>
 <body>
+<div class="page-header">
+	<h1>Non Ui Tag - Action Prefix (Freemarker)</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<p>You have come to this page because you did a normal submit.<p/>
 	
-	You have come to this page because you did a normal submit.<p/>
-	
-	The text you've enter is %{text}<p/>
-	
-	<@s.url id="url" action="actionPrefixExampleUsingFreemarker" namespace="/tags/non-ui/prefix" />
-	<@s.a href="%{#url}">Back</...@s.a>
-	
+			<p>The text you've enter is %{text}<p/>
+
+			<@s.a href="javascript:history.back();" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back</...@s.a>
+		</div>
+	</div>
+</div>
 </body>
 </html>
 

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/redirectActionPrefix.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/redirectActionPrefix.ftl?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/redirectActionPrefix.ftl (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/redirectActionPrefix.ftl Fri Oct 19 18:49:39 2012
@@ -1,21 +1,27 @@
-
-
 <html>
 <head>
-	<title>Showcase - Tags - Non UI - Action Prefix (freemarker)</title>
+	<title>Struts2 Showcase - Non UI Tags - Action Prefix (Freemarker)</title>
 </head>
 <body>
+<div class="page-header">
+	<h1>Non Ui Tag - Action Prefix (Freemarker)</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<p>You have come to this page because you used an 'redirect-action' prefix.<p/>
 	
-	You have come to this page because you used an 'redirect-action' prefix.<p/>
-	
-	Because this is a 'redirect-action', the text will be lost, due to a redirection
-	implies a new request being issued from the client.<p/>
-	
-	The text you've enter is ${text?default('')?html}<p/>
-	
-	<@s.url id="url" action="actionPrefixExampleUsingFreemarker" namespace="/tags/non-ui/actionPrefix" />
-	<@s.a href="%{#url}">Back</...@s.a>
-	
+			<p>Because this is a <strong>redirect-action</strong>, the text will be lost, due to a redirection
+			implies a new request being issued from the client.<p/>
+
+			The text you've enter is ${text?default('')?html}<p/>
+
+			<@s.a href="javascript:history.back();" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back</...@s.a>
+		</div>
+	</div>
+</div>
 </body>
 </html>
 

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage.jsp Fri Oct 19 18:49:39 2012
@@ -1 +1 @@
-<h1>This is INCLUDED by the action tag</h1>
+<h2>This is INCLUDED by the action tag</h2>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage2.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage2.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage2.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage2.jsp Fri Oct 19 18:49:39 2012
@@ -1,2 +1,2 @@
 
-<h1>This is INCLUDED by the action tag (Page2)</h1>
+<h2>This is INCLUDED by the action tag (Page2)</h2>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage3.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage3.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage3.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage3.jsp Fri Oct 19 18:49:39 2012
@@ -1,2 +1,2 @@
 
-<h1>This is INCLUDED by the action tag (Page3)</h1>
+<h2>This is INCLUDED by the action tag (Page3)</h2>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp Fri Oct 19 18:49:39 2012
@@ -1,43 +1,52 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
 <head>
-<title>Showcase - Non-Ui Tag - Action Tag </title>
+	<title>Struts2 Showcase - Non-Ui Tag - Action Tag </title>
 </head>
 <body>
 
-<div style="margin: 5px; border: solid 1px; ">
-<h1> This is Not - Included by the Action Tag</h1>
-</div>
-
-
-<!-- lets include the first page many times -->
-<div style="margin: 5px; border: solid 1px; ">
-<s:action name="includePage" namespace="/tags/non-ui/actionTag" executeResult="true" />
-<s:action name="includePage" namespace="/tags/non-ui/actionTag" executeResult="true" />
-<s:action name="includePage" namespace="/tags/non-ui/actionTag" executeResult="true" />
+<div class="page-header">
+	<h1>Non-Ui Tag - Action Tag</h1>
 </div>
 
-
-<!-- lets include the second page many times -->
-<div style="margin: 5px; border: solid 1px; ">
-<s:action name="includePage2" namespace="/tags/non-ui/actionTag" executeResult="true" />
-<s:action name="includePage2" namespace="/tags/non-ui/actionTag" executeResult="true" />
-<s:action name="includePage2" namespace="/tags/non-ui/actionTag" executeResult="true" />
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<div class="well">
+				<h2> This is Not - Included by the Action Tag</h2>
+			</div>
+
+
+			<!-- lets include the first page many times -->
+			<div class="well">
+				<s:action name="includePage" namespace="/tags/non-ui/actionTag" executeResult="true" />
+				<s:action name="includePage" namespace="/tags/non-ui/actionTag" executeResult="true" />
+				<s:action name="includePage" namespace="/tags/non-ui/actionTag" executeResult="true" />
+			</div>
+
+
+			<!-- lets include the second page many times -->
+			<div class="well">
+				<s:action name="includePage2" namespace="/tags/non-ui/actionTag" executeResult="true" />
+				<s:action name="includePage2" namespace="/tags/non-ui/actionTag" executeResult="true" />
+				<s:action name="includePage2" namespace="/tags/non-ui/actionTag" executeResult="true" />
+			</div>
+
+
+			<!--  lets include the third page many time -->
+			<div class="well">
+				<s:action name="includePage3" namespace="/tags/non-ui/actionTag" executeResult="true" />
+				<s:action name="includePage3" namespace="/tags/non-ui/actionTag" executeResult="true" />
+				<s:action name="includePage3" namespace="/tags/non-ui/actionTag" executeResult="true" />
+			</div>
+
+
+			<s:url var="url" action="lookAtSource" namespace="/tags/non-ui/actionTag" />
+			<s:a href="%{#url}" cssClass="btn btn-info">Source</s:a>
+		</div>
+	</div>
 </div>
-
-
-<!--  lets include the third page many time -->
-<div style="margin: 5px; margin: 5px; border: solid 1px; ">
-<s:action name="includePage3" namespace="/tags/non-ui/actionTag" executeResult="true" />
-<s:action name="includePage3" namespace="/tags/non-ui/actionTag" executeResult="true" />
-<s:action name="includePage3" namespace="/tags/non-ui/actionTag" executeResult="true" />
-</div>
-
-
-<s:url var="url" action="lookAtSource" namespace="/tags/non-ui/actionTag" />
-<s:a href="%{#url}">Source</s:a>
-
 </body>
 </html>
 

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/date.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/date.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/date.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/date.jsp Fri Oct 19 18:49:39 2012
@@ -1,104 +1,114 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
 <head>
-    <title>UI Tags Example: Date</title>
-    <s:head/>
+	<title>Struts2 Showcase - Non UI Tags Example - Date</title>
 </head>
 
 <body>
-<s:action var="myDate" name="date" namespace="/" executeResult="false" />
+<div class="page-header">
+	<h1>Non UI Tags Example - Date</h1>
+</div>
 
-<table>
-    <tr>
-        <th>Name</th>
-        <th>Format</th>
-        <th>Output</th>
-    </tr>
-    <tr>
-        <td><strong>Before date</strong></td>
-        <td>toString()</td>
-        <td><s:property value="#myDate.before.toString()"/></td>
-    </tr>
-    <tr>
-        <td><strong>Past date</strong></td>
-        <td>toString()</td>
-        <td><s:property value="#myDate.past.toString()"/></td>
-    </tr>
-    <tr>
-        <td><strong>Now date</strong></td>
-        <td>toString()</td>
-        <td><s:property value="#myDate.now.toString()"/></td>
-    </tr>
-    <tr>
-        <td><strong>Future date</strong></td>
-        <td>toString()</td>
-        <td><s:property value="#myDate.future.toString()"/></td>
-    </tr>
-    <tr>
-        <td><strong>After date</strong></td>
-        <td>toString()</td>
-        <td><s:property value="#myDate.after.toString()"/></td>
-    </tr>
-    <tr>
-        <td><strong>Current date</strong></td>
-        <td>yyyy/MM/dd hh:mm:ss</td>
-        <td><s:date name="#myDate.now" format="yyyy/MM/dd hh:mm:ss" /></td>
-    </tr>
-    <tr>
-        <td><strong>Current date</strong></td>
-        <td>dd.MM.yyyy hh:mm:ss</td>
-        <td><s:date name="#myDate.now" format="dd.MM.yyyy hh:mm:ss" /></td>
-    </tr>
-    <tr>
-        <td><strong>Current time (24h)</strong></td>
-        <td>HH:mm:ss</td>
-        <td><s:date name="#myDate.now" format="HH:mm:ss" /></td>
-    </tr>
-    <tr>
-        <td><strong>Before date</strong></td>
-        <td>MMM, dd yyyy</td>
-        <td><s:date name="#myDate.before" format="MMM, dd yyyy" /></td>
-    </tr>
-    <tr>
-        <td><strong>Before date</strong></td>
-        <td>nice</td>
-        <td><s:date name="#myDate.before" nice="true"/></td>
-    </tr>
-    <tr>
-        <td><strong>After date</strong></td>
-        <td>dd.MM.yyyy</td>
-        <td><s:date name="#myDate.after" format="dd.MM.yyyy" /></td>
-    </tr>
-    <tr>
-        <td><strong>After date</strong></td>
-        <td>nice</td>
-        <td><s:date name="#myDate.after" nice="true"/></td>
-    </tr>
-    <tr>
-        <td><strong>Past date</strong></td>
-        <td>dd/MM/yyyy hh:mm</td>
-        <td><s:date name="#myDate.past" format="dd/MM/yyyy hh:mm"/></td>
-    </tr>
-    <tr>
-        <td><strong>Future date</strong></td>
-        <td>MM-dd-yy</td>
-        <td><s:date name="#myDate.past" format="MM-dd-yy"/></td>
-    </tr>
-    <tr>
-        <td><strong>Future date (fallback)</strong></td>
-        <td>fallback</td>
-        <td><s:date name="#myDate.future" /></td>
-    </tr>
-    <tr>
-        <td><strong>Past date</strong></td>
-        <td>nice</td>
-        <td><s:date name="#myDate.past" nice="true"/></td>
-    </tr>
-    <tr>
-        <td><strong>Future date</strong></td>
-        <td>nice</td>
-        <td><s:date name="#myDate.future" nice="true"/></td>
-    </tr>
-</table>
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<s:action var="myDate" name="date" namespace="/" executeResult="false" />
+
+			<table class="table table-striped table-bordered table-hover table-condensed">
+			    <tr>
+			        <th>Name</th>
+			        <th>Format</th>
+			        <th>Output</th>
+			    </tr>
+			    <tr>
+			        <td><strong>Before date</strong></td>
+			        <td>toString()</td>
+			        <td><s:property value="#myDate.before.toString()"/></td>
+			    </tr>
+			    <tr>
+			        <td><strong>Past date</strong></td>
+			        <td>toString()</td>
+			        <td><s:property value="#myDate.past.toString()"/></td>
+			    </tr>
+			    <tr>
+			        <td><strong>Now date</strong></td>
+			        <td>toString()</td>
+			        <td><s:property value="#myDate.now.toString()"/></td>
+			    </tr>
+			    <tr>
+			        <td><strong>Future date</strong></td>
+			        <td>toString()</td>
+			        <td><s:property value="#myDate.future.toString()"/></td>
+			    </tr>
+			    <tr>
+			        <td><strong>After date</strong></td>
+			        <td>toString()</td>
+			        <td><s:property value="#myDate.after.toString()"/></td>
+			    </tr>
+			    <tr>
+			        <td><strong>Current date</strong></td>
+			        <td>yyyy/MM/dd hh:mm:ss</td>
+			        <td><s:date name="#myDate.now" format="yyyy/MM/dd hh:mm:ss" /></td>
+			    </tr>
+			    <tr>
+			        <td><strong>Current date</strong></td>
+			        <td>dd.MM.yyyy hh:mm:ss</td>
+			        <td><s:date name="#myDate.now" format="dd.MM.yyyy hh:mm:ss" /></td>
+			    </tr>
+			    <tr>
+			        <td><strong>Current time (24h)</strong></td>
+			        <td>HH:mm:ss</td>
+			        <td><s:date name="#myDate.now" format="HH:mm:ss" /></td>
+			    </tr>
+			    <tr>
+			        <td><strong>Before date</strong></td>
+			        <td>MMM, dd yyyy</td>
+			        <td><s:date name="#myDate.before" format="MMM, dd yyyy" /></td>
+			    </tr>
+			    <tr>
+			        <td><strong>Before date</strong></td>
+			        <td>nice</td>
+			        <td><s:date name="#myDate.before" nice="true"/></td>
+			    </tr>
+			    <tr>
+			        <td><strong>After date</strong></td>
+			        <td>dd.MM.yyyy</td>
+			        <td><s:date name="#myDate.after" format="dd.MM.yyyy" /></td>
+			    </tr>
+			    <tr>
+			        <td><strong>After date</strong></td>
+			        <td>nice</td>
+			        <td><s:date name="#myDate.after" nice="true"/></td>
+			    </tr>
+			    <tr>
+			        <td><strong>Past date</strong></td>
+			        <td>dd/MM/yyyy hh:mm</td>
+			        <td><s:date name="#myDate.past" format="dd/MM/yyyy hh:mm"/></td>
+			    </tr>
+			    <tr>
+			        <td><strong>Future date</strong></td>
+			        <td>MM-dd-yy</td>
+			        <td><s:date name="#myDate.past" format="MM-dd-yy"/></td>
+			    </tr>
+			    <tr>
+			        <td><strong>Future date (fallback)</strong></td>
+			        <td>fallback</td>
+			        <td><s:date name="#myDate.future" /></td>
+			    </tr>
+			    <tr>
+			        <td><strong>Past date</strong></td>
+			        <td>nice</td>
+			        <td><s:date name="#myDate.past" nice="true"/></td>
+			    </tr>
+			    <tr>
+			        <td><strong>Future date</strong></td>
+			        <td>nice</td>
+			        <td><s:date name="#myDate.future" nice="true"/></td>
+			    </tr>
+			</table>
+		</div>
+	</div>
+</div>
 </body>
 </html>
\ No newline at end of file

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/debug.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/debug.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/debug.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/debug.jsp Fri Oct 19 18:49:39 2012
@@ -1,20 +1,30 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
 <head>
-    <title>Non-UI Tags Example: Debug</title>
-    <s:head/>
+	<title>Struts2 Showcase - Non UI Tags Example - Debug</title>
 </head>
 
 <body>
-<h1>Debug Tag Usage</h1>
+<div class="page-header">
+	<h1>Debug Tag Usage</h1>
+</div>
 
-	<p/>
-	This page shows a simple example of using the debug tag.  <br/>
-	Just add <tt style="font-size: 12px; font-weight:bold;color: blue;">&lt;s:debug /&gt;</tt> to your JSP page
-    and you will see the debug link.
-    <p/>
-    Just click on the Debug label to see the Struts ValueStack Debug information.
-    <p/>
-    <s:debug />
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<p/>
+				This page shows a simple example of using the debug tag.  <br/>
+				Just add <tt style="font-size: 12px; font-weight:bold;color: blue;">&lt;s:debug /&gt;</tt> to your JSP page
+			    and you will see the debug link.
+		    <p/>
+
+			<p>
+			    Just click on the Debug label to see the Struts ValueStack Debug information.
+		    <p/>
+		    <s:debug />
+		</div>
+	</div>
+</div>
 </body>
 </html>
\ No newline at end of file

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl Fri Oct 19 18:49:39 2012
@@ -1,611 +1,618 @@
 <html>
-	<head>
-		<title>TEST IF</title>
-	</head>
+<head>
+	<title>Struts2 Showcase - Non Ui Tag - Test If Tag (Freemarker)</title>
+	<s:head/>
+</head>
 <body>
-<p>
-This is a simple freemarker template to test the If Tag (using freemarker directive).
-There's quite a few combination being tested. The characters in bold and non-bold should be the same.
-</p>	
-	
-	
-<b>1 - Foo -</b>
-<@s.if test="true">
-	Foo
-</...@s.if>
-<@s.else>
-	Bar
-</...@s.else>
-<br/>
-<b>2 - Bar -</b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.else>
-	Bar
-</...@s.else>
-<br/>
-<b>3 - FooFooFoo - </b>
-<@s.if test="true">
-	Foo
-	<@s.if test="true">
-		FooFoo	
-	</...@s.if>
-	<@s.else>
-		BarBar
-	</...@s.else>
-</...@s.if>
-<@s.else>
-	Bar
-</...@s.else>
-<br/>
-<b>4 - FooBarBar - </b>
-<@s.if test="true">
-	Foo
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-	<@s.else>
-		BarBar
-	</...@s.else>
-</...@s.if>
-<br/>
-<b>5 - BarFooFoo - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.else>
-	Bar
-	<@s.if test="true">
-		FooFoo
-	</...@s.if>
-	<@s.else>
-		BarBar
-	</...@s.else>
-</...@s.else>
-<br/>
-<b>6 - BarBarBar - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.else>
-	Bar
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-	<@s.else>
-		BarBar
-	</...@s.else>
-</...@s.else>
-<br/>
-<b>7 - Foo - </b>
-<@s.if test="true">
-	Foo
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-<br/>
-<b>8 - Moo - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.elseif test="true">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-<br/>
-<b>9 - Bar - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-<br/>
-<b>10 - FooFooFoo - </b>
-<@s.if test="true">
-	Foo
-	<@s.if test="true">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="false">
-		MooMoo
-	</...@s.elseif>
-	<@s.else>
-		BarBar
-	</...@s.else>
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-<br/>
-<b>11 - FooMooMoo - </b>
-<@s.if test="true">
-	Foo
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="true">
-		MooMoo
-	</...@s.elseif>
-	<@s.else>
-		BarBar
-	</...@s.else>
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-<br/>
-<b>12 - FooBarBar - </b>
-<@s.if test="true">
-	Foo
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="false">
-		MooMoo
-	</...@s.elseif>
-	<@s.else>
-		BarBar
-	</...@s.else>
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-<br/>
-<b>13 - MooFooFoo - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.elseif test="true">
-	Moo
-	<@s.if test="true">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="false">
-		MooMoo
-	</...@s.elseif>
-	<@s.else>
-		BarBar
-	</...@s.else>
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-<br/>
-<b>14 - MooMooMoo - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.elseif test="true">
-	Moo
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="true">
-		MooMoo
-	</...@s.elseif>
-	<@s.else>
-		BarBar
-	</...@s.else>
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-<br/>
-<b>15 - MooBarBar - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.elseif test="true">
-	Moo
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="false">
-		MooMoo
-	</...@s.elseif>
-	<@s.else>
-		BarBar
-	</...@s.else>
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-<br/>
-<b>16 - BarFooFoo - </b>
-<@s.if test="false">	
-	Foo
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-	<@s.if test="true">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="false">
-		MooMoo
-	</...@s.elseif>
-	<@s.else>
-		BarBar
-	</...@s.else>
-</...@s.else>	
-<br/>
-<b>17 - BarMooMoo - </b>
-<@s.if test="false">	
-	Foo
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="true">
-		MooMoo
-	</...@s.elseif>
-	<@s.else>
-		BarBar
-	</...@s.else>
-</...@s.else>	
-<br/>
-<b>18 - BarBarBar - </b>
-<@s.if test="false">	
-	Foo
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="false">
-		MooMoo
-	</...@s.elseif>
-	<@s.else>
-		BarBar
-	</...@s.else>
-</...@s.else>
-
-<br/>
-<b>19 - Foo - </b> 
-<@s.if test="true">
-	Foo
-</...@s.if>
-
-<br/>
-<b>20 - ** should not display anything ** - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-
-<br/>
-<b>21 FooFooFoo - </b>
-<@s.if test="true">
-	Foo
-	<@s.if test="true">
-		FooFoo
-	</...@s.if>
-</...@s.if>
-<@s.else>
-	Bar
-</...@s.else>
-
-<br/>
-<b>22 - Foo -  </b>
-<@s.if test="true">
-	Foo
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-</...@s.if>
-<@s.else>
-	Bar
-</...@s.else>
-
-<br/>
-<b>23 - BarFooFoo - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.else>
-	Bar
-	<@s.if test="true">
-		FooFoo
-	</...@s.if>
-</...@s.else>
-
-<br/>
-<b>24 - Bar - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.else>
-	Bar
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-</...@s.else>
-
-<br/>
-<b>25 - FooFooFoo</b>
-<@s.if test="true">
-	Foo
-	<@s.if test="true">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="false">
-		MooMoo
-	</...@s.elseif>
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-
-<br/>
-<b>26 - FooMooMoo</b>
-<@s.if test="true">
-	Foo
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="true">
-		MooMoo
-	</...@s.elseif>
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-
-<br/>
-<b>27 - Foo - </b>
-<@s.if test="true">
-	Foo
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="false">
-		MooMoo
-	</...@s.elseif>
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-
-<br/>
-<b>28 - MooFooFoo</b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.elseif test="true">
-	Moo
-	<@s.if test="true">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="false">
-		MooMoo
-	</...@s.elseif>
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-
-<br/>
-<b>29 - MooMooMoo</b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.elseif test="true">
-	Moo
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="true">
-		MooMoo
-	</...@s.elseif>
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-
-<br/>
-<b>30 - Moo - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.elseif test="true">
-	Moo
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="false">
-		MooMoo
-	</...@s.elseif>
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-
-<br/>
-<b>31 - BarFooFoo - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-	<@s.if test="true">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="false">
-		MooMoo
-	</...@s.elseif>
-</...@s.else>
-
-<br/>
-<b>32 - BarMooMoo - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="true">
-		MooMoo
-	</...@s.elseif>
-</...@s.else>
-
-<br/>
-<b>33 - Bar - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-	<@s.elseif test="false">
-		MooMoo
-	</...@s.elseif>
-</...@s.else>
-
-<br/>
-<b>34 - FooFooFoo - </b>
-<@s.if test="true">
-	Foo
-	<@s.if test="true">
-		FooFoo
-	</...@s.if>
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-
-<br/>
-<b>35 - Foo - </b>
-<@s.if test="true">
-	Foo
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-
-<br/>
-<b>36 - MooFooFoo - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.elseif test="true">
-	Moo
-	<@s.if test="true">
-		FooFoo
-	</...@s.if>
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-
-<br/>
-<b>37 - Moo - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.elseif test="true">
-	Moo
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-</...@s.elseif>
-<@s.else>
-	Bar
-</...@s.else>
-
-<br/>
-<b>38 - BarFooFoo  - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-	<@s.if test="true">
-		FooFoo
-	</...@s.if>
-</...@s.else>
-
-<br/>
-<b>39 - Bar  - </b>
-<@s.if test="false">
-	Foo
-</...@s.if>
-<@s.elseif test="false">
-	Moo
-</...@s.elseif>
-<@s.else>
-	Bar
-	<@s.if test="false">
-		FooFoo
-	</...@s.if>
-</...@s.else>
-
-
-
-
+<div class="page-header">
+	<h1>Non Ui Tag - Test If Tag (Freemarker)</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+			<p>
+			This is a simple freemarker template to test the If Tag (using freemarker directive).
+			There's quite a few combination being tested. The characters in bold and non-bold should be the same.
+			</p>
+
+
+			<b>1 - Foo -</b>
+			<@s.if test="true">
+				Foo
+			</...@s.if>
+			<@s.else>
+				Bar
+			</...@s.else>
+			<br/>
+			<b>2 - Bar -</b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.else>
+				Bar
+			</...@s.else>
+			<br/>
+			<b>3 - FooFooFoo - </b>
+			<@s.if test="true">
+				Foo
+				<@s.if test="true">
+					FooFoo
+				</...@s.if>
+				<@s.else>
+					BarBar
+				</...@s.else>
+			</...@s.if>
+			<@s.else>
+				Bar
+			</...@s.else>
+			<br/>
+			<b>4 - FooBarBar - </b>
+			<@s.if test="true">
+				Foo
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+				<@s.else>
+					BarBar
+				</...@s.else>
+			</...@s.if>
+			<br/>
+			<b>5 - BarFooFoo - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.else>
+				Bar
+				<@s.if test="true">
+					FooFoo
+				</...@s.if>
+				<@s.else>
+					BarBar
+				</...@s.else>
+			</...@s.else>
+			<br/>
+			<b>6 - BarBarBar - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.else>
+				Bar
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+				<@s.else>
+					BarBar
+				</...@s.else>
+			</...@s.else>
+			<br/>
+			<b>7 - Foo - </b>
+			<@s.if test="true">
+				Foo
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+			<br/>
+			<b>8 - Moo - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="true">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+			<br/>
+			<b>9 - Bar - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+			<br/>
+			<b>10 - FooFooFoo - </b>
+			<@s.if test="true">
+				Foo
+				<@s.if test="true">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="false">
+					MooMoo
+				</...@s.elseif>
+				<@s.else>
+					BarBar
+				</...@s.else>
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+			<br/>
+			<b>11 - FooMooMoo - </b>
+			<@s.if test="true">
+				Foo
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="true">
+					MooMoo
+				</...@s.elseif>
+				<@s.else>
+					BarBar
+				</...@s.else>
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+			<br/>
+			<b>12 - FooBarBar - </b>
+			<@s.if test="true">
+				Foo
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="false">
+					MooMoo
+				</...@s.elseif>
+				<@s.else>
+					BarBar
+				</...@s.else>
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+			<br/>
+			<b>13 - MooFooFoo - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="true">
+				Moo
+				<@s.if test="true">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="false">
+					MooMoo
+				</...@s.elseif>
+				<@s.else>
+					BarBar
+				</...@s.else>
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+			<br/>
+			<b>14 - MooMooMoo - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="true">
+				Moo
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="true">
+					MooMoo
+				</...@s.elseif>
+				<@s.else>
+					BarBar
+				</...@s.else>
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+			<br/>
+			<b>15 - MooBarBar - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="true">
+				Moo
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="false">
+					MooMoo
+				</...@s.elseif>
+				<@s.else>
+					BarBar
+				</...@s.else>
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+			<br/>
+			<b>16 - BarFooFoo - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+				<@s.if test="true">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="false">
+					MooMoo
+				</...@s.elseif>
+				<@s.else>
+					BarBar
+				</...@s.else>
+			</...@s.else>
+			<br/>
+			<b>17 - BarMooMoo - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="true">
+					MooMoo
+				</...@s.elseif>
+				<@s.else>
+					BarBar
+				</...@s.else>
+			</...@s.else>
+			<br/>
+			<b>18 - BarBarBar - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="false">
+					MooMoo
+				</...@s.elseif>
+				<@s.else>
+					BarBar
+				</...@s.else>
+			</...@s.else>
+
+			<br/>
+			<b>19 - Foo - </b>
+			<@s.if test="true">
+				Foo
+			</...@s.if>
+
+			<br/>
+			<b>20 - ** should not display anything ** - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+
+			<br/>
+			<b>21 FooFooFoo - </b>
+			<@s.if test="true">
+				Foo
+				<@s.if test="true">
+					FooFoo
+				</...@s.if>
+			</...@s.if>
+			<@s.else>
+				Bar
+			</...@s.else>
+
+			<br/>
+			<b>22 - Foo -  </b>
+			<@s.if test="true">
+				Foo
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+			</...@s.if>
+			<@s.else>
+				Bar
+			</...@s.else>
+
+			<br/>
+			<b>23 - BarFooFoo - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.else>
+				Bar
+				<@s.if test="true">
+					FooFoo
+				</...@s.if>
+			</...@s.else>
+
+			<br/>
+			<b>24 - Bar - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.else>
+				Bar
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+			</...@s.else>
+
+			<br/>
+			<b>25 - FooFooFoo</b>
+			<@s.if test="true">
+				Foo
+				<@s.if test="true">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="false">
+					MooMoo
+				</...@s.elseif>
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+
+			<br/>
+			<b>26 - FooMooMoo</b>
+			<@s.if test="true">
+				Foo
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="true">
+					MooMoo
+				</...@s.elseif>
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+
+			<br/>
+			<b>27 - Foo - </b>
+			<@s.if test="true">
+				Foo
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="false">
+					MooMoo
+				</...@s.elseif>
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+
+			<br/>
+			<b>28 - MooFooFoo</b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="true">
+				Moo
+				<@s.if test="true">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="false">
+					MooMoo
+				</...@s.elseif>
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+
+			<br/>
+			<b>29 - MooMooMoo</b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="true">
+				Moo
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="true">
+					MooMoo
+				</...@s.elseif>
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+
+			<br/>
+			<b>30 - Moo - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="true">
+				Moo
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="false">
+					MooMoo
+				</...@s.elseif>
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+
+			<br/>
+			<b>31 - BarFooFoo - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+				<@s.if test="true">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="false">
+					MooMoo
+				</...@s.elseif>
+			</...@s.else>
+
+			<br/>
+			<b>32 - BarMooMoo - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="true">
+					MooMoo
+				</...@s.elseif>
+			</...@s.else>
+
+			<br/>
+			<b>33 - Bar - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+				<@s.elseif test="false">
+					MooMoo
+				</...@s.elseif>
+			</...@s.else>
+
+			<br/>
+			<b>34 - FooFooFoo - </b>
+			<@s.if test="true">
+				Foo
+				<@s.if test="true">
+					FooFoo
+				</...@s.if>
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+
+			<br/>
+			<b>35 - Foo - </b>
+			<@s.if test="true">
+				Foo
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+
+			<br/>
+			<b>36 - MooFooFoo - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="true">
+				Moo
+				<@s.if test="true">
+					FooFoo
+				</...@s.if>
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+
+			<br/>
+			<b>37 - Moo - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="true">
+				Moo
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+			</...@s.elseif>
+			<@s.else>
+				Bar
+			</...@s.else>
+
+			<br/>
+			<b>38 - BarFooFoo  - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+				<@s.if test="true">
+					FooFoo
+				</...@s.if>
+			</...@s.else>
+
+			<br/>
+			<b>39 - Bar  - </b>
+			<@s.if test="false">
+				Foo
+			</...@s.if>
+			<@s.elseif test="false">
+				Moo
+			</...@s.elseif>
+			<@s.else>
+				Bar
+				<@s.if test="false">
+					FooFoo
+				</...@s.if>
+			</...@s.else>
+		</div>
+	</div>
+</div>
 </body>
 </html>
 

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp Fri Oct 19 18:49:39 2012
@@ -1,616 +1,619 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-
 <%@taglib prefix="s" uri="/struts-tags" %>
-    
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Test If Tag</title>
+	<title>Struts2 Showcase - Non Ui Tag - Test If Tag</title>
+	<s:head/>
 </head>
 <body>
-<p>
-This is a simple jsp to test the If Tag. There's quite a few combination being tested. 
-The characters in bold an non-bold should be the same.
-</p>
-
-
-<b>1 - Foo -</b>
-<s:if test="true">
-	Foo
-</s:if>
-<s:else>
-	Bar
-</s:else>
-<br/>
-<b>2 - Bar -</b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:else>
-	Bar
-</s:else>
-<br/>
-<b>3 - FooFooFoo - </b>
-<s:if test="true">
-	Foo
-	<s:if test="true">
-		FooFoo	
-	</s:if>
-	<s:else>
-		BarBar
-	</s:else>
-</s:if>
-<s:else>
-	Bar
-</s:else>
-<br/>
-<b>4 - FooBarBar - </b>
-<s:if test="true">
-	Foo
-	<s:if test="false">
-		FooFoo
-	</s:if>
-	<s:else>
-		BarBar
-	</s:else>
-</s:if>
-<br/>
-<b>5 - BarFooFoo - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:else>
-	Bar
-	<s:if test="true">
-		FooFoo
-	</s:if>
-	<s:else>
-		BarBar
-	</s:else>
-</s:else>
-<br/>
-<b>6 - BarBarBar - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:else>
-	Bar
-	<s:if test="false">
-		FooFoo
-	</s:if>
-	<s:else>
-		BarBar
-	</s:else>
-</s:else>
-<br/>
-<b>7 - Foo - </b>
-<s:if test="true">
-	Foo
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-<br/>
-<b>8 - Moo - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:elseif test="true">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-<br/>
-<b>9 - Bar - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-<br/>
-<b>10 - FooFooFoo - </b>
-<s:if test="true">
-	Foo
-	<s:if test="true">
-		FooFoo
-	</s:if>
-	<s:elseif test="false">
-		MooMoo
-	</s:elseif>
-	<s:else>
-		BarBar
-	</s:else>
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-<br/>
-<b>11 - FooMooMoo - </b>
-<s:if test="true">
-	Foo
-	<s:if test="false">
-		FooFoo
-	</s:if>
-	<s:elseif test="true">
-		MooMoo
-	</s:elseif>
-	<s:else>
-		BarBar
-	</s:else>
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-<br/>
-<b>12 - FooBarBar - </b>
-<s:if test="true">
-	Foo
-	<s:if test="false">
-		FooFoo
-	</s:if>
-	<s:elseif test="false">
-		MooMoo
-	</s:elseif>
-	<s:else>
-		BarBar
-	</s:else>
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-<br/>
-<b>13 - MooFooFoo - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:elseif test="true">
-	Moo
-	<s:if test="true">
-		FooFoo
-	</s:if>
-	<s:elseif test="false">
-		MooMoo
-	</s:elseif>
-	<s:else>
-		BarBar
-	</s:else>
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-<br/>
-<b>14 - MooMooMoo - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:elseif test="true">
-	Moo
-	<s:if test="false">
-		FooFoo
-	</s:if>
-	<s:elseif test="true">
-		MooMoo
-	</s:elseif>
-	<s:else>
-		BarBar
-	</s:else>
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-<br/>
-<b>15 - MooBarBar - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:elseif test="true">
-	Moo
-	<s:if test="false">
-		FooFoo
-	</s:if>
-	<s:elseif test="false">
-		MooMoo
-	</s:elseif>
-	<s:else>
-		BarBar
-	</s:else>
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-<br/>
-<b>16 - BarFooFoo - </b>
-<s:if test="false">	
-	Foo
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-	<s:if test="true">
-		FooFoo
-	</s:if>
-	<s:elseif test="false">
-		MooMoo
-	</s:elseif>
-	<s:else>
-		BarBar
-	</s:else>
-</s:else>	
-<br/>
-<b>17 - BarMooMoo - </b>
-<s:if test="false">	
-	Foo
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-	<s:if test="false">
-		FooFoo
-	</s:if>
-	<s:elseif test="true">
-		MooMoo
-	</s:elseif>
-	<s:else>
-		BarBar
-	</s:else>
-</s:else>	
-<br/>
-<b>18 - BarBarBar - </b>
-<s:if test="false">	
-	Foo
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-	<s:if test="false">
-		FooFoo
-	</s:if>
-	<s:elseif test="false">
-		MooMoo
-	</s:elseif>
-	<s:else>
-		BarBar
-	</s:else>
-</s:else>
-
-<br/>
-<b>19 - Foo - </b> 
-<s:if test="true">
-	Foo
-</s:if>
-
-<br/>
-<b>20 - ** should not display anything ** - </b>
-<s:if test="false">
-	Foo
-</s:if>
-
-<br/>
-<b>21 FooFooFoo - </b>
-<s:if test="true">
-	Foo
-	<s:if test="true">
-		FooFoo
-	</s:if>
-</s:if>
-<s:else>
-	Bar
-</s:else>
-
-<br/>
-<b>22 - Foo -  </b>
-<s:if test="true">
-	Foo
-	<s:if test="false">
-		FooFoo
-	</s:if>
-</s:if>
-<s:else>
-	Bar
-</s:else>
-
-<br/>
-<b>23 - BarFooFoo - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:else>
-	Bar
-	<s:if test="true">
-		FooFoo
-	</s:if>
-</s:else>
-
-<br/>
-<b>24 - Bar - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:else>
-	Bar
-	<s:if test="false">
-		FooFoo
-	</s:if>
-</s:else>
-
-<br/>
-<b>25 - FooFooFoo</b>
-<s:if test="true">
-	Foo
-	<s:if test="true">
-		FooFoo
-	</s:if>
-	<s:elseif test="false">
-		MooMoo
-	</s:elseif>
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-
-<br/>
-<b>26 - FooMooMoo</b>
-<s:if test="true">
-	Foo
-	<s:if test="false">
-		FooFoo
-	</s:if>
-	<s:elseif test="true">
-		MooMoo
-	</s:elseif>
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-
-<br/>
-<b>27 - Foo - </b>
-<s:if test="true">
-	Foo
-	<s:if test="false">
-		FooFoo
-	</s:if>
-	<s:elseif test="false">
-		MooMoo
-	</s:elseif>
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-
-<br/>
-<b>28 - MooFooFoo</b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:elseif test="true">
-	Moo
-	<s:if test="true">
-		FooFoo
-	</s:if>
-	<s:elseif test="false">
-		MooMoo
-	</s:elseif>
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-
-<br/>
-<b>29 - MooMooMoo</b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:elseif test="true">
-	Moo
-	<s:if test="false">
-		FooFoo
-	</s:if>
-	<s:elseif test="true">
-		MooMoo
-	</s:elseif>
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-
-<br/>
-<b>30 - Moo - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:elseif test="true">
-	Moo
-	<s:if test="false">
-		FooFoo
-	</s:if>
-	<s:elseif test="false">
-		MooMoo
-	</s:elseif>
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-
-<br/>
-<b>31 - BarFooFoo - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-	<s:if test="true">
-		FooFoo
-	</s:if>
-	<s:elseif test="false">
-		MooMoo
-	</s:elseif>
-</s:else>
-
-<br/>
-<b>32 - BarMooMoo - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-	<s:if test="false">
-		FooFoo
-	</s:if>
-	<s:elseif test="true">
-		MooMoo
-	</s:elseif>
-</s:else>
-
-<br/>
-<b>33 - Bar - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-	<s:if test="false">
-		FooFoo
-	</s:if>
-	<s:elseif test="false">
-		MooMoo
-	</s:elseif>
-</s:else>
-
-
-<br/>
-<b>34 - FooFooFoo - </b>
-<s:if test="true">
-	Foo
-	<s:if test="true">
-		FooFoo
-	</s:if>
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-
-<br/>
-<b>35 - Foo - </b>
-<s:if test="true">
-	Foo
-	<s:if test="false">
-		FooFoo
-	</s:if>
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-
-<br/>
-<b>36 - MooFooFoo - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:elseif test="true">
-	Moo
-	<s:if test="true">
-		FooFoo
-	</s:if>
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-
-<br/>
-<b>37 - Moo - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:elseif test="true">
-	Moo
-	<s:if test="false">
-		FooFoo
-	</s:if>
-</s:elseif>
-<s:else>
-	Bar
-</s:else>
-
-<br/>
-<b>38 - BarFooFoo  - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-	<s:if test="true">
-		FooFoo
-	</s:if>
-</s:else>
-
-<br/>
-<b>39 - Bar  - </b>
-<s:if test="false">
-	Foo
-</s:if>
-<s:elseif test="false">
-	Moo
-</s:elseif>
-<s:else>
-	Bar
-	<s:if test="false">
-		FooFoo
-	</s:if>
-</s:else>
-
-
+<div class="page-header">
+	<h1>Non Ui Tag - Test If Tag</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+				<p>
+					This is a simple jsp to test the If Tag. There's quite a few combination being tested.
+					The characters in bold an non-bold should be the same.
+				</p>
+
+
+				<b>1 - Foo -</b>
+				<s:if test="true">
+					Foo
+				</s:if>
+				<s:else>
+					Bar
+				</s:else>
+				<br/>
+				<b>2 - Bar -</b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:else>
+					Bar
+				</s:else>
+				<br/>
+				<b>3 - FooFooFoo - </b>
+				<s:if test="true">
+					Foo
+					<s:if test="true">
+						FooFoo
+					</s:if>
+					<s:else>
+						BarBar
+					</s:else>
+				</s:if>
+				<s:else>
+					Bar
+				</s:else>
+				<br/>
+				<b>4 - FooBarBar - </b>
+				<s:if test="true">
+					Foo
+					<s:if test="false">
+						FooFoo
+					</s:if>
+					<s:else>
+						BarBar
+					</s:else>
+				</s:if>
+				<br/>
+				<b>5 - BarFooFoo - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:else>
+					Bar
+					<s:if test="true">
+						FooFoo
+					</s:if>
+					<s:else>
+						BarBar
+					</s:else>
+				</s:else>
+				<br/>
+				<b>6 - BarBarBar - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:else>
+					Bar
+					<s:if test="false">
+						FooFoo
+					</s:if>
+					<s:else>
+						BarBar
+					</s:else>
+				</s:else>
+				<br/>
+				<b>7 - Foo - </b>
+				<s:if test="true">
+					Foo
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+				<br/>
+				<b>8 - Moo - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="true">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+				<br/>
+				<b>9 - Bar - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+				<br/>
+				<b>10 - FooFooFoo - </b>
+				<s:if test="true">
+					Foo
+					<s:if test="true">
+						FooFoo
+					</s:if>
+					<s:elseif test="false">
+						MooMoo
+					</s:elseif>
+					<s:else>
+						BarBar
+					</s:else>
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+				<br/>
+				<b>11 - FooMooMoo - </b>
+				<s:if test="true">
+					Foo
+					<s:if test="false">
+						FooFoo
+					</s:if>
+					<s:elseif test="true">
+						MooMoo
+					</s:elseif>
+					<s:else>
+						BarBar
+					</s:else>
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+				<br/>
+				<b>12 - FooBarBar - </b>
+				<s:if test="true">
+					Foo
+					<s:if test="false">
+						FooFoo
+					</s:if>
+					<s:elseif test="false">
+						MooMoo
+					</s:elseif>
+					<s:else>
+						BarBar
+					</s:else>
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+				<br/>
+				<b>13 - MooFooFoo - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="true">
+					Moo
+					<s:if test="true">
+						FooFoo
+					</s:if>
+					<s:elseif test="false">
+						MooMoo
+					</s:elseif>
+					<s:else>
+						BarBar
+					</s:else>
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+				<br/>
+				<b>14 - MooMooMoo - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="true">
+					Moo
+					<s:if test="false">
+						FooFoo
+					</s:if>
+					<s:elseif test="true">
+						MooMoo
+					</s:elseif>
+					<s:else>
+						BarBar
+					</s:else>
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+				<br/>
+				<b>15 - MooBarBar - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="true">
+					Moo
+					<s:if test="false">
+						FooFoo
+					</s:if>
+					<s:elseif test="false">
+						MooMoo
+					</s:elseif>
+					<s:else>
+						BarBar
+					</s:else>
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+				<br/>
+				<b>16 - BarFooFoo - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+					<s:if test="true">
+						FooFoo
+					</s:if>
+					<s:elseif test="false">
+						MooMoo
+					</s:elseif>
+					<s:else>
+						BarBar
+					</s:else>
+				</s:else>
+				<br/>
+				<b>17 - BarMooMoo - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+					<s:if test="false">
+						FooFoo
+					</s:if>
+					<s:elseif test="true">
+						MooMoo
+					</s:elseif>
+					<s:else>
+						BarBar
+					</s:else>
+				</s:else>
+				<br/>
+				<b>18 - BarBarBar - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+					<s:if test="false">
+						FooFoo
+					</s:if>
+					<s:elseif test="false">
+						MooMoo
+					</s:elseif>
+					<s:else>
+						BarBar
+					</s:else>
+				</s:else>
+
+				<br/>
+				<b>19 - Foo - </b>
+				<s:if test="true">
+					Foo
+				</s:if>
+
+				<br/>
+				<b>20 - ** should not display anything ** - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+
+				<br/>
+				<b>21 FooFooFoo - </b>
+				<s:if test="true">
+					Foo
+					<s:if test="true">
+						FooFoo
+					</s:if>
+				</s:if>
+				<s:else>
+					Bar
+				</s:else>
+
+				<br/>
+				<b>22 - Foo - </b>
+				<s:if test="true">
+					Foo
+					<s:if test="false">
+						FooFoo
+					</s:if>
+				</s:if>
+				<s:else>
+					Bar
+				</s:else>
+
+				<br/>
+				<b>23 - BarFooFoo - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:else>
+					Bar
+					<s:if test="true">
+						FooFoo
+					</s:if>
+				</s:else>
+
+				<br/>
+				<b>24 - Bar - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:else>
+					Bar
+					<s:if test="false">
+						FooFoo
+					</s:if>
+				</s:else>
+
+				<br/>
+				<b>25 - FooFooFoo</b>
+				<s:if test="true">
+					Foo
+					<s:if test="true">
+						FooFoo
+					</s:if>
+					<s:elseif test="false">
+						MooMoo
+					</s:elseif>
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+
+				<br/>
+				<b>26 - FooMooMoo</b>
+				<s:if test="true">
+					Foo
+					<s:if test="false">
+						FooFoo
+					</s:if>
+					<s:elseif test="true">
+						MooMoo
+					</s:elseif>
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+
+				<br/>
+				<b>27 - Foo - </b>
+				<s:if test="true">
+					Foo
+					<s:if test="false">
+						FooFoo
+					</s:if>
+					<s:elseif test="false">
+						MooMoo
+					</s:elseif>
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+
+				<br/>
+				<b>28 - MooFooFoo</b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="true">
+					Moo
+					<s:if test="true">
+						FooFoo
+					</s:if>
+					<s:elseif test="false">
+						MooMoo
+					</s:elseif>
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+
+				<br/>
+				<b>29 - MooMooMoo</b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="true">
+					Moo
+					<s:if test="false">
+						FooFoo
+					</s:if>
+					<s:elseif test="true">
+						MooMoo
+					</s:elseif>
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+
+				<br/>
+				<b>30 - Moo - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="true">
+					Moo
+					<s:if test="false">
+						FooFoo
+					</s:if>
+					<s:elseif test="false">
+						MooMoo
+					</s:elseif>
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+
+				<br/>
+				<b>31 - BarFooFoo - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+					<s:if test="true">
+						FooFoo
+					</s:if>
+					<s:elseif test="false">
+						MooMoo
+					</s:elseif>
+				</s:else>
+
+				<br/>
+				<b>32 - BarMooMoo - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+					<s:if test="false">
+						FooFoo
+					</s:if>
+					<s:elseif test="true">
+						MooMoo
+					</s:elseif>
+				</s:else>
+
+				<br/>
+				<b>33 - Bar - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+					<s:if test="false">
+						FooFoo
+					</s:if>
+					<s:elseif test="false">
+						MooMoo
+					</s:elseif>
+				</s:else>
+
+
+				<br/>
+				<b>34 - FooFooFoo - </b>
+				<s:if test="true">
+					Foo
+					<s:if test="true">
+						FooFoo
+					</s:if>
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+
+				<br/>
+				<b>35 - Foo - </b>
+				<s:if test="true">
+					Foo
+					<s:if test="false">
+						FooFoo
+					</s:if>
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+
+				<br/>
+				<b>36 - MooFooFoo - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="true">
+					Moo
+					<s:if test="true">
+						FooFoo
+					</s:if>
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+
+				<br/>
+				<b>37 - Moo - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="true">
+					Moo
+					<s:if test="false">
+						FooFoo
+					</s:if>
+				</s:elseif>
+				<s:else>
+					Bar
+				</s:else>
+
+				<br/>
+				<b>38 - BarFooFoo - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+					<s:if test="true">
+						FooFoo
+					</s:if>
+				</s:else>
+
+				<br/>
+				<b>39 - Bar - </b>
+				<s:if test="false">
+					Foo
+				</s:if>
+				<s:elseif test="false">
+					Moo
+				</s:elseif>
+				<s:else>
+					Bar
+					<s:if test="false">
+						FooFoo
+					</s:if>
+				</s:else>
+		</div>
+	</div>
+</div>
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp Fri Oct 19 18:49:39 2012
@@ -1,25 +1,34 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
 <head>
-<title>Showcase - Tag - Non UI Tag - AppendIterator Tag</title>
+	<title>Struts2 Showcase - Non Ui Tag - AppendIterator Tag</title>
+	<s:head/>
 </head>
 <body>
+<div class="page-header">
+	<h1>Non Ui Tag - AppendIterator Tag Demo</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<s:generator var="iterator1" separator="," val="%{iteratorValue1}" />
+		    <s:generator var="iterator2" separator="," val="%{iteratorValue2}" />
+
+		    <s:append id="appendedIterator">
+		        <s:param value="%{#attr.iterator1}" />
+		        <s:param value="%{#attr.iterator2}" />
+		    </s:append>
 
-    <s:generator var="iterator1" separator="," val="%{iteratorValue1}" />
-    <s:generator var="iterator2" separator="," val="%{iteratorValue2}" />
-    
-    <s:append id="appendedIterator">
-        <s:param value="%{#attr.iterator1}" />
-        <s:param value="%{#attr.iterator2}" />
-    </s:append>
-    
-    <s:iterator value="#appendedIterator">
-        <s:property /><br/>
-    </s:iterator>
-    
-    <s:url value="%{'/tags/non-ui/'}" var="url" /><s:a href="%{#url}">Back To Non-UI Demo</s:a>
-    <s:url value="%{'/'}" var="url" /><s:a href="%{#url}">Back To Showcase</s:a>
+		    <s:iterator value="#appendedIterator">
+		        <s:property /><br/>
+		    </s:iterator>
 
+			<s:url var="url" action="showAppendTagDemo" namespace="/tags/non-ui/appendIteratorTag" />
+			<s:a href="%{#url}" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back To Input</s:a>
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp Fri Oct 19 18:49:39 2012
@@ -1,19 +1,29 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
 <head>
-<title>Showcase - Tag - Non Ui Tag - Iterator Generator Tag Demo</title>
+	<title>Struts2 Showcase - Non Ui Tag - Iterator Generator Tag Demo</title>
+	<s:head/>
 </head>
 <body>
+<div class="page-header">
+	<h1>Non Ui Tag - Iterator Generator Tag Demo</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
 
-    <s:generator val="%{value}" separator="%{separator}" count="%{count}">
-        <s:iterator value="%{top}">
-            <s:property /><br/>
-        </s:iterator>
-    </s:generator>
+		<s:generator val="%{value}" separator="%{separator}" count="%{count}">
+            <s:iterator value="%{top}">
+               <s:property /><br/>
+            </s:iterator>
+        </s:generator>
 
-    <s:url value="%{'/tags/non-ui/'}" var="url" /><s:a href="%{#url}">Back To Non-UI Demo</s:a>
-    <s:url value="%{'/'}" var="url" /><s:a href="%{#url}">Back To Showcase</s:a>
 
+        <s:url var="url" action="showGeneratorTagDemo" namespace="/tags/non-ui/iteratorGeneratorTag" />
+        <s:a href="%{#url}" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back To Input</s:a>
+        </div>
+    </div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp Fri Oct 19 18:49:39 2012
@@ -1,25 +1,33 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
 <head>
-<title>Showcase - Tags - Non UI Tag - MergeIterator Tag</title>
+	<title>Struts2 Showcase - Non Ui Tag - MergeIterator Tag</title>
+	<s:head/>
 </head>
 <body>
+<div class="page-header">
+	<h1>Non Ui Tag - MergeIterator Tag</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+			<s:generator var="iterator1" val="%{iteratorValue1}" separator="," />
+		    <s:generator var="iterator2" val="%{iteratorValue2}" separator="," />
 
-    <s:generator var="iterator1" val="%{iteratorValue1}" separator="," />
-    <s:generator var="iterator2" val="%{iteratorValue2}" separator="," />
-    
-    <s:merge var="mergedIterator">
-        <s:param value="%{#attr.iterator1}" />
-        <s:param value="%{#attr.iterator2}" />
-    </s:merge>
-    
-    <s:iterator value="%{#mergedIterator}">
-        <s:property /><br/>
-    </s:iterator>
+		    <s:merge var="mergedIterator">
+		        <s:param value="%{#attr.iterator1}" />
+		        <s:param value="%{#attr.iterator2}" />
+		    </s:merge>
 
-    <s:url value="%{'/tags/non-ui/'}" var="url" /><s:a href="%{#url}">Back To Non-UI Demo</s:a>
-    <s:url value="%{'/'}" var="url" /><s:a href="%{#url}">Back To Showcase</s:a>
+		    <s:iterator value="%{#mergedIterator}">
+		        <s:property /><br/>
+		    </s:iterator>
 
+			<s:url var="url" action="showMergeTagDemo" namespace="/tags/non-ui/mergeIteratorTag" />
+			<s:a href="%{#url}" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back To Input</s:a>
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp Fri Oct 19 18:49:39 2012
@@ -1,19 +1,28 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
 <head>
-<title>Showcase - Tag - Non UI Tag - AppendIterator Tag</title>
+    <title>Struts2 Showcase - Non Ui Tag - AppendIterator Tag</title>
+    <s:head/>
 </head>
 <body>
+<div class="page-header">
+    <h1>Non Ui Tag - AppendIterator Tag Demo</h1>
+</div>
 
-    <s:actionerror/>
-    <s:actionmessage/>
+<div class="container-fluid">
+    <div class="row-fluid">
+	    <div class="span12">
 
-    <s:form action="submitAppendTagDemo" namespace="/tags/non-ui/appendIteratorTag" method="POST">
-        <s:textfield label="iterator 1 values (comma separated)" name="iteratorValue1" />
-        <s:textfield label="iterator 2 values (comma separated)" name="iteratorValue2" />
-        <s:submit />
-    </s:form>
+		    <s:actionerror cssClass="alert alert-error"/>
+		    <s:fielderror cssClass="alert alert-error"/>
 
+		    <s:form action="submitAppendTagDemo" namespace="/tags/non-ui/appendIteratorTag" method="POST">
+		        <s:textfield label="iterator 1 values (comma separated)" name="iteratorValue1" />
+		        <s:textfield label="iterator 2 values (comma separated)" name="iteratorValue2" />
+		        <s:submit cssClass="btn btn-primary"/>
+		    </s:form>
+	    </div>
+    </div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp Fri Oct 19 18:49:39 2012
@@ -1,21 +1,29 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
 <head>
-<title>Showcase - Tag - Non Ui Tag - Iterator Generator Tag Demo</title>
-<s:head/>
+	<title>Struts2 Showcase - Non Ui Tag - Iterator Generator Tag Demo</title>
+	<s:head/>
 </head>
 <body>
+<div class="page-header">
+	<h1>Non Ui Tag - Iterator Generator Tag Demo</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
 
-    <s:actionerror/>
-    <s:actionmessage/>
-    
-    <s:form action="submitGeneratorTagDemo" namespace="/tags/non-ui/iteratorGeneratorTag" method="POST">
-        <s:textfield label="Value" name="value" />
-        <s:textfield label="Separator" name="separator" />
-        <s:textfield label="Count" name="count" />
-        <s:submit />
-    </s:form>
+			<s:actionerror cssClass="alert alert-error"/>
+			<s:fielderror cssClass="alert alert-error"/>
 
+			<s:form action="submitGeneratorTagDemo" namespace="/tags/non-ui/iteratorGeneratorTag" method="POST">
+		        <s:textfield label="Value" name="value" />
+		        <s:textfield label="Separator" name="separator" />
+		        <s:textfield label="Count" name="count" />
+		        <s:submit cssClass="btn btn-primary"/>
+            </s:form>
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp Fri Oct 19 18:49:39 2012
@@ -1,17 +1,29 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
 <head>
-<title>Showcase - Tags - Non UI Tag - MergeIterator Tag</title>
+	<title>Struts2 Showcase - Non Ui Tag - MergeIterator Tag</title>
+	<s:head/>
 </head>
 <body>
+<div class="page-header">
+	<h1>Non Ui Tag - MergeIterator Tag</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
 
-    <s:form action="submitMergeTagDemo" namespace="/tags/non-ui/mergeIteratorTag" method="POST">
-        <s:textfield label="Iterator 1 Value (Comma Separated)" name="iteratorValue1" />
-        <s:textfield label="Iterator 2 Value (Comma Separated)" name="iteratorValue2" />
-        <s:submit />
-    </s:form>
+			<s:actionerror cssClass="alert alert-error"/>
+			<s:fielderror cssClass="alert alert-error"/>
 
+		    <s:form action="submitMergeTagDemo" namespace="/tags/non-ui/mergeIteratorTag" method="POST">
+		        <s:textfield label="Iterator 1 Value (Comma Separated)" name="iteratorValue1" />
+		        <s:textfield label="Iterator 2 Value (Comma Separated)" name="iteratorValue2" />
+		        <s:submit cssClass="btn btn-primary"/>
+		    </s:form>
 
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp Fri Oct 19 18:49:39 2012
@@ -1,20 +1,29 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
 <head>
-<title>Showcase - Tags - Non UI Tags - SubsetTag Demo</title>
+	<title>Struts2 Showcase - Non Ui Tag - SubsetTag Demo</title>
+	<s:head/>
 </head>
 <body>
+<div class="page-header">
+	<h1>Non Ui Tag - SubsetTag Demo</h1>
+</div>
 
-    <s:actionerror/>
-    <s:actionmessage/>
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
 
-    <s:form action="submitSubsetTagDemo" namespace="/tags/non-ui/subsetIteratorTag" method="POST">
-        <s:textfield label="Iterator value (comma separated)" name="iteratorValue" />
-        <s:textfield label="Count" name="count" />
-        <s:textfield label="Start" name="start" />
-        <s:submit />
-    </s:form>
+			<s:actionerror cssClass="alert alert-error"/>
+			<s:fielderror cssClass="alert alert-error"/>
 
+		    <s:form action="submitSubsetTagDemo" namespace="/tags/non-ui/subsetIteratorTag" method="POST">
+		        <s:textfield label="Iterator value (comma separated)" name="iteratorValue" />
+		        <s:textfield label="Count" name="count" />
+		        <s:textfield label="Start" name="start" />
+		        <s:submit cssClass="btn btn-primary"/>
+		    </s:form>
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp Fri Oct 19 18:49:39 2012
@@ -1,21 +1,30 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
 <head>
-<title>Showcase - Tags - Non UI Tags - Subset Tag</title>
+	<title>Struts2 Showcase - Non Ui Tag - SubsetTag Demo</title>
+	<s:head/>
 </head>
 <body>
+<div class="page-header">
+	<h1>Non Ui Tag - SubsetTag Demo</h1>
+</div>
 
-    <s:generator var="iterator" val="%{iteratorValue}" separator="," />
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
 
-    <s:subset count="%{count}" start="%{start}" source="%{#attr.iterator}" >
-        <s:iterator>
-            <s:property /><br/>
-        </s:iterator>
-    </s:subset>
+			<s:generator var="iterator" val="%{iteratorValue}" separator="," />
 
-    <s:url value="%{'/tags/non-ui/'}" var="url" /><s:a href="%{#url}">Back To Non-UI Demo</s:a>
-    <s:url value="%{'/'}" var="url" /><s:a href="%{#url}">Back To Showcase</s:a>
+		    <s:subset count="%{count}" start="%{start}" source="%{#attr.iterator}" >
+		        <s:iterator>
+		            <s:property /><br/>
+		        </s:iterator>
+		    </s:subset>
 
+			<s:url var="url" action="showSubsetTagDemo" namespace="/tags/non-ui/subsetIteratorTag" />
+			<s:a href="%{#url}" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back To Input</s:a>
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalling.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalling.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalling.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalling.jsp Fri Oct 19 18:49:39 2012
@@ -1,14 +1,24 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
 <head>
-<title>Showcase - Tags - UI Tags - Action Tag</title>
+	<title>Struts2 Showcase - UI Tags - Action Tag</title>
+	<s:head/>
 </head>
 <body>
-  <b>Example 1:</b>
-  This example calls an action and includes the output on the page
-  <p id="example1" style="background-color:yellow;">
-    <s:action namespace="/tags/ui" name="actionTagExample" executeResult="true"/>
-  </p>
+<div class="page-header">
+	<h1>UI Tags - Action Tag</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+			  <b>Example 1:</b>
+			  This example calls an action and includes the output on the page
+			  <p id="example1" class="well">
+			    <s:action namespace="/tags/ui" name="actionTagExample" executeResult="true"/>
+			  </p>
+		</div>
+	</div>
+</div>
 </body>
 </html>
\ No newline at end of file

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/componentTagExample.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/componentTagExample.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/componentTagExample.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/componentTagExample.jsp Fri Oct 19 18:49:39 2012
@@ -1,62 +1,69 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
 <head>
-<title>Showcase - Tags - UI Tags - Component Tag</title>
+	<title>Struts2 Showcase - UI Tags - Component Tag</title>
+	<s:head/>
 </head>
 <body>
-    
-This example tries to demonstrates the usage of &lt;s:component ... &gt; tag.
-<p/>
-
-To have a look at the source of this jsp page click 
-<s:url var="url" action="showComponentTagExampleCode" namespace="/tags/ui"/>
-<s:a href="%{#url}">here</s:a>
-<p/>
-    
-<b>Example 1:</b>   
-This example load the template from the webapp context path using 
-the default (ftl) as its template.
-    <s:component 
-        theme="customTheme" 
-        templateDir="customTemplateDir" 
-        template="ftlCustomTemplate">
-        <s:param name="paramName" value="%{'paramValue1'}" />
-    </s:component>
-<p/>
-    
-<b>Example 2:</b>
-This example load the template from the webapp context path using
-jsp as its template (notice the *.jsp extension to the template).       
-    <s:component 
-        theme="customTheme" 
-        templateDir="customTemplateDir" 
-        template="jspCustomTemplate.jsp">
-        <s:param name="paramName" value="%{'paramValue2'}" />
-    </s:component>      
-<p/>
-    
-<b>Example 3</b>
-This example load the template from the webapp context path, 
-using the default template directory and theme (default to 
-'template' and 'xhtml' respectively)
-    <s:component template="mytemplate.jsp">
-        <s:param name="paramName" value="%{'paramValue3'}" />
-    </s:component>
-<p/>
-    
-    
-<b>Example 4</b>    
-This example load the template from the webapp classpath using 
-a custom themplate directory and theme.
-    <s:component
-        theme="myTheme"
-        templateDir="myTemplateDir"
-        template="myAnotherTemplate">
-        <s:param name="paramName" value="%{'paramValue4'}" />
-    </s:component>
-<p/>
+<div class="page-header">
+	<h1>UI Tags - Component Tag</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+			<p>This example tries to demonstrates the usage of &lt;s:component ... &gt; tag.<p/>
+
+			<p>To have a look at the source of this jsp page click
+			<s:url var="url" action="showComponentTagExampleCode" namespace="/tags/ui"/>
+			<s:a href="%{#url}">here</s:a>
+			<p/>
+
+			<b>Example 1:</b>
+			<p>This example load the template from the webapp context path using
+			the default (ftl) as its template.
+			    <s:component
+			        theme="customTheme"
+			        templateDir="customTemplateDir"
+			        template="ftlCustomTemplate">
+			        <s:param name="paramName" value="%{'paramValue1'}" />
+			    </s:component>
+			<p/>
+
+			<b>Example 2:</b>
+			<p>This example load the template from the webapp context path using
+			jsp as its template (notice the *.jsp extension to the template).
+			    <s:component
+			        theme="customTheme"
+			        templateDir="customTemplateDir"
+			        template="jspCustomTemplate.jsp">
+			        <s:param name="paramName" value="%{'paramValue2'}" />
+			    </s:component>
+			<p/>
+
+			<b>Example 3</b>
+			<p>This example load the template from the webapp context path,
+			using the default template directory and theme (default to
+			'template' and 'xhtml' respectively)
+			    <s:component template="mytemplate.jsp">
+			        <s:param name="paramName" value="%{'paramValue3'}" />
+			    </s:component>
+			<p/>
+
 
+			<b>Example 4</b>
+			<p>This example load the template from the webapp classpath using
+			a custom themplate directory and theme.
+			    <s:component
+			        theme="myTheme"
+			        templateDir="myTemplateDir"
+			        template="myAnotherTemplate">
+			        <s:param name="paramName" value="%{'paramValue4'}" />
+			    </s:component>
+			<p/>
+		</div>
+	</div>
+</div>
 </body>
 </html>
 

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp Fri Oct 19 18:49:39 2012
@@ -1,25 +1,33 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
 <html>
 <head>
-    <title>UI Tags Example</title>
-    <sx:head extraLocales="en-us,nl-nl,de-de" />
+	<title>Struts2 Showcase - UI Tags - Datepicker Tag</title>
+	<sx:head extraLocales="en-us,nl-nl,de-de" />
 </head>
 <body>
-<table>
-<sx:datetimepicker label="toggleType='wipe'" value="%{'2006-10-31'}" toggleType="wipe" toggleDuration="300" name="test"/>
-<sx:datetimepicker label="toggleType='explode'" value="%{'2006-07-22'}" toggleType="explode" toggleDuration="500" id="dp2"/>
-<sx:datetimepicker label="toggleType='fade'" value="%{'2006-06-30'}" toggleType="fade" toggleDuration="500"/>
-<sx:datetimepicker label="With value='today'"  name="dddp1" value="%{'today'}" />
-<sx:datetimepicker label="US format, empty" name="dddp2" language="en-us" />
-<sx:datetimepicker label="US format with initial date of 2006-06-26" name="dddp3" value="%{'2006-06-26'}" language="en-us" />
-<sx:datetimepicker label="With initial date of 1969-04-25 and a custom format dd/MM/yyyy" name="dddp5" value="%{'25/04/1969'}" displayFormat="dd/MM/yyyy" />
-<sx:datetimepicker label="In German" name="dddp7" value="%{'2006-06-28'}" language="de-de" />
-<sx:datetimepicker label="In Dutch"  name="dddp8" value="%{'2006-06-28'}" language="nl-nl" />
-<sx:datetimepicker label="US format with initial date of 2006-06-26 and long formatting (parse not supported)" name="dddp12" value="%{'2006-06-26'}" formatLength="long" language="en-us" />
-<sx:datetimepicker label="German format with initial date of 2006-06-26 and long formatting (parse not supported)" name="dddp13" value="%{'2006-06-26'}" formatLength="long" language="de" />
-</table>
+<div class="page-header">
+	<h1>UI Tags - Datepicker Tag</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+			<table>
+				<sx:datetimepicker label="toggleType='wipe'" value="%{'2006-10-31'}" toggleType="wipe" toggleDuration="300" name="test"/>
+				<sx:datetimepicker label="toggleType='explode'" value="%{'2006-07-22'}" toggleType="explode" toggleDuration="500" id="dp2"/>
+				<sx:datetimepicker label="toggleType='fade'" value="%{'2006-06-30'}" toggleType="fade" toggleDuration="500"/>
+				<sx:datetimepicker label="With value='today'"  name="dddp1" value="%{'today'}" />
+				<sx:datetimepicker label="US format, empty" name="dddp2" language="en-us" />
+				<sx:datetimepicker label="US format with initial date of 2006-06-26" name="dddp3" value="%{'2006-06-26'}" language="en-us" />
+				<sx:datetimepicker label="With initial date of 1969-04-25 and a custom format dd/MM/yyyy" name="dddp5" value="%{'25/04/1969'}" displayFormat="dd/MM/yyyy" />
+				<sx:datetimepicker label="In German" name="dddp7" value="%{'2006-06-28'}" language="de-de" />
+				<sx:datetimepicker label="In Dutch"  name="dddp8" value="%{'2006-06-28'}" language="nl-nl" />
+				<sx:datetimepicker label="US format with initial date of 2006-06-26 and long formatting (parse not supported)" name="dddp12" value="%{'2006-06-26'}" formatLength="long" language="en-us" />
+				<sx:datetimepicker label="German format with initial date of 2006-06-26 and long formatting (parse not supported)" name="dddp13" value="%{'2006-06-26'}" formatLength="long" language="de" />
+			</table>
+		</div>
+	</div>
+</div>
 </body>
 </html>