Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nested Content #33

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+669 −557
Open

Nested Content #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
94584fa
Nested Content
slominskir Nov 19, 2024
0ef1d62
Nested Content
slominskir Nov 19, 2024
ddada1f
Nested Content
slominskir Nov 20, 2024
e10168e
Nested Content
slominskir Nov 20, 2024
1efd18a
Nested Content
slominskir Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion smoothness-demo/src/main/webapp/WEB-INF/tags/page.tag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@
<%@attribute name="stylesheets" fragment="true"%>
<%@attribute name="scripts" fragment="true"%>
<%@attribute name="secondaryNavigation" fragment="true"%>
<c:choose>
<c:when test="${param.partial eq 'Y'}">
<div class="partial" data-title="${title}">
<jsp:invoke fragment="stylesheets"/>
<jsp:doBody/>
<jsp:invoke fragment="scripts"/>
</div>
</c:when>
<c:otherwise>
<s:tabbed-page title="${title}" category="${category}" description="${description}">
<jsp:attribute name="stylesheets">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/demo.css"/>
Expand Down Expand Up @@ -55,4 +64,6 @@
<jsp:body>
<jsp:doBody/>
</jsp:body>
</s:tabbed-page>
</s:tabbed-page>
</c:otherwise>
</c:choose>
113 changes: 66 additions & 47 deletions smoothness-demo/src/main/webapp/WEB-INF/views/breadcrumbs/crumb-four.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,77 @@
<%@page contentType="text/html" pageEncoding="UTF-8" trimDirectiveWhitespaces="true"%>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%>
<%@taglib prefix="t" tagdir="/WEB-INF/tags"%>
<%@page contentType="text/html" pageEncoding="UTF-8" trimDirectiveWhitespaces="true" %>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
<c:set var="title" value="Crumb Four"/>
<t:page title="${title}">
<jsp:attribute name="stylesheets">
</jsp:attribute>
<jsp:attribute name="scripts">
</jsp:attribute>
</jsp:attribute>
<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>
<section>
<div class="ribbon-breadbox">
<ul>
<li>
<s:filter-flyout-widget>
<form id="filter-form" method="get" action="crumb-two">
<div id="filter-form-panel">
<fieldset>
<legend>Filter</legend>
<ul class="key-value-list">
<li>
<div class="li-key">
<label for="search">Search</label>
</div>
<div class="li-value">
<input id="search" name="search" value="${fn:escapeXml(param.search)}"/>
<div>(matches any attribute which starts with substring)</div>
</div>
</li>
</ul>
</fieldset>
</div>
<input type="hidden" id="offset-input" name="offset" value="0"/>
<input id="filter-form-submit-button" type="submit" value="Apply"/>
</form>
</s:filter-flyout-widget>
</li>
<li><div>Item 1</div></li>
<li><div>Item 2</div></li>
<li><div>Item 3</div></li>
</ul>
</div>
<h2 id="page-header-title"><c:out value="${title}"/></h2>
<p>The End</p>
</section>
</jsp:body>
</div>
<div class="dialog-content">
<section>
<div class="ribbon-breadbox">
<ul>
<li>
<s:filter-flyout-widget>
<form class="filter-form" method="get" action="crumb-four">
<div class="filter-form-panel">
<fieldset>
<legend>Filter</legend>
<ul class="key-value-list">
<li>
<div class="li-key">
<label for="search">Search</label>
</div>
<div class="li-value">
<input id="search" name="search"
value="${fn:escapeXml(param.search)}"/>
<div>(matches any attribute which starts with substring)</div>
</div>
</li>
</ul>
</fieldset>
</div>
<input type="hidden" class="offset-input" name="offset" value="0"/>
<input class="filter-form-submit-button" type="submit" value="Apply"/>
</form>
</s:filter-flyout-widget>
</li>
<li>
<div>Item 1</div>
</li>
<li>
<div>Item 2</div>
</li>
<li>
<div>Item 3</div>
</li>
</ul>
</div>
<div class="float-breadbox left-only">
<ul>
<li>
<div><a href="crumb-three" class="partial-support">Previous</a></div>
</li>
<li class="hide-in-dialog">
<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-opener">Multi-select Datatable</a></p>
</section>
</div>
</jsp:body>
</t:page>
151 changes: 67 additions & 84 deletions smoothness-demo/src/main/webapp/WEB-INF/views/breadcrumbs/crumb-one.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,91 +1,74 @@
<%@page contentType="text/html" pageEncoding="UTF-8" trimDirectiveWhitespaces="true"%>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%>
<%@taglib prefix="t" tagdir="/WEB-INF/tags"%>
<%@page contentType="text/html" pageEncoding="UTF-8" trimDirectiveWhitespaces="true" %>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
<c:set var="title" value="Crumb One"/>
<t:page title="${title}">
<jsp:attribute name="stylesheets">
</jsp:attribute>
<jsp:attribute name="scripts">
</jsp:attribute>
</jsp:attribute>
<jsp:body>
<section>
<s:filter-flyout-widget requiredMessage="true" ribbon="true" resetButton="true">
<form id="filter-form" method="get" action="crumb-one">
<div id="filter-form-panel" class="scrollable-filter-form">
<fieldset>
<legend>Filter Set 1</legend>
<ul class="key-value-list">
<li>
<div class="li-key"><span class="required-field">Key 1</span></div>
<div class="li-value"><input type="text" name="key1"/></div>
</li>
<li>
<div class="li-key"><span>Key 2</span></div>
<div class="li-value"><input type="text" name="key2"/></div>
</li>
<li>
<div class="li-key"><span>Key 3</span></div>
<div class="li-value"><input type="text" name="key3"/></div>
</li>
</ul>
</fieldset>
<fieldset>
<legend>Filter Set 2</legend>
<ul class="key-value-list">
<li>
<div class="li-key"><span>Key 4</span></div>
<div class="li-value"><input type="text" name="key4"/></div>
</li>
<li>
<div class="li-key"><span>Key 5</span></div>
<div class="li-value"><input type="text" name="key5"/></div>
</li>
<li>
<div class="li-key"><span class="key-label">Key 6</span></div>
<div class="li-value"><input type="text" name="key6"/></div>
</li>
</ul>
</fieldset>
<fieldset>
<legend>Filter Set 3</legend>
<ul class="key-value-list">
<li>
<div class="li-key"><span>Key 7</span></div>
<div class="li-value"><input type="text" name="key7"/></div>
</li>
<li>
<div class="li-key"><span>Key 8</span></div>
<div class="li-value"><input type="text" name="key8"/></div>
</li>
<li>
<div class="li-key"><span>Key 9</span></div>
<div class="li-value"><input type="text" name="key9"/></div>
</li>
<li>
<div class="li-key"><span>Key 10</span></div>
<div class="li-value"><input type="text" name="key10"/></div>
</li>
<li>
<div class="li-key"><span>Key 11</span></div>
<div class="li-value"><input type="text" name="key11"/></div>
</li>
<li>
<div class="li-key"><span>Key 12</span></div>
<div class="li-value"><input type="text" name="key12"/></div>
</li>
</ul>
</fieldset>
</div>
<input id="filter-form-submit-button" type="submit" value="Apply"/>
</form>
</s:filter-flyout-widget>
<h2 id="page-header-title"><c:out value="${title}"/></h2>
<p>
<a href="crumb-two">Keep Going!</a>
</p>
</section>
</jsp:body>
<div class="dialog-content">
<section>
<s:filter-flyout-widget requiredMessage="true" ribbon="true" resetButton="true">
<form class="filter-form" method="get" action="crumb-one">
<div class="filter-form-panel" class="scrollable-filter-form">
<fieldset>
<legend>Filter Set 1</legend>
<ul class="key-value-list">
<li>
<div class="li-key"><span class="required-field">Key 1</span></div>
<div class="li-value"><input type="text" name="key1"/></div>
</li>
<li>
<div class="li-key"><span>Key 2</span></div>
<div class="li-value"><input type="text" name="key2"/></div>
</li>
<li>
<div class="li-key"><span>Key 3</span></div>
<div class="li-value"><input type="text" name="key3"/></div>
</li>
</ul>
</fieldset>
<fieldset>
<legend>Filter Set 2</legend>
<ul class="key-value-list">
<li>
<div class="li-key"><span>Key 4</span></div>
<div class="li-value"><input type="text" name="key4"/></div>
</li>
<li>
<div class="li-key"><span>Key 5</span></div>
<div class="li-value"><input type="text" name="key5"/></div>
</li>
<li>
<div class="li-key"><span class="key-label">Key 6</span></div>
<div class="li-value"><input type="text" name="key6"/></div>
</li>
</ul>
</fieldset>
</div>
<input class="filter-form-submit-button" type="submit" value="Apply"/>
</form>
</s:filter-flyout-widget>
<div class="float-breadbox right-only">
<ul>
<li class="hide-in-dialog">
<div><a href="crumb-one" class="dialog-opener">🗗</a></div>
</li>
<li>
<div><a href="crumb-two" class="partial-support">Next</a></div>
</li>
</ul>
</div>
<h2 class="page-header-title"><c:out value="${title}"/></h2>
<p>
Hello World
</p>
</section>
</div>
</jsp:body>
</t:page>
28 changes: 20 additions & 8 deletions smoothness-demo/src/main/webapp/WEB-INF/views/breadcrumbs/crumb-three.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,27 @@
<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>
<section>
<h2 id="page-header-title"><c:out value="${title}"/></h2>
<p><a href="crumb-two?max=100" class="dialog-ready" data-dialog-title="Hello World">Check this out</a></p>
<p><a href="crumb-four">Keep Going</a></p>
</section>
</div>
<div class="dialog-content">
<section>
<div class="float-breadbox">
<ul>
<li>
<div><a href="crumb-two" class="partial-support">Previous</a></div>
</li>
<li class="hide-in-dialog">
<div><a href="crumb-three" class="dialog-opener">🗗</a></div>
</li>
<li><a href="crumb-four" class="partial-support">Next</a></li>
</ul>
</div>
<h2 class="page-header-title"><c:out value="${title}"/></h2>
<p>Nothing to see here.</p>
</section>
</div>
</jsp:body>
</t:page>
Loading