diff --git a/src/main/webapp/WEB-INF/jsp/owners/form.jsp b/src/main/webapp/WEB-INF/jsp/owners/form.jsp index 208f521f4b601981b8eba1c2ded9c0fcbc38ac46..6ebdf2853f32e40b2c9e60dba3dde825dc0b9090 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/form.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/form.jsp @@ -10,8 +10,11 @@ <jsp:include page="../header.jsp"/> <body> - - <div id="main"> + <div id="header"> + <spring:url value="/resources/images/banner-graphic.png" var="banner"/> + <img src="${banner}" /> + </div> + <div id="main"> <c:choose> <c:when test="${owner['new']}"><c:set var="method" value="post"/></c:when> <c:otherwise><c:set var="method" value="put"/></c:otherwise> diff --git a/src/main/webapp/WEB-INF/jsp/owners/list.jsp b/src/main/webapp/WEB-INF/jsp/owners/list.jsp index b28ce6b6b34ca97841ca2f755844e7f65fb897f2..cb679b01907f416c23de494e719e90151c6a2550 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/list.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/list.jsp @@ -9,43 +9,46 @@ <jsp:include page="../header.jsp"/> <body> - - <div id="main"> - -<h2>Owners:</h2> - - <table> - <thead> - <tr> - <th>Name</th> - <th>Address</th> - <th>City</th> - <th>Telephone</th> - <th>Pets</th> - </tr> - </thead> - <c:forEach var="owner" items="${selections}"> - <tr> - <td> - <spring:url value="owners/{ownerId}" var="ownerUrl"> - <spring:param name="ownerId" value="${owner.id}"/> - </spring:url> - <a href="${fn:escapeXml(ownerUrl)}">${owner.firstName} ${owner.lastName}</a> - </td> - <td>${owner.address}</td> - <td>${owner.city}</td> - <td>${owner.telephone}</td> - <td> - <c:forEach var="pet" items="${owner.pets}"> - ${pet.name} - </c:forEach> - </td> - </tr> - </c:forEach> - </table> - - </div> - <jsp:include page="../footer.jsp"/> + <div id="header"> + <spring:url value="/resources/images/banner-graphic.png" var="banner"/> + <img src="${banner}" /> + </div> + <div id="main"> + + <h2>Owners:</h2> + + <table> + <thead> + <tr> + <th>Name</th> + <th>Address</th> + <th>City</th> + <th>Telephone</th> + <th>Pets</th> + </tr> + </thead> + <c:forEach var="owner" items="${selections}"> + <tr> + <td> + <spring:url value="owners/{ownerId}" var="ownerUrl"> + <spring:param name="ownerId" value="${owner.id}"/> + </spring:url> + <a href="${fn:escapeXml(ownerUrl)}">${owner.firstName} ${owner.lastName}</a> + </td> + <td>${owner.address}</td> + <td>${owner.city}</td> + <td>${owner.telephone}</td> + <td> + <c:forEach var="pet" items="${owner.pets}"> + ${pet.name} + </c:forEach> + </td> + </tr> + </c:forEach> + </table> + + </div> + <jsp:include page="../footer.jsp"/> </body> </html> diff --git a/src/main/webapp/WEB-INF/jsp/owners/search.jsp b/src/main/webapp/WEB-INF/jsp/owners/search.jsp index 7b6b5c88001999fba8e50f860991e996527f08c7..1a1614f5ee2d508bc4d2b4437f616eb910e5be30 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/search.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/search.jsp @@ -9,7 +9,11 @@ <body> - <div id="main"> + <div id="header"> + <spring:url value="/resources/images/banner-graphic.png" var="banner"/> + <img src="${banner}" /> + </div> + <div id="main"> <h2>Find Owners:</h2> diff --git a/src/main/webapp/WEB-INF/jsp/owners/show.jsp b/src/main/webapp/WEB-INF/jsp/owners/show.jsp index 077d8cff554badb9956d6083eac14489f4b8e39d..60c0c031ab210eba513145273623a2ac7380dd61 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/show.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/show.jsp @@ -9,6 +9,10 @@ <body> + <div id="header"> + <spring:url value="/resources/images/banner-graphic.png" var="banner"/> + <img src="${banner}" /> + </div> <div id="main"> <h2>Owner Information</h2> diff --git a/src/main/webapp/WEB-INF/jsp/pets/form.jsp b/src/main/webapp/WEB-INF/jsp/pets/form.jsp index ec06dc16247805c1a594bd17408bbd975d9475da..c3d942715ba1c667c2a4792c008130ed7df8836b 100644 --- a/src/main/webapp/WEB-INF/jsp/pets/form.jsp +++ b/src/main/webapp/WEB-INF/jsp/pets/form.jsp @@ -8,8 +8,12 @@ <jsp:include page="../header.jsp"/> <body> + <div id="header"> + <spring:url value="/resources/images/banner-graphic.png" var="banner"/> + <img src="${banner}" /> + </div> - <div id="main"> + <div id="main"> <c:choose> <c:when test="${pet['new']}"><c:set var="method" value="post"/></c:when> <c:otherwise><c:set var="method" value="put"/></c:otherwise> diff --git a/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp b/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp index 08dda8e81a20706cc933861220126aae7b0a97ce..0756eedabe69be737f9ea34a6e2b355375aeac6a 100644 --- a/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp @@ -9,8 +9,12 @@ <jsp:include page="../header.jsp"/> <body> + <div id="header"> + <spring:url value="/resources/images/banner-graphic.png" var="banner"/> + <img src="${banner}" /> + </div> - <div id="main"> + <div id="main"> <h2><c:if test="${visit['new']}">New </c:if>Visit:</h2> diff --git a/src/main/webapp/WEB-INF/jsp/vets.jsp b/src/main/webapp/WEB-INF/jsp/vets.jsp index 81f3fdfe3e796b5b7873c9ed66ba0e35f913b0ad..8c12018f0b3bb2a771c6a4c840f4e3a9525b7a4b 100644 --- a/src/main/webapp/WEB-INF/jsp/vets.jsp +++ b/src/main/webapp/WEB-INF/jsp/vets.jsp @@ -8,42 +8,46 @@ <jsp:include page="header.jsp"/> <body> - - <div id="main"> - - <h2>Veterinarians:</h2> + <div id="header"> + <spring:url value="/resources/images/banner-graphic.png" var="banner"/> + <img src="${banner}" /> + </div> - <table> - <thead> - <tr> - <th>Name</th> - <th>Specialties</th> - </tr> - </thead> - <tbody> - <c:forEach var="vet" items="${vets.vetList}"> - <tr> - <td>${vet.firstName} ${vet.lastName}</td> - <td> - <c:forEach var="specialty" items="${vet.specialties}"> - ${specialty.name} - </c:forEach> - <c:if test="${vet.nrOfSpecialties == 0}">none</c:if> - </td> + <div id="main"> + + <h2>Veterinarians:</h2> + + <table> + <thead> + <tr> + <th>Name</th> + <th>Specialties</th> </tr> - </c:forEach> - </tbody> - </table> - <table class="table-buttons"> - <tr> - <td> - <a href="<spring:url value="/vets.xml" htmlEscape="true" />">View as XML</a> - </td> - </tr> - </table> - - </div> - <jsp:include page="footer.jsp"/> -</body> + </thead> + <tbody> + <c:forEach var="vet" items="${vets.vetList}"> + <tr> + <td>${vet.firstName} ${vet.lastName}</td> + <td> + <c:forEach var="specialty" items="${vet.specialties}"> + ${specialty.name} + </c:forEach> + <c:if test="${vet.nrOfSpecialties == 0}">none</c:if> + </td> + </tr> + </c:forEach> + </tbody> + </table> + <table class="table-buttons"> + <tr> + <td> + <a href="<spring:url value="/vets.xml" htmlEscape="true" />">View as XML</a> + </td> + </tr> + </table> + + </div> + <jsp:include page="footer.jsp"/> + </body> </html> diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp index 9cddcd629f7894730e7926137ae2692188694cb6..95270b8f84247e795c8d81a4181a4cbbff93ddba 100644 --- a/src/main/webapp/WEB-INF/jsp/welcome.jsp +++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp @@ -7,6 +7,10 @@ <jsp:include page="header.jsp"/> <body> + <div id="header"> + <spring:url value="/resources/images/banner-graphic.png" var="banner"/> + <img src="${banner}" /> + </div> <div id="main"> <img src="<spring:url value="/resources/images/pets.png" htmlEscape="true" />" align="right" style="position:relative;right:30px;"></img>