struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r1400220 [9/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/validation/index.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/index.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/index.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/index.jsp Fri Oct 19 18:49:39 2012
@@ -8,35 +8,44 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
 
 <html>
-    <head>
-        <title>Showcase - Validation</title>
-    </head>
-    <body>
-        <h1>Validation Examples</h1>
-        
-        <s:url var="quizBasic" namespace="/validation" action="quizBasic" method="input"/>
-        <s:url var="quizClient" namespace="/validation" action="quizClient" method="input"/>
-        <s:url var="quizClientCss" namespace="/validation" action="quizClientCss" method="input"/>
-        <s:url var="quizAjax" namespace="/validation" action="quizAjax" method="input"/>
-        <s:url var="fieldValidatorUrl" action="showFieldValidatorsExamples" namespace="/validation" />
-        <s:url var="nonFieldValidatorUrl" action="showNonFieldValidatorsExamples" namespace="/validation" />
-        <s:url var="visitorValidatorUrl" action="showVisitorValidatorsExamples" namespace="/validation" />
-        <s:url var="clientSideValidationUrl" action="clientSideValidationExample" namespace="/validation" />
-        <s:url var="backToShowcase" action="showcase" namespace="/" />
-        <s:url var="storeMessageAcrossRequestExample" value="/validation/storeErrorsAcrossRequestExample.jsp" />
-        
-        <ul>
-            <li><s:a href="%{fieldValidatorUrl}">Field Validators</s:a></li>
-            <li><s:a href="%{clientSideValidationUrl}">Field Validators with client-side JavaScript</s:a></li>
-            <li><s:a href="%{nonFieldValidatorUrl}">Non Field Validator</s:a></li>
-            <li><s:a href="%{storeMessageAcrossRequestExample}">Store across request using MessageStoreInterceptor (Example)</s:a></li>
-            <li><s:a href="%{quizAjax}">Validation (ajax)</s:a></li>
-            <li><s:a href="%{quizBasic}">Validation (basic)</s:a></li>
-            <li><s:a href="%{quizClient}">Validation (client)</s:a></li>
-            <li><s:a href="%{quizClientCss}">Validation (client using css_xhtml theme)</s:a></li>
-            <li><s:a href="%{visitorValidatorUrl}">Visitor Validator</s:a></li>
-            <li><s:a href="%{backToShowcase}">Back To Showcase</s:a>
-        </ul>
-    </body>
+<head>
+	<title>Struts2 Showcase - Validation</title>
+</head>
+<body>
+
+<div class="page-header">
+	<h1>Validation Examples</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<s:url var="quizBasic" namespace="/validation" action="quizBasic" method="input"/>
+			<s:url var="quizClient" namespace="/validation" action="quizClient" method="input"/>
+			<s:url var="quizClientCss" namespace="/validation" action="quizClientCss" method="input"/>
+			<s:url var="quizAjax" namespace="/validation" action="quizAjax" method="input"/>
+			<s:url var="fieldValidatorUrl" action="showFieldValidatorsExamples" namespace="/validation"/>
+			<s:url var="nonFieldValidatorUrl" action="showNonFieldValidatorsExamples" namespace="/validation"/>
+			<s:url var="visitorValidatorUrl" action="showVisitorValidatorsExamples" namespace="/validation"/>
+			<s:url var="clientSideValidationUrl" action="clientSideValidationExample" namespace="/validation"/>
+			<s:url var="backToShowcase" action="showcase" namespace="/"/>
+			<s:url var="storeMessageAcrossRequestExample" value="/validation/storeErrorsAcrossRequestExample.jsp"/>
+
+			<ul>
+				<li><s:a href="%{fieldValidatorUrl}">Field Validators</s:a></li>
+				<li><s:a href="%{clientSideValidationUrl}">Field Validators with client-side JavaScript</s:a></li>
+				<li><s:a href="%{nonFieldValidatorUrl}">Non Field Validator</s:a></li>
+				<li><s:a href="%{storeMessageAcrossRequestExample}">Store across request using MessageStoreInterceptor (Example)</s:a></li>
+				<li><s:a href="%{quizAjax}">Validation (ajax)</s:a></li>
+				<li><s:a href="%{quizBasic}">Validation (basic)</s:a></li>
+				<li><s:a href="%{quizClient}">Validation (client)</s:a></li>
+				<li><s:a href="%{quizClientCss}">Validation (client using css_xhtml theme)</s:a></li>
+				<li><s:a href="%{visitorValidatorUrl}">Visitor Validator</s:a></li>
+			</ul>
+		</div>
+	</div>
+</div>
+</body>
 </html>
 

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp Fri Oct 19 18:49:39 2012
@@ -9,30 +9,38 @@
 <%@taglib prefix="s" uri="/struts-tags" %>
 
 <html>
-    <head>
-        <title>Showcase - Validation - Non Field Validator Example</title>
-        <s:url var="siteCss" value="/validation/validationExamplesStyles.css" includeContext="true" />
-        <s:head />
-        <!-- link rel="stylesheet" type="text/css" href='<s:property value="%{siteCss}" />'-->
-    </head>
-    <body>
-    
-       
-       <!-- START SNIPPET: nonFieldValidatorsExample -->
-        <s:actionerror />
-    
-        <s:form method="POST" action="submitNonFieldValidatorsExamples" namespace="/validation">
-            <s:textfield name="someText" label="Some Text" />
-            <s:textfield name="someTextRetype" label="Retype Some Text" />  
-            <s:textfield name="someTextRetypeAgain" label="Retype Some Text Again" />
-            <s:submit label="Submit" />
-        </s:form>
-        
-        
-        <!--  END SNIPPET: nonFieldValidatorsExample -->
-        
-        
-        <s:include value="footer.jsp" />
-    </body>
+<head>
+	<title>Struts2 Showcase - Validation - Non Field Validator Example</title>
+	<s:head/>
+</head>
+<body>
+
+<div class="page-header">
+	<h1>Non Field Validator Example</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<!-- START SNIPPET: nonFieldValidatorsExample -->
+			<s:actionerror/>
+
+			<s:form method="POST" action="submitNonFieldValidatorsExamples" namespace="/validation">
+				<s:textfield name="someText" label="Some Text"/>
+				<s:textfield name="someTextRetype" label="Retype Some Text"/>
+				<s:textfield name="someTextRetypeAgain" label="Retype Some Text Again"/>
+				<s:submit label="Submit" cssClass="btn btn-primary"/>
+			</s:form>
+
+
+			<!--  END SNIPPET: nonFieldValidatorsExample -->
+
+
+			<s:include value="footer.jsp"/>
+		</div>
+	</div>
+</div>
+</body>
 </html>
 

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-ajax.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-ajax.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-ajax.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-ajax.jsp Fri Oct 19 18:49:39 2012
@@ -5,85 +5,100 @@
 
 <html>
 <head>
-    <title>Validation - Ajax</title>
-    <sx:head cache="true" compressed="true"/>
+	<title>Struts2 Showcase - Validation - Ajax</title>
+	<sx:head cache="true" compressed="true"/>
 </head>
 
 <s:url var="url" namespace="/validation" action="quizAjax"/>
 
 <body>
 
-<h5>1.Use AJAX validation, and AJAX request (ajaxAfterValidation="true"), if validation succeeds</h5>
-
-<div id="response" style="border: 1px solid black">
-    Response goes here
+<div class="page-header">
+	<h1>AJAX validation Example</h1>
 </div>
 
-<br />
-
-<s:form method="post" theme="xhtml" namespace="/nodecorate" action="quizAjax" id="form">
-    <s:textfield label="Name" name="name" />
-    <s:textfield label="Age" name="age" />
-    <s:textfield label="Favorite color" name="answer"/>
-    <sx:submit 
-        validate="true" 
-        ajaxAfterValidation="true" 
-        targets="response" 
-        showLoadingText="false"/>
-</s:form>
-
-<sx:a 
-    formId="form" 
-    validate="true" 
-    ajaxAfterValidation="true" 
-    targets="response"
-    showLoadingText="false">Submit Form with a link</sx:a>
-<br /><br />
-
-<input type="checkbox" id="checkbox">Submit Form listening to an event on an element (check to submit)
-<sx:bind 
-    id="bind"
-    formId="form"
-    sources="checkbox" 
-    validate="true"
-    events="onchange" 
-    ajaxAfterValidation="true" 
-    targets="response"
-    showLoadingText="false"/>
-
-<br /><br /><br /><br />
-
-<h5>2.Use AJAX validation, and regular request (ajaxAfterValidation="false", default), if validation succeeds</h5>
-<br />
-
-<s:form method="post" theme="xhtml" namespace="/nodecorate" action="quizAjax" id="form2">
-    <s:textfield label="Name" name="name" />
-    <s:textfield label="Age" name="age" />
-    <s:textfield label="Favorite color" name="answer"/>
-    <sx:submit 
-        validate="true" 
-        ajaxAfterValidation="false" 
-        showLoadingText="false"/>
-</s:form>
-
-<sx:a 
-    formId="form2" 
-    validate="true" 
-    ajaxAfterValidation="false" 
-    showLoadingText="false">Submit Form with a link</sx:a>
-<br /><br />
-
-<input type="checkbox" id="checkbox2">Submit Form listening to an event on an element (check to submit)
-<sx:bind 
-    formId="form2"
-    sources="checkbox2" 
-    validate="true"
-    events="onchange" 
-    ajaxAfterValidation="false" 
-    showLoadingText="false"/>
-
-
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+			<h5>1.Use AJAX validation, and AJAX request (ajaxAfterValidation="true"), if validation succeeds</h5>
+
+			<div id="response" class="well">
+				Response goes here
+			</div>
+
+			<br/>
+
+			<s:form method="post" theme="xhtml" namespace="/nodecorate" action="quizAjax" id="form">
+				<s:textfield label="Name" name="name"/>
+				<s:textfield label="Age" name="age"/>
+				<s:textfield label="Favorite color" name="answer"/>
+				<sx:submit
+						validate="true"
+						ajaxAfterValidation="true"
+						targets="response"
+						showLoadingText="false"
+						cssClass="btn btn-primary"/>
+			</s:form>
+
+			<sx:a
+					formId="form"
+					validate="true"
+					ajaxAfterValidation="true"
+					targets="response"
+					showLoadingText="false"
+					cssClass="btn btn-primary">Submit Form with a link</sx:a>
+			<br/><br/>
+
+			<input type="checkbox" id="checkbox">Submit Form listening to an event on an element (check to submit)
+			<sx:bind
+					id="bind"
+					formId="form"
+					sources="checkbox"
+					validate="true"
+					events="onchange"
+					ajaxAfterValidation="true"
+					targets="response"
+					showLoadingText="false"/>
+
+			<br/><br/><br/><br/>
+
+			<h5>2.Use AJAX validation, and regular request (ajaxAfterValidation="false", default), if validation
+				succeeds</h5>
+			<br/>
+
+			<s:form method="post" theme="xhtml" namespace="/nodecorate" action="quizAjax" id="form2">
+				<s:textfield label="Name" name="name"/>
+				<s:textfield label="Age" name="age"/>
+				<s:textfield label="Favorite color" name="answer"/>
+				<sx:submit
+						validate="true"
+						ajaxAfterValidation="false"
+						showLoadingText="false"
+						cssClass="btn btn-primary"/>
+			</s:form>
+
+			<sx:a
+					formId="form2"
+					validate="true"
+					ajaxAfterValidation="false"
+					showLoadingText="false"
+					cssClass="btn btn-primary">Submit Form with a link</sx:a>
+			<br/><br/>
+
+			<input type="checkbox" id="checkbox2">Submit Form listening to an event on an element (check to submit)
+			<sx:bind
+					formId="form2"
+					sources="checkbox2"
+					validate="true"
+					events="onchange"
+					ajaxAfterValidation="false"
+					showLoadingText="false"/>
+
+
+			<s:include value="footer.jsp"/>
+		</div>
+	</div>
+</div>
 </body>
 </html>
-
 <!-- END SNIPPET: ajaxValidation -->

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-basic.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-basic.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-basic.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-basic.jsp Fri Oct 19 18:49:39 2012
@@ -4,24 +4,38 @@
 
 <html>
 <head>
-    <title>Validation - Basic</title>
-    <s:head/>
+	<title>Struts2 Showcase - Validation - Basic</title>
+	<s:head/>
 </head>
 
 <body>
 
-<b>What is your favorite color?</b>
-<p/>
-
-<s:form method="post">
-    <s:textfield label="Name" name="name"/>
-    <s:textfield label="Age" name="age"/>
-    <s:textfield label="Favorite color" name="answer"/>
-    <s:submit/>
-</s:form>
-
+<div class="page-header">
+	<h1>Basic validation Example</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<p>
+				<b>What is your favorite color?</b>
+
+			<p/>
+
+			<s:form method="post">
+				<s:textfield label="Name" name="name"/>
+				<s:textfield label="Age" name="age"/>
+				<s:textfield label="Favorite color" name="answer"/>
+				<s:submit cssClass="btn btn-primary"/>
+			</s:form>
+
+
+			<s:include value="footer.jsp"/>
+		</div>
+	</div>
+</div>
 </body>
 </html>
-
 <!-- END SNIPPET: basicValidation -->
 

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-client-css.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-client-css.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-client-css.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-client-css.jsp Fri Oct 19 18:49:39 2012
@@ -4,21 +4,34 @@
 
 <html>
 <head>
-    <title>Validation - Basic</title>
-    <s:head theme="css_xhtml"/>
+	<title>Struts2 Showcase - Validation - Basic (CSS Theme)</title>
+	<s:head theme="css_xhtml"/>
 </head>
 
 <body>
 
-<s:form method="post" theme="css_xhtml" validate="true">
-    <s:textfield label="Name" name="name"/>
-    <s:textfield label="Age" name="age"/>
-    <s:textfield label="Favorite color" name="answer"/>
-    <s:submit/>
-</s:form>
-
+<div class="page-header">
+	<h1>Basic validation Example (CSS Theme)</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<s:form method="post" theme="css_xhtml" validate="true">
+				<s:textfield label="Name" name="name"/>
+				<s:textfield label="Age" name="age"/>
+				<s:textfield label="Favorite color" name="answer"/>
+				<s:submit cssClass="btn btn-primary"/>
+			</s:form>
+
+
+			<s:include value="footer.jsp"/>
+		</div>
+	</div>
+</div>
 </body>
 </html>
 
-<!--  END SNIPPET: clientCssValidation -->
+<!-- END SNIPPET: clientCssValidation -->
 

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-client.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-client.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-client.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-client.jsp Fri Oct 19 18:49:39 2012
@@ -4,21 +4,34 @@
 
 <html>
 <head>
-    <title>Validation - Basic</title>
-    <s:head/>
+	<title>Struts2 Showcase - Validation - Basic</title>
+	<s:head/>
 </head>
 
 <body>
 
-<s:form method="post" validate="true">
-    <s:textfield label="Name" name="name"/>
-    <s:textfield label="Age" name="age"/>
-    <s:textfield label="Favorite color" name="answer"/>
-    <s:submit/>
-</s:form>
-
+<div class="page-header">
+	<h1>Basic validation Example</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+
+			<s:form method="post" validate="true">
+				<s:textfield label="Name" name="name"/>
+				<s:textfield label="Age" name="age"/>
+				<s:textfield label="Favorite color" name="answer"/>
+				<s:submit cssClass="btn btn-primary"/>
+			</s:form>
+
+			<s:include value="footer.jsp"/>
+		</div>
+	</div>
+</div>
 </body>
 </html>
 
-<!--  END SNIPPET: clientValidation -->
+<!-- END SNIPPET: clientValidation -->
 

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-success.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-success.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-success.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/quiz-success.jsp Fri Oct 19 18:49:39 2012
@@ -1,14 +1,27 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
 <head>
-    <title>Quiz submitted!</title>
+	<title>Struts2 Showcase - Validation - Quiz submitted!</title>
+	<s:head/>
 </head>
 
 <body>
 
-Thank you, <b><s:property value="name"/></b>. Your answer has been submitted as:
+<div class="page-header">
+	<h1>Quiz submitted!</h1>
+</div>
 
-<b><s:property value="answer"/></b>
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
 
+			Thank you, <b><s:property value="name"/></b>. Your answer has been submitted as:
+
+			<b><s:property value="answer"/></b>
+
+			<s:include value="footer.jsp"/>
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestCancel.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestCancel.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestCancel.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestCancel.jsp Fri Oct 19 18:49:39 2012
@@ -1,21 +1,30 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Insert title here</title>
+	<title>Struts2 Showcase - Validation - Store Errors Across Request Example</title>
+	<s:head/>
 </head>
+
 <body>
 
-	<s:actionmessage/>
-	<s:actionerror/>
-	<s:fielderror />
-
-	<h1>Application Canceled</h1>	
-	<s:url var="url" value="/validation/storeErrorsAcrossRequestExample.jsp" />
-	<s:a href="%{#url}">Try Again</s:a>
+<div class="page-header">
+	<h1>Application Canceled</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<s:actionmessage cssClass="alert alert-info"/>
+			<s:actionerror cssClass="alert alert-error"/>
+			<s:fielderror cssClass="alert alert-error"/>
+
+			<s:url var="url" value="/validation/storeErrorsAcrossRequestExample.jsp" />
+			<s:a href="%{#url}">Try Again</s:a>
+
+			<s:include value="footer.jsp"/>
+		</div>
+	</div>
+</div>
 </body>
 </html>
-

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestExample.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestExample.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestExample.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestExample.jsp Fri Oct 19 18:49:39 2012
@@ -1,44 +1,54 @@
-<%@ 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">
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Showcase - Validation - Store Errors Across Request Example</title>
+	<title>Struts2 Showcase - Validation - Store Errors Across Request Example</title>
+	<s:head/>
 </head>
+
 <body>
-	<p>
-	This is an example demonstrating the use of MessageStoreInterceptor.
-	When this form is submited a redirect is issue both when there's a validation
-	error or not. Normally, when a redirect is issue the action messages / errors and
-	field errors stored in the action will be lost (due to an action lives 
-	only as long as a request). With a MessageStoreInterceptor in place and 
-	configured, the action errors / messages / field errors will be store and 
-	remains retrieveable even after a redirect.
-	</p>
-
-    <table border="1">
-        <tr><td>ActionMessages: </td><td></td><s:actionmessage/></tr>
-       <tr><td>ActionErrors: </td><td><s:actionerror/></td></tr>
-    </table>
-
-    <p>
-    <s:form action="submitApplication" namespace="/validation">
-		<s:textfield name="name" label="Name" />
-		<s:textfield name="age" label="Age" />
-		<s:submit />
-		<s:submit action="cancelApplication" value="%{'Cancel'}" />
-	</s:form>
-    </p>
-    <p>
-        Try submitting with an invalid age value,
-        and note that the browser location changes,
-        but validation messages are retained.
-        Because of the redirect,
-        the input values are not retained. 
-    </p>
 
+<div class="page-header">
+	<h1>Store Errors Across Request Example</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<p>
+				This is an example demonstrating the use of MessageStoreInterceptor.
+				When this form is submited a redirect is issue both when there's a validation
+				error or not. Normally, when a redirect is issue the action messages / errors and
+				field errors stored in the action will be lost (due to an action lives
+				only as long as a request). With a MessageStoreInterceptor in place and
+				configured, the action errors / messages / field errors will be store and
+				remains retrieveable even after a redirect.
+			</p>
+
+			<table border="1">
+				<tr><td>ActionMessages: </td><td></td><s:actionmessage/></tr>
+				<tr><td>ActionErrors: </td><td><s:actionerror/></td></tr>
+			</table>
+
+			<p>
+				<s:form action="submitApplication" namespace="/validation">
+					<s:textfield name="name" label="Name" />
+					<s:textfield name="age" label="Age" />
+					<s:submit cssClass="btn btn-primary"/>
+					<s:submit action="cancelApplication" value="%{'Cancel'}" cssClass="btn btn-danger"/>
+				</s:form>
+			</p>
+			<p>
+				Try submitting with an invalid age value,
+				and note that the browser location changes,
+				but validation messages are retained.
+				Because of the redirect,
+				the input values are not retained.
+			</p>
+
+			<s:include value="footer.jsp"/>
+		</div>
+	</div>
+</div>
 </body>
 </html>
-

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestOk.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestOk.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestOk.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/storeErrorsAcrossRequestOk.jsp Fri Oct 19 18:49:39 2012
@@ -1,23 +1,31 @@
-<%@ 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">
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Showcase - Validation - Store Errors Across Request Example</title>
+	<title>Struts2 Showcase - Validation - Store Errors Across Request Example</title>
+	<s:head/>
 </head>
+
 <body>
 
-	<s:actionmessage/>
-	<s:actionerror/>
-	<s:fielderror />
-
-	<h2>Ok !</h2>
-	
-	<s:url var="url" value="/validation/storeErrorsAcrossRequestExample.jsp" />
-	<s:a href="%{#id}">Try Again</s:a>
+<div class="page-header">
+	<h1>Ok !</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<s:actionmessage cssClass="alert alert-info"/>
+			<s:actionerror cssClass="alert alert-error"/>
+			<s:fielderror cssClass="alert alert-error"/>
+
+			<s:url var="url" value="/validation/storeErrorsAcrossRequestExample.jsp" />
+			<s:a href="%{#id}">Try Again</s:a>
 
+			<s:include value="footer.jsp"/>
+		</div>
+	</div>
+</div>
 </body>
 </html>
 

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp Fri Oct 19 18:49:39 2012
@@ -6,12 +6,22 @@
 --%>
 
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
-    <head><title>Showcase - Validation - SuccessFieldValidatorsExample</title></head>
-    <body>
-        <h1>Success !</h1>
-        <table>
+<head>
+	<title>Struts2 Showcase - Validation - Success Client Side Validators Example</title>
+	<s:head/>
+</head>
+<body>
+
+<div class="page-header">
+	<h1>Success !</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+        <table class="table table-striped table-bordered table-hover table-condensed">
             <tr>
                 <td>Required Validator Field:</td>
                 <td><s:property value="requiredValidatorField" /></td>
@@ -47,7 +57,8 @@
         </table>
 
         <s:include value="footer.jsp" />
-    </body>
-    
+		</div>
+	</div>
+</div>
+</body>
 </html>
-

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp Fri Oct 19 18:49:39 2012
@@ -5,14 +5,25 @@
     @version $Date$ $Id$
 --%>
 
-<%@taglib prefix="s" uri="/struts-tags" %>
 
+<%@taglib prefix="s" uri="/struts-tags" %>
 <html>
-    <head><title>Showcase - Validation - SuccessFieldValidatorsExample</title></head>
-    <body>
-        <h1>Success !</h1>
-        <table>
-            <tr>
+<head>
+	<title>Struts2 Showcase - Validation - Success Field Validators Example</title>
+	<s:head/>
+</head>
+<body>
+
+<div class="page-header">
+	<h1>Success !</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<table class="table table-striped table-bordered table-hover table-condensed">
+			<tr>
                 <td>Required Validator Field:</td>
                 <td><s:property value="requiredValidatorField" /></td>
             </tr>
@@ -43,6 +54,8 @@
         </table>
         
         <s:include value="footer.jsp" />
-    </body>
+		</div>
+	</div>
+</div>
+</body>
 </html>
-

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp Fri Oct 19 18:49:39 2012
@@ -7,12 +7,22 @@
 
 
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
-    <head><title>Showcase - Validation - SuccessNonFieldValidatorsExample</title></head>
-    <body>
-        <h1>Success !</h1>
-        <table>
+<head>
+	<title>Struts2 Showcase - Validation - Success Non Field Validators Example</title>
+	<s:head/>
+</head>
+<body>
+
+<div class="page-header">
+	<h1>Success !</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<table class="table table-striped table-bordered table-hover table-condensed">
             <tr>
                 <td>Some Text: </td>
                 <td><s:property value="someText" /></td>
@@ -28,6 +38,8 @@
         </table>
         
         <s:include value="footer.jsp" />
-    </body>
+		</div>
+	</div>
+</div>
+</body>
 </html>
-

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp Fri Oct 19 18:49:39 2012
@@ -6,14 +6,23 @@
 --%>
 
 
-
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
-    <head><title>Showcase - Validation - SuccessVisitorValidatorsExameple</title></head>
-    <body>
-        <h1>Success !</h1>
-        <table>
+<head>
+	<title>Struts2 Showcase - Validation - Success Visitor Validators Exameple</title>
+	<s:head/>
+</head>
+<body>
+
+<div class="page-header">
+	<h1>Success !</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<table class="table table-striped table-bordered table-hover table-condensed">
             <tr>
                 <td>User Name:</td>
                 <td><s:property value="user.name" /></td>
@@ -29,7 +38,9 @@
         </table>
         
         <s:include value="footer.jsp" />
-        
-    </body>
-</html>
 
+		</div>
+	</div>
+</div>
+</body>
+</html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp Fri Oct 19 18:49:39 2012
@@ -7,30 +7,37 @@
 
 
 <%@taglib prefix="s" uri="/struts-tags" %>
-
 <html>
-<head><title>Showcase - Validation - VisitorValidatorsExample </title>
-        <s:url var="siteCss" value="/validation/validationExamplesStyles.css" includeContext="true" />
-        <s:head />
-        <!-- link rel="stylesheet" type="text/css" href='<s:property value="%{siteCss}" />' -->
+<head>
+	<title>Struts2 Showcase - Validation - Visitor Validators Example</title>
+	<s:head/>
 </head>
 <body>
 
-    <!-- START SNIPPET: visitorValidatorsExample -->
-    
-    <s:fielderror />
-
-    <s:form method="POST" action="submitVisitorValidatorsExamples" namespace="/validation">
-        <s:textfield name="user.name" label="User Name" />
-        <s:textfield name="user.age" label="User Age" />
-        <s:textfield name="user.birthday" label="Birthday" />
-        <s:submit label="Submit" />
-    </s:form>
-    
-    <!--  END SNIPPET: visitorValidatorsExample -->
-    
-    
-    <s:include value="footer.jsp" />
+<div class="page-header">
+	<h1>Visitor Validators Example</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+
+			<!-- START SNIPPET: visitorValidatorsExample -->
+
+			<s:fielderror cssClass="alert alert-error"/>
+
+			<s:form method="POST" action="submitVisitorValidatorsExamples" namespace="/validation">
+				<s:textfield name="user.name" label="User Name"/>
+				<s:textfield name="user.age" label="User Age"/>
+				<s:textfield name="user.birthday" label="Birthday"/>
+				<s:submit label="Submit" cssClass="btn btn-primary"/>
+			</s:form>
+
+			<!--  END SNIPPET: visitorValidatorsExample -->
+
+			<s:include value="footer.jsp"/>
+		</div>
+	</div>
+</div>
 </body>
 </html>
-

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp Fri Oct 19 18:49:39 2012
@@ -1,40 +1,54 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
 <html>
 <head>
     <title>View Sources</title>
-
-    <jsp:include page="/ajax/commonInclude.jsp"/>
 </head>
 <body>
-<h1>View Sources</h1>
 
-<sx:tabbedpanel id="test">
-	<sx:div id="one" label="Page" >
-        <h3><s:property default="Unknown page" value="page"/></h3>
-<pre>
-<s:iterator value="pageLines" status="row">
-${row.count}: <s:property/></s:iterator>
-</pre>
-    </sx:div>
-    <sx:div id="two" label="Configuration" >
-        <h3><s:property default="Unknown configuration" value="config"/></h3>
-<pre>
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+			<h1>View Sources</h1>
+
+			<ul class="nav nav-tabs" id="codeTab">
+				<li class="active"><a href="#page">Page</a></li>
+				<li><a href="#config">Configuration</a></li>
+				<li><a href="#java">Java Action</a></li>
+			</ul>
+
+			<div class="tab-content">
+				<div class="tab-pane active" id="page">
+					<h3><s:property default="Unknown page" value="page"/></h3>
+					<pre class="prettyprint lang-html linenums">
+						<s:iterator value="pageLines" status="row">
+<s:property/></s:iterator>
+					</pre>
+				</div>
+				<div class="tab-pane" id="config">
+					<h3><s:property default="Unknown configuration" value="config"/></h3>
+					<pre class="prettyprint lang-xml linenums">
+						<s:iterator value="configLines" status="row">
+<s:property/></s:iterator>
+					</pre>
+				</div>
+				<div class="tab-pane" id="java">
+					<h3><s:property default="Unknown or unavailable Action class" value="className"/></h3>
+					<pre class="prettyprint lang-java linenums">
+						<s:iterator value="classLines" status="row">
+<s:property/></s:iterator>
+					</pre>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
 
-<s:iterator value="configLines" status="row"><s:if test="%{(#row.count-1)==(configLines.size()/2)}">
-<span style="background-color:yellow">${configLine - padding + row.count - 1}: <s:property/></span></s:if><s:else>
-${configLine - padding + row.count - 1}: <s:property/></s:else></s:iterator>
-</pre>
-    </sx:div>
-    <sx:div id="three" label="Java Action">
-        <h3><s:property default="Unknown or unavailable Action class" value="className"/></h3>
-<pre>
-<s:iterator value="classLines" status="row">
-${row.count}: <s:property/></s:iterator>
-</pre>
-    </sx:div>
-    
-</sx:tabbedpanel>
 
+<script>
+	$('#codeTab a').click(function (e) {
+		e.preventDefault();
+		$(this).tab('show');
+	})
+</script>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/wait/complete.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/wait/complete.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/wait/complete.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/wait/complete.jsp Fri Oct 19 18:49:39 2012
@@ -1,13 +1,25 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
-    <head><title>Execute and Wait Examples</title></head>
+<head>
+	<title>Struts2 Showcase - Execute and Wait Examples - Complete</title>
+</head>
 
 <body>
-    <h1>The process is complete</h1>
+<div class="page-header">
+	<h1>The process is complete</h1>
+</div>
 
-    <b>We have processed your request.</b>
-    <p/>
-    Click here to <s:url var="back" value="/wait"/><s:a href="%{back}">return</s:a>.
 
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12" style="text-align: center;">
+
+			<b>We have processed your request.</b>
+			<p/>
+			Click here to <s:url var="back" value="/wait/index.jsp"/><s:a href="%{back}" cssClass="btn btn-link">return</s:a>.
+
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/wait/example1.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/wait/example1.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/wait/example1.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/wait/example1.jsp Fri Oct 19 18:49:39 2012
@@ -1,16 +1,28 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
-    <head><title>Execute and Wait Examples</title></head>
+<head>
+	<title>Struts2 Showcase - Execute and Wait Examples - Example 1</title>
+</head>
 
 <body>
-    <h1>Execute and Wait Example 1</h1>
-    
-    <b>Example 1:</b> In the form below enter how long time to simulate the process should take.
-
-    <s:form action="longProcess1">
-        <s:textfield label="Time (millis)" name="time" required="true" value="7000"/>
-        <s:submit value="submit"/>
-    </s:form>
+<div class="page-header">
+	<h1>Execute and Wait Examples - Example 1</h1>
+</div>
 
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12" style="text-align: center;">
+
+			<p><b>Example 1:</b> In the form below enter how long time to simulate the process should take.</p>
+
+			<s:form action="longProcess1">
+				<s:textfield label="Time (millis)" name="time" required="true" value="7000"/>
+				<s:submit value="submit" cssClass="btn btn-primary"/>
+			</s:form>
+
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/wait/example2.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/wait/example2.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/wait/example2.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/wait/example2.jsp Fri Oct 19 18:49:39 2012
@@ -1,17 +1,29 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
-    <head><title>Execute and Wait Examples</title></head>
+<head>
+	<title>Struts2 Showcase - Execute and Wait Examples - Example 2</title>
+</head>
 
 <body>
-    <h1>Execute and Wait Example 2</h1>
+<div class="page-header">
+	<h1>Execute and Wait Examples - Example 2</h1>
+</div>
 
-    <b>Example 2:</b> As example 1 but uses a delay of 2000 millis before the wait page is shown. Try simulating with
-    a value of 500 millis to see that no wait page is shown at all.
 
-    <s:form action="longProcess2">
-        <s:textfield label="Time (millis)" name="time" required="true" value="8000"/>
-        <s:submit value="submit"/>
-    </s:form>
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
 
+			<p><b>Example 2:</b> As example 1 but uses a delay of 2000 millis before the wait page is shown. Try simulating with
+				a value of 500 millis to see that no wait page is shown at all.</p>
+
+			<s:form action="longProcess2">
+				<s:textfield label="Time (millis)" name="time" required="true" value="8000"/>
+				<s:submit value="submit" cssClass="btn btn-primary"/>
+			</s:form>
+
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/wait/example3.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/wait/example3.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/wait/example3.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/wait/example3.jsp Fri Oct 19 18:49:39 2012
@@ -1,18 +1,29 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
-    <head><title>Execute and Wait Examples</title></head>
+<head>
+	<title>Struts2 Showcase - Execute and Wait Examples - Example 3</title>
+</head>
 
 <body>
-    <h1>Execute and Wait Example 3</h1>
+<div class="page-header">
+	<h1>Execute and Wait Examples - Example 3</h1>
+</div>
 
-    <b>Example 3:</b> As example 1 but uses a delay of 3000 millis before the wait page is shown.
-    While waiting for the wait page it will check every 1000 millis if the background process is already
-    done. Try simulating with a value of 700 millis to see that the wait page is shown soon thereafter.
 
-    <s:form action="longProcess3">
-        <s:textfield label="Time (millis)" name="time" required="true" value="9000"/>
-        <s:submit value="submit"/>
-    </s:form>
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
 
+			<p><b>Example 3:</b> As example 1 but uses a delay of 3000 millis before the wait page is shown.
+				While waiting for the wait page it will check every 1000 millis if the background process is already
+				done. Try simulating with a value of 700 millis to see that the wait page is shown soon thereafter.</p>
+
+			<s:form action="longProcess3">
+				<s:textfield label="Time (millis)" name="time" required="true" value="9000"/>
+				<s:submit value="submit" cssClass="btn btn-primary"/>
+			</s:form>
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/wait/index.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/wait/index.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/wait/index.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/wait/index.jsp Fri Oct 19 18:49:39 2012
@@ -1,19 +1,34 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
-    <head><title>Execute and Wait Examples</title></head>
+<head>
+	<title>Struts2 Showcase - Execute and Wait Examples</title>
+</head>
 
 <body>
-    <h1>Execute and Wait Examples</h1>
+<div class="page-header">
+	<h1>Execute and Wait Examples</h1>
+</div>
 
-    These examples illustrate Struts build in support for execute and wait.
-    <p/>
-    When you have a process that takes a long time your users can be impatient and starts to submit/click again.
-    <br/> A good solution is to show the user a progress page (wait page) while the process takes it time.
-
-    <br/>
-    <br/><a href="example1.jsp">Example 1 (no delay)</a>
-    <br/><a href="example2.jsp">Example 2 (with delay)</a>
-    <br/><a href="example3.jsp">Example 2 (with longer check delay)</a>
 
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12" style="text-align: center;">
+
+			<p>
+				These examples illustrate Struts build in support for execute and wait.
+			<p/>
+			<p>
+				When you have a process that takes a long time your users can be impatient and starts to submit/click again.
+				<br/> A good solution is to show the user a progress page (wait page) while the process takes it time.
+			<p/>
+
+			<br/>
+			<br/><a href="example1.jsp">Example 1 (no delay)</a>
+			<br/><a href="example2.jsp">Example 2 (with delay)</a>
+			<br/><a href="example3.jsp">Example 3 (with longer check delay)</a>
+		</div>
+	</div>
+</div>
 </body>
 </html>

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/wait/wait.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/wait/wait.jsp?rev=1400220&r1=1400219&r2=1400220&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/wait/wait.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/wait/wait.jsp Fri Oct 19 18:49:39 2012
@@ -1,6 +1,43 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
 <head>
+	<title>Struts2 Showcase - Execute and Wait Examples - Wait</title>
+</head>
+
+<body>
+<div class="page-header">
+	<h1>Execute and Wait Examples - Wait</h1>
+</div>
+
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12" style="text-align: center;">
+
+			<p class="well">
+				We are processing your request. Please wait.
+			</p>
+
+			<div class="progress progress-striped active">
+				<div class="bar" style="width: 50%;"></div>
+			</div>
+
+			<p/>
+			You can click this link to <a href="<s:url includeParams="all"/>">refresh</a>.
+
+			<b>We have processed your request.</b>
+			<p/>
+			Click here to <s:url var="back" value="/wait/index.jsp"/><s:a href="%{back}" cssClass="btn btn-link">return</s:a>.
+
+		</div>
+	</div>
+</div>
+</body>
+</html>
+
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head>
     <meta http-equiv="refresh" content="5;url=<s:url includeParams="all"/>"/>
 </head>
 



Mime
View raw message