From 5139c8d3bc661361440732c237682e38e6c23a2f Mon Sep 17 00:00:00 2001
From: Mic <misvy@vmware.com>
Date: Mon, 14 Jan 2013 00:08:37 +0800
Subject: [PATCH] added header to all JSPs
---
src/main/webapp/WEB-INF/jsp/owners/form.jsp | 7 +-
src/main/webapp/WEB-INF/jsp/owners/list.jsp | 77 ++++++++++---------
src/main/webapp/WEB-INF/jsp/owners/search.jsp | 6 +-
src/main/webapp/WEB-INF/jsp/owners/show.jsp | 4 +
src/main/webapp/WEB-INF/jsp/pets/form.jsp | 6 +-
.../webapp/WEB-INF/jsp/pets/visitForm.jsp | 6 +-
src/main/webapp/WEB-INF/jsp/vets.jsp | 74 +++++++++---------
src/main/webapp/WEB-INF/jsp/welcome.jsp | 4 +
8 files changed, 107 insertions(+), 77 deletions(-)
diff --git a/src/main/webapp/WEB-INF/jsp/owners/form.jsp b/src/main/webapp/WEB-INF/jsp/owners/form.jsp
index 208f521..6ebdf28 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 b28ce6b..cb679b0 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 7b6b5c8..1a1614f 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 077d8cf..60c0c03 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 ec06dc1..c3d9427 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 08dda8e..0756eed 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 81f3fdf..8c12018 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 9cddcd6..95270b8 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>
--
GitLab