You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2026/07/18 06:13:13 UTC
(struts) 12/18: WW-5653 fix(showcase): remove BS3 carets and well class
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 74ec105ad02732d9cbfb83dc9af271a6e9e65648
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Sat Jul 18 07:15:37 2026 +0200
WW-5653 fix(showcase): remove BS3 carets and well class
Co-Authored-By: Claude Opus 4.8 <no...@anthropic.com>
---
.../src/main/webapp/WEB-INF/decorators/main.jsp | 18 ++++++++----------
.../tags/non-ui/actionTag/showActionTagDemo.jsp | 8 ++++----
.../webapp/WEB-INF/tags/ui/actionTagExampleCalling.jsp | 2 +-
3 files changed, 13 insertions(+), 15 deletions(-)
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 41fda1cb9..8f07a6016 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
@@ -115,8 +115,7 @@
<li><s:a value="%{home}"><i class="bi bi-house"></i> Home</s:a></li>
<li class="dropdown">
<a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">
- <i class="bi bi-gear"></i> Configuration
- <b class="caret"></b></a>
+ <i class="bi bi-gear"></i> Configuration</a>
<ul class="dropdown-menu" role="menu">
<li><s:a action="actionChain1!input" namespace="/actionchaining"
includeParams="none" cssClass="dropdown-item">Action Chaining</s:a></li>
@@ -128,7 +127,7 @@
</ul>
</li>
<li class="dropdown">
- <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">Non UI Tags<b class="caret"></b></a>
+ <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"/>
<s:a href="%{url}" cssClass="dropdown-item">Action Tag</s:a></li>
@@ -156,7 +155,7 @@
</ul>
</li>
<li class="dropdown">
- <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">UI Tags<b class="caret"></b></a>
+ <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"/>
<s:a href="%{url}" cssClass="dropdown-item">UI Example</s:a></li>
@@ -177,8 +176,7 @@
</li>
<li class="dropdown">
<a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">
- <i class="bi bi-file-earmark"></i> File
- <b class="caret"></b></a>
+ <i class="bi bi-file-earmark"></i> File</a>
<ul class="dropdown-menu" role="menu">
<li><s:a namespace="/filedownload" action="index" cssClass="dropdown-item">File Download</s:a></li>
<li>
@@ -201,7 +199,7 @@
</ul>
</li>
<li class="dropdown">
- <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">Validation<b class="caret"></b></a>
+ <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"/>
<s:url var="quizClient" namespace="/validation" action="quizClient" method="input"/>
@@ -227,7 +225,7 @@
</ul>
</li>
<li class="dropdown">
- <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">Examples<b class="caret"></b></a>
+ <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">Examples</a>
<ul class="dropdown-menu" role="menu">
<li class="dropdown-submenu">
<li>
@@ -246,7 +244,7 @@
</ul>
</li>
<li class="dropdown">
- <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">Integration<b class="caret"></b></a>
+ <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">Integration</a>
<ul class="dropdown-menu" role="menu">
<li>
<s:url var="url" action="customFreemarkerManagerDemo" namespace="/freemarker"/>
@@ -264,7 +262,7 @@
<ul class="nav navbar-nav float-end">
<li class="dropdown last">
<a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">
- <i class="bi bi-question-circle"></i> Help<b class="caret"></b></a>
+ <i class="bi bi-question-circle"></i> Help</a>
<ul class="dropdown-menu">
<s:url var="help" action="help" namespace="/" includeContext="false" />
<li><s:a value="%{help}" cssClass="dropdown-item">Help</s:a></li>
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 bfd18cfab..d8e1eaeca 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
@@ -33,13 +33,13 @@
<div class="row">
<div class="col-md-12">
- <div class="well">
+ <div class="bg-light border rounded p-3">
<h2> This is Not - Included by the Action Tag</h2>
</div>
<!-- lets include the first page many times -->
- <div class="well">
+ <div class="bg-light border rounded p-3">
<s:action name="includePage" namespace="/tags/non-ui/actionTag" executeResult="true" />
<s:action name="includePage" namespace="/tags/non-ui/actionTag" executeResult="true" />
<s:action name="includePage" namespace="/tags/non-ui/actionTag" executeResult="true" />
@@ -47,7 +47,7 @@
<!-- lets include the second page many times -->
- <div class="well">
+ <div class="bg-light border rounded p-3">
<s:action name="includePage2" namespace="/tags/non-ui/actionTag" executeResult="true" />
<s:action name="includePage2" namespace="/tags/non-ui/actionTag" executeResult="true" />
<s:action name="includePage2" namespace="/tags/non-ui/actionTag" executeResult="true" />
@@ -55,7 +55,7 @@
<!-- lets include the third page many time -->
- <div class="well">
+ <div class="bg-light border rounded p-3">
<s:action name="includePage3" namespace="/tags/non-ui/actionTag" executeResult="true" />
<s:action name="includePage3" namespace="/tags/non-ui/actionTag" executeResult="true" />
<s:action name="includePage3" namespace="/tags/non-ui/actionTag" executeResult="true" />
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 4cb19c631..61482e67e 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
@@ -34,7 +34,7 @@
<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">
+ <p id="example1" class="bg-light border rounded p-3">
<s:action namespace="/tags/ui" name="actionTagExample" executeResult="true"/>
</p>
</div>