You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jo...@apache.org on 2015/05/28 21:27:24 UTC
[11/17] struts git commit: Refactor showcase and migrate to bootstrap
3
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.ttf
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.ttf b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.ttf
index 67fa00b..1413fc6 100644
Binary files a/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.ttf and b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.ttf differ
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff
index 8c54182..9e61285 100644
Binary files a/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff and b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff differ
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff2
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff2
new file mode 100644
index 0000000..64539b5
Binary files /dev/null and b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 differ
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/resources/struts.xml b/apps/showcase/src/main/resources/struts.xml
index 5a12a9e..dcf9a91 100644
--- a/apps/showcase/src/main/resources/struts.xml
+++ b/apps/showcase/src/main/resources/struts.xml
@@ -71,6 +71,10 @@
<result>/WEB-INF/showcase.jsp</result>
</action>
+ <action name="help">
+ <result>/WEB-INF/help.jsp</result>
+ </action>
+
<action name="viewSource" class="org.apache.struts2.showcase.source.ViewSourceAction">
<result>/WEB-INF/viewSource.jsp</result>
</action>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/actionchaining/actionChainingResult.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/actionchaining/actionChainingResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/actionchaining/actionChainingResult.jsp
index 87566e8..b5696d6 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/actionchaining/actionChainingResult.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/actionchaining/actionChainingResult.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:label label="Action Chain 1 Property 1" name="actionChain1Property1" /><br/>
<s:label label="Action Chain 2 Property 1" name="actionChain2Property1" /><br/>
<s:label label="Action Chain 3 Property 1" name="actionChain3Property1" /><br/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/bean-validation/bean-validation.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/bean-validation/bean-validation.jsp b/apps/showcase/src/main/webapp/WEB-INF/bean-validation/bean-validation.jsp
index 101ef23..67f375f 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/bean-validation/bean-validation.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/bean-validation/bean-validation.jsp
@@ -11,8 +11,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<!-- START SNIPPET: beanValidatationExample -->
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/conversion/enterAddressInfo.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/conversion/enterAddressInfo.jsp b/apps/showcase/src/main/webapp/WEB-INF/conversion/enterAddressInfo.jsp
index b0e3e79..04eed7a 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/conversion/enterAddressInfo.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/conversion/enterAddressInfo.jsp
@@ -9,8 +9,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p/>
An example populating a Set of object (Address.java) into Struts' action (AddressAction.java)
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/conversion/enterOperations.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/conversion/enterOperations.jsp b/apps/showcase/src/main/webapp/WEB-INF/conversion/enterOperations.jsp
index 817e81f..803cd98 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/conversion/enterOperations.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/conversion/enterOperations.jsp
@@ -9,8 +9,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
See the jsp code <s:url var="url" action="showEnumJspCode" namespace="/conversion" /><s:a href="%{#url}">here.</s:a><br/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/conversion/enterPersonInfo.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/conversion/enterPersonInfo.jsp b/apps/showcase/src/main/webapp/WEB-INF/conversion/enterPersonInfo.jsp
index ba30a79..0459d1a 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/conversion/enterPersonInfo.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/conversion/enterPersonInfo.jsp
@@ -9,8 +9,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/conversion/index.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/conversion/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/conversion/index.jsp
index 805d490..04db692 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/conversion/index.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/conversion/index.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<ul>
<li>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/conversion/showAddressInfo.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/conversion/showAddressInfo.jsp b/apps/showcase/src/main/webapp/WEB-INF/conversion/showAddressInfo.jsp
index 8f2c0c4..a8c8a7f 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/conversion/showAddressInfo.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/conversion/showAddressInfo.jsp
@@ -9,8 +9,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:iterator value="%{addresses}">
<s:property value="%{top.id}" /> -> <s:property value="%{top.address}" /><br/>
</s:iterator>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/conversion/showOperations.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/conversion/showOperations.jsp b/apps/showcase/src/main/webapp/WEB-INF/conversion/showOperations.jsp
index 4cb6679..ed8e226 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/conversion/showOperations.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/conversion/showOperations.jsp
@@ -9,8 +9,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:iterator value="%{selectedOperations}" status="stat">
<s:property value="%{top.name()}" /><br/>
</s:iterator>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/conversion/showPersonInfo.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/conversion/showPersonInfo.jsp b/apps/showcase/src/main/webapp/WEB-INF/conversion/showPersonInfo.jsp
index 24f9760..d4e6f7f 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/conversion/showPersonInfo.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/conversion/showPersonInfo.jsp
@@ -9,8 +9,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:iterator value="persons" status="status">
<s:label label="%{'SET '+#status.index+' Name'}" value="%{name}" /><br/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
index b84cbee..d4a6187 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
@@ -34,25 +34,21 @@
<html lang="en">
<head>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Struts2 Showcase for Apache Struts Project">
<meta name="author" content="The Apache Software Foundation">
<title><decorator:title default="Struts2 Showcase"/></title>
- <link href="<s:url value='/styles/bootstrap.css' encode='false' includeParams='none'/>" rel="stylesheet"
- type="text/css" media="all">
- <link href="<s:url value='/styles/bootstrap-responsive.css' encode='false' includeParams='none'/>" rel="stylesheet"
- type="text/css" media="all">
- <link href="<s:url value='/styles/main.css' encode='false' includeParams='none'/>" rel="stylesheet" type="text/css"
- media="all"/>
+ <link href="<s:url value='/styles/bootstrap.css' encode='false' includeParams='none'/>" rel="stylesheet" type="text/css" media="all">
+ <link href="<s:url value='/styles/main.css' encode='false' includeParams='none'/>" rel="stylesheet" type="text/css" media="all"/>
- <script src="<s:url value='/js/jquery-1.8.2.min.js' encode='false' includeParams='none'/>"></script>
+ <script src="<s:url value='/js/jquery-2.1.4.min.js' encode='false' includeParams='none'/>"></script>
<script src="<s:url value='/js/bootstrap.min.js' encode='false' includeParams='none'/>"></script>
<script type="text/javascript">
$(function () {
- $('.dropdown-toggle').dropdown();
var alerts = $('ul.alert').wrap('<div />');
alerts.prepend('<a class="close" data-dismiss="alert" href="#">×</a>');
alerts.alert();
@@ -73,23 +69,29 @@
<body id="page-home" onload="prettyPrint();">
-<div class="navbar navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container-fluid">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+<nav class="navbar navbar-default navbar-fixed-top">
+ <div class="container-fluid">
+
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
- </a>
+ </button>
<s:url var="home" action="showcase" namespace="/" includeContext="false" />
- <s:a value="%{home}" cssClass="brand">Struts2 Showcase</s:a>
- <div class="nav-collapse">
- <ul class="nav">
- <li><s:a value="%{home}"><i class="icon-home"></i> Home</s:a></li>
+ <s:a value="%{home}" cssClass="navbar-brand">
+ Struts2 Showcase
+ </s:a>
+ </div>
+
+ <div id="navbar" class="navbar-collapse collapse">
+ <ul class="nav navbar-nav">
+ <li><s:a value="%{home}"><i class="glyphicon glyphicon-home"></i> Home</s:a></li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Configuration<b
- class="caret"></b></a>
- <ul class="dropdown-menu">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+ <i class="glyphicon glyphicon-cog"></i> Configuration
+ <b class="caret"></b></a>
+ <ul class="dropdown-menu" role="menu">
<li><s:a action="actionChain1!input" namespace="/actionchaining"
includeParams="none">Action Chaining</s:a></li>
<li><s:a action="index" namespace="/config-browser"
@@ -100,91 +102,105 @@
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Tags<b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li class="dropdown-submenu">
- <a href="#">Non UI Tags</a>
- <ul class="dropdown-menu">
- <li><s:url var="url" action="showActionTagDemo" namespace="/tags/non-ui/actionTag"/><s:a
- href="%{url}">Action Tag</s:a></li>
- <li><s:url var="url" namespace="/tags/non-ui" action="date"/><s:a
- href="%{url}">Date Tag</s:a></li>
- <li><s:url var="url" action="debugTagDemo" namespace="/tags/non-ui"/><s:a
- href="%{url}">Debug Tag</s:a></li>
- <li><s:url var="url" action="showGeneratorTagDemo"
- namespace="/tags/non-ui/iteratorGeneratorTag"/><s:a
- href="%{url}">Iterator Generator Tag</s:a></li>
- <li>
- <s:url var="url" action="showAppendTagDemo"
- namespace="/tags/non-ui/appendIteratorTag"/>
- <s:a href="%{#url}">Append Iterator Tag</s:a>
- <li>
- <s:url var="url" action="showMergeTagDemo"
- namespace="/tags/non-ui/mergeIteratorTag"/>
- <s:a href="%{#url}">Merge Iterator Demo</s:a>
- <li>
- <s:url var="url" action="showSubsetTagDemo"
- namespace="/tags/non-ui/subsetIteratorTag"/>
- <s:a href="%{#url}">Subset Tag</s:a>
- <li><s:url var="url" action="actionPrefixExampleUsingFreemarker"
- namespace="/tags/non-ui/actionPrefix"/><s:a
- href="%{#url}">Action Prefix Example (Freemarker)</s:a></li>
- <li><s:url var="url" action="testIfTagJsp" namespace="/tags/non-ui/ifTag"/><s:a
- href="%{#url}">If Tag (JSP)</s:a></li>
- <li><s:url var="url" action="testIfTagFreemarker"
- namespace="/tags/non-ui/ifTag"/><s:a
- href="%{#url}">If Tag (Freemarker)</s:a></li>
- </ul>
-
- </li>
- <li class="dropdown-submenu">
- <a href="#">UI Tags</a>
- <ul class="dropdown-menu">
- <li><s:url var="url" namespace="/tags/ui" action="example" method="input"/><s:a
- href="%{url}">UI Example</s:a></li>
- <li><s:url var="url" namespace="/tags/ui" action="exampleVelocity"
- method="input"/><s:a href="%{url}">UI Example (Velocity)</s:a></li>
- <li><s:url var="url" namespace="/tags/ui" action="lotsOfOptiontransferselect"
- method="input"/><s:a
- href="%{url}">Option Transfer Select UI Example</s:a></li>
- <li><s:url var="url" namespace="/tags/ui" action="moreSelects" method="input"/><s:a
- href="%{url}">More Select Box UI Examples</s:a></li>
- <li>
- <s:url var="url" namespace="/tags/ui" action="componentTagExample"/>
- <s:a href="%{#url}">Component Tag Example</s:a></li>
- <li><s:url var="url" namespace="/tags/ui" action="actionTagExample" method="input"/><s:a
- href="%{url}">Action Tag Example</s:a></li>
- </ul>
- </li>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Non UI Tags<b class="caret"></b></a>
+ <ul class="dropdown-menu" role="menu">
+ <li><s:url var="url" action="showActionTagDemo" namespace="/tags/non-ui/actionTag"/><s:a
+ href="%{url}">Action Tag</s:a></li>
+ <li><s:url var="url" namespace="/tags/non-ui" action="date"/><s:a
+ href="%{url}">Date Tag</s:a></li>
+ <li><s:url var="url" action="debugTagDemo" namespace="/tags/non-ui"/><s:a
+ href="%{url}">Debug Tag</s:a></li>
+ <li><s:url var="url" action="showGeneratorTagDemo"
+ namespace="/tags/non-ui/iteratorGeneratorTag"/><s:a
+ href="%{url}">Iterator Generator Tag</s:a></li>
+ <li>
+ <s:url var="url" action="showAppendTagDemo"
+ namespace="/tags/non-ui/appendIteratorTag"/>
+ <s:a href="%{#url}">Append Iterator Tag</s:a>
+ <li>
+ <s:url var="url" action="showMergeTagDemo"
+ namespace="/tags/non-ui/mergeIteratorTag"/>
+ <s:a href="%{#url}">Merge Iterator Demo</s:a>
+ <li>
+ <s:url var="url" action="showSubsetTagDemo"
+ namespace="/tags/non-ui/subsetIteratorTag"/>
+ <s:a href="%{#url}">Subset Tag</s:a>
+ <li><s:url var="url" action="actionPrefixExampleUsingFreemarker"
+ namespace="/tags/non-ui/actionPrefix"/><s:a
+ href="%{#url}">Action Prefix Example (Freemarker)</s:a></li>
+ <li><s:url var="url" action="testIfTagJsp" namespace="/tags/non-ui/ifTag"/><s:a
+ href="%{#url}">If Tag (JSP)</s:a></li>
+ <li><s:url var="url" action="testIfTagFreemarker"
+ namespace="/tags/non-ui/ifTag"/><s:a
+ href="%{#url}">If Tag (Freemarker)</s:a></li>
</ul>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">File<b class="caret"></b></a>
- <ul class="dropdown-menu">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">UI Tags<b class="caret"></b></a>
+ <ul class="dropdown-menu" role="menu">
+ <li><s:url var="url" namespace="/tags/ui" action="example" method="input"/><s:a
+ href="%{url}">UI Example</s:a></li>
+ <li><s:url var="url" namespace="/tags/ui" action="exampleVelocity"
+ method="input"/><s:a href="%{url}">UI Example (Velocity)</s:a></li>
+ <li><s:url var="url" namespace="/tags/ui" action="lotsOfOptiontransferselect"
+ method="input"/><s:a
+ href="%{url}">Option Transfer Select UI Example</s:a></li>
+ <li><s:url var="url" namespace="/tags/ui" action="moreSelects" method="input"/><s:a
+ href="%{url}">More Select Box UI Examples</s:a></li>
+ <li>
+ <s:url var="url" namespace="/tags/ui" action="componentTagExample"/>
+ <s:a href="%{#url}">Component Tag Example</s:a></li>
+ <li><s:url var="url" namespace="/tags/ui" action="actionTagExample" method="input"/><s:a
+ href="%{url}">Action Tag Example</s:a></li>
+ </ul>
+ </li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+ <i class="glyphicon glyphicon-file"></i> File
+ <b class="caret"></b></a>
+ <ul class="dropdown-menu" role="menu">
<li><s:a namespace="/filedownload" action="index">File Download</s:a></li>
- <li class="dropdown-submenu">
- <a href="#">File Upload</a>
- <ul class="dropdown-menu">
- <li>
- <s:url var="url" action="upload" namespace="/fileupload"/>
- <s:a href="%{#url}">Single File Upload</s:a>
- </li>
- <li>
- <s:url var="url" action="multipleUploadUsingList" namespace="/fileupload"/>
- <s:a href="%{#url}">Multiple File Upload (List)</s:a>
+ <li>
+ <s:url var="url" action="upload" namespace="/fileupload"/>
+ <s:a href="%{#url}">Single File Upload</s:a>
+ </li>
+ <li>
+ <s:url var="url" action="multipleUploadUsingList" namespace="/fileupload"/>
+ <s:a href="%{#url}">Multiple File Upload (List)</s:a>
- </li>
- <li>
- <s:url var="url" action="multipleUploadUsingArray" namespace="/fileupload"/>
- <s:a href="%{#url}">Multiple File Upload (Array)</s:a>
- </li>
- </ul>
</li>
+ <li>
+ <s:url var="url" action="multipleUploadUsingArray" namespace="/fileupload"/>
+ <s:a href="%{#url}">Multiple File Upload (Array)</s:a>
+ </li>
+ </ul>
+ </li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Validation<b class="caret"></b></a>
+ <ul class="dropdown-menu" role="menu">
+ <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="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="storeMessageAcrossRequestExample" namespace="/validation" action="storeErrorsAcrossRequestExample"/>
+ <s:url var="beanValidationUrl" action="bean-validation" namespace="/bean-validation"/>
+ <li><s:a href="%{beanValidationUrl}">Bean Validation</s:a></li>
+ <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="%{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>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Examples<b class="caret"></b></a>
- <ul class="dropdown-menu">
+ <ul class="dropdown-menu" role="menu">
<li class="dropdown-submenu">
<li>
<s:url var="url" namespace="/hangman" action="hangmanNonAjax"/>
@@ -194,61 +210,33 @@
<li><s:a value="/skill/index.html">CRUD</s:a></li>
<li><s:a value="/wait/index.html">Execute & Wait</s:a></li>
<li><s:a value="/token/index.html">Token</s:a></li>
- <li class="dropdown-submenu">
- <a href="#">Validation</a>
- <ul class="dropdown-menu">
-
- <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="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="storeMessageAcrossRequestExample" namespace="/validation" action="storeErrorsAcrossRequestExample"/>
- <s:url var="beanValidationUrl" action="bean-validation" namespace="/bean-validation"/>
- <li><s:a href="%{beanValidationUrl}">Bean Validation</s:a></li>
- <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="%{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>
- </li>
<li><s:url var="url" namespace="/modelDriven" action="modelDriven"/><s:a
href="%{url}">Model Driven</s:a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Integration<b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li class="dropdown-submenu">
- <a href="#">Freemarker</a>
- <ul class="dropdown-menu">
- <li>
- <s:url var="url" action="customFreemarkerManagerDemo" namespace="/freemarker"/>
- <s:a href="%{#url}">Demo of usage of a Custom Freemarker Manager</s:a>
- </li>
- <li>
- <s:url var="url" action="standardTags" namespace="/freemarker"/>
- <s:a href="%{#url}">Demo of Standard Struts Freemarker Tags</s:a>
- </li>
- </ul>
+ <ul class="dropdown-menu" role="menu">
+ <li>
+ <s:url var="url" action="customFreemarkerManagerDemo" namespace="/freemarker"/>
+ <s:a href="%{#url}">Demo of usage of a Custom Freemarker Manager</s:a>
+ </li>
+ <li>
+ <s:url var="url" action="standardTags" namespace="/freemarker"/>
+ <s:a href="%{#url}">Demo of Standard Struts Freemarker Tags</s:a>
</li>
<li><s:a value="/tiles/index.action">Tiles</s:a></li>
</ul>
</li>
</ul>
- <ul class="nav pull-right">
+ <ul class="nav navbar-nav pull-right">
<li class="dropdown last">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-flag"></i> Help<b
- class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+ <i class="glyphicon glyphicon-question-sign"></i> Help<b lass="caret"></b></a>
<ul class="dropdown-menu">
- <li><s:a value="/help.jsp">Help</s:a></li>
+ <s:url var="help" action="help" namespace="/" includeContext="false" />
+ <li><s:a value="%{help}">Help</s:a></li>
<li><a href="http://struts.apache.org/mail.html"><i class="icon-share"></i> User Mailing
List</a></li>
<li><a href="http://struts.apache.org"><i class="icon-share"></i> Struts2 Website</a>
@@ -258,11 +246,9 @@
</ul>
</li>
</ul>
- </div>
- <!--/.nav-collapse -->
</div>
</div>
-</div>
+</nav>
<decorator:body/>
@@ -284,7 +270,7 @@
<!-- end branding -->
<div>
- <a href="http://struts.apache.org/2.x/">
+ <a href="http://struts.apache.org">
<img src="<s:url value='/img/struts-power.gif' encode='false' includeParams='none'/>"
alt="Powered by Struts"/>
</a>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/empmanager/editEmployee.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/empmanager/editEmployee.jsp b/apps/showcase/src/main/webapp/WEB-INF/empmanager/editEmployee.jsp
index f11577e..7518395 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/empmanager/editEmployee.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/empmanager/editEmployee.jsp
@@ -9,7 +9,6 @@
</s:else>
<title>Struts2 Showcase - CRUD Example - <s:property value="#title"/></title>
<s:head/>
- <sx:head/>
</head>
<body>
<div class="page-header">
@@ -17,8 +16,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span3">
+ <div class="row">
+ <div class="col-md-3">
<ul class="nav nav-tabs nav-stacked">
<li><s:url var="url" namespace="/employee" action="list"/><s:a href="%{url}">List available Employees</s:a></li>
<li class="active"><s:url var="url" namespace="/employee" action="edit"/><s:a href="%{url}">Create/Edit Employee</s:a></li>
@@ -26,7 +25,7 @@
<li><s:url var="url" namespace="/skill" action="edit"/><s:a href="%{url}">Create/Edit Skill</s:a></li>
</ul>
</div>
- <div class="span9">
+ <div class="col-md-9">
<s:action var="skillAction" namespace="/skill" name="list"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/empmanager/editSkill.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/empmanager/editSkill.jsp b/apps/showcase/src/main/webapp/WEB-INF/empmanager/editSkill.jsp
index f47390e..9e0bc29 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/empmanager/editSkill.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/empmanager/editSkill.jsp
@@ -17,8 +17,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span3">
+ <div class="row">
+ <div class="col-md-3">
<ul class="nav nav-tabs nav-stacked">
<li><s:url var="url" namespace="/employee" action="list"/><s:a href="%{url}">List available Employees</s:a></li>
<li><s:url var="url" namespace="/employee" action="edit"/><s:a href="%{url}">Create/Edit Employee</s:a></li>
@@ -26,7 +26,7 @@
<li class="active"><s:url var="url" namespace="/skill" action="edit"/><s:a href="%{url}">Create/Edit Skill</s:a></li>
</ul>
</div>
- <div class="span9">
+ <div class="col-md-9">
<s:form action="save">
<s:textfield label="%{getText('skill.name')}" name="currentSkill.name"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/empmanager/listEmployees.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/empmanager/listEmployees.jsp b/apps/showcase/src/main/webapp/WEB-INF/empmanager/listEmployees.jsp
index 1991924..79006e4 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/empmanager/listEmployees.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/empmanager/listEmployees.jsp
@@ -9,8 +9,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span3">
+ <div class="row">
+ <div class="col-md-3">
<ul class="nav nav-tabs nav-stacked">
<li class="active"><s:url var="url" namespace="/employee" action="list"/><s:a href="%{url}">List available Employees</s:a></li>
<li><s:url var="url" namespace="/employee" action="edit"/><s:a href="%{url}">Create/Edit Employee</s:a></li>
@@ -18,7 +18,7 @@
<li><s:url var="url" namespace="/skill" action="edit"/><s:a href="%{url}">Create/Edit Skill</s:a></li>
</ul>
</div>
- <div class="span9">
+ <div class="col-md-9">
<table class="table table-striped table-bordered table-hover table-condensed">
<tr>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/empmanager/listSkills.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/empmanager/listSkills.jsp b/apps/showcase/src/main/webapp/WEB-INF/empmanager/listSkills.jsp
index 1c20253..9fd2ff3 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/empmanager/listSkills.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/empmanager/listSkills.jsp
@@ -9,8 +9,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span3">
+ <div class="row">
+ <div class="col-md-3">
<ul class="nav nav-tabs nav-stacked">
<li><s:url var="url" namespace="/employee" action="list"/><s:a href="%{url}">List available Employees</s:a></li>
<li><s:url var="url" namespace="/employee" action="edit"/><s:a href="%{url}">Create/Edit Employee</s:a></li>
@@ -18,7 +18,7 @@
<li><s:url var="url" namespace="/skill" action="edit"/><s:a href="%{url}">Create/Edit Skill</s:a></li>
</ul>
</div>
- <div class="span9">
+ <div class="col-md-9">
<table class="table table-striped table-bordered table-hover table-condensed">
<tr>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/filedownload/index.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/filedownload/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/filedownload/index.jsp
index a8b7ef8..fa33089 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/filedownload/index.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/filedownload/index.jsp
@@ -12,8 +12,8 @@
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span6" style="text-align: center;">
+ <div class="row">
+ <div class="col-md-6" style="text-align: center;">
<div class="alert alert-info">
The browser should display the Struts logo.
</div>
@@ -21,7 +21,7 @@
<s:url var="url" action="download"/>
<s:a href="%{url}" cssClass="btn btn-large btn-info"><i class="icon-picture"></i> Download image file.</s:a>
</div>
- <div class="span6" style="text-align: center;">
+ <div class="col-md-6" style="text-align: center;">
<div class="alert alert-info">
The browser should prompt for a location to save the ZIP file.
</div>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/fileupload/multipleUploadUsingArray.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/fileupload/multipleUploadUsingArray.jsp b/apps/showcase/src/main/webapp/WEB-INF/fileupload/multipleUploadUsingArray.jsp
index 4c8167c..0756fa2 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/fileupload/multipleUploadUsingArray.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/fileupload/multipleUploadUsingArray.jsp
@@ -14,8 +14,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:form action="doMultipleUploadUsingArray" method="POST" enctype="multipart/form-data">
<s:file label="File (1)" name="upload" />
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/fileupload/multipleUploadUsingList.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/fileupload/multipleUploadUsingList.jsp b/apps/showcase/src/main/webapp/WEB-INF/fileupload/multipleUploadUsingList.jsp
index a84ef6c..8d8aacf 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/fileupload/multipleUploadUsingList.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/fileupload/multipleUploadUsingList.jsp
@@ -14,8 +14,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:form action="doMultipleUploadUsingList" method="POST" enctype="multipart/form-data">
<s:file label="File (1)" name="upload" />
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/fileupload/upload-success.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/fileupload/upload-success.jsp b/apps/showcase/src/main/webapp/WEB-INF/fileupload/upload-success.jsp
index 6073d2a..1852017 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/fileupload/upload-success.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/fileupload/upload-success.jsp
@@ -14,8 +14,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<ul>
<li>ContentType: <s:property value="uploadContentType" /></li>
<li>FileName: <s:property value="uploadFileName" /></li>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/fileupload/upload.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/fileupload/upload.jsp b/apps/showcase/src/main/webapp/WEB-INF/fileupload/upload.jsp
index cc770c4..ce7ce0c 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/fileupload/upload.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/fileupload/upload.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:actionerror cssClass="alert alert-error"/>
<s:fielderror cssClass="alert alert-error"/>
<s:form action="doUpload" method="POST" enctype="multipart/form-data">
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/freemarker/customFreemarkerManagerUsage.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/freemarker/customFreemarkerManagerUsage.ftl b/apps/showcase/src/main/webapp/WEB-INF/freemarker/customFreemarkerManagerUsage.ftl
index a1e14cf..e44513d 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/freemarker/customFreemarkerManagerUsage.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/freemarker/customFreemarkerManagerUsage.ftl
@@ -9,8 +9,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p>
This page shows a simple example of using a custom freemarker manager.
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/freemarker/standardTags.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/freemarker/standardTags.ftl b/apps/showcase/src/main/webapp/WEB-INF/freemarker/standardTags.ftl
index 016e189..907bec0 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/freemarker/standardTags.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/freemarker/standardTags.ftl
@@ -9,8 +9,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<@s.form action="test">
<@s.textfield label="Name" name="name"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl b/apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl
index 6bfd8ea..0bc2335 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl
@@ -8,8 +8,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<table>
<tr>
<td>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/help.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/help.jsp b/apps/showcase/src/main/webapp/WEB-INF/help.jsp
index 08d84ac..4e43366 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/help.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/help.jsp
@@ -1,7 +1,7 @@
<%@taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
- <title>Struts2 Showcase . Getting Support</title>
+ <title>Struts2 Showcase - Getting Support</title>
</head>
<body>
@@ -11,21 +11,21 @@
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span4" style="text-align: center;">
+ <div class="row">
+ <div class="col-md-4" style="text-align: center;">
<img src='<s:url value="/images/struts.gif"/>' alt="Struts Logo" width="290" height="80"/>
</div>
- <div class="span4" style="text-align: center;">
+ <div class="col-md-4" style="text-align: center;">
<div class="alert alert-info">
Use this mailing list if you encounter problems while developing and using with Struts.
</div>
- <a href="http://struts.apache.org/mail.html" class="btn btn-large btn-info"><i class="icon-share"></i> User List</a>
+ <a href="http://struts.apache.org/mail.html" class="btn btn-large btn-info"><i class="glyphicon glyphicon-share"></i> User List</a>
</div>
- <div class="span4" style="text-align: center;">
+ <div class="col-md-4" style="text-align: center;">
<div class="alert alert-info">
The Struts 2 website.
</div>
- <a href="http://struts.apache.org/2.x/" class="btn btn-large btn-info"><i class="icon-share"></i> Struts 2</a>
+ <a href="http://struts.apache.org" class="btn btn-large btn-info"><i class="glyphicon glyphicon-share"></i> Struts 2</a>
</div>
</div>
</body>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/modelDriven/modelDriven.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/modelDriven/modelDriven.jsp b/apps/showcase/src/main/webapp/WEB-INF/modelDriven/modelDriven.jsp
index d51533e..39018c5 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/modelDriven/modelDriven.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/modelDriven/modelDriven.jsp
@@ -12,8 +12,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:form action="modelDrivenResult" method="POST" namespace="/modelDriven">
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/modelDriven/modelDrivenResult.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/modelDriven/modelDrivenResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/modelDriven/modelDrivenResult.jsp
index d80b966..6d8e288 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/modelDriven/modelDrivenResult.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/modelDriven/modelDrivenResult.jsp
@@ -19,8 +19,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:label
label="Gangster Name"
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/person/edit-person.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/person/edit-person.jsp b/apps/showcase/src/main/webapp/WEB-INF/person/edit-person.jsp
index a7b0d98..2847ca1 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/person/edit-person.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/person/edit-person.jsp
@@ -9,8 +9,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span3">
+ <div class="row">
+ <div class="col-md-3">
<ul class="nav nav-tabs nav-stacked">
<s:url id="listpeopleurl" action="list-people" namespace="/person" />
<li><s:a href="%{listpeopleurl}">List all people</s:a> </li>
@@ -20,7 +20,7 @@
<li><s:a href="%{newpersonurl}">Create a new person</s:a></li>
</ul>
</div>
- <div class="span9">
+ <div class="col-md-9">
<s:form action="edit-person" theme="simple" validate="false">
<table class="table table-striped table-bordered table-hover table-condensed">
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/person/list-people.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/person/list-people.ftl b/apps/showcase/src/main/webapp/WEB-INF/person/list-people.ftl
index ac29b17..8a601f1 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/person/list-people.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/person/list-people.ftl
@@ -8,8 +8,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span3">
+ <div class="row">
+ <div class="col-md-3">
<ul class="nav nav-tabs nav-stacked">
<@s.url id="listpeopleurl" action="list-people" />
<li class="active"><@s.a href="%{listpeopleurl}">List all people</...@s.a></li>
@@ -19,7 +19,7 @@
<li><@s.a href="%{newpersonurl}">Create a new person</...@s.a></li>
</ul>
</div>
- <div class="span9">
+ <div class="col-md-9">
<p>There are ${peopleCount} people...</p>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/person/new-person.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/person/new-person.ftl b/apps/showcase/src/main/webapp/WEB-INF/person/new-person.ftl
index 6e99f07..77ccd8e 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/person/new-person.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/person/new-person.ftl
@@ -8,8 +8,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span3">
+ <div class="row">
+ <div class="col-md-3">
<ul class="nav nav-tabs nav-stacked">
<@s.url id="listpeopleurl" action="list-people" />
<li><@s.a href="%{listpeopleurl}">List all people</...@s.a></li>
@@ -19,7 +19,7 @@
<li class="active"><@s.a href="%{newpersonurl}">Create a new person</...@s.a></li>
</ul>
</div>
- <div class="span9">
+ <div class="col-md-9">
<@s.actionerror cssClass="alert alert-error"/>
<@s.actionmessage cssClass="alert alert-info"/>
<@s.fielderror cssClass="alert alert-error"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/showcase.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/showcase.jsp b/apps/showcase/src/main/webapp/WEB-INF/showcase.jsp
index bb23e78..adb3846 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/showcase.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/showcase.jsp
@@ -13,8 +13,8 @@
<body>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<div class="hero-unit">
<h1>Welcome!</h1>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl
index f87b6d4..412e370 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl
@@ -8,8 +8,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p>You have come to this page because you used an <strong>action</strong> prefix.<p/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl
index 84d477f..8ffe85e 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl
@@ -8,8 +8,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<b>Action Prefix</b><br/>
By clicking on 'action prefix' button, the request will go to the action alias 'actionPrefix'
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl
index 836bb22..702ca71 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl
@@ -8,8 +8,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p>You have come to this page because you used an <strong>method</strong> prefix.<p/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/normalSubmit.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/normalSubmit.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/normalSubmit.ftl
index e30d88c..dd15b08 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/normalSubmit.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/normalSubmit.ftl
@@ -8,8 +8,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p>You have come to this page because you did a normal submit.<p/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl
index f21fc45..f0bd957 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl
@@ -8,8 +8,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p>You have come to this page because you used an 'redirect-action' prefix.<p/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp
index 1fb5b44..1ddda5a 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<div class="well">
<h2> This is Not - Included by the Action Tag</h2>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/date.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/date.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/date.jsp
index 8581d8f..315f12a 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/date.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/date.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:action var="myDate" name="date" namespace="/" executeResult="false" />
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/debug.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/debug.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/debug.jsp
index 26c49a5..0294533 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/debug.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/debug.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p/>
This page shows a simple example of using the debug tag. <br/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/ifTag/testIf.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/ifTag/testIf.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/ifTag/testIf.ftl
index 4b9fab2..340df6f 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/ifTag/testIf.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/ifTag/testIf.ftl
@@ -9,8 +9,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p>
This is a simple freemarker template to test the If Tag (using freemarker directive).
There's quite a few combination being tested. The characters in bold and non-bold should be the same.
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/ifTag/testIf.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/ifTag/testIf.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/ifTag/testIf.jsp
index c049283..6fa99cb 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/ifTag/testIf.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/ifTag/testIf.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p>
This is a simple jsp to test the If Tag. There's quite a few combination being tested.
The characters in bold an non-bold should be the same.
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
index 32b9fec..4df1ea9 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:generator var="iterator1" separator="," val="%{iteratorValue1}" />
<s:generator var="iterator2" separator="," val="%{iteratorValue2}" />
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
index 5ebb9fc..49f74f5 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:generator val="%{value}" separator="%{separator}" count="%{count}">
<s:iterator value="%{top}">
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
index 15cab7d..c79a232 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:generator var="iterator1" val="%{iteratorValue1}" separator="," />
<s:generator var="iterator2" val="%{iteratorValue2}" separator="," />
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
index 259cfc4..5120e01 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:actionerror cssClass="alert alert-error"/>
<s:fielderror cssClass="alert alert-error"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
index e5a0665..720b38d 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:actionerror cssClass="alert alert-error"/>
<s:fielderror cssClass="alert alert-error"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
index 54d2c38..692dd9f 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:actionerror cssClass="alert alert-error"/>
<s:fielderror cssClass="alert alert-error"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
index e14de24..7cffab1 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:actionerror cssClass="alert alert-error"/>
<s:fielderror cssClass="alert alert-error"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
index 22f8be6..47bbbef 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:generator var="iterator" val="%{iteratorValue}" separator="," />
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/ui/actionTagExampleCalling.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/actionTagExampleCalling.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/actionTagExampleCalling.jsp
index 160851c..762a0d4 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/actionTagExampleCalling.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/actionTagExampleCalling.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<b>Example 1:</b>
This example calls an action and includes the output on the page
<p id="example1" class="well">
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/ui/componentTagExample.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/componentTagExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/componentTagExample.jsp
index dca5b0f..232f9e5 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/componentTagExample.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/componentTagExample.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p>This example tries to demonstrates the usage of <s:component ... > tag.<p/>
<p>To have a look at the source of this jsp page click
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.jsp
index 98d2881..847b794 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.jsp
@@ -3,7 +3,6 @@
<head>
<title>Struts2 Showcase - UI Tags Example</title>
<s:head/>
- <sx:head />
</head>
<body>
<div class="page-header">
@@ -11,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:actionerror cssClass="alert alert-error"/>
<s:actionmessage cssClass="alert alert-info"/>
@@ -25,12 +24,12 @@
name="name"
tooltip="Enter your Name here"/>
- <sx:datetimepicker
+ <s:textfield
tooltip="Select Your Birthday"
label="Birthday"
name="birthday" />
- <sx:datetimepicker
+ <s:textfield
tooltip="Enter the time you wake up"
label="Wake up time"
name="wakeup"
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.vm
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.vm b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.vm
index 399c3cf..cd6978e 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.vm
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/example.vm
@@ -9,8 +9,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
#sform ("action=exampleSubmitVelocity" "method=post" "enctype=multipart/form-data")
#stextfield ("label=Name" "name=name")
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/ui/exampleSubmited.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/exampleSubmited.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/exampleSubmited.jsp
index 5ef2126..cba7fc2 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/exampleSubmited.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/exampleSubmited.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<table class="table table-striped table-bordered table-hover table-condensed">
<s:label label="Name" name="name" />
<s:label label="Birthday" name="birthday" />
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/ui/exampleSubmited.vm
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/exampleSubmited.vm b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/exampleSubmited.vm
index fc6d9f3..9f69944 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/exampleSubmited.vm
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/exampleSubmited.vm
@@ -8,8 +8,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<table>
#slabel ("label=Name" "name=name")
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/ui/lotsOfOptiontransferselect.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/lotsOfOptiontransferselect.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/lotsOfOptiontransferselect.jsp
index d4aca42..5ce4cd4 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/lotsOfOptiontransferselect.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/lotsOfOptiontransferselect.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:form action="lotsOfOptiontransferselectSubmit" namespace="/tags/ui" method="post">
<s:optiontransferselect
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/ui/lotsOfOptiontransferselectSubmit.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/lotsOfOptiontransferselectSubmit.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/lotsOfOptiontransferselectSubmit.jsp
index 03d6adc..0756978 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/lotsOfOptiontransferselectSubmit.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/lotsOfOptiontransferselectSubmit.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<table>
<tr>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/ui/moreSelects.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/moreSelects.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/moreSelects.jsp
index 39019f0..e1aa125 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/moreSelects.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/moreSelects.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:form action="moreSelectsSubmit" namespace="/tags/ui" method="post">
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tags/ui/moreSelectsSubmit.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/moreSelectsSubmit.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/moreSelectsSubmit.jsp
index 82a0a70..c17a2d7 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/ui/moreSelectsSubmit.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/ui/moreSelectsSubmit.jsp
@@ -10,8 +10,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<table>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tiles/body.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tiles/body.ftl b/apps/showcase/src/main/webapp/WEB-INF/tiles/body.ftl
index bdaac05..73b2559 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tiles/body.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/tiles/body.ftl
@@ -1,6 +1,6 @@
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<div>
<p>This example illustrates the freemarker support in the Struts/Tiles Plugin.</p>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/tiles/body.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tiles/body.jsp b/apps/showcase/src/main/webapp/WEB-INF/tiles/body.jsp
index 095762f..e2e3512 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tiles/body.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tiles/body.jsp
@@ -1,7 +1,7 @@
<%@taglib prefix="s" uri="/struts-tags" %>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<div>
<p>This example illustrates the Struts/Tiles Plugin.</p>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/token/doublePost.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/token/doublePost.jsp b/apps/showcase/src/main/webapp/WEB-INF/token/doublePost.jsp
index 15dab33..66439b4 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/token/doublePost.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/token/doublePost.jsp
@@ -11,8 +11,8 @@
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p class="alert alert-warning">
Double post. Struts intercepted this request and prevents the action from executing again.
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/token/example1.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/token/example1.jsp b/apps/showcase/src/main/webapp/WEB-INF/token/example1.jsp
index 9495671..b4e3093 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/token/example1.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/token/example1.jsp
@@ -11,8 +11,8 @@
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p>
<b>Example 1:</b> This example illustrates a situation where you can transfer money from
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/token/example2.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/token/example2.jsp b/apps/showcase/src/main/webapp/WEB-INF/token/example2.jsp
index 7042ce8..93b1f5c 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/token/example2.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/token/example2.jsp
@@ -11,8 +11,8 @@
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p>
<b>Example 2:</b> This example illustrates a situation where you can transfer money from
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/token/example3.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/token/example3.jsp b/apps/showcase/src/main/webapp/WEB-INF/token/example3.jsp
index 4cf2b5a..9bfd1b6 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/token/example3.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/token/example3.jsp
@@ -11,8 +11,8 @@
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p>
<b>Example 3:</b> This example illustrates a situation where you can transfer money from
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/token/example4.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/token/example4.ftl b/apps/showcase/src/main/webapp/WEB-INF/token/example4.ftl
index e66b045..56ea464 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/token/example4.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/token/example4.ftl
@@ -10,8 +10,8 @@
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p>
<b>Example 4:</b> This example illustrates a situation where you can transfer money from
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/token/transferDone.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/token/transferDone.jsp b/apps/showcase/src/main/webapp/WEB-INF/token/transferDone.jsp
index 2a1ab8f..b1606e0 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/token/transferDone.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/token/transferDone.jsp
@@ -11,8 +11,8 @@
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p>
The transfer is done at
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/validation/clientSideValidationExample.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/clientSideValidationExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/clientSideValidationExample.jsp
index 42103e8..0ac640b 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/validation/clientSideValidationExample.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/validation/clientSideValidationExample.jsp
@@ -19,8 +19,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<!-- START SNIPPET: fieldValidatorsExample -->
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/validation/fieldValidatorsExample.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/fieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/fieldValidatorsExample.jsp
index f9332eb..4e92f0d 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/validation/fieldValidatorsExample.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/validation/fieldValidatorsExample.jsp
@@ -19,8 +19,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<!-- START SNIPPET: fieldValidatorsExample -->
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/validation/nonFieldValidatorsExample.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/nonFieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/nonFieldValidatorsExample.jsp
index 7860b66..fbee116 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/validation/nonFieldValidatorsExample.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/validation/nonFieldValidatorsExample.jsp
@@ -20,8 +20,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<!-- START SNIPPET: nonFieldValidatorsExample -->
<s:actionerror/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-basic.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-basic.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-basic.jsp
index 5ec5aaa..d64a478 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-basic.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-basic.jsp
@@ -15,8 +15,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<p>
<b>What is your favorite color?</b>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-client-css.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-client-css.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-client-css.jsp
index 04d104c..2224f6e 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-client-css.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-client-css.jsp
@@ -15,8 +15,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:form method="post" theme="css_xhtml" validate="true">
<s:textfield label="Name" name="name"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-client.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-client.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-client.jsp
index ceec697..b08cc74 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-client.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-client.jsp
@@ -15,8 +15,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
<s:form method="post" validate="true">
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-success.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-success.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-success.jsp
index 6f3672d..3bbb162 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-success.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-success.jsp
@@ -12,8 +12,8 @@
</div>
<div class="container-fluid">
- <div class="row-fluid">
- <div class="span12">
+ <div class="row">
+ <div class="col-md-12">
Thank you, <b><s:property value="name"/></b>. Your answer has been submitted as: