mirror of
https://github.com/spring-projects/spring-petclinic.git
synced 2025-05-29 06:39:38 +00:00
simplify jsp layout management
abstract the page layout into “layout.tag”
This commit is contained in:
Dapeng
parent
beb46b2b3b
commit
aa8cc431eb
12 changed files with 281 additions and 404 deletions
|
|
@ -1,34 +1,14 @@
|
|||
<!DOCTYPE html>
|
||||
|
||||
<%@ page session="false" %>
|
||||
<%@ page session="false" trimDirectiveWhitespaces="true" %>
|
||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
|
||||
<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
|
||||
|
||||
<html lang="en">
|
||||
<petclinic:htmlHeader />
|
||||
<petclinic:layout pageName="error">
|
||||
|
||||
<body>
|
||||
<petclinic:bodyHeader menuName="error"/>
|
||||
<div class="container-fluid">
|
||||
<div class="container xd-container">
|
||||
<spring:url value="/resources/images/pets.png" var="petsImage"/>
|
||||
<img src="${petsImage}"/>
|
||||
|
||||
<spring:url value="/resources/images/pets.png" var="petsImage"/>
|
||||
<img src="${petsImage}"/>
|
||||
<h2>Something happened...</h2>
|
||||
|
||||
<h2>Something happened...</h2>
|
||||
<p>${exception.message}</p>
|
||||
|
||||
<p>${exception.message}</p>
|
||||
|
||||
<!-- Exception: ${exception.message}.
|
||||
<c:forEach items="${exception.stackTrace}" var="stackTrace">
|
||||
${stackTrace}
|
||||
</c:forEach>
|
||||
-->
|
||||
<petclinic:pivotal/>
|
||||
</div>
|
||||
</div>
|
||||
<petclinic:footer/>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</petclinic:layout>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
<!DOCTYPE html>
|
||||
|
||||
<%@ page session="false" %>
|
||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
||||
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
|
||||
|
|
@ -8,43 +6,29 @@
|
|||
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
|
||||
<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
|
||||
|
||||
|
||||
<html lang="en">
|
||||
|
||||
<petclinic:htmlHeader />
|
||||
|
||||
<body>
|
||||
<petclinic:bodyHeader menuName="owners"/>
|
||||
<div class="container-fluid">
|
||||
<div class="container xd-container">
|
||||
<h2>
|
||||
<c:if test="${owner['new']}">New </c:if> Owner
|
||||
</h2>
|
||||
<form:form modelAttribute="owner" class="form-horizontal" id="add-owner-form">
|
||||
<div class="form-group has-feedback">
|
||||
<petclinic:inputField label="First Name" name="firstName"/>
|
||||
<petclinic:inputField label="Last Name" name="lastName"/>
|
||||
<petclinic:inputField label="Address" name="address"/>
|
||||
<petclinic:inputField label="City" name="city"/>
|
||||
<petclinic:inputField label="Telephone" name="telephone"/>
|
||||
<petclinic:layout pageName="owners">
|
||||
<h2>
|
||||
<c:if test="${owner['new']}">New </c:if> Owner
|
||||
</h2>
|
||||
<form:form modelAttribute="owner" class="form-horizontal" id="add-owner-form">
|
||||
<div class="form-group has-feedback">
|
||||
<petclinic:inputField label="First Name" name="firstName"/>
|
||||
<petclinic:inputField label="Last Name" name="lastName"/>
|
||||
<petclinic:inputField label="Address" name="address"/>
|
||||
<petclinic:inputField label="City" name="city"/>
|
||||
<petclinic:inputField label="Telephone" name="telephone"/>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-sm-offset-2 col-sm-10">
|
||||
<c:choose>
|
||||
<c:when test="${owner['new']}">
|
||||
<button class="btn btn-default" type="submit">Add Owner</button>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<button class="btn btn-default" type="submit">Update Owner</button>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-sm-offset-2 col-sm-10">
|
||||
<c:choose>
|
||||
<c:when test="${owner['new']}">
|
||||
<button class="btn btn-default" type="submit">Add Owner</button>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<button class="btn btn-default" type="submit">Update Owner</button>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</div>
|
||||
</div>
|
||||
</form:form>
|
||||
<petclinic:pivotal/>
|
||||
</div>
|
||||
</div>
|
||||
<petclinic:footer />
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</div>
|
||||
</form:form>
|
||||
</petclinic:layout>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
<!DOCTYPE html>
|
||||
|
||||
<%@ page session="false" %>
|
||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
||||
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
|
||||
|
|
@ -7,45 +5,30 @@
|
|||
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
|
||||
<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
|
||||
|
||||
<html lang="en">
|
||||
<petclinic:layout pageName="owners">
|
||||
|
||||
<petclinic:htmlHeader />
|
||||
<h2>Find Owners</h2>
|
||||
|
||||
<body>
|
||||
<petclinic:bodyHeader menuName="owners"/>
|
||||
<div class="container-fluid">
|
||||
<div class="container xd-container">
|
||||
|
||||
<h2>Find Owners</h2>
|
||||
|
||||
<spring:url value="/owners.html" var="formUrl"/>
|
||||
<form:form modelAttribute="owner" action="${fn:escapeXml(formUrl)}" method="get" class="form-horizontal"
|
||||
id="search-owner-form">
|
||||
<div class="form-group">
|
||||
<div class="control-group" id="lastName">
|
||||
<label class="col-sm-2 control-label">Last name </label>
|
||||
<div class="col-sm-10">
|
||||
<form:input class="form-control" path="lastName" size="30" maxlength="80"/>
|
||||
<span class="help-inline"><form:errors path="*"/></span>
|
||||
</div>
|
||||
<spring:url value="/owners.html" var="formUrl"/>
|
||||
<form:form modelAttribute="owner" action="${fn:escapeXml(formUrl)}" method="get" class="form-horizontal"
|
||||
id="search-owner-form">
|
||||
<div class="form-group">
|
||||
<div class="control-group" id="lastName">
|
||||
<label class="col-sm-2 control-label">Last name </label>
|
||||
<div class="col-sm-10">
|
||||
<form:input class="form-control" path="lastName" size="30" maxlength="80"/>
|
||||
<span class="help-inline"><form:errors path="*"/></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-sm-offset-2 col-sm-10">
|
||||
<button type="submit" class="btn btn-default">Find Owner</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-sm-offset-2 col-sm-10">
|
||||
<button type="submit" class="btn btn-default">Find Owner</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form:form>
|
||||
</form:form>
|
||||
|
||||
<br/>
|
||||
<a class="btn btn-default" href='<spring:url value="/owners/new" htmlEscape="true"/>'>Add Owner</a>
|
||||
|
||||
<petclinic:pivotal/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<petclinic:footer />
|
||||
</body>
|
||||
|
||||
</html>
|
||||
<br/>
|
||||
<a class="btn btn-default" href='<spring:url value="/owners/new" htmlEscape="true"/>'>Add Owner</a>
|
||||
</petclinic:layout>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
<!DOCTYPE html>
|
||||
|
||||
<%@ page session="false" %>
|
||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
||||
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
|
||||
|
|
@ -8,109 +6,94 @@
|
|||
<%@ taglib prefix="joda" uri="http://www.joda.org/joda/time/tags" %>
|
||||
<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
|
||||
|
||||
<html lang="en">
|
||||
<petclinic:layout pageName="owners">
|
||||
|
||||
<petclinic:htmlHeader />
|
||||
|
||||
<body>
|
||||
<petclinic:bodyHeader menuName="owners"/>
|
||||
<div class="container-fluid">
|
||||
<div class="container xd-container">
|
||||
|
||||
<h2>Owner Information</h2>
|
||||
<h2>Owner Information</h2>
|
||||
|
||||
|
||||
<table class="table table-striped">
|
||||
<table class="table table-striped">
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<td><b><c:out value="${owner.firstName} ${owner.lastName}"/></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Address</th>
|
||||
<td><c:out value="${owner.address}"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>City</th>
|
||||
<td><c:out value="${owner.city}"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Telephone</th>
|
||||
<td><c:out value="${owner.telephone}"/></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<spring:url value="{ownerId}/edit.html" var="editUrl">
|
||||
<spring:param name="ownerId" value="${owner.id}"/>
|
||||
</spring:url>
|
||||
<a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Edit Owner</a>
|
||||
|
||||
<spring:url value="{ownerId}/pets/new.html" var="addUrl">
|
||||
<spring:param name="ownerId" value="${owner.id}"/>
|
||||
</spring:url>
|
||||
<a href="${fn:escapeXml(addUrl)}" class="btn btn-default">Add New Pet</a>
|
||||
|
||||
<br/>
|
||||
<br/>
|
||||
<br/>
|
||||
<h2>Pets and Visits</h2>
|
||||
|
||||
<table class="table table-striped">
|
||||
<c:forEach var="pet" items="${owner.pets}">
|
||||
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<td><b><c:out value="${owner.firstName} ${owner.lastName}"/></b></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Address</th>
|
||||
<td><c:out value="${owner.address}"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>City</th>
|
||||
<td><c:out value="${owner.city}"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Telephone</th>
|
||||
<td><c:out value="${owner.telephone}"/></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<spring:url value="{ownerId}/edit.html" var="editUrl">
|
||||
<spring:param name="ownerId" value="${owner.id}"/>
|
||||
</spring:url>
|
||||
<a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Edit Owner</a>
|
||||
|
||||
<spring:url value="{ownerId}/pets/new.html" var="addUrl">
|
||||
<spring:param name="ownerId" value="${owner.id}"/>
|
||||
</spring:url>
|
||||
<a href="${fn:escapeXml(addUrl)}" class="btn btn-default">Add New Pet</a>
|
||||
|
||||
<br/>
|
||||
<br/>
|
||||
<br/>
|
||||
<h2>Pets and Visits</h2>
|
||||
|
||||
<table class="table table-striped">
|
||||
<c:forEach var="pet" items="${owner.pets}">
|
||||
|
||||
<tr>
|
||||
<td valign="top">
|
||||
<dl class="dl-horizontal">
|
||||
<dt>Name</dt>
|
||||
<dd><c:out value="${pet.name}"/></dd>
|
||||
<dt>Birth Date</dt>
|
||||
<dd><joda:format value="${pet.birthDate}" pattern="yyyy-MM-dd"/></dd>
|
||||
<dt>Type</dt>
|
||||
<dd><c:out value="${pet.type.name}"/></dd>
|
||||
</dl>
|
||||
</td>
|
||||
<td valign="top">
|
||||
<table class="table-condensed">
|
||||
<thead>
|
||||
<td valign="top">
|
||||
<dl class="dl-horizontal">
|
||||
<dt>Name</dt>
|
||||
<dd><c:out value="${pet.name}"/></dd>
|
||||
<dt>Birth Date</dt>
|
||||
<dd><joda:format value="${pet.birthDate}" pattern="yyyy-MM-dd"/></dd>
|
||||
<dt>Type</dt>
|
||||
<dd><c:out value="${pet.type.name}"/></dd>
|
||||
</dl>
|
||||
</td>
|
||||
<td valign="top">
|
||||
<table class="table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Visit Date</th>
|
||||
<th>Description</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<c:forEach var="visit" items="${pet.visits}">
|
||||
<tr>
|
||||
<th>Visit Date</th>
|
||||
<th>Description</th>
|
||||
<td><joda:format value="${visit.date}" pattern="yyyy-MM-dd"/></td>
|
||||
<td><c:out value="${visit.description}"/></td>
|
||||
</tr>
|
||||
</thead>
|
||||
<c:forEach var="visit" items="${pet.visits}">
|
||||
<tr>
|
||||
<td><joda:format value="${visit.date}" pattern="yyyy-MM-dd"/></td>
|
||||
<td><c:out value="${visit.description}"/></td>
|
||||
</tr>
|
||||
</c:forEach>
|
||||
<tr>
|
||||
<td>
|
||||
<spring:url value="/owners/{ownerId}/pets/{petId}/edit" var="petUrl">
|
||||
<spring:param name="ownerId" value="${owner.id}"/>
|
||||
<spring:param name="petId" value="${pet.id}"/>
|
||||
</spring:url>
|
||||
<a href="${fn:escapeXml(petUrl)}">Edit Pet</a>
|
||||
</td>
|
||||
<td>
|
||||
<spring:url value="/owners/{ownerId}/pets/{petId}/visits/new" var="visitUrl">
|
||||
<spring:param name="ownerId" value="${owner.id}"/>
|
||||
<spring:param name="petId" value="${pet.id}"/>
|
||||
</spring:url>
|
||||
<a href="${fn:escapeXml(visitUrl)}">Add Visit</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</c:forEach>
|
||||
<tr>
|
||||
<td>
|
||||
<spring:url value="/owners/{ownerId}/pets/{petId}/edit" var="petUrl">
|
||||
<spring:param name="ownerId" value="${owner.id}"/>
|
||||
<spring:param name="petId" value="${pet.id}"/>
|
||||
</spring:url>
|
||||
<a href="${fn:escapeXml(petUrl)}">Edit Pet</a>
|
||||
</td>
|
||||
<td>
|
||||
<spring:url value="/owners/{ownerId}/pets/{petId}/visits/new" var="visitUrl">
|
||||
<spring:param name="ownerId" value="${owner.id}"/>
|
||||
<spring:param name="petId" value="${pet.id}"/>
|
||||
</spring:url>
|
||||
<a href="${fn:escapeXml(visitUrl)}">Add Visit</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</c:forEach>
|
||||
</table>
|
||||
</c:forEach>
|
||||
</table>
|
||||
|
||||
<petclinic:pivotal/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<petclinic:footer />
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</petclinic:layout>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
<!DOCTYPE html>
|
||||
|
||||
<%@ page session="false" %>
|
||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
||||
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
|
||||
|
|
@ -8,43 +6,28 @@
|
|||
<%@ taglib prefix="datatables" uri="http://github.com/dandelion/datatables" %>
|
||||
<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
|
||||
|
||||
<html lang="en">
|
||||
<petclinic:layout pageName="owners">
|
||||
<h2>Owners</h2>
|
||||
|
||||
<petclinic:htmlHeader />
|
||||
|
||||
<body>
|
||||
<petclinic:bodyHeader menuName="owners"/>
|
||||
<div class="container-fluid">
|
||||
<div class="container xd-container">
|
||||
<h2>Owners</h2>
|
||||
|
||||
<datatables:table id="owners" data="${selections}" row="owner"
|
||||
cssClass="table table-striped" pageable="false" info="false" export="pdf">
|
||||
<datatables:column title="Name" cssStyle="width: 150px;" display="html">
|
||||
<spring:url value="/owners/{ownerId}.html" var="ownerUrl">
|
||||
<spring:param name="ownerId" value="${owner.id}"/>
|
||||
</spring:url>
|
||||
<a href="${fn:escapeXml(ownerUrl)}"><c:out value="${owner.firstName} ${owner.lastName}"/></a>
|
||||
</datatables:column>
|
||||
<datatables:column title="Name" display="pdf">
|
||||
<c:out value="${owner.firstName} ${owner.lastName}"/>
|
||||
</datatables:column>
|
||||
<datatables:column title="Address" property="address" cssStyle="width: 200px;"/>
|
||||
<datatables:column title="City" property="city"/>
|
||||
<datatables:column title="Telephone" property="telephone"/>
|
||||
<datatables:column title="Pets" cssStyle="width: 100px;">
|
||||
<c:forEach var="pet" items="${owner.pets}">
|
||||
<c:out value="${pet.name}"/>
|
||||
</c:forEach>
|
||||
</datatables:column>
|
||||
<datatables:export type="pdf" cssClass="btn" cssStyle="height: 25px;"/>
|
||||
</datatables:table>
|
||||
|
||||
<petclinic:pivotal/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<petclinic:footer />
|
||||
</body>
|
||||
|
||||
</html>
|
||||
<datatables:table id="owners" data="${selections}" row="owner"
|
||||
cssClass="table table-striped" pageable="false" info="false" export="pdf">
|
||||
<datatables:column title="Name" cssStyle="width: 150px;" display="html">
|
||||
<spring:url value="/owners/{ownerId}.html" var="ownerUrl">
|
||||
<spring:param name="ownerId" value="${owner.id}"/>
|
||||
</spring:url>
|
||||
<a href="${fn:escapeXml(ownerUrl)}"><c:out value="${owner.firstName} ${owner.lastName}"/></a>
|
||||
</datatables:column>
|
||||
<datatables:column title="Name" display="pdf">
|
||||
<c:out value="${owner.firstName} ${owner.lastName}"/>
|
||||
</datatables:column>
|
||||
<datatables:column title="Address" property="address" cssStyle="width: 200px;"/>
|
||||
<datatables:column title="City" property="city"/>
|
||||
<datatables:column title="Telephone" property="telephone"/>
|
||||
<datatables:column title="Pets" cssStyle="width: 100px;">
|
||||
<c:forEach var="pet" items="${owner.pets}">
|
||||
<c:out value="${pet.name}"/>
|
||||
</c:forEach>
|
||||
</datatables:column>
|
||||
<datatables:export type="pdf" cssClass="btn" cssStyle="height: 25px;"/>
|
||||
</datatables:table>
|
||||
</petclinic:layout>
|
||||
|
|
|
|||
|
|
@ -1,20 +1,18 @@
|
|||
<!DOCTYPE html>
|
||||
|
||||
<%@ page session="false" %>
|
||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
|
||||
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
|
||||
<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
|
||||
|
||||
|
||||
<html lang="en">
|
||||
|
||||
<petclinic:htmlHeader />
|
||||
<body>
|
||||
<petclinic:bodyHeader menuName="owners"/>
|
||||
|
||||
<div class="container-fluid">
|
||||
<div class="container xd-container">
|
||||
<petclinic:layout pageName="owners">
|
||||
<jsp:attribute name="customScript">
|
||||
<script>
|
||||
$(function () {
|
||||
$("#birthDate").datepicker({dateFormat: 'yy/mm/dd'});
|
||||
});
|
||||
</script>
|
||||
</jsp:attribute>
|
||||
<jsp:body>
|
||||
<h2>
|
||||
<c:if test="${pet['new']}">New </c:if> Pet
|
||||
</h2>
|
||||
|
|
@ -49,17 +47,5 @@
|
|||
</form:form>
|
||||
<c:if test="${!pet['new']}">
|
||||
</c:if>
|
||||
|
||||
<petclinic:pivotal/>
|
||||
</div>
|
||||
</div>
|
||||
<petclinic:footer />
|
||||
|
||||
<script>
|
||||
$(function () {
|
||||
$("#birthDate").datepicker({dateFormat: 'yy/mm/dd'});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</jsp:body>
|
||||
</petclinic:layout>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
<!DOCTYPE html>
|
||||
|
||||
<%@ page session="false" %>
|
||||
<%@ page session="false" trimDirectiveWhitespaces="true" %>
|
||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
|
||||
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
|
||||
|
|
@ -9,15 +7,15 @@
|
|||
<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
|
||||
|
||||
|
||||
<html lang="en">
|
||||
|
||||
<petclinic:htmlHeader />
|
||||
|
||||
<body>
|
||||
|
||||
<petclinic:bodyHeader menuName="owners"/>
|
||||
<div class="container-fluid">
|
||||
<div class="container xd-container">
|
||||
<petclinic:layout pageName="owners">
|
||||
<jsp:attribute name="customScript">
|
||||
<script>
|
||||
$(function () {
|
||||
$("#date").datepicker({dateFormat: 'yy/mm/dd'});
|
||||
});
|
||||
</script>
|
||||
</jsp:attribute>
|
||||
<jsp:body>
|
||||
<h2><c:if test="${visit['new']}">New </c:if>Visit</h2>
|
||||
|
||||
<b>Pet</b>
|
||||
|
|
@ -68,16 +66,6 @@
|
|||
</c:if>
|
||||
</c:forEach>
|
||||
</table>
|
||||
</jsp:body>
|
||||
|
||||
<petclinic:pivotal/>
|
||||
</div>
|
||||
</div>
|
||||
<petclinic:footer />
|
||||
<script>
|
||||
$(function () {
|
||||
$("#date").datepicker({dateFormat: 'yy/mm/dd'});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</petclinic:layout>
|
||||
|
|
|
|||
|
|
@ -1,50 +1,34 @@
|
|||
<!DOCTYPE html>
|
||||
|
||||
<%@ page session="false" %>
|
||||
<%@ page session="false" trimDirectiveWhitespaces="true" %>
|
||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
||||
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
|
||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
|
||||
<%@ taglib prefix="datatables" uri="http://github.com/dandelion/datatables" %>
|
||||
<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
|
||||
|
||||
<html lang="en">
|
||||
<petclinic:layout pageName="vets">
|
||||
<h2>Veterinarians</h2>
|
||||
|
||||
<petclinic:htmlHeader />
|
||||
<datatables:table id="vets" data="${vets.vetList}" row="vet" cssClass="table table-striped"
|
||||
pageable="false" info="false">
|
||||
<datatables:column title="Name">
|
||||
<c:out value="${vet.firstName} ${vet.lastName}"/>
|
||||
</datatables:column>
|
||||
<datatables:column title="Specialties">
|
||||
<c:forEach var="specialty" items="${vet.specialties}">
|
||||
<c:out value="${specialty.name}"/>
|
||||
</c:forEach>
|
||||
<c:if test="${vet.nrOfSpecialties == 0}">none</c:if>
|
||||
</datatables:column>
|
||||
</datatables:table>
|
||||
|
||||
<body>
|
||||
<petclinic:bodyHeader menuName="vets"/>
|
||||
<div class="container-fluid">
|
||||
<div class="container xd-container">
|
||||
<h2>Veterinarians</h2>
|
||||
|
||||
<datatables:table id="vets" data="${vets.vetList}" row="vet" cssClass="table table-striped"
|
||||
pageable="false" info="false">
|
||||
<datatables:column title="Name">
|
||||
<c:out value="${vet.firstName} ${vet.lastName}"/>
|
||||
</datatables:column>
|
||||
<datatables:column title="Specialties">
|
||||
<c:forEach var="specialty" items="${vet.specialties}">
|
||||
<c:out value="${specialty.name}"/>
|
||||
</c:forEach>
|
||||
<c:if test="${vet.nrOfSpecialties == 0}">none</c:if>
|
||||
</datatables:column>
|
||||
</datatables:table>
|
||||
|
||||
<table class="table-buttons">
|
||||
<tr>
|
||||
<td>
|
||||
<a href="<spring:url value="/vets.xml" htmlEscape="true" />">View as XML</a>
|
||||
</td>
|
||||
<td>
|
||||
<a href="<spring:url value="/vets.json" htmlEscape="true" />">View as JSON</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<petclinic:pivotal/>
|
||||
</div>
|
||||
</div>
|
||||
<petclinic:footer />
|
||||
</body>
|
||||
|
||||
</html>
|
||||
<table class="table-buttons">
|
||||
<tr>
|
||||
<td>
|
||||
<a href="<spring:url value="/vets.xml" htmlEscape="true" />">View as XML</a>
|
||||
</td>
|
||||
<td>
|
||||
<a href="<spring:url value="/vets.json" htmlEscape="true" />">View as JSON</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</petclinic:layout>
|
||||
|
|
|
|||
|
|
@ -1,32 +1,14 @@
|
|||
<!DOCTYPE html>
|
||||
|
||||
<%@ page session="false" %>
|
||||
<%@ page session="false" trimDirectiveWhitespaces="true" %>
|
||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
||||
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
|
||||
<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
|
||||
|
||||
|
||||
<html lang="en">
|
||||
|
||||
<petclinic:htmlHeader/>
|
||||
|
||||
<body>
|
||||
<petclinic:bodyHeader menuName="home"/>
|
||||
|
||||
<div class="container-fluid">
|
||||
<div class="container xd-container">
|
||||
<h2><fmt:message key="welcome"/></h2>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<spring:url value="/resources/images/pets.png" htmlEscape="true" var="petsImage"/>
|
||||
<img class="img-responsive" src="${petsImage}"/>
|
||||
</div>
|
||||
<petclinic:layout pageName="home">
|
||||
<h2><fmt:message key="welcome"/></h2>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<spring:url value="/resources/images/pets.png" htmlEscape="true" var="petsImage"/>
|
||||
<img class="img-responsive" src="${petsImage}"/>
|
||||
</div>
|
||||
|
||||
<petclinic:pivotal/>
|
||||
</div>
|
||||
</div>
|
||||
<petclinic:footer/>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</petclinic:layout>
|
||||
|
|
|
|||
27
src/main/webapp/WEB-INF/tags/layout.tag
Normal file
27
src/main/webapp/WEB-INF/tags/layout.tag
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
<%@ tag trimDirectiveWhitespaces="true" %>
|
||||
<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
|
||||
|
||||
<%@ attribute name="pageName" required="true" %>
|
||||
<%@ attribute name="customScript" required="false" fragment="true"%>
|
||||
|
||||
<!doctype html>
|
||||
<html>
|
||||
<petclinic:htmlHeader/>
|
||||
|
||||
<body>
|
||||
<petclinic:bodyHeader menuName="${pageName}"/>
|
||||
|
||||
<div class="container-fluid">
|
||||
<div class="container xd-container">
|
||||
|
||||
<jsp:doBody/>
|
||||
|
||||
<petclinic:pivotal/>
|
||||
</div>
|
||||
</div>
|
||||
<petclinic:footer/>
|
||||
<jsp:invoke fragment="customScript" />
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
@ -1,10 +1,9 @@
|
|||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
|
||||
|
||||
<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
|
||||
<%@ attribute name="name" required="true" rtexprvalue="true"
|
||||
description="Name of the active menu: home, owners, vets or error" %>
|
||||
|
||||
<%-- Static navbar --%>
|
||||
<nav class="navbar navbar-default" role="navigation">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
|
|
@ -18,44 +17,29 @@
|
|||
</div>
|
||||
<div class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<c:choose>
|
||||
<c:when test="${name eq 'home'}">
|
||||
<c:set var="cssMenu" value="active"/>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:set var="cssMenu" value=""/>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<li class="${cssMenu}"><a href="<spring:url value="/" htmlEscape="true" />"><span class="glyphicon glyphicon-home" aria-hidden="true"></span><span> Home</span></a></li>
|
||||
<c:choose>
|
||||
<c:when test="${name eq 'owners'}">
|
||||
<c:set var="cssMenu" value="active"/>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:set var="cssMenu" value=""/>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<li class="${cssMenu}"><a href="<spring:url value="/owners/find.html" htmlEscape="true" />"><span class="glyphicon glyphicon-search" aria-hidden="true"></span><span> Find owners</span></a></li>
|
||||
<c:choose>
|
||||
<c:when test="${name eq 'vets'}">
|
||||
<c:set var="cssMenu" value="active"/>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:set var="cssMenu" value=""/>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<li class="${cssMenu}"><a href="<spring:url value="/vets.html" htmlEscape="true" />"><span class="glyphicon glyphicon-th-list" aria-hidden="true"></span><span> Veterinarians</span></a></li>
|
||||
<c:choose>
|
||||
<c:when test="${name eq 'error'}">
|
||||
<c:set var="cssMenu" value="active"/>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:set var="cssMenu" value=""/>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<li class="${cssMenu}"><a href="<spring:url value="/oups.html" htmlEscape="true" />"
|
||||
title="trigger a RuntimeException to see how it is handled"><span class="glyphicon glyphicon-warning-sign" aria-hidden="true"></span><span> Error</span></a></li>
|
||||
|
||||
<petclinic:menuItem active="${name eq 'home'}" url="/" title="home page">
|
||||
<span class="glyphicon glyphicon-home" aria-hidden="true"></span>
|
||||
<span>Home</span>
|
||||
</petclinic:menuItem>
|
||||
|
||||
<petclinic:menuItem active="${name eq 'owners'}" url="/owners/find.html" title="find owners">
|
||||
<span class="glyphicon glyphicon-search" aria-hidden="true"></span>
|
||||
<span>Find owners</span>
|
||||
</petclinic:menuItem>
|
||||
|
||||
<petclinic:menuItem active="${name eq 'vets'}" url="/vets.html" title="veterinarians">
|
||||
<span class="glyphicon glyphicon-th-list" aria-hidden="true"></span>
|
||||
<span>Veterinarians</span>
|
||||
</petclinic:menuItem>
|
||||
|
||||
<petclinic:menuItem active="${name eq 'error'}" url="/oups.html"
|
||||
title="trigger a RuntimeException to see how it is handled">
|
||||
<span class="glyphicon glyphicon-warning-sign" aria-hidden="true"></span>
|
||||
<span>Error</span>
|
||||
</petclinic:menuItem>
|
||||
|
||||
</ul>
|
||||
</div> <%--/.nav-collapse --%>
|
||||
</div> <%--/.container-fluid --%>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
|
|
|||
13
src/main/webapp/WEB-INF/tags/menuItem.tag
Normal file
13
src/main/webapp/WEB-INF/tags/menuItem.tag
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
|
||||
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
|
||||
|
||||
<%@ attribute name="active" required="true" rtexprvalue="true" %>
|
||||
<%@ attribute name="url" required="true" rtexprvalue="true" %>
|
||||
<%@ attribute name="title" required="false" rtexprvalue="true" %>
|
||||
|
||||
<li class="${active ? 'active' : ''}">
|
||||
<a href="<spring:url value="${url}" htmlEscape="true" />"
|
||||
title="${fn:escapeXml(title)}">
|
||||
<jsp:doBody/>
|
||||
</a>
|
||||
</li>
|
||||
Loading…
Reference in a new issue