This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch WW-5653-bootstrap5-sample-apps in repository https://gitbox.apache.org/repos/asf/struts.git
commit 4b96fcb03dea3553f77d479579d6167c6948daad Author: Lukasz Lenart <[email protected]> AuthorDate: Sat Jul 18 08:08:53 2026 +0200 WW-5653 fix(samples): migrate remaining BS2/BS3 classes (tables, buttons, progress, forms, navbar) Co-Authored-By: Claude Opus 4.8 <[email protected]> --- .../src/main/webapp/WEB-INF/content/orders-edit.jsp | 16 ++++++++-------- .../src/main/webapp/WEB-INF/content/orders-editNew.jsp | 12 ++++++------ .../showcase/src/main/webapp/WEB-INF/decorators/main.jsp | 16 ++++++++-------- .../src/main/webapp/WEB-INF/empmanager/listEmployees.jsp | 2 +- .../src/main/webapp/WEB-INF/empmanager/listSkills.jsp | 2 +- .../src/main/webapp/WEB-INF/filedownload/index.jsp | 4 ++-- apps/showcase/src/main/webapp/WEB-INF/help.jsp | 4 ++-- .../src/main/webapp/WEB-INF/person/edit-person.jsp | 2 +- apps/showcase/src/main/webapp/WEB-INF/showcase.jsp | 2 +- .../src/main/webapp/WEB-INF/tags/non-ui/date.jsp | 2 +- .../src/main/webapp/WEB-INF/tags/ui/exampleSubmited.jsp | 2 +- .../validation/successClientSideValidationExample.jsp | 2 +- .../WEB-INF/validation/successFieldValidatorsExample.jsp | 2 +- .../validation/successNonFieldValidatorsExample.jsp | 2 +- .../validation/successVisitorValidatorsExample.jsp | 2 +- apps/showcase/src/main/webapp/WEB-INF/wait/wait.jsp | 4 ++-- 16 files changed, 38 insertions(+), 38 deletions(-) diff --git a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-edit.jsp b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-edit.jsp index 8c488e6fe..511bb16f7 100644 --- a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-edit.jsp +++ b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-edit.jsp @@ -51,16 +51,16 @@ <s:actionmessage cssClass="alert alert-danger"/> - <s:form method="post" action="%{#request.contextPath}/orders/%{id}" cssClass="form-horizontal" theme="simple"> + <s:form method="post" action="%{#request.contextPath}/orders/%{id}" theme="simple"> <s:hidden name="_method" value="put" /> - <div class="form-group"> - <label class="col-sm-2 control-label" for="id">ID</label> + <div class="row mb-3"> + <label class="col-sm-2 col-form-label" for="id">ID</label> <div class="col-sm-4"> <s:textfield id="id" name="id" disabled="true" cssClass="form-control"/> </div> </div> - <div class="form-group"> - <label class="col-sm-2 control-label" for="clientName">Client</label> + <div class="row mb-3"> + <label class="col-sm-2 col-form-label" for="clientName">Client</label> <div class="col-sm-4"> <s:textfield id="clientName" name="clientName" cssClass="form-control"/> </div> @@ -68,8 +68,8 @@ <s:fielderror fieldName="clientName" /> </div> </div> - <div class="form-group"> - <label class="col-sm-2 control-label" for="amount">Amount</label> + <div class="row mb-3"> + <label class="col-sm-2 col-form-label" for="amount">Amount</label> <div class="col-sm-4"> <s:textfield id="amount" name="amount" cssClass="form-control" /> </div> @@ -77,7 +77,7 @@ <s:fielderror fieldName="amount" /> </div> </div> - <div class="form-group"> + <div class="row mb-3"> <div class="offset-sm-2 col-sm-4"> <s:submit cssClass="btn btn-primary"/> </div> diff --git a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-editNew.jsp b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-editNew.jsp index 2d1bb7190..6bf2b1d3d 100644 --- a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-editNew.jsp +++ b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-editNew.jsp @@ -51,9 +51,9 @@ <s:actionmessage cssClass="alert alert-danger"/> - <s:form method="post" action="%{#request.contextPath}/orders" cssClass="form-horizontal" theme="simple"> - <div class="form-group"> - <label class="col-sm-2 control-label" for="clientName">Client</label> + <s:form method="post" action="%{#request.contextPath}/orders" theme="simple"> + <div class="row mb-3"> + <label class="col-sm-2 col-form-label" for="clientName">Client</label> <div class="col-sm-4"> <s:textfield id="clientName" name="clientName" cssClass="form-control"/> </div> @@ -61,8 +61,8 @@ <s:fielderror fieldName="clientName" /> </div> </div> - <div class="form-group"> - <label class="col-sm-2 control-label" for="amount">Amount</label> + <div class="row mb-3"> + <label class="col-sm-2 col-form-label" for="amount">Amount</label> <div class="col-sm-4"> <s:textfield id="amount" name="amount" cssClass="form-control"/> </div> @@ -70,7 +70,7 @@ <s:fielderror fieldName="amount" /> </div> </div> - <div class="form-group"> + <div class="row mb-3"> <div class="offset-sm-2 col-sm-4"> <s:submit cssClass="btn btn-primary"/> </div> 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 4d0aa36cf..cfcd294af 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp @@ -113,7 +113,7 @@ <div class="collapse navbar-collapse" id="navbar-main"> <ul class="nav navbar-nav"> <li class="nav-item"><s:a value="%{home}" cssClass="nav-link"><i class="bi bi-house"></i> Home</s:a></li> - <li class="dropdown"> + <li class="nav-item dropdown"> <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown"> <i class="bi bi-gear"></i> Configuration</a> <ul class="dropdown-menu" role="menu"> @@ -126,7 +126,7 @@ <li><s:a value="/person/index.html" cssClass="dropdown-item">Person Manager ( by Conventions )</s:a></li> </ul> </li> - <li class="dropdown"> + <li class="nav-item dropdown"> <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">Non UI Tags</a> <ul class="dropdown-menu" role="menu"> <li><s:url var="url" action="showActionTagDemo" namespace="/tags/non-ui/actionTag"/> @@ -154,7 +154,7 @@ <s:a href="%{#url}" cssClass="dropdown-item">If Tag (Freemarker)</s:a></li> </ul> </li> - <li class="dropdown"> + <li class="nav-item dropdown"> <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">UI Tags</a> <ul class="dropdown-menu" role="menu"> <li><s:url var="url" namespace="/tags/ui" action="example" method="input"/> @@ -174,7 +174,7 @@ <s:a href="%{#url}" cssClass="dropdown-item">Html 5 theme</s:a></li> </ul> </li> - <li class="dropdown"> + <li class="nav-item dropdown"> <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown"> <i class="bi bi-file-earmark"></i> File</a> <ul class="dropdown-menu" role="menu"> @@ -198,7 +198,7 @@ </li> </ul> </li> - <li class="dropdown"> + <li class="nav-item dropdown"> <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">Validation</a> <ul class="dropdown-menu" role="menu"> <s:url var="quizBasic" namespace="/validation" action="quizBasic" method="input"/> @@ -224,7 +224,7 @@ <li><s:a href="%{ajaxFormSubmitUrl}" cssClass="dropdown-item">AJAX Form Submit</s:a></li> </ul> </li> - <li class="dropdown"> + <li class="nav-item dropdown"> <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">Examples</a> <ul class="dropdown-menu" role="menu"> <li class="dropdown-submenu"> @@ -243,7 +243,7 @@ <li><s:a value="/dispatcher/forward.action" cssClass="dropdown-item">Dispatcher result - forward</s:a></li> </ul> </li> - <li class="dropdown"> + <li class="nav-item dropdown"> <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">Integration</a> <ul class="dropdown-menu" role="menu"> <li> @@ -260,7 +260,7 @@ </ul> <ul class="nav navbar-nav ms-auto"> - <li class="dropdown last"> + <li class="nav-item dropdown"> <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown"> <i class="bi bi-question-circle"></i> Help</a> <ul class="dropdown-menu"> 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 c93ca6f51..8bd3f18f3 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/empmanager/listEmployees.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/empmanager/listEmployees.jsp @@ -40,7 +40,7 @@ </div> <div class="col-md-9"> - <table class="table table-striped table-bordered table-hover table-condensed"> + <table class="table table-striped table-bordered table-hover table-sm"> <tr> <th>Id</th> <th>First Name</th> 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 2211f2bb8..b336a0eef 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/empmanager/listSkills.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/empmanager/listSkills.jsp @@ -40,7 +40,7 @@ </div> <div class="col-md-9"> - <table class="table table-striped table-bordered table-hover table-condensed"> + <table class="table table-striped table-bordered table-hover table-sm"> <tr> <th>Name</th><th>Description</th> </tr> 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 e7ad4fff0..5cfa6d67e 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/filedownload/index.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/filedownload/index.jsp @@ -39,7 +39,7 @@ </div> <s:url var="url" action="download"/> - <s:a href="%{url}" cssClass="btn btn-large btn-info"><i class="bi bi-image"></i> Download image file.</s:a> + <s:a href="%{url}" cssClass="btn btn-lg btn-info"><i class="bi bi-image"></i> Download image file.</s:a> </div> <div class="col-md-6" style="text-align: center;"> <div class="alert alert-info"> @@ -47,7 +47,7 @@ </div> <s:url var="url" action="download2"/> - <s:a href="%{url}" cssClass="btn btn-large btn-info"><i class="bi bi-download"></i> Download ZIP file.</s:a> + <s:a href="%{url}" cssClass="btn btn-lg btn-info"><i class="bi bi-download"></i> Download ZIP file.</s:a> </div> </div> </div> diff --git a/apps/showcase/src/main/webapp/WEB-INF/help.jsp b/apps/showcase/src/main/webapp/WEB-INF/help.jsp index 18dac37b6..18016f6bf 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/help.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/help.jsp @@ -39,13 +39,13 @@ <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="bi bi-share"></i> User List</a> + <a href="http://struts.apache.org/mail.html"; class="btn btn-lg btn-info"><i class="bi bi-share"></i> User List</a> </div> <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"; class="btn btn-large btn-info"><i class="bi bi-share"></i> Struts 2</a> + <a href="http://struts.apache.org"; class="btn btn-lg btn-info"><i class="bi bi-share"></i> Struts 2</a> </div> </div> </body> 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 909297c41..dcebc233e 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 @@ -43,7 +43,7 @@ <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"> + <table class="table table-striped table-bordered table-hover table-sm"> <tr> <th>ID</th> <th>First Name</th> diff --git a/apps/showcase/src/main/webapp/WEB-INF/showcase.jsp b/apps/showcase/src/main/webapp/WEB-INF/showcase.jsp index 043947ce2..1c10d8987 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/showcase.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/showcase.jsp @@ -39,7 +39,7 @@ <div class="p-5 mb-4 bg-light rounded-3"> <h1>Welcome!</h1> <p>The Struts Showcase demonstrates a variety of use cases and tag usages. Essentially, the application exercises various framework features in isolation. The Showcase is not meant as a "best practices" example.</p> - <p>For more "by example" solutions, see the <a href="https://github.com/apache/struts-examples"; class="btn btn-primary btn-large">Struts Examples »</a> pages.</p> + <p>For more "by example" solutions, see the <a href="https://github.com/apache/struts-examples"; class="btn btn-primary btn-lg">Struts Examples »</a> pages.</p> </div> </div> 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 a1b8504a1..c48a5bf39 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 @@ -35,7 +35,7 @@ <s:action var="myDate" name="date" namespace="/" executeResult="false" /> - <table class="table table-striped table-bordered table-hover table-condensed"> + <table class="table table-striped table-bordered table-hover table-sm"> <tr> <th>Name</th> <th>Format</th> 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 1feb30354..34f6c733c 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 @@ -32,7 +32,7 @@ <div class="container-fluid"> <div class="row"> <div class="col-md-12"> - <table class="table table-striped table-bordered table-hover table-condensed"> + <table class="table table-striped table-bordered table-hover table-sm"> <s:label label="Name" name="name" /> <s:label label="Birthday" name="birthday" /> <tr> diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/successClientSideValidationExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/successClientSideValidationExample.jsp index 884b33d38..c0113ab43 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/validation/successClientSideValidationExample.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/validation/successClientSideValidationExample.jsp @@ -41,7 +41,7 @@ <div class="row"> <div class="col-md-12"> - <table class="table table-striped table-bordered table-hover table-condensed"> + <table class="table table-striped table-bordered table-hover table-sm"> <tr> <td>Required Validator Field:</td> <td><s:property value="requiredValidatorField" /></td> diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/successFieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/successFieldValidatorsExample.jsp index d70aa6c25..a23fb577b 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/validation/successFieldValidatorsExample.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/validation/successFieldValidatorsExample.jsp @@ -42,7 +42,7 @@ <div class="row"> <div class="col-md-12"> - <table class="table table-striped table-bordered table-hover table-condensed"> + <table class="table table-striped table-bordered table-hover table-sm"> <tr> <td>Required Validator Field:</td> <td><s:property value="requiredValidatorField" /></td> diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/successNonFieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/successNonFieldValidatorsExample.jsp index 771a958dd..be1058484 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/validation/successNonFieldValidatorsExample.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/validation/successNonFieldValidatorsExample.jsp @@ -42,7 +42,7 @@ <div class="row"> <div class="col-md-12"> - <table class="table table-striped table-bordered table-hover table-condensed"> + <table class="table table-striped table-bordered table-hover table-sm"> <tr> <td>Some Text: </td> <td><s:property value="someText" /></td> diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/successVisitorValidatorsExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/successVisitorValidatorsExample.jsp index 5ae01ffee..27043b0aa 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/validation/successVisitorValidatorsExample.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/validation/successVisitorValidatorsExample.jsp @@ -42,7 +42,7 @@ <div class="row"> <div class="col-md-12"> - <table class="table table-striped table-bordered table-hover table-condensed"> + <table class="table table-striped table-bordered table-hover table-sm"> <tr> <td>User Name:</td> <td><s:property value="user.name" /></td> diff --git a/apps/showcase/src/main/webapp/WEB-INF/wait/wait.jsp b/apps/showcase/src/main/webapp/WEB-INF/wait/wait.jsp index 5feac7a78..05fa3173d 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/wait/wait.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/wait/wait.jsp @@ -39,8 +39,8 @@ We are processing your request. Please wait. </p> - <div class="progress progress-striped active"> - <div class="bar progress-bar progress-bar-success" style="width: 50%;"></div> + <div class="progress" role="progressbar" aria-valuenow="50" aria-valuemin="0" aria-valuemax="100"> + <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width: 50%;"></div> </div> <div class="card">
