struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r1400220 [8/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...
Date Fri, 19 Oct 2012 18:49:48 GMT
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp Fri Oct 19 18:49:39 2012
@@ -1,142 +1,149 @@
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ 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/>
+	<title>Struts2 Showcase - UI Tags Example</title>
+	<s:head/>
+	<sx:head />
 </head>
-
 <body>
-
-<s:actionerror/>
-<s:actionmessage/>
-<s:fielderror />
-
-
-<s:form action="exampleSubmit" enctype="multipart/form-data" javascriptTooltip="true">
-    <s:textfield
-            label="Name"
-            name="name"
-            tooltip="Enter your Name here"/>
-
-    <sx:datetimepicker
-            tooltip="Select Your Birthday"
-            label="Birthday"
-            name="birthday" />
-
-    <sx:datetimepicker
-            tooltip="Enter the time you wake up"
-            label="Wake up time"
-            name="wakeup"
-            type="time"/>
-
-    <s:textarea
-            tooltip="Enter your Biography"
-            label="Biography"
-            name="bio"
-            cols="20"
-            rows="3"/>
-
-    <s:select
-            tooltip="Choose Your Favourite Color"
-            label="Favorite Color"
-            list="{'Red', 'Blue', 'Green'}"
-            name="favouriteColor"
-            emptyOption="true"
-            headerKey="None"
-            headerValue="None"/>
-
-    <s:select
-            tooltip="Choose Your Favourite Language"
-            label="Favourite Language"
-            list="favouriteLanguages"
-            name="favouriteLanguage"
-            listKey="key"
-            listValue="description"
-            listCssStyle="style"
-            emptyOption="true"
-            headerKey="None"
-            headerValue="None"/>
-
-    <s:checkboxlist
-            tooltip="Choose your Friends"
-            label="Friends"
-            list="{'Wes', 'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}"
-            name="friends"/>
-
-    <s:radio
-            tooltip="Choose your Best Friend"
-            label="Best Friend"
-            list="{'Wes', 'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}"
-            name="bestFriend"
-            cssErrorClass="foo" />
-
-    <s:checkbox
-            tooltip="Confirmed that your are Over 18"
-            label="Age 18+"
-            name="legalAge"/>
-
-    <s:doubleselect
-            tooltip="Choose Your State"
-            label="State"
-            name="region" list="{'North', 'South'}"
-            value="'South'"
-            doubleValue="'Florida'"
-            doubleList="top == 'North' ? {'Oregon', 'Washington'} : {'Texas', 'Florida'}"
-            doubleName="state"
-            headerKey="-1"
-            headerValue="---------- Please Select ----------"
-            emptyOption="true" />
-
-    <s:doubleselect
-            tooltip="Choose your Vehical"
-            label="Favourite Vehical"
-            name="favouriteVehicalType"
-            list="vehicalTypeList"
-            listKey="key"
-            listValue="description"
-            value="'MotorcycleKey'"
-            doubleValue="'YamahaKey'"
-            doubleList="vehicalSpecificList"
-            doubleListKey="key"
-            doubleListValue="description"
-            doubleName="favouriteVehicalSpecific" headerKey="-1"
-            headerValue="---------- Please Select ----------"
-            emptyOption="true" />
-
-    <s:file
-            tooltip="Upload Your Picture"
-            label="Picture"
-            name="picture" />
-
-    <s:optiontransferselect
-            tooltip="Select Your Favourite Cartoon Characters"
-            label="Favourite Cartoons Characters"
-            name="leftSideCartoonCharacters"
-            leftTitle="Left Title"
-            rightTitle="Right Title"
-            list="{'Popeye', 'He-Man', 'Spiderman'}"
-            multiple="true"
-            headerKey="headerKey"
-            headerValue="--- Please Select ---"
-            emptyOption="true"
-            doubleList="{'Superman', 'Mickey Mouse', 'Donald Duck'}"
-            doubleName="rightSideCartoonCharacters"
-            doubleHeaderKey="doubleHeaderKey"
-            doubleHeaderValue="--- Please Select ---"
-            doubleEmptyOption="true"
-            doubleMultiple="true" />
-
-    <s:textarea
-            label="Your Thougths"
-            name="thoughts"
-            tooltip="Enter your thoughts here" />
-
-    <s:submit />
-    <s:reset onclick="alert('Resetting form now... Press OK to continue!');" />
-</s:form>
-
+<div class="page-header">
+	<h1>UI Tags Example</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<s:actionerror cssClass="alert alert-error"/>
+			<s:actionmessage cssClass="alert alert-info"/>
+			<s:fielderror  cssClass="alert alert-error"/>
+
+
+			<s:form action="exampleSubmit" enctype="multipart/form-data" javascriptTooltip="true">
+			    <s:textfield
+			            label="Name"
+			            name="name"
+			            tooltip="Enter your Name here"/>
+
+			    <sx:datetimepicker
+			            tooltip="Select Your Birthday"
+			            label="Birthday"
+			            name="birthday" />
+
+			    <sx:datetimepicker
+			            tooltip="Enter the time you wake up"
+			            label="Wake up time"
+			            name="wakeup"
+			            type="time"/>
+
+			    <s:textarea
+			            tooltip="Enter your Biography"
+			            label="Biography"
+			            name="bio"
+			            cols="20"
+			            rows="3"/>
+
+			    <s:select
+			            tooltip="Choose Your Favourite Color"
+			            label="Favorite Color"
+			            list="{'Red', 'Blue', 'Green'}"
+			            name="favouriteColor"
+			            emptyOption="true"
+			            headerKey="None"
+			            headerValue="None"/>
+
+			    <s:select
+			            tooltip="Choose Your Favourite Language"
+			            label="Favourite Language"
+			            list="favouriteLanguages"
+			            name="favouriteLanguage"
+			            listKey="key"
+			            listValue="description"
+			            listCssStyle="style"
+			            emptyOption="true"
+			            headerKey="None"
+			            headerValue="None"/>
+
+			    <s:checkboxlist
+			            tooltip="Choose your Friends"
+			            label="Friends"
+			            list="{'Wes', 'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}"
+			            name="friends"/>
+
+			    <s:radio
+			            tooltip="Choose your Best Friend"
+			            label="Best Friend"
+			            list="{'Wes', 'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}"
+			            name="bestFriend"
+			            cssErrorClass="foo" />
+
+			    <s:checkbox
+			            tooltip="Confirmed that your are Over 18"
+			            label="Age 18+"
+			            name="legalAge"/>
+
+			    <s:doubleselect
+			            tooltip="Choose Your State"
+			            label="State"
+			            name="region" list="{'North', 'South'}"
+			            value="'South'"
+			            doubleValue="'Florida'"
+			            doubleList="top == 'North' ? {'Oregon', 'Washington'} : {'Texas', 'Florida'}"
+			            doubleName="state"
+			            headerKey="-1"
+			            headerValue="---------- Please Select ----------"
+			            emptyOption="true" />
+
+			    <s:doubleselect
+			            tooltip="Choose your Vehical"
+			            label="Favourite Vehical"
+			            name="favouriteVehicalType"
+			            list="vehicalTypeList"
+			            listKey="key"
+			            listValue="description"
+			            value="'MotorcycleKey'"
+			            doubleValue="'YamahaKey'"
+			            doubleList="vehicalSpecificList"
+			            doubleListKey="key"
+			            doubleListValue="description"
+			            doubleName="favouriteVehicalSpecific" headerKey="-1"
+			            headerValue="---------- Please Select ----------"
+			            emptyOption="true" />
+
+			    <s:file
+			            tooltip="Upload Your Picture"
+			            label="Picture"
+			            name="picture" />
+
+			    <s:optiontransferselect
+			            tooltip="Select Your Favourite Cartoon Characters"
+			            label="Favourite Cartoons Characters"
+			            name="leftSideCartoonCharacters"
+			            leftTitle="Left Title"
+			            rightTitle="Right Title"
+			            list="{'Popeye', 'He-Man', 'Spiderman'}"
+			            multiple="true"
+			            headerKey="headerKey"
+			            headerValue="--- Please Select ---"
+			            emptyOption="true"
+			            doubleList="{'Superman', 'Mickey Mouse', 'Donald Duck'}"
+			            doubleName="rightSideCartoonCharacters"
+			            doubleHeaderKey="doubleHeaderKey"
+			            doubleHeaderValue="--- Please Select ---"
+			            doubleEmptyOption="true"
+			            doubleMultiple="true" />
+
+			    <s:textarea
+			            label="Your Thougths"
+			            name="thoughts"
+			            tooltip="Enter your thoughts here" />
+
+			    <s:submit cssClass="btn btn-primary"/>
+			    <s:reset cssClass="btn btn-danger" onclick="alert('Resetting form now... Press OK to continue!');" />
+			</s:form>
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm Fri Oct 19 18:49:39 2012
@@ -1,34 +1,39 @@
 <html>
 <head>
-    <title>UI Tags Example</title>
-    #shead()
-    #sxhead()
+	<title>Struts2 Showcase - UI Tags Example (Velocity)</title>
+	#shead()
+	#sxhead()
 </head>
-
 <body>
-
-#surl ("id=url" "value=index.jsp")
-<a href="${url}">Back to index.jsp</a>!
-
-
-#sform ("action=exampleSubmitVelocity" "method=post" "enctype=multipart/form-data")
-    #stextfield ("label=Name" "name=name")
-    #sxdatetimepicker ("label=Birthday" "name=birthday")
-    #sxdatetimepicker ("label=Wake up time" "name=wakeup" "type=time")
-    #stextarea ("label=Biography" "name=bio" "cols=20" "rows=3")
-    #sselect ("label=Favourite Color" "list={'Red', 'Blue', 'Green'}" "name=favouriteColor" "emptyOption=true" "headerKey=None" "headerValue=None")
-    #sselect ("label=Favourite Language" "list=favouriteLanguages" "name=favouriteLanguage" "listKey=key" "listValue=description" "emptyOption=true" "headerKey=None" "headerValue=None")
-    #scheckboxlist ("label=Friends" "list={'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}" "name=friends")
-    #scheckbox ("label=Age 18+" "name=legalAge")
-    #sdoubleselect ("label=State" "name=region" "list={'North', 'South'}" "value='North'" "doubleValue='Florida'" "doubleList=top == 'North' ? {'Oregon', 'Washington'} : {'Texas', 'Florida'}" "doubleName=state" "headerKey=-1" "headerValue=---------- Please Select ----------" "emptyOption=true" )
-    #sdoubleselect ("label=Favourite Vehical" "name=favouriteVehicalType" "list=vehicalTypeList" "listKey=key" "listValue=description" "value='MotorcycleKey'" "doubleValue='YamahaKey'" "doubleList=vehicalSpecificList" "doubleListKey=key" "doubleListValue=description" "doubleName=favouriteVehicalSpecific" "headerKey=-1" "headerValue=---------- Please Select ----------" "emptyOption=true" )
-    #sfile ("label=Picture" "name=picture")
-    #soptiontransferselect ("label=Favourite Cartoons Characters" "name=leftSideCartoonCharacters" "leftTitle=Left Title" "rightTitle=Right Title" "list={'Popeye', 'He-Man', 'Spiderman'}" "multiple=true" "headerKey=headerKey" "headerValue=--- Please Select ---" "emptyOption=true" "doubleList={'Superman', 'Mickey Mouse', 'Donald Duck'}" "doubleName=rightSideCartoonCharacters" "doubleHeaderKey=doubleHeaderKey" "doubleHeaderValue=--- Please Select ---" "doubleEmptyOption=true" "doubleMultiple=true" )
-    #ssubmit()
-    #sreset()
-#end
-
-#sa("href=${url}")Back to index.jsp#end
-
+<div class="page-header">
+	<h1>UI Tags Example (Velocity)</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			#sform ("action=exampleSubmitVelocity" "method=post" "enctype=multipart/form-data")
+			    #stextfield ("label=Name" "name=name")
+			    #sxdatetimepicker ("label=Birthday" "name=birthday")
+			    #sxdatetimepicker ("label=Wake up time" "name=wakeup" "type=time")
+			    #stextarea ("label=Biography" "name=bio" "cols=20" "rows=3")
+			    #sselect ("label=Favourite Color" "list={'Red', 'Blue', 'Green'}" "name=favouriteColor" "emptyOption=true" "headerKey=None" "headerValue=None")
+			    #sselect ("label=Favourite Language" "list=favouriteLanguages" "name=favouriteLanguage" "listKey=key" "listValue=description" "emptyOption=true" "headerKey=None" "headerValue=None")
+			    #scheckboxlist ("label=Friends" "list={'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}" "name=friends")
+			    #scheckbox ("label=Age 18+" "name=legalAge")
+			    #sdoubleselect ("label=State" "name=region" "list={'North', 'South'}" "value='North'" "doubleValue='Florida'" "doubleList=top == 'North' ? {'Oregon', 'Washington'} : {'Texas', 'Florida'}" "doubleName=state" "headerKey=-1" "headerValue=---------- Please Select ----------" "emptyOption=true" )
+			    #sdoubleselect ("label=Favourite Vehical" "name=favouriteVehicalType" "list=vehicalTypeList" "listKey=key" "listValue=description" "value='MotorcycleKey'" "doubleValue='YamahaKey'" "doubleList=vehicalSpecificList" "doubleListKey=key" "doubleListValue=description" "doubleName=favouriteVehicalSpecific" "headerKey=-1" "headerValue=---------- Please Select ----------" "emptyOption=true" )
+			    #sfile ("label=Picture" "name=picture")
+			    #soptiontransferselect ("label=Favourite Cartoons Characters" "name=leftSideCartoonCharacters" "leftTitle=Left Title" "rightTitle=Right Title" "list={'Popeye', 'He-Man', 'Spiderman'}" "multiple=true" "headerKey=headerKey" "headerValue=--- Please Select ---" "emptyOption=true" "doubleList={'Superman', 'Mickey Mouse', 'Donald Duck'}" "doubleName=rightSideCartoonCharacters" "doubleHeaderKey=doubleHeaderKey" "doubleHeaderValue=--- Please Select ---" "doubleEmptyOption=true" "doubleMultiple=true" )
+			    #ssubmit("cssClass=btn btn-primary")
+			    #sreset("cssClass=btn btn-danger")
+			#end
+
+			#surl ("id=url" "value=index.jsp")
+			<a href="${url}" class="btn btn-info"><i class="icon icon-arrow-left"></i> Back to index.jsp</a>
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp Fri Oct 19 18:49:39 2012
@@ -1,50 +1,58 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
 <head>
-<title>Showcase - Non-UI Tag - Example Submited </title>
+	<title>Struts2 Showcase - UI Tags Example - Example Submited</title>
+	<s:head/>
 </head>
 <body>
+<div class="page-header">
+	<h1>UI Tags Example - Example Submited</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+			<table class="table table-striped table-bordered table-hover table-condensed">
+			    <s:label label="Name" name="name" />
+			    <s:label label="Birthday" name="birthday" />
+			    <tr>
+			        <td><label class="label">Wake up time:</label></td>
+			        <td>
+			           <s:date name="wakeup" format="hh:mm aa" />
+			        </td>
+			    </tr>
+			    <s:label label="Biography" name="bio" />
+			    <s:label label="Favourite Color" name="favouriteColor" />
+			    <s:label label="Friends" name="friends" />
+			    <s:label label="Best Friend" name="bestFriend" />
+			    <s:label label="Legal Age" name="legalAge" />
+			    <s:label label="Region" name="region" />
+			    <s:label label="State" name="state" />
+			    <s:label label="Picture" name="picture" />
+			    <s:label label="Favourite Language" name="favouriteLanguage" />
+			    <s:label label="Favourite Vehical Type" name="favouriteVehicalType" />
+			    <s:label label="Favourite Vehical Specific" name="favouriteVehicalSpecific" />
+			    <tr>
+			        <td><label class="label">Favourite Cartoon Characters (Left):</label></td>
+			        <td>
+			            <s:iterator value="leftSideCartoonCharacters" status="stat">
+			                <s:property value="%{#stat.count}" />.<s:property value="top" />&nbsp;
+			            </s:iterator>
+			        </td>
+			    </tr>
+			    <tr>
+			        <td><label class="label">Favourite Cartoon Characters (Right):</label></td>
+			        <td>
+			            <s:iterator value="rightSideCartoonCharacters" status="stat">
+			                <s:property value="%{#stat.count}" />.<s:property value="top" />&nbsp;
+			            </s:iterator>
+			        </td>
+			    </tr>
+			    <s:label label="Thoughts" name="thoughts" />
 
-<h1>Example Submitted</h1>
-<table>
-    <s:label label="Name" name="name" /> 
-    <s:label label="Birthday" name="birthday" />
-    <tr>
-        <td><label class="label">Wake up time:</label></td>
-        <td>
-           <s:date name="wakeup" format="hh:mm aa" />
-        </td>
-    </tr>
-    <s:label label="Biography" name="bio" /> 
-    <s:label label="Favourite Color" name="favouriteColor" /> 
-    <s:label label="Friends" name="friends" />
-    <s:label label="Best Friend" name="bestFriend" />
-    <s:label label="Legal Age" name="legalAge" /> 
-    <s:label label="Region" name="region" /> 
-    <s:label label="State" name="state" /> 
-    <s:label label="Picture" name="picture" /> 
-    <s:label label="Favourite Language" name="favouriteLanguage" />
-    <s:label label="Favourite Vehical Type" name="favouriteVehicalType" />
-    <s:label label="Favourite Vehical Specific" name="favouriteVehicalSpecific" />
-    <tr>
-        <td><label class="label">Favourite Cartoon Characters (Left):</label></td>
-        <td>
-            <s:iterator value="leftSideCartoonCharacters" status="stat">
-                <s:property value="%{#stat.count}" />.<s:property value="top" />&nbsp;
-            </s:iterator>
-        </td>
-    </tr>
-    <tr>
-        <td><label class="label">Favourite Cartoon Characters (Right):</label></td>
-        <td>
-            <s:iterator value="rightSideCartoonCharacters" status="stat">
-                <s:property value="%{#stat.count}" />.<s:property value="top" />&nbsp;
-            </s:iterator>
-        </td>
-    </tr>
-    <s:label label="Thoughts" name="thoughts" />
-    
-</table>
+			</table>
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm Fri Oct 19 18:49:39 2012
@@ -1,53 +1,61 @@
 <html>
 <head>
-<title>Showcase - Non-UI Tag - Example Submited </title>
+	<title>Struts2 Showcase - UI Tags Example (Velocity) - Example Submited </title>
 </head>
 <body>
+<div class="page-header">
+	<h1>UI Tags Example (Velocity) - Example Submited</h1>
+</div>
 
-<h1>Example Submitted</h1>
-<table>
-	#slabel ("label=Name" "name=name")
-	#slabel ("label=Birthday" "name=birthday")
-	<tr>
-        <td><label class="label">Wake up time:</label></td>
-        <td>
-           #sdate ("name=wakeup" "format=hh:mm aa")
-        </td>
-    </tr>
-	#slabel ("label=Biography" "name=bio")
-	#slabel ("label=Favourite Color" "name=favouriteColor")
-	#slabel ("label=Friends" "name=friends")
-	#slabel ("label=Legal Age" "name=legalAge")
-	#slabel ("label=Region" "name=region")
-	#slabel ("label=State" "name=state")
-	#slabel ("label=Picture" "name=picture")
-	#slabel ("label=Favourite Language" "name=favouriteLanguage")
-	#slabel ("label=Favourite Vehical Type" "name=favouriteVehicalType")
-	#slabel ("label=Favourite Vehical Specific" "name=favouriteVehicalSpecific")
-	<tr>
-		<td>Favourite Cartoon Characters (Left):</td>
-		<td>
-            #set ( $startCount = 1)
-		    #foreach( $item in $leftSideCartoonCharacters)
-				$startCount.${item}&nbsp;
-				#set ( $startCount = $startCount + 1)
-            #end
-		</td>
-	</tr>
-	<tr>
-		<td>Favourite Cartoon Characters (Right):</td>
-		<td>
-            #set ( $startCount = 1)
-		    #foreach( $item in $rightSideCartoonCharacters)
-				$startCount.${item}&nbsp;
-				#set ( $startCount = $startCount + 1)
-            #end
-		</td>
-	</tr>
-</table>
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
 
-#surl ("id=url" "value=index.jsp")
-#sa("href=${url}")Back to index.jsp#end
+			<table>
+				#slabel ("label=Name" "name=name")
+				#slabel ("label=Birthday" "name=birthday")
+				<tr>
+			        <td><label class="label">Wake up time:</label></td>
+			        <td>
+			           #sdate ("name=wakeup" "format=hh:mm aa")
+			        </td>
+			    </tr>
+				#slabel ("label=Biography" "name=bio")
+				#slabel ("label=Favourite Color" "name=favouriteColor")
+				#slabel ("label=Friends" "name=friends")
+				#slabel ("label=Legal Age" "name=legalAge")
+				#slabel ("label=Region" "name=region")
+				#slabel ("label=State" "name=state")
+				#slabel ("label=Picture" "name=picture")
+				#slabel ("label=Favourite Language" "name=favouriteLanguage")
+				#slabel ("label=Favourite Vehical Type" "name=favouriteVehicalType")
+				#slabel ("label=Favourite Vehical Specific" "name=favouriteVehicalSpecific")
+				<tr>
+					<td>Favourite Cartoon Characters (Left):</td>
+					<td>
+			            #set ( $startCount = 1)
+					    #foreach( $item in $leftSideCartoonCharacters)
+							$startCount.${item}&nbsp;
+							#set ( $startCount = $startCount + 1)
+			            #end
+					</td>
+				</tr>
+				<tr>
+					<td>Favourite Cartoon Characters (Right):</td>
+					<td>
+			            #set ( $startCount = 1)
+					    #foreach( $item in $rightSideCartoonCharacters)
+							$startCount.${item}&nbsp;
+							#set ( $startCount = $startCount + 1)
+			            #end
+					</td>
+				</tr>
+			</table>
 
+			#surl ("id=url" "value=index.jsp")
+			#sa("href=${url}")Back to index.jsp#end
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp Fri Oct 19 18:49:39 2012
@@ -1,93 +1,101 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
 <head>
-<title>Show Case - Tags - UI Tags - Optiontransferselect</title>
-<s:head />
+	<title>Struts2 Showcase - UI Tags - Optiontransferselect</title>
+	<s:head/>
 </head>
 <body>
+<div class="page-header">
+	<h1>UI Tags - Optiontransferselect</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<s:form action="lotsOfOptiontransferselectSubmit" namespace="/tags/ui" method="post">
+			    <s:optiontransferselect
+			        tooltip="Select Your Favourite Cartoon Characters"
+			        headerKey="-1"
+			        headerValue="--- Please Select ---"
+			        doubleHeaderKey="-1"
+			        doubleHeaderValue="--- Please Select ---"
+			        emptyOption="true"
+			        doubleEmptyOption="true"
+			        label="Favourite Cartoon Characters"
+			        leftTitle="Favourite Cartoon Characters"
+			        rightTitle="Non Favourite Cartoon Characters"
+			        name="favouriteCartoonCharacters"
+			        list="defaultFavouriteCartoonCharacters"
+			        doubleName="notFavouriteCartoonCharacters"
+			        doubleList="defaultNotFavouriteCartoonCharacters" />
+
+			    <br/>
+
+			    <s:optiontransferselect
+			        tooltip="Select Your Favourite Cars"
+			        label="Favourite Cars"
+			        leftTitle="Favourite Cars"
+			        rightTitle="Non Favourite Cars"
+			        name="favouriteCars"
+			        list="defaultFavouriteCars"
+			        doubleName="notFavouriteCars"
+			        doubleList="defaultNotFavouriteCars" />
+
+			    <br/>
+
+			    <s:optiontransferselect
+			        tooltip="Select Your Favourite Motorcycles"
+			        headerKey="-1"
+			        headerValue="--- Please Select ---"
+			        doubleHeaderKey="-1"
+			        doubleHeaderValue="--- Please Select ---"
+			        label="Favourite Motorcycles"
+			        leftTitle="Favourite Motorcycles"
+			        rightTitle="Non Favourite Motorcycles"
+			        name="favouriteMotorcycles"
+			        list="defaultFavouriteMotorcycles"
+			        doubleName="notFavouriteMotorcycles"
+			        doubleList="defaultNotFavouriteMotorcycles" />
+
+			    <br/>
+
+			    <s:optiontransferselect
+			        tooltip="Select Your Favourite Countries"
+			        emptyOption="true"
+			        doubleEmptyOption="true"
+			        label="Favourite Countries"
+			        leftTitle="Favourite Countries"
+			        rightTitle="Non Favourite Countries"
+			        name="favouriteCountries"
+			        list="defaultFavouriteCountries"
+			        doubleName="notFavouriteCountries"
+			        doubleList="defaultNotFavouriteCountries"
+			          />
+
+			    <br/>
 
-<s:form action="lotsOfOptiontransferselectSubmit" namespace="/tags/ui" method="post">
-    <s:optiontransferselect 
-        tooltip="Select Your Favourite Cartoon Characters"
-        headerKey="-1"
-        headerValue="--- Please Select ---"
-        doubleHeaderKey="-1"
-        doubleHeaderValue="--- Please Select ---"
-        emptyOption="true"
-        doubleEmptyOption="true"
-        label="Favourite Cartoon Characters"
-        leftTitle="Favourite Cartoon Characters"
-        rightTitle="Non Favourite Cartoon Characters"
-        name="favouriteCartoonCharacters" 
-        list="defaultFavouriteCartoonCharacters" 
-        doubleName="notFavouriteCartoonCharacters"
-        doubleList="defaultNotFavouriteCartoonCharacters" />
-        
-    <br/>   
-        
-    <s:optiontransferselect
-        tooltip="Select Your Favourite Cars"
-        label="Favourite Cars"
-        leftTitle="Favourite Cars"
-        rightTitle="Non Favourite Cars"
-        name="favouriteCars"
-        list="defaultFavouriteCars"
-        doubleName="notFavouriteCars"
-        doubleList="defaultNotFavouriteCars" />
-        
-    <br/>
-        
-    <s:optiontransferselect 
-        tooltip="Select Your Favourite Motorcycles"
-        headerKey="-1"
-        headerValue="--- Please Select ---"
-        doubleHeaderKey="-1"
-        doubleHeaderValue="--- Please Select ---"
-        label="Favourite Motorcycles"
-        leftTitle="Favourite Motorcycles"
-        rightTitle="Non Favourite Motorcycles"
-        name="favouriteMotorcycles" 
-        list="defaultFavouriteMotorcycles"
-        doubleName="notFavouriteMotorcycles"
-        doubleList="defaultNotFavouriteMotorcycles" />
-        
-    <br/>
-        
-    <s:optiontransferselect 
-        tooltip="Select Your Favourite Countries"
-        emptyOption="true"
-        doubleEmptyOption="true"
-        label="Favourite Countries"
-        leftTitle="Favourite Countries"
-        rightTitle="Non Favourite Countries"
-        name="favouriteCountries" 
-        list="defaultFavouriteCountries" 
-        doubleName="notFavouriteCountries" 
-        doubleList="defaultNotFavouriteCountries"
-          /> 
-        
-    <br/>   
-
-    <s:optiontransferselect
-        tooltip="Pick One at a Time"
-        label="Favourite Sport"
-        leftTitle="Non Favourite Sports"
-        rightTitle="Favourite Sports"
-        name="nonFavouriteSports"
-        list="defaultNonFavoriteSports"
-        doubleName="favouriteSports"
-        doubleList="defaultFavouriteSports"
-        size="1" multiple="false"
-        doubleSize="5" doubleMultiple="true"
-        allowAddAllToLeft="false"
-        allowAddAllToRight="false"
-        allowSelectAll="false"
-          />
-    <br/>
-    
-    <s:submit value="Submit It" />
-</s:form>
+			    <s:optiontransferselect
+			        tooltip="Pick One at a Time"
+			        label="Favourite Sport"
+			        leftTitle="Non Favourite Sports"
+			        rightTitle="Favourite Sports"
+			        name="nonFavouriteSports"
+			        list="defaultNonFavoriteSports"
+			        doubleName="favouriteSports"
+			        doubleList="defaultFavouriteSports"
+			        size="1" multiple="false"
+			        doubleSize="5" doubleMultiple="true"
+			        allowAddAllToLeft="false"
+			        allowAddAllToRight="false"
+			        allowSelectAll="false"
+			          />
+			    <br/>
 
+			    <s:submit value="Submit It" />
+			</s:form>
+		</div>
+	</div>
+</div>
 </body>
 </html>
\ No newline at end of file

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp Fri Oct 19 18:49:39 2012
@@ -1,94 +1,103 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
 <head>
-<title>Showcase - Tags - UI Tags - Optiontransferoption Result</title>
+	<title>Struts2 Showcase - UI Tags - Optiontransferselect Result</title>
+	<s:head/>
 </head>
 <body>
-    
-    <table>
-    <tr>
-        <td>Favourite Cartoons:</td>
-        <td>
-        <s:iterator value="favouriteCartoonCharacters" status="stat">
-            <s:property value="%{#stat.count}" />.<s:property />&nbsp;
-        </s:iterator>
-        </td>
-    </tr>
-    <tr>
-        <td>Non Favourite Cartoons:</td>
-        <td>
-        <s:iterator value="notFavouriteCartoonCharacters" status="stat">
-            <s:property value="%{#stat.count}" />.<s:property />&nbsp;
-        </s:iterator>
-        </td>
-    </tr>
-    <tr>
-        <td>Favourite Cars:</td>
-        <td>
-        <s:iterator value="favouriteCars" status="stat">
-            <s:property value="%{#stat.count}" />.<s:property />&nbsp;
-        </s:iterator>
-        </td>
-    </tr>
-    <tr>
-        <td>Non Favourite Cars:</td>
-        <td>
-        <s:iterator value="notFavouriteCars" status="stat">
-            <s:property value="%{#stat.count}" />.<s:property />&nbsp;
-        </s:iterator>
-        </td>
-    </tr>
-    <tr>
-        <td>Favourite Motorcycles:</td>
-        <td>
-        <s:iterator value="favouriteMotorcycles" status="stat">
-            <s:property value="%{#stat.count}" />.<s:property />&nbsp;
-        </s:iterator>
-        </td>
-    </tr>
-    <tr>
-        <td>Non Favourite Motorcycles:</td>
-        <td>
-        <s:iterator value="notFavouriteMotorcycles" status="stat">
-            <s:property value="%{#stat.count}" />.<s:property />&nbsp;
-        </s:iterator>
-        </td>
-    </tr>
-    <tr>
-        <td>Favourite Countries:</td>
-        <td>
-        <s:iterator value="favouriteCountries" status="stat">
-            <s:property value="%{#stat.count}" />.<s:property />&nbsp;
-        </s:iterator>
-        </td>
-    </tr>
-    <tr>
-        <td>Non Favourite Countries:</td>
-        <td>
-            <s:iterator value="notFavouriteCountries" status="stat">
-                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
-            </s:iterator>
-        </td>
-    </tr>
-      <tr>
-        <td>Favourite Sports:</td>
-        <td>
-            <s:iterator value="favouriteSports" status="stat">
-                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
-            </s:iterator>
-        </td>
-    </tr>
+<div class="page-header">
+	<h1>UI Tags - Optiontransferselect Result</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
 
-     <tr>
-        <td>Non Favourite Sports:</td>
-        <td>
-            <s:iterator value="nonfavouriteSports" status="stat">
-                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
-            </s:iterator>
-        </td>
-    </tr>
-    </table>
+		    <table>
+		    <tr>
+		        <td>Favourite Cartoons:</td>
+		        <td>
+		        <s:iterator value="favouriteCartoonCharacters" status="stat">
+		            <s:property value="%{#stat.count}" />.<s:property />&nbsp;
+		        </s:iterator>
+		        </td>
+		    </tr>
+		    <tr>
+		        <td>Non Favourite Cartoons:</td>
+		        <td>
+		        <s:iterator value="notFavouriteCartoonCharacters" status="stat">
+		            <s:property value="%{#stat.count}" />.<s:property />&nbsp;
+		        </s:iterator>
+		        </td>
+		    </tr>
+		    <tr>
+		        <td>Favourite Cars:</td>
+		        <td>
+		        <s:iterator value="favouriteCars" status="stat">
+		            <s:property value="%{#stat.count}" />.<s:property />&nbsp;
+		        </s:iterator>
+		        </td>
+		    </tr>
+		    <tr>
+		        <td>Non Favourite Cars:</td>
+		        <td>
+		        <s:iterator value="notFavouriteCars" status="stat">
+		            <s:property value="%{#stat.count}" />.<s:property />&nbsp;
+		        </s:iterator>
+		        </td>
+		    </tr>
+		    <tr>
+		        <td>Favourite Motorcycles:</td>
+		        <td>
+		        <s:iterator value="favouriteMotorcycles" status="stat">
+		            <s:property value="%{#stat.count}" />.<s:property />&nbsp;
+		        </s:iterator>
+		        </td>
+		    </tr>
+		    <tr>
+		        <td>Non Favourite Motorcycles:</td>
+		        <td>
+		        <s:iterator value="notFavouriteMotorcycles" status="stat">
+		            <s:property value="%{#stat.count}" />.<s:property />&nbsp;
+		        </s:iterator>
+		        </td>
+		    </tr>
+		    <tr>
+		        <td>Favourite Countries:</td>
+		        <td>
+		        <s:iterator value="favouriteCountries" status="stat">
+		            <s:property value="%{#stat.count}" />.<s:property />&nbsp;
+		        </s:iterator>
+		        </td>
+		    </tr>
+		    <tr>
+		        <td>Non Favourite Countries:</td>
+		        <td>
+		            <s:iterator value="notFavouriteCountries" status="stat">
+		                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
+		            </s:iterator>
+		        </td>
+		    </tr>
+		      <tr>
+		        <td>Favourite Sports:</td>
+		        <td>
+		            <s:iterator value="favouriteSports" status="stat">
+		                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
+		            </s:iterator>
+		        </td>
+		    </tr>
 
+		     <tr>
+		        <td>Non Favourite Sports:</td>
+		        <td>
+		            <s:iterator value="nonfavouriteSports" status="stat">
+		                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
+		            </s:iterator>
+		        </td>
+		    </tr>
+		    </table>
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/moreSelects.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/moreSelects.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/moreSelects.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/moreSelects.jsp Fri Oct 19 18:49:39 2012
@@ -1,61 +1,69 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
 <head>
-<title>Show Case - Tags - UI Tags - Optiontransferselect</title>
-<s:head />
+	<title>Struts2 Showcase - UI Tags - More Select Box UI Examples</title>
+	<s:head/>
 </head>
 <body>
-
-<s:form action="moreSelectsSubmit" namespace="/tags/ui" method="post">
-
-    <s:updownselect
-        tooltip="Prioritized Your Favourite Cartoon Characters"
-        label="Prioritised Favourite Cartoon Characters"
-        list="defaultFavouriteCartoonCharacters" 
-        name="prioritisedFavouriteCartoonCharacters" 
-        headerKey="-1" 
-        headerValue="--- Please Order ---" 
-        emptyOption="true"  />
-    
-    <br/>
-        
-    <s:updownselect
-        tooltip="Prioritise Your Favourite Cars"
-        label="Prioritised Favourite Cars"
-        list="defaultFavouriteCars"
-        name="prioritisedFavouriteCars" 
-        headerKey="-10" 
-        headerValue="--- Please Order ---" />
-        
-    <br/>
-        
-    <s:updownselect 
-        tooltip="Prioritised Your Favourite Countries"
-        label="Prioritised Favourite Countries"
-        list="defaultFavouriteCountries"
-        name="prioritisedFavouriteCountries" 
-        emptyOption="true" 
-        value="{'england', 'brazil'}" />    
-        
-    <br/>
-
-    <s:inputtransferselect
-        list="defaultFavouriteNumbers"
-        name="favouriteNumbers"
-        label="Numbers"/>
-
-    <s:select label="Favourite Cities"
-        list="availableCities"
-        name="favouriteCities"
-        value="%{defaultFavouriteCities}"
-        multiple="true" size="4"/>
-
-    <s:submit value="Submit It" />
-    
-    <br/>
-    
-</s:form>
-
+<div class="page-header">
+	<h1>UI Tags - More Select Box UI Examples</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<s:form action="moreSelectsSubmit" namespace="/tags/ui" method="post">
+
+		    <s:updownselect
+		        tooltip="Prioritized Your Favourite Cartoon Characters"
+		        label="Prioritised Favourite Cartoon Characters"
+		        list="defaultFavouriteCartoonCharacters"
+		        name="prioritisedFavouriteCartoonCharacters"
+		        headerKey="-1"
+		        headerValue="--- Please Order ---"
+		        emptyOption="true"  />
+
+		    <br/>
+
+		    <s:updownselect
+		        tooltip="Prioritise Your Favourite Cars"
+		        label="Prioritised Favourite Cars"
+		        list="defaultFavouriteCars"
+		        name="prioritisedFavouriteCars"
+		        headerKey="-10"
+		        headerValue="--- Please Order ---" />
+
+		    <br/>
+
+		    <s:updownselect
+		        tooltip="Prioritised Your Favourite Countries"
+		        label="Prioritised Favourite Countries"
+		        list="defaultFavouriteCountries"
+		        name="prioritisedFavouriteCountries"
+		        emptyOption="true"
+		        value="{'england', 'brazil'}" />
+
+		    <br/>
+
+		    <s:inputtransferselect
+		        list="defaultFavouriteNumbers"
+		        name="favouriteNumbers"
+		        label="Numbers"/>
+
+		    <s:select label="Favourite Cities"
+		        list="availableCities"
+		        name="favouriteCities"
+		        value="%{defaultFavouriteCities}"
+		        multiple="true" size="4"/>
+
+		    <s:submit value="Submit It" cssClass="btn btn-primary"/>
+
+		    <br/>
+
+		</s:form>
+		</div>
+	</div>
+</div>
 </body>
 </html>
\ No newline at end of file

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/moreSelectsSubmit.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/moreSelectsSubmit.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/moreSelectsSubmit.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/moreSelectsSubmit.jsp Fri Oct 19 18:49:39 2012
@@ -1,53 +1,63 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
 <head>
-<title>Showcase - Tags - UI Tags - Select Boxes Result</title>
+	<title>Struts2 Showcase - UI Tags - More Select Box UI Examples - Result</title>
+	<s:head/>
 </head>
 <body>
-    
-    <table>
-    <tr>
-        <td>Prioritised Favourite Cartoon Characters:</td>
-        <td>
-            <s:iterator value="prioritisedFavouriteCartoonCharacters" status="stat">
-                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
-            </s:iterator>
-        </td>
-    </tr>
-    <tr>
-        <td>Prioritised Favourite Cars:</td>
-        <td>
-            <s:iterator value="prioritisedFavouriteCars" status="stat">
-                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
-            </s:iterator>
-        </td>   
-    </tr>
-    <tr>
-        <td>Prioritised Favourite Countries</td>
-        <td>
-            <s:iterator value="prioritisedFavouriteCountries" status="stat">
-                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
-            </s:iterator>
-        </td>
-    </tr>
-        <tr>
-        <td>Favourite Cities</td>
-        <td>
-            <s:iterator value="favouriteCities" status="stat">
-                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
-            </s:iterator>
-        </td>
-    </tr>
-        <tr>
-        <td>Favourite Numbers</td>
-        <td>
-            <s:iterator value="favouriteNumbers" status="stat">
-                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
-            </s:iterator>
-        </td>
-    </tr>
-    </table>
+<div class="page-header">
+	<h1>UI Tags - More Select Box UI Examples - Result</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
 
+			<table>
+			    <tr>
+			        <td>Prioritised Favourite Cartoon Characters:</td>
+			        <td>
+			            <s:iterator value="prioritisedFavouriteCartoonCharacters" status="stat">
+			                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
+			            </s:iterator>
+			        </td>
+			    </tr>
+			    <tr>
+			        <td>Prioritised Favourite Cars:</td>
+			        <td>
+			            <s:iterator value="prioritisedFavouriteCars" status="stat">
+			                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
+			            </s:iterator>
+			        </td>
+			    </tr>
+			    <tr>
+			        <td>Prioritised Favourite Countries</td>
+			        <td>
+			            <s:iterator value="prioritisedFavouriteCountries" status="stat">
+			                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
+			            </s:iterator>
+			        </td>
+			    </tr>
+			        <tr>
+			        <td>Favourite Cities</td>
+			        <td>
+			            <s:iterator value="favouriteCities" status="stat">
+			                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
+			            </s:iterator>
+			        </td>
+			    </tr>
+			        <tr>
+			        <td>Favourite Numbers</td>
+			        <td>
+			            <s:iterator value="favouriteNumbers" status="stat">
+			                <s:property value="%{#stat.count}" />.<s:property />&nbsp;
+			            </s:iterator>
+			        </td>
+			    </tr>
+		    </table>
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp Fri Oct 19 18:49:39 2012
@@ -1,22 +1,31 @@
-<%@ 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 - Timepicker Tag</title>
+	<sx:head extraLocales="en-us,nl-nl,de-de" />
 </head>
 <body>
-<table>
-<sx:datetimepicker label="toggleType='wipe'" type="time" value="%{'10:30'}" toggleType="wipe" toggleDuration="300"/>
-<sx:datetimepicker label="toggleType='explode'" type="time" value="%{'13:00'}" toggleType="explode" toggleDuration="500"/>
-<sx:datetimepicker label="toggleType='fade'" type="time" value="%{'13:00'}" toggleType="fade" toggleDuration="500"/>
-<sx:datetimepicker label="With value='today'" name="dddp4" type="time" value="%{'today'}" />
-<sx:datetimepicker label="US format, empty" name="dddp5" type="time" language="en-us" />
-<sx:datetimepicker label="US format, 13:00 hours" name="dddp6" type="time" value="%{'13:00'}" language="en-us" />
-<sx:datetimepicker label="In German" name="dddp7" type="time" value="%{'13:00'}" language="de" />
-<sx:datetimepicker label="In Dutch" name="dddp8" type="time" value="%{'13:00'}" language="nl" />
-</table>
+<div class="page-header">
+	<h1>UI Tags - Timepicker Tag</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<table>
+				<sx:datetimepicker label="toggleType='wipe'" type="time" value="%{'10:30'}" toggleType="wipe" toggleDuration="300"/>
+				<sx:datetimepicker label="toggleType='explode'" type="time" value="%{'13:00'}" toggleType="explode" toggleDuration="500"/>
+				<sx:datetimepicker label="toggleType='fade'" type="time" value="%{'13:00'}" toggleType="fade" toggleDuration="500"/>
+				<sx:datetimepicker label="With value='today'" name="dddp4" type="time" value="%{'today'}" />
+				<sx:datetimepicker label="US format, empty" name="dddp5" type="time" language="en-us" />
+				<sx:datetimepicker label="US format, 13:00 hours" name="dddp6" type="time" value="%{'13:00'}" language="en-us" />
+				<sx:datetimepicker label="In German" name="dddp7" type="time" value="%{'13:00'}" language="de" />
+				<sx:datetimepicker label="In Dutch" name="dddp8" type="time" value="%{'13:00'}" language="nl" />
+			</table>
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleAjaxDynamic.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleAjaxDynamic.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleAjaxDynamic.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleAjaxDynamic.jsp Fri Oct 19 18:49:39 2012
@@ -1,18 +1,25 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
 <html>
 <head>
-<title>Showcase - UI Tag Example - Tree Example (Dynamic)</title>
-<sx:head />
+	<title>Struts2 Showcase - UI Tags - Tree Example AJAX (Dynamic)</title>
+	<sx:head />
 </head>
 <body>
+<div class="page-header">
+	<h1>UI Tags - Tree Example AJAX (Dynamic)</h1>
+</div>
 
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
 
-<s:url var="nodesUrl" namespace="/nodecorate" action="getNodes" />
-<div style="float:left; margin-right: 50px;">
-    <sx:tree id="tree" href="%{#nodesUrl}" />
+			<s:url var="nodesUrl" namespace="/nodecorate" action="getNodes" />
+			<div style="float:left; margin-right: 50px;">
+			    <sx:tree id="tree" href="%{#nodesUrl}" />
+			</div>
+		</div>
+	</div>
 </div>
-
 </body>
 </html>
\ No newline at end of file

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp Fri Oct 19 18:49:39 2012
@@ -1,46 +1,54 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
 <html>
 <head>
-<title>Showcase - UI Tag Example - Tree Example (Dynamic)</title>
-<sx:head/>
+	<title>Struts2 Showcase - UI Tags - Tree Example (Dynamic)</title>
+	<sx:head/>
 </head>
 <body>
+<div class="page-header">
+	<h1>UI Tags - Tree Example (Dynamic)</h1>
+</div>
 
-<!-- START SNIPPET: treeExampleDynamicJsp -->
-
-<script language="JavaScript" type="text/javascript">
-    dojo.event.topic.subscribe("treeSelected", function treeNodeSelected(node) {
-        dojo.io.bind({
-            url: "<s:url value='/tags/ui/ajax/dynamicTreeSelectAction.action'/>?nodeId="+node.node.widgetId,
-            load: function(type, data, evt) {
-                var divDisplay = dojo.byId("displayId");
-                divDisplay.innerHTML=data;
-            },
-            mimeType: "text/html"
-        });
-    });
-</script>
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<!-- START SNIPPET: treeExampleDynamicJsp -->
+
+			<script language="JavaScript" type="text/javascript">
+			    dojo.event.topic.subscribe("treeSelected", function treeNodeSelected(node) {
+			        dojo.io.bind({
+			            url: "<s:url value='/tags/ui/ajax/dynamicTreeSelectAction.action'/>?nodeId="+node.node.widgetId,
+			            load: function(type, data, evt) {
+			                var divDisplay = dojo.byId("displayId");
+			                divDisplay.innerHTML=data;
+			            },
+			            mimeType: "text/html"
+			        });
+			    });
+			</script>
 
 
 
-<div style="float:left; margin-right: 50px;">
-<sx:tree 
-    id="tree"
-    rootNode="%{treeRootNode}" 
-    childCollectionProperty="children" 
-    nodeIdProperty="id"
-    nodeTitleProperty="name"
-    treeSelectedTopic="treeSelected">
-</sx:tree> 
+			<div style="float:left; margin-right: 50px;">
+			<sx:tree
+			    id="tree"
+			    rootNode="%{treeRootNode}"
+			    childCollectionProperty="children"
+			    nodeIdProperty="id"
+			    nodeTitleProperty="name"
+			    treeSelectedTopic="treeSelected">
+			</sx:tree>
+			</div>
+
+			<div id="displayId">
+			Please click on any of the tree nodes.
+			</div>
+
+			<!-- END SNIPPET: treeExampleDynamicJsp -->
+		</div>
+	</div>
 </div>
-
-<div id="displayId">
-Please click on any of the tree nodes.
-</div>
-
-<!-- END SNIPPET: treeExampleDynamicJsp -->
-
 </body>
 </html>
\ No newline at end of file

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp Fri Oct 19 18:49:39 2012
@@ -2,51 +2,60 @@
 <%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
 <html>
 <head>
-<title>Showcase - UI Tag Example - Tree Example (Static)</title>
+	<title>Struts2 Showcase - UI Tags - Tree Example (Static)</title>
 <sx:head/>
 </head>
 <body>
-
-<!-- START SNIPPET: treeExampleStaticJsp -->
-
-<script language="JavaScript" type="text/javascript">
-    dojo.event.topic.subscribe("treeSelected", function treeNodeSelected(node) {
-        dojo.io.bind({
-            url: "<s:url value='/tags/ui/ajax/staticTreeSelectAction.action'/>?nodeId="+node.node.title,
-            load: function(type, data, evt) {
-                var divDisplay = dojo.byId("displayIt");
-                divDisplay.innerHTML=data;
-            },
-            mimeType: "text/html"
-        });
-    });
-</script>
-
-
-<div style="float:left; margin-right: 50px;">
-<sx:tree label="parent"  templateCssPath="/struts/tree.css" 
-showRootGrid="true" showGrid="true" treeSelectedTopic="treeSelected">
-    <sx:treenode label="child1" >
-        <sx:treenode label="grandchild1" id="grandchild1Id"/>
-        <sx:treenode label="grandchild2" id="grandchild2Id"/>
-        <sx:treenode label="grandchild3" id="grandchild3Id"/>
-    </sx:treenode>
-    <sx:treenode label="child2" id="child2Id"/>
-    <sx:treenode label="child3" id="child3Id"/>
-    <sx:treenode label="child4" id="child4Id"/>
-    <sx:treenode label="child5" id="child5Id">
-        <sx:treenode label="gChild1" id="gChild1Id"/>
-        <sx:treenode label="gChild2" id="gChild2Id"/>
-    </sx:treenode>
-</sx:tree>
+<div class="page-header">
+	<h1>UI Tags - Tree Example (Static)</h1>
 </div>
 
-
-<div id="displayIt">
-Please click on any node on the tree.
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<!-- START SNIPPET: treeExampleStaticJsp -->
+
+			<script language="JavaScript" type="text/javascript">
+			    dojo.event.topic.subscribe("treeSelected", function treeNodeSelected(node) {
+			        dojo.io.bind({
+			            url: "<s:url value='/tags/ui/ajax/staticTreeSelectAction.action'/>?nodeId="+node.node.title,
+			            load: function(type, data, evt) {
+			                var divDisplay = dojo.byId("displayIt");
+			                divDisplay.innerHTML=data;
+			            },
+			            mimeType: "text/html"
+			        });
+			    });
+			</script>
+
+
+			<div style="float:left; margin-right: 50px;">
+			<sx:tree label="parent"  templateCssPath="/struts/tree.css"
+			showRootGrid="true" showGrid="true" treeSelectedTopic="treeSelected">
+			    <sx:treenode label="child1" >
+			        <sx:treenode label="grandchild1" id="grandchild1Id"/>
+			        <sx:treenode label="grandchild2" id="grandchild2Id"/>
+			        <sx:treenode label="grandchild3" id="grandchild3Id"/>
+			    </sx:treenode>
+			    <sx:treenode label="child2" id="child2Id"/>
+			    <sx:treenode label="child3" id="child3Id"/>
+			    <sx:treenode label="child4" id="child4Id"/>
+			    <sx:treenode label="child5" id="child5Id">
+			        <sx:treenode label="gChild1" id="gChild1Id"/>
+			        <sx:treenode label="gChild2" id="gChild2Id"/>
+			    </sx:treenode>
+			</sx:tree>
+			</div>
+
+
+			<div id="displayIt">
+			Please click on any node on the tree.
+			</div>
+
+			<!-- END SNIPPET: treeExampleStaticJsp  -->
+		</div>
+	</div>
 </div>
-
-<!-- END SNIPPET: treeExampleStaticJsp  -->
-
 </body>
 </html>
\ No newline at end of file

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.ftl?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.ftl (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.ftl Fri Oct 19 18:49:39 2012
@@ -1,10 +1,16 @@
-<div>
-    <p>This example illustrates the freemarker support in the Struts/Tiles Plugin.</p>
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+			<div>
+				<p>This example illustrates the freemarker support in the Struts/Tiles Plugin.</p>
 
-    <p>Tiles 2 is an effort to extract the Tiles library from Struts. It is currently housed
-        in the Sandbox area of the Apache Struts Subversion repository.</p>
+				<p>Tiles 2 is an effort to extract the Tiles library from Struts. It is currently housed
+					in the Sandbox area of the Apache Struts Subversion repository.</p>
 
-    <@s.form>
-      <@s.textfield name="Textfield" value="Textfield"/>
-    </@s.form>
+				<@s.form>
+					<@s.textfield name="Textfield" value="Textfield"/>
+				</@s.form>
+			</div>
+		</div>
+	</div>
 </div>
\ No newline at end of file

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.jsp Fri Oct 19 18:49:39 2012
@@ -1,18 +1,24 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
-<div>
-    <p>This example illustrates the Struts/Tiles Plugin.</p>
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+			<div>
+				<p>This example illustrates the Struts/Tiles Plugin.</p>
 
-    <p>Tiles 2 is an effort to extract the Tiles library from Struts. It is currently housed
-        in the Sandbox area of the Apache Struts Subversion repository.</p>
+				<p>Tiles 2 is an effort to extract the Tiles library from Struts. It is currently housed
+					in the Sandbox area of the Apache Struts Subversion repository.</p>
 
-    <h4>Features</h4>
-    <ul>
-        <li>
-            <a href="freemarker.action">View FreeMarker Example</a>
-        </li>
-        <li>
-            <a href="freemarkerLayout.action">View Example with a FreeMarker Layout</a>
-        </li>
-    </ul>
+				<h4>Features</h4>
+				<ul>
+					<li>
+						<a href="freemarker.action">View FreeMarker Example</a>
+					</li>
+					<li>
+						<a href="freemarkerLayout.action">View Example with a FreeMarker Layout</a>
+					</li>
+				</ul>
 
+			</div>
+		</div>
+	</div>
 </div>
\ No newline at end of file

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/header.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/header.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/header.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/header.jsp Fri Oct 19 18:49:39 2012
@@ -1 +1,3 @@
-<h1>${title}</h1>
+<div class="page-header">
+	<h1>${title}</h1>
+</div>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl Fri Oct 19 18:49:39 2012
@@ -1,12 +1,10 @@
 <#assign tiles=JspTaglibs["http://tiles.apache.org/tags-tiles"]>
 <@tiles.importAttribute name="title" scope="request"/>
 <html>
-    <head><title><@tiles.getAsString name="title"/></title></head>
+    <head><title>Struts2 Showcase - <@tiles.getAsString name="title"/></title></head>
 <body>
     <@tiles.insertAttribute name="header"/>
-    <p id="body">
-        <@tiles.insertAttribute name="body"/>
-    </p>
+    <@tiles.insertAttribute name="body"/>
 	<p>Notice that this is a layout made in FreeMarker</p>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.jsp Fri Oct 19 18:49:39 2012
@@ -4,14 +4,10 @@
 <%-- Show usage; Used in Header --%>
 <tiles:importAttribute name="title" scope="request"/>
 <html>
-    <head><title><tiles:getAsString name="title"/></title></head>
+    <head><title>Struts2 Showcase - <tiles:getAsString name="title"/></title></head>
 <body>
     <tiles:insertAttribute name="header"/>
-
-    <p id="body">
-        <tiles:insertAttribute name="body"/>
-    </p>
-
+    <tiles:insertAttribute name="body"/>
 	<p>Notice that this is a layout made in JSP</p>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/token/doublePost.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/token/doublePost.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/token/doublePost.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/token/doublePost.jsp Fri Oct 19 18:49:39 2012
@@ -1,15 +1,28 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
 <head>
+	<title>Struts2 Showcase - Token Examples - Double post</title>
 </head>
 
 <body>
-    <p style="border: 1px solid silver; padding: 5px; background: #ffd; text-align: center;">
-      Double post. Struts intercepted this request and prevents the action from executing again.
-    </p>
+<div class="page-header">
+	<h1>Token Examples - Double post</h1>
+</div>
 
-    <p/>
-    Click here to <s:url var="back" value="/token"/><s:a href="%{back}">return</s:a>.
 
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<p class="alert alert-warning">
+				Double post. Struts intercepted this request and prevents the action from executing again.
+			</p>
+
+			<p/>
+			Click here to
+			<s:url var="back" value="/token/index.jsp"/><s:a href="%{back}">return</s:a>.
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/token/example1.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/token/example1.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/token/example1.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/token/example1.jsp Fri Oct 19 18:49:39 2012
@@ -1,24 +1,50 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
+<head>
+	<title>Struts2 Showcase - Token Examples - Example 1</title>
+</head>
+
+<body>
+<div class="page-header">
+	<h1>Token Examples - Example 1</h1>
+</div>
+
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<p>
+			<b>Example 1:</b> This example illustrates a situation where you can transfer money from
+			one account to another. We use the token to prevent double posts so the transfer only
+			happens once.
+			<p/>
+
+			<p>
+			<br/>Balance of source account: <s:property value="#session.balanceSource"/>
+			<br/>Balance of destination account: <s:property value="#session.balanceDestination"/>
+			<p/>
+
+			<s:form action="transfer">
+				<s:token/>
+				<s:textfield label="Amount" name="amount" required="true" value="100"/>
+				<s:submit value="Transfer money" cssClass="btn btn-primary"/>
+			</s:form>
+
+		</div>
+	</div>
+</div>
+</body>
+</html>
+
+
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
     <head><title>Token Examples</title></head>
 
 <body>
     <h1>Token Example 1</h1>
 
-    <b>Example 1:</b> This example illustrates a situation where you can transfer money from
-    one account to another. We use the token to prevent double posts so the transfer only
-    happens once.
-    <p/>
-
-    <br/>Balance of source account: <s:property value="#session.balanceSource"/>
-    <br/>Balance of destination account: <s:property value="#session.balanceDestination"/>
-    <p/>
-
-    <s:form action="transfer">
-        <s:token/>
-        <s:textfield label="Amount" name="amount" required="true" value="100"/>
-        <s:submit value="Transfer money"/>
-    </s:form>
 
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/token/example2.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/token/example2.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/token/example2.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/token/example2.jsp Fri Oct 19 18:49:39 2012
@@ -1,24 +1,38 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
-    <head><title>Token Examples</title></head>
+<head>
+	<title>Struts2 Showcase - Token Examples - Example 2</title>
+</head>
 
 <body>
-    <h1>Token Example 2</h1>
+<div class="page-header">
+	<h1>Token Examples - Example 2</h1>
+</div>
 
-    <b>Example 2:</b> This example illustrates a situation where you can transfer money from
-    one account to another. We use the token to prevent double posts so the transfer only
-    happens once. This action will redirect after you have submitted the form.
-    <p/>
-
-    <br/>Balance of source account: <s:property value="#session.balanceSource"/>
-    <br/>Balance of destination account: <s:property value="#session.balanceDestination"/>
-    <p/>
-
-    <s:form action="transfer2">
-        <s:token/>
-        <s:textfield label="Amount" name="amount" required="true" value="200"/>
-        <s:submit value="Transfer money"/>
-    </s:form>
 
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<p>
+				<b>Example 2:</b> This example illustrates a situation where you can transfer money from
+				one account to another. We use the token to prevent double posts so the transfer only
+				happens once. This action will redirect after you have submitted the form.
+			<p/>
+
+			<p>
+				Balance of source account: <s:property value="#session.balanceSource"/>
+			<br/>Balance of destination account: <s:property value="#session.balanceDestination"/>
+			<p/>
+
+			<s:form action="transfer2">
+				<s:token/>
+				<s:textfield label="Amount" name="amount" required="true" value="200"/>
+				<s:submit value="Transfer money" cssClass="btn btn-primary"/>
+			</s:form>
+
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/token/example3.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/token/example3.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/token/example3.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/token/example3.jsp Fri Oct 19 18:49:39 2012
@@ -1,24 +1,37 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
-    <head><title>Token Examples</title></head>
+<head>
+	<title>Struts2 Showcase - Token Examples - Example 3</title>
+</head>
 
 <body>
-    <h1>Token Example 3</h1>
+<div class="page-header">
+	<h1>Token Examples - Example 3</h1>
+</div>
 
-    <b>Example 3:</b> This example illustrates a situation where you can transfer money from
-    one account to another. We use the token to prevent double posts so the transfer only
-    happens once. This example uses the token session based interceptor and redirect after post.
-    <p/>
-
-    <br/>Balance of source account: <s:property value="#session.balanceSource"/>
-    <br/>Balance of destination account: <s:property value="#session.balanceDestination"/>
-    <p/>
-
-    <s:form action="transfer3">
-        <s:token/>
-        <s:textfield label="Amount" name="amount" required="true" value="300"/>
-        <s:submit value="Transfer money"/>
-    </s:form>
 
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<p>
+				<b>Example 3:</b> This example illustrates a situation where you can transfer money from
+				one account to another. We use the token to prevent double posts so the transfer only
+				happens once. This example uses the token session based interceptor and redirect after post.
+			<p/>
+
+			<p>Balance of source account: <s:property value="#session.balanceSource"/>
+			<br/>Balance of destination account: <s:property value="#session.balanceDestination"/>
+			<p/>
+
+			<s:form action="transfer3">
+				<s:token/>
+				<s:textfield label="Amount" name="amount" required="true" value="300"/>
+				<s:submit value="Transfer money" cssClass="btn btn-primary"/>
+			</s:form>
+
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/token/example4.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/token/example4.ftl?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/token/example4.ftl (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/token/example4.ftl Fri Oct 19 18:49:39 2012
@@ -1,26 +1,40 @@
 <html>
-    <head><title>Token Examples</title></head>
+<head>
+	<title>Struts2 Showcase - Token Examples - Example 4</title>
+</head>
 
 <body>
-    <h1>Token Example 4</h1>
+<div class="page-header">
+	<h1>Token Examples - Example 4</h1>
+</div>
 
-    <b>Example 4:</b> This example illustrates a situation where you can transfer money from
-    one account to another. We use the token to prevent double posts so the transfer only
-    happens once. This page is rendered using freemarker. See the xwork-token.xml where
-    we must also use the createSession interceptor to be sure that a HttpSession exists
-    when freemarker renders this webpage, otherwise the @s.token tag causes an exception
-    while rendering the page.
-    <p/>
-
-    <br/>Balance of source account: <@s.property value="#session.balanceSource"/>
-    <br/>Balance of destination account: <@s.property value="#session.balanceDestination"/>
-    <p/>
-
-    <@s.form action="transfer4">
-        <@s.token/>
-        <@s.textfield label="Amount" name="amount" required="true" value="400"/>
-        <@s.submit value="Transfer money"/>
-    </@s.form>
 
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<p>
+				<b>Example 4:</b> This example illustrates a situation where you can transfer money from
+				one account to another. We use the token to prevent double posts so the transfer only
+				happens once. This page is rendered using freemarker. See the xwork-token.xml where
+				we must also use the createSession interceptor to be sure that a HttpSession exists
+				when freemarker renders this webpage, otherwise the @s.token tag causes an exception
+				while rendering the page.
+
+			<p/>
+
+			<p>Balance of source account: <@s.property value="#session.balanceSource"/>
+				<br/>Balance of destination account: <@s.property value="#session.balanceDestination"/>
+
+			<p/>
+
+		<@s.form action="transfer4">
+			<@s.token/>
+			<@s.textfield label="Amount" name="amount" required="true" value="400"/>
+			<@s.submit value="Transfer money" cssClass="btn btn-primary"/>
+		</@s.form>
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/token/index.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/token/index.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/token/index.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/token/index.jsp Fri Oct 19 18:49:39 2012
@@ -1,33 +1,48 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
-    <head><title>Token Examples (double post)</title></head>
+<head>
+	<title>Struts2 Showcase - Token Examples (double post)</title>
+</head>
 
 <body>
-    <h1>Token Examples</h1>
-
-    These examples illustrate Struts build in support of using tokens to prevent double post.
-    <p/>
-    You have a web page where user can input data and press a button to submit.
-    There could be a problem that the user submit the data many times, by either clicking the
-    button many times, or use the browser back button and then submit the form again.
-    <br/> A good solution is to use a hidden token in the form. The token is autogenerated and unique
-    from time to time. This token is then validated with the HttpSession that it is the first time
-    it is submitted, if not we have a double post and therefore can prevent the second submit action.
-    <p/>
-    For more information check out javadoc for org.apache.struts2.interceptor.TokenInterceptor
-    and org.apache.struts2.interceptor.TokenSessionStoreInterceptor.
-
-    <br/>
-    <br/><a href="tokenPrepare!input.action">Example 1 (token based .jsp example)</a>
-
-    <br/>
-    <br/><a href="tokenPrepare2!input.action">Example 2 (as example 1 with redirect after post)</a>
-
-    <br/>
-    <br/><a href="tokenPrepare3!input.action">Example 3 (token-session based .jsp example)</a>
-
-    <br/>
-    <br/><a href="tokenPrepare4!input.action">Example 4 (token based freemarker example)</a>
-
+<div class="page-header">
+	<h1>Token Examples</h1>
+</div>
+
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12" style="text-align: center;">
+
+			<p>
+				These examples illustrate Struts build in support of using tokens to prevent double post.
+			<p/>
+			<p>
+			You have a web page where user can input data and press a button to submit.
+			There could be a problem that the user submit the data many times, by either clicking the
+			button many times, or use the browser back button and then submit the form again.
+			<br/> A good solution is to use a hidden token in the form. The token is autogenerated and unique
+			from time to time. This token is then validated with the HttpSession that it is the first time
+			it is submitted, if not we have a double post and therefore can prevent the second submit action.
+			<p/>
+			<p>
+			For more information check out javadoc for org.apache.struts2.interceptor.TokenInterceptor
+			and org.apache.struts2.interceptor.TokenSessionStoreInterceptor.
+			<p/>
+
+			<br/>
+			<br/><a href="tokenPrepare!input.action">Example 1 (token based .jsp example)</a>
+
+			<br/>
+			<br/><a href="tokenPrepare2!input.action">Example 2 (as example 1 with redirect after post)</a>
+
+			<br/>
+			<br/><a href="tokenPrepare3!input.action">Example 3 (token-session based .jsp example)</a>
+
+			<br/>
+			<br/><a href="tokenPrepare4!input.action">Example 4 (token based freemarker example)</a>
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/token/transferDone.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/token/transferDone.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/token/transferDone.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/token/transferDone.jsp Fri Oct 19 18:49:39 2012
@@ -1,25 +1,48 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
-    <head><title>Token Examples (double post)</title></head>
+<head>
+	<title>Struts2 Showcase - Token Examples - Transfer is Done</title>
+</head>
 
 <body>
-    <h1>Token Examples</h1>
-
-    The transfer is done at <s:text name="token.transfer.time"><s:param value="#session.time"/></s:text>
-
-    <br/>New balance of source account: <s:property value="#session.balanceSource"/>
-    <br/>New balance of destination account: <s:property value="#session.balanceDestination"/>
-
-    <p/>
-    Try using the browser back button and submit the form again. This should result in a double post
-    that Struts should intercept and handle accordingly.
-    <p/>
-    For example 3 (session token) you should notice that the date/time stays the same. This interceptor
-    catches that this is a double post but doens't display the double post page, but just renders the
-    web page result from the first post. 
-
-    <p/>
-    Click here to <s:url var="back" value="/token"/><s:a href="%{back}">return</s:a>.
-
+<div class="page-header">
+	<h1>Token Examples - Transfer is Done</h1>
+</div>
+
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<p>
+				The transfer is done at
+				<s:text name="token.transfer.time">
+					<s:param value="#session.time"/>
+				</s:text>
+
+				<br/>New balance of source account:
+				<s:property value="#session.balanceSource"/>
+				<br/>New balance of destination account:
+				<s:property value="#session.balanceDestination"/>
+
+			<p/>
+
+			<p>
+				Try using the browser back button and submit the form again. This should result in a double post
+				that Struts should intercept and handle accordingly.
+
+			<p/>
+
+			<p>
+				For example 3 (session token) you should notice that the date/time stays the same. This interceptor
+				catches that this is a double post but doens't display the double post page, but just renders the
+				web page result from the first post.
+
+			<p/>
+			Click here to
+			<s:url var="back" value="/token/index.jsp"/><s:a href="%{back}">return</s:a>.
+		</div>
+	</div>
+</div>
 </body>
-</html>
+</html>
\ No newline at end of file

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp Fri Oct 19 18:49:39 2012
@@ -8,48 +8,57 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
 
 <html>
-    <head>
-        <title>Showcase - Validation - Field Validators Example</title>
-        <s:url var="siteCss" includeContext="true" value="/validation/validationExamplesStyles.css" />
-        <s:head />
-        <!--  link rel="stylesheet" type="text/css" href='<s:property value="%{siteCss}" />'-->
-    </head>
-    <body>
-
-    <!-- START SNIPPET: fieldValidatorsExample -->
-
-        <h3>All Field Errors Will Appear Here</h3>
-        <s:fielderror />
-        <hr/>
-
-        <h3>Field Error due to 'Required String Validator Field' Will Appear Here</h3>
-        <s:fielderror>
-            <s:param value="%{'requiredStringValidatorField'}" />
-        </s:fielderror>
-        <hr/>
-
-        <h3>Field Error due to 'String Length Validator Field' Will Appear Here</h3>
-        <s:fielderror>
-            <s:param>stringLengthValidatorField</s:param>
-        </s:fielderror>
-        <hr/>
-
-        <s:form action="submitClientSideValidationExample" namespace="/validation" method="POST" validate="true">
-            <s:textfield label="Required Validator Field" name="requiredValidatorField" />
-            <s:textfield label="Required String Validator Field" name="requiredStringValidatorField" />
-            <s:textfield label="Integer Validator Field" name="integerValidatorField" />
-            <s:textfield label="Date Validator Field" name="dateValidatorField" />
-            <s:textfield label="Email Validator Field" name="emailValidatorField" />
-            <s:textfield label="URL Validator Field" name="urlValidatorField" />
-            <s:textfield label="String Length Validator Field" name="stringLengthValidatorField" />
-            <s:textfield label="Regex Validator Field" name="regexValidatorField"/>
-            <s:textfield label="Field Expression Validator Field" name="fieldExpressionValidatorField" />
-            <s:submit label="Submit" />
-        </s:form>
-
-    <!-- END SNIPPET: fieldValidatorsExample -->
-
-
-        <s:include value="footer.jsp" />
-    </body>
+<head>
+	<title>Struts2 Showcase - Validation - Field Validators Example</title>
+	<s:head/>
+</head>
+<body>
+
+<div class="page-header">
+	<h1>Client Side Validation Examples</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<!-- START SNIPPET: fieldValidatorsExample -->
+
+			<h3>All Field Errors Will Appear Here</h3>
+			<s:fielderror/>
+			<hr/>
+
+			<h3>Field Error due to 'Required String Validator Field' Will Appear Here</h3>
+			<s:fielderror>
+				<s:param value="%{'requiredStringValidatorField'}"/>
+			</s:fielderror>
+			<hr/>
+
+			<h3>Field Error due to 'String Length Validator Field' Will Appear Here</h3>
+			<s:fielderror>
+				<s:param>stringLengthValidatorField</s:param>
+			</s:fielderror>
+			<hr/>
+
+			<s:form action="submitClientSideValidationExample" namespace="/validation" method="POST" validate="true">
+				<s:textfield label="Required Validator Field" name="requiredValidatorField"/>
+				<s:textfield label="Required String Validator Field" name="requiredStringValidatorField"/>
+				<s:textfield label="Integer Validator Field" name="integerValidatorField"/>
+				<s:textfield label="Date Validator Field" name="dateValidatorField"/>
+				<s:textfield label="Email Validator Field" name="emailValidatorField"/>
+				<s:textfield label="URL Validator Field" name="urlValidatorField"/>
+				<s:textfield label="String Length Validator Field" name="stringLengthValidatorField"/>
+				<s:textfield label="Regex Validator Field" name="regexValidatorField"/>
+				<s:textfield label="Field Expression Validator Field" name="fieldExpressionValidatorField"/>
+				<s:submit label="Submit" cssClass="btn btn-primary"/>
+			</s:form>
+
+			<!-- END SNIPPET: fieldValidatorsExample -->
+
+
+			<s:include value="footer.jsp"/>
+		</div>
+	</div>
+</div>
+</body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp Fri Oct 19 18:49:39 2012
@@ -8,48 +8,55 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
 
 <html>
-    <head>
-        <title>Showcase - Validation - Field Validators Example</title>
-        <s:url var="siteCss" includeContext="true" value="/validation/validationExamplesStyles.css" />
-        <s:head theme="xhtml"/>
-        <!--  link rel="stylesheet" type="text/css" href='<s:property value="%{siteCss}" />'-->
-    </head>
-    <body>
-    
-    <!-- START SNIPPET: fieldValidatorsExample -->
-    
-        <h3>All Field Errors Will Appear Here</h3>
-        <s:fielderror />
-        <hr/>
-        
-        <h3>Field Error due to 'Required String Validator Field' Will Appear Here</h3>
-        <s:fielderror>
-            <s:param value="%{'requiredStringValidatorField'}" />
-        </s:fielderror>
-        <hr/>
-        
-        <h3>Field Error due to 'String Length Validator Field' Will Appear Here</h3>
-        <s:fielderror>
-            <s:param>stringLengthValidatorField</s:param>
-        </s:fielderror>
-        <hr/>
-    
-        <s:form action="submitFieldValidatorsExamples" namespace="/validation" method="POST" theme="xhtml">
-            <s:textfield label="Required Validator Field" name="requiredValidatorField" />
-            <s:textfield label="Required String Validator Field" name="requiredStringValidatorField" />
-            <s:textfield label="Integer Validator Field" name="integerValidatorField" />
-            <s:textfield label="Date Validator Field" name="dateValidatorField" />
-            <s:textfield label="Email Validator Field" name="emailValidatorField" />
-            <s:textfield label="URL Validator Field" name="urlValidatorField" />
-            <s:textfield label="String Length Validator Field" name="stringLengthValidatorField" />
-            <s:textfield label="Regex Validator Field" name="regexValidatorField"/>
-            <s:textfield label="Field Expression Validator Field" name="fieldExpressionValidatorField" />
-            <s:submit label="Submit" />
-        </s:form>
-        
-    <!-- END SNIPPET: fieldValidatorsExample -->
-        
-        
-        <s:include value="footer.jsp" />
-    </body>
+<head>
+	<title>Struts2 Showcase - Validation - Field Validators Example</title>
+	<s:head theme="xhtml"/>
+</head>
+<body>
+
+<div class="page-header">
+	<h1>Field Validation Examples</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<h3>All Field Errors Will Appear Here</h3>
+			<s:fielderror/>
+			<hr/>
+
+			<h3>Field Error due to 'Required String Validator Field' Will Appear Here</h3>
+			<s:fielderror>
+				<s:param value="%{'requiredStringValidatorField'}"/>
+			</s:fielderror>
+			<hr/>
+
+			<h3>Field Error due to 'String Length Validator Field' Will Appear Here</h3>
+			<s:fielderror>
+				<s:param>stringLengthValidatorField</s:param>
+			</s:fielderror>
+			<hr/>
+
+			<s:form action="submitFieldValidatorsExamples" namespace="/validation" method="POST" theme="xhtml">
+				<s:textfield label="Required Validator Field" name="requiredValidatorField"/>
+				<s:textfield label="Required String Validator Field" name="requiredStringValidatorField"/>
+				<s:textfield label="Integer Validator Field" name="integerValidatorField"/>
+				<s:textfield label="Date Validator Field" name="dateValidatorField"/>
+				<s:textfield label="Email Validator Field" name="emailValidatorField"/>
+				<s:textfield label="URL Validator Field" name="urlValidatorField"/>
+				<s:textfield label="String Length Validator Field" name="stringLengthValidatorField"/>
+				<s:textfield label="Regex Validator Field" name="regexValidatorField"/>
+				<s:textfield label="Field Expression Validator Field" name="fieldExpressionValidatorField"/>
+				<s:submit label="Submit" cssClass="btn btn-primary"/>
+			</s:form>
+
+			<!-- END SNIPPET: fieldValidatorsExample -->
+
+
+			<s:include value="footer.jsp"/>
+		</div>
+	</div>
+</div>
+</body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/footer.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/footer.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/footer.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/footer.jsp Fri Oct 19 18:49:39 2012
@@ -5,5 +5,4 @@
 <s:url var="backToValidationExamples" action="list" namespace="/validation" />
 <s:url var="backToShowCase" action="showcase" namespace="/" />
         
-<s:a href="%{backToValidationExamples}">Back To Validation Examples</s:a>&nbsp;
-<s:a href="%{backToShowCase}">Back To Showcase</s:a>
+<s:a href="%{backToValidationExamples}" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back To Validation Examples</s:a>



Mime
View raw message