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 dd4c0b9b689c2ed9ec5526af89b42fc3b94841cc Author: Lukasz Lenart <[email protected]> AuthorDate: Sat Jul 18 07:33:26 2026 +0200 WW-5653 feat(rest-showcase): migrate JSP markup to Bootstrap 5 Co-Authored-By: Claude Opus 4.8 <[email protected]> --- .../src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp | 4 ++-- .../src/main/webapp/WEB-INF/content/orders-edit.jsp | 4 ++-- .../src/main/webapp/WEB-INF/content/orders-editNew.jsp | 4 ++-- .../src/main/webapp/WEB-INF/content/orders-index.jsp | 10 +++++----- .../src/main/webapp/WEB-INF/content/orders-show.jsp | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp index b5ffc3ee8..35235e2a7 100644 --- a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp +++ b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-deleteConfirm.jsp @@ -45,7 +45,7 @@ <div class="row"> <div class="col-md-12"> - <div class="page-header"> + <div class="border-bottom pb-2"> <h1>Delete Order ${id}</h1> </div> @@ -60,7 +60,7 @@ </form> <br /> <a href="${pageContext.request.contextPath}/orders" class="btn btn-info"> - <span class="glyphicon glyphicon-arrow-left"></span> Back to Orders + <i class="bi bi-arrow-left"></i> Back to Orders </a> </div><!--/col-md-12---> </div><!--/row--> 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 beeebbc6e..ed9bac842 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 @@ -45,7 +45,7 @@ <div class="row"> <div class="col-md-12"> - <div class="page-header"> + <div class="border-bottom pb-2"> <h1>Order <s:property value="id" /></h1> </div> @@ -85,7 +85,7 @@ <table> </s:form> <a href="${pageContext.request.contextPath}/orders" class="btn btn-info"> - <span class="glyphicon glyphicon-arrow-left"></span> Back to Orders + <i class="bi bi-arrow-left"></i> Back to Orders </a> </div><!--/col-md-12---> </div><!--/row--> 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 71367cd4e..f0a5f0d70 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 @@ -45,7 +45,7 @@ <div class="row"> <div class="col-md-12"> - <div class="page-header"> + <div class="border-bottom pb-2"> <h1>New Order</h1> </div> @@ -77,7 +77,7 @@ </div> </s:form> <a href="${pageContext.request.contextPath}/orders" class="btn btn-info"> - <span class="glyphicon glyphicon-arrow-left"></apan> Back to Orders + <i class="bi bi-arrow-left"></i> Back to Orders </a> </div><!--/col-md-12---> </div><!--/row--> diff --git a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-index.jsp b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-index.jsp index f935a4dd9..bfe163d5d 100644 --- a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-index.jsp +++ b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-index.jsp @@ -45,7 +45,7 @@ <div class="row"> <div class="col-md-12"> - <div class="page-header"> + <div class="border-bottom pb-2"> <h1>Orders</h1> </div> <s:actionmessage cssClass="alert alert-danger"/> @@ -63,15 +63,15 @@ <td><s:property value="amount"/></td> <td> <div class="btn-group"> - <a href="orders/${id}" class="btn btn-default"><span class="glyphicon glyphicon-eye-open"></span> View</a> - <a href="orders/${id}/edit" class="btn btn-default"><span class="glyphicon glyphicon-edit"></span> Edit</a> - <a href="orders/${id}/deleteConfirm" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> Delete</a> + <a href="orders/${id}" class="btn btn-secondary"><i class="bi bi-eye"></i> View</a> + <a href="orders/${id}/edit" class="btn btn-secondary"><i class="bi bi-pencil"></i> Edit</a> + <a href="orders/${id}/deleteConfirm" class="btn btn-danger"><i class="bi bi-trash"></i> Delete</a> </div> </td> </tr> </s:iterator> </table> - <a href="orders/new" class="btn btn-primary"><span class="glyphicon glyphicon-file"></span> Create a new order</a> + <a href="orders/new" class="btn btn-primary"><i class="bi bi-file-earmark"></i> Create a new order</a> </div><!--/col-md-12---> </div><!--/row--> </div><!--/container--> diff --git a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-show.jsp b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-show.jsp index 3b05221d3..4e3161ce6 100644 --- a/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-show.jsp +++ b/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-show.jsp @@ -44,7 +44,7 @@ <div class="container-fluid"> <div class="row"> <div class="col-md-12"> - <div class="page-header"> + <div class="border-bottom pb-2"> <h1>Order ${id}</h1> </div> <table class="table table-striped"> @@ -62,7 +62,7 @@ </tr> </table> <a href="${pageContext.request.contextPath}/orders" class="btn btn-info"> - <span class="glyphicon glyphicon-arrow-left"></span> Back to Orders + <i class="bi bi-arrow-left"></i> Back to Orders </a> </div><!--/col-md-12---> </div><!--/row-->
