diff --git a/src/main/java/org/springframework/samples/petclinic/web/VetController.java b/src/main/java/org/springframework/samples/petclinic/web/VetController.java
index 996e587f8cae4e15569dc2e1beb3929497d6eb95..07bcaaa8492d1c4e96c9cc1617ba7ab887f9a76e 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/VetController.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/VetController.java
@@ -44,7 +44,7 @@ public class VetController {
Vets vets = new Vets();
vets.getVetList().addAll(this.clinicService.findVets());
model.addAttribute("vets", vets);
- return "vetsList";
+ return "vets/vetsList";
}
diff --git a/src/main/webapp/WEB-INF/jsp/exception.jsp b/src/main/webapp/WEB-INF/jsp/exception.jsp
index 35bfc43e53d074a00921e53281312a9a3766ad4a..bae22ab23fb79cc1185d5c778a3430749b41b559 100644
--- a/src/main/webapp/WEB-INF/jsp/exception.jsp
+++ b/src/main/webapp/WEB-INF/jsp/exception.jsp
@@ -1,19 +1,18 @@
<html lang="en">
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<jsp:include page="header.jsp"/>
+<jsp:include page="fragments/headTag.jsp"/>
<body>
<div class="container">
- <spring:url value="/resources/images/banner-graphic.png" var="banner"/>
- <img src="${banner}" />
+ <jsp:include page="fragments/bodyHeader.jsp"/>
<spring:url value="/resources/images/pets.png" var="petsImage"/>
<img src="${petsImage}" />
<h2>Something happened...</h2>
<p>${exception.message}</p>
- <jsp:include page="footer.jsp"/>
+ <jsp:include page="fragments/footer.jsp"/>
</div>
</body>
diff --git a/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp b/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..cbbce5f6d88d542ac1def92bd7200405b59afc04
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp
@@ -0,0 +1,16 @@
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+
+<spring:url value="/resources/images/banner-graphic.png" var="banner"/>
+<img src="${banner}" />
+<div class="navbar" style="width: 601px;">
+ <div class="navbar-inner">
+ <ul class="nav">
+ <li><a href="<spring:url value="/" htmlEscape="true" />"><i class="icon-home"></i> Home</a></li>
+ <li><a href="<spring:url value="/owners/find.html" htmlEscape="true" />"><i class="icon-search"></i> Find owner</a></li>
+ <li><a href="<spring:url value="/vets.html" htmlEscape="true" />"><i class="icon-th-list"></i> Display all veterinarians</a></li>
+ <li><a href="<spring:url value="/resources/html/tutorial.html" htmlEscape="true" />"><i class=" icon-question-sign"></i> Tutorial</a></li>
+ </ul>
+ </div>
+</div>
+
diff --git a/src/main/webapp/WEB-INF/jsp/footer.jsp b/src/main/webapp/WEB-INF/jsp/fragments/footer.jsp
similarity index 78%
rename from src/main/webapp/WEB-INF/jsp/footer.jsp
rename to src/main/webapp/WEB-INF/jsp/fragments/footer.jsp
index 486957defec935d423f23dfbad1e3814fb365c9f..a031e66cfbb2fa11f68851bb01183da5c75e6dbf 100644
--- a/src/main/webapp/WEB-INF/jsp/footer.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fragments/footer.jsp
@@ -2,7 +2,7 @@
<table class="footer">
<tr>
- <td><a href="<spring:url value="/" htmlEscape="true" />">Home</a></td>
+ <td></td>
<td align="right"><img src="<spring:url value="/resources/images/springsource-logo.png" htmlEscape="true" />" alt="Sponsored by SpringSource"/></td>
</tr>
</table>
diff --git a/src/main/webapp/WEB-INF/jsp/header.jsp b/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/header.jsp
rename to src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp b/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp
index 17baa650a40ca898d637a97aec93fc1d54c8e5c7..763aac06c560ae141be938850fe67460eda0321a 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp
@@ -7,12 +7,11 @@
<html lang="en">
-<jsp:include page="../header.jsp"/>
+<jsp:include page="../fragments/headTag.jsp"/>
<body>
<div class="container">
- <spring:url value="/resources/images/banner-graphic.png" var="banner"/>
- <img src="${banner}" />
+ <jsp:include page="../fragments/bodyHeader.jsp"/>
<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>
@@ -71,7 +70,7 @@
</fieldset>
</form:form>
</div>
- <jsp:include page="../footer.jsp"/>
+ <jsp:include page="../fragments/footer.jsp"/>
</body>
</html>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp b/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp
index 2a88db5cd68ef63d4bca77e256ca4a40a09113ad..4f86370fd9348d43062e284e19e26e03e587ca2b 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp
@@ -5,12 +5,11 @@
<html lang="en">
-<jsp:include page="../header.jsp"/>
+<jsp:include page="../fragments/headTag.jsp"/>
<body>
- <div class="container">
- <spring:url value="/resources/images/banner-graphic.png" var="banner"/>
- <img src="${banner}" />
+ <div class="container">
+ <jsp:include page="../fragments/bodyHeader.jsp"/>
<h2>Find Owners</h2>
@@ -31,7 +30,7 @@
<br/>
<a href='<spring:url value="/owners/new" htmlEscape="true"/>'>Add Owner</a>
- <jsp:include page="../footer.jsp"/>
+ <jsp:include page="../fragments/footer.jsp"/>
</div>
</body>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
index 6c0f8810efc7652c8dda711f85f5a970db6a23e0..e982a405bb2f563316643f8f9fb2ef6864414b47 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
@@ -5,13 +5,11 @@
<html lang="en">
-<jsp:include page="../header.jsp"/>
+<jsp:include page="../fragments/headTag.jsp"/>
<body>
-
- <div class="container">
- <spring:url value="/resources/images/banner-graphic.png" var="banner"/>
- <img src="${banner}" />
+ <div class="container">
+ <jsp:include page="../fragments/bodyHeader.jsp"/>
<h2>Owner Information</h2>
@@ -55,24 +53,18 @@
<c:forEach var="pet" items="${owner.pets}">
<table class="table" style="width:600px;">
<tr>
- <td valign="top">
- <table>
- <tr>
- <th>Name</th>
- <td><b>${pet.name}</b></td>
- </tr>
- <tr>
- <th>Birth Date</th>
- <td><fmt:formatDate value="${pet.birthDate}" pattern="yyyy-MM-dd"/></td>
- </tr>
- <tr>
- <th>Type</th>
- <td>${pet.type.name}</td>
- </tr>
- </table>
+ <td valign="top" style="width: 120px;">
+ <dl class="dl-horizontal">
+ <dt>Name</dt>
+ <dd>${pet.name}</dd>
+ <dt>Birth Date</dt>
+ <dd><fmt:formatDate value="${pet.birthDate}" pattern="yyyy-MM-dd"/></dd>
+ <dt>Type</dt>
+ <dd>${pet.type.name}</dd>
+ </dl>
</td>
<td valign="top">
- <table>
+ <table class="table-condensed">
<thead>
<tr>
<th>Visit Date</th>
@@ -118,7 +110,7 @@
</table>
</c:forEach>
- <jsp:include page="../footer.jsp"/>
+ <jsp:include page="../fragments/footer.jsp"/>
</div>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
index 3ed300056c85645c46df5dc6d593b5c4e137b1c4..99bf63c4927177c78faafc15090d23eebf06f684 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
@@ -6,14 +6,11 @@
<html lang="en">
-<jsp:include page="../header.jsp"/>
+<jsp:include page="../fragments/headTag.jsp"/>
<body>
-
<div class="container">
-
- <spring:url value="/resources/images/banner-graphic.png" var="banner"/>
- <img src="${banner}" />
+ <jsp:include page="../fragments/bodyHeader.jsp"/>
<h2>Owners</h2>
<table class="table table-striped">
@@ -45,7 +42,7 @@
</tr>
</c:forEach>
</table>
- <jsp:include page="../footer.jsp"/>
+ <jsp:include page="../fragments/footer.jsp"/>
</div>
</body>
diff --git a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
index 53b8c8cca0b7c36dab763b9026be81c3f98ee4f7..1dfe06cd0988f7497f0b5c25ac3a2734a55c0ae0 100644
--- a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
@@ -5,14 +5,11 @@
<html lang="en">
-<jsp:include page="../header.jsp"/>
+<jsp:include page="../fragments/headTag.jsp"/>
<body>
-
<div class="container">
- <spring:url value="/resources/images/banner-graphic.png" var="banner"/>
- <img src="${banner}" />
-
+ <jsp:include page="../fragments/bodyHeader.jsp"/>
<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>
@@ -56,7 +53,7 @@
</form:form>
<c:if test="${!pet['new']}">
</c:if>
- <jsp:include page="../footer.jsp"/>
+ <jsp:include page="../fragments/footer.jsp"/>
</div>
</body>
diff --git a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp
index 22ad647f7bc28bf47fc83e22b5edfc36840313ba..cd68a2d5f96d5e3b0337124b0c96708d6882520f 100644
--- a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp
@@ -6,14 +6,11 @@
<html lang="en">
-<jsp:include page="../header.jsp"/>
+<jsp:include page="../fragments/headTag.jsp"/>
<body>
-
<div class="container">
-
- <spring:url value="/resources/images/banner-graphic.png" var="banner"/>
- <img src="${banner}" />
+ <jsp:include page="../fragments/bodyHeader.jsp"/>
<h2><c:if test="${visit['new']}">New </c:if>Visit:</h2>
<form:form modelAttribute="visit">
@@ -65,7 +62,7 @@
<br/>
<b>Previous Visits:</b>
- <table width="333">
+ <table style="width: 333px;">
<tr>
<th>Date</th>
<th>Description</th>
@@ -81,7 +78,7 @@
</table>
</div>
- <jsp:include page="../footer.jsp"/>
+ <jsp:include page="../fragments/footer.jsp"/>
</body>
</html>
diff --git a/src/main/webapp/WEB-INF/jsp/vetsList.jsp b/src/main/webapp/WEB-INF/jsp/vets/vetsList.jsp
similarity index 83%
rename from src/main/webapp/WEB-INF/jsp/vetsList.jsp
rename to src/main/webapp/WEB-INF/jsp/vets/vetsList.jsp
index 2674e75be57ba4ebbacbb35f9374845e0cd5250d..057454ab7355f66393b55f10a1ffa66de69e8a69 100644
--- a/src/main/webapp/WEB-INF/jsp/vetsList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/vets/vetsList.jsp
@@ -6,12 +6,11 @@
<html lang="en">
+<jsp:include page="../fragments/headTag.jsp"/>
+
<body>
- <div class="container">
- <jsp:include page="header.jsp"/>
-
- <spring:url value="/resources/images/banner-graphic.png" var="banner"/>
- <img src="${banner}" />
+ <div class="container">
+ <jsp:include page="../fragments/bodyHeader.jsp"/>
<h2>Veterinarians</h2>
@@ -44,7 +43,7 @@
</tr>
</table>
- <jsp:include page="footer.jsp"/>
+ <jsp:include page="../fragments/footer.jsp"/>
</div>
</body>
diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp
index 63d5aacfde1864ec006a5c98841c686efa084730..ab7de63aaade3e55526b6308ab0932e71b48c0d5 100644
--- a/src/main/webapp/WEB-INF/jsp/welcome.jsp
+++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp
@@ -4,23 +4,16 @@
<html lang="en">
-<jsp:include page="header.jsp"/>
+<jsp:include page="fragments/headTag.jsp"/>
<body>
<div class="container">
- <spring:url value="/resources/images/banner-graphic.png" var="banner"/>
- <img src="${banner}" />
- <img src="<spring:url value="/resources/images/pets.png" htmlEscape="true" />" align="right" style="position:relative;right:30px;"></img>
- <h2><fmt:message key="welcome"/></h2>
-
- <ul class="unstyled">
- <li><a href="<spring:url value="/owners/find.html" htmlEscape="true" />">Find owner</a></li>
- <li><a href="<spring:url value="/vets.html" htmlEscape="true" />">Display all veterinarians</a></li>
- <li><a href="<spring:url value="/resources/html/tutorial.html" htmlEscape="true" />">Tutorial</a></li>
- </ul>
-
+ <jsp:include page="fragments/bodyHeader.jsp"/>
+ <h2><fmt:message key="welcome"/></h2>
+ <spring:url value="/resources/images/pets.png" htmlEscape="true" var="petsImage"/>
+ <img src="${petsImage}" />
- <jsp:include page="footer.jsp"/>
+ <jsp:include page="fragments/footer.jsp"/>
</div>
</body>
diff --git a/src/main/webapp/WEB-INF/petclinic-servlet.xml b/src/main/webapp/WEB-INF/petclinic-servlet.xml
index c619a4f5c7f02e018fdcd73cb12540d87d350546..299409a42b910dd51dec48e38cd58950d8f660e8 100644
--- a/src/main/webapp/WEB-INF/petclinic-servlet.xml
+++ b/src/main/webapp/WEB-INF/petclinic-servlet.xml
@@ -42,7 +42,7 @@
<bean class="org.springframework.web.accept.PathExtensionContentNegotiationStrategy">
<constructor-arg>
<map>
- <entry key="xml" value="#{vetsList.contentType}"/>
+ <entry key="xml" value="application/vnd.springsource.samples.petclinic+xml"/>
<entry key="atom" value="#{visitsList.contentType}"/>
</map>
</constructor-arg>
@@ -101,8 +101,7 @@
<bean id="visitsList" class="org.springframework.samples.petclinic.web.VisitsAtomView"/>
- <bean id="vetsList" class="org.springframework.web.servlet.view.xml.MarshallingView">
- <property name="contentType" value="application/vnd.springsource.samples.petclinic+xml"/>
+ <bean id="vets/vetsList" class="org.springframework.web.servlet.view.xml.MarshallingView">
<property name="marshaller" ref="marshaller"/>
</bean>
diff --git a/src/main/webapp/resources/css/petclinic.css b/src/main/webapp/resources/css/petclinic.css
index 5ad24c1b9aa38362607d91332f21d91a39d96c62..e4632fc636723359c741bbfb8f9ea20c79a1b1b9 100644
--- a/src/main/webapp/resources/css/petclinic.css
+++ b/src/main/webapp/resources/css/petclinic.css
@@ -11,4 +11,3 @@
input[type="text"] {
height: 25px;
}
-