Skip to content

Commit

Permalink
Nested Content
Browse files Browse the repository at this point in the history
  • Loading branch information
@slominskir
slominskir committed Nov 20, 2024
1 parent ddada1f commit e10168e
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 25 deletions.
12 changes: 6 additions & 6 deletions smoothness-demo/src/main/webapp/WEB-INF/views/breadcrumbs/crumb-four.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<jsp:body>
<div class="banner-breadbox">
<ul>
<li><a href="crumb-one">Crumb One</a></li>
<li><a href="crumb-two">Crumb Two</a></li>
<li><a href="crumb-three">Crumb Three</a></li>
<li><a href="crumb-one" class="partial-support">Crumb One</a></li>
<li><a href="crumb-two" class="partial-support">Crumb Two</a></li>
<li><a href="crumb-three" class="partial-support">Crumb Three</a></li>
<li>Crumb Four</li>
</ul>
</div>
Expand Down Expand Up @@ -62,15 +62,15 @@
<div class="float-breadbox left-only">
<ul>
<li>
<div><a href="crumb-three" data-dialog-title="Crumb Three" class="dialog-friendly">Previous</a></div>
<div><a href="crumb-three" class="partial-support">Previous</a></div>
</li>
<li class="hide-in-dialog">
<div><a href="crumb-four" class="dialog-ready" data-dialog-title="Crumb Four">🗗</a></div>
<div><a href="crumb-four" class="dialog-opener">🗗</a></div>
</li>
</ul>
</div>
<h2 class="page-header-title"><c:out value="${title}"/></h2>
<p>Try this in a dialog: <a href="${pageContext.request.contextPath}/features/multiselect-datatable" class="dialog-ready" data-dialog-title="Multi-Select Datatable">Multi-select Datatable</a></p>
<p>Try this in a dialog: <a href="${pageContext.request.contextPath}/features/multiselect-datatable" class="dialog-opener">Multi-select Datatable</a></p>
</section>
</div>
</jsp:body>
Expand Down
4 changes: 2 additions & 2 deletions smoothness-demo/src/main/webapp/WEB-INF/views/breadcrumbs/crumb-one.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
<div class="float-breadbox right-only">
<ul>
<li class="hide-in-dialog">
<div><a href="crumb-one" class="dialog-ready" data-dialog-title="Crumb One">🗗</a></div>
<div><a href="crumb-one" class="dialog-opener">🗗</a></div>
</li>
<li>
<div><a href="crumb-two" data-dialog-title="Crumb Two" class="dialog-friendly">Next</a></div>
<div><a href="crumb-two" class="partial-support">Next</a></div>
</li>
</ul>
</div>
Expand Down
10 changes: 5 additions & 5 deletions smoothness-demo/src/main/webapp/WEB-INF/views/breadcrumbs/crumb-three.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<jsp:body>
<div class="banner-breadbox">
<ul>
<li><a href="crumb-one">Crumb One</a></li>
<li><a href="crumb-two">Crumb Two</a></li>
<li><a href="crumb-one" class="partial-support">Crumb One</a></li>
<li><a href="crumb-two" class="partial-support">Crumb Two</a></li>
<li>Crumb Three</li>
</ul>
</div>
Expand All @@ -29,12 +29,12 @@
<div class="float-breadbox">
<ul>
<li>
<div><a href="crumb-two" data-dialog-title="Crumb Two" class="dialog-friendly">Previous</a></div>
<div><a href="crumb-two" class="partial-support">Previous</a></div>
</li>
<li class="hide-in-dialog">
<div><a href="crumb-three" class="dialog-ready" data-dialog-title="Crumb Three">🗗</a></div>
<div><a href="crumb-three" class="dialog-opener">🗗</a></div>
</li>
<li><a href="crumb-four" data-dialog-title="Crumb Four" class="dialog-friendly">Next</a></li>
<li><a href="crumb-four" class="partial-support">Next</a></li>
</ul>
</div>
<h2 class="page-header-title"><c:out value="${title}"/></h2>
Expand Down
8 changes: 4 additions & 4 deletions smoothness-demo/src/main/webapp/WEB-INF/views/breadcrumbs/crumb-two.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<jsp:body>
<div class="banner-breadbox">
<ul>
<li><a href="crumb-one">Crumb One</a></li>
<li><a href="crumb-one" class="partial-support">Crumb One</a></li>
<li>Crumb Two</li>
</ul>
</div>
Expand Down Expand Up @@ -44,12 +44,12 @@
<div class="float-breadbox">
<ul>
<li>
<div><a href="crumb-one" data-dialog-title="Crumb One" class="dialog-friendly">Previous</a></div>
<div><a href="crumb-one" class="partial-support">Previous</a></div>
</li>
<li class="hide-in-dialog">
<div><a href="crumb-two" class="dialog-ready" data-dialog-title="Crumb One">🗗</a></div>
<div><a href="crumb-two" class="dialog-opener">🗗</a></div>
</li>
<li><a href="crumb-three" data-dialog-title="Crumb Three" class="dialog-friendly">Next</a></li>
<li><a href="crumb-three" class="partial-support">Next</a></li>
</ul>
</div>
<h2 class="page-header-title"><c:out value="${title}"/></h2>
Expand Down
9 changes: 1 addition & 8 deletions smoothness-weblib/src/main/resources/META-INF/resources/resources/js/smoothness.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1083,14 +1083,7 @@ $(document).on("change", "#date-range", function () {

});
// Dialog events
$(document).on("click", ".page-dialog .dialog-friendly", function () {
var title = $(this).attr("data-dialog-title");

jlab.closePageDialogs();
jlab.openPageInDialog($(this).attr("href"), title);
return false;
});
$(document).on("click", ".dialog-ready", function (e) {
$(document).on("click", ".dialog-opener, .page-dialog .partial-support", function (e) {
jlab.closePageDialogs();
jlab.openPageInDialog($(this).attr("href"));
return false;
Expand Down

0 comments on commit e10168e

Please sign in to comment.