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 996e587f8..07bcaaa84 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 35bfc43e5..bae22ab23 100644 --- a/src/main/webapp/WEB-INF/jsp/exception.jsp +++ b/src/main/webapp/WEB-INF/jsp/exception.jsp @@ -1,19 +1,18 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> - +
- - +

Something happened...

${exception.message}

- +
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 000000000..cbbce5f6d --- /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" %> + + + +
+
+ +
+
+ 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 486957def..a031e66cf 100644 --- a/src/main/webapp/WEB-INF/jsp/footer.jsp +++ b/src/main/webapp/WEB-INF/jsp/fragments/footer.jsp @@ -2,7 +2,7 @@ - +
">Home " alt="Sponsored by SpringSource"/>
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 17baa650a..763aac06c 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 @@ - +
- - + @@ -71,7 +70,7 @@
- + diff --git a/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp b/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp index 2a88db5cd..4f86370fd 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 @@ - + -
- - +
+

Find Owners

@@ -31,7 +30,7 @@
Add Owner - +
diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp index 6c0f8810e..e982a405b 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 @@ - + - -
- - +
+

Owner Information

@@ -55,24 +53,18 @@ -
- - - - - - - - - - - - - -
Name${pet.name}
Birth Date
Type${pet.type.name}
+ 		+
+
Name
+
${pet.name}
+
Birth Date
+
+
Type
+
${pet.type.name}
+
- +
@@ -118,7 +110,7 @@
Visit Date
- + diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp index 3ed300056..99bf63c49 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 @@ - + -
- - - +

Owners

@@ -45,7 +42,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp index 53b8c8cca..1dfe06cd0 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 @@ - + -
- - - + @@ -56,7 +53,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp index 22ad647f7..cd68a2d5f 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 @@ - + -
- - - +

New Visit:

@@ -65,7 +62,7 @@
Previous Visits: - +
@@ -81,7 +78,7 @@
Date Description
- + 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 2674e75be..057454ab7 100644 --- a/src/main/webapp/WEB-INF/jsp/vetsList.jsp +++ b/src/main/webapp/WEB-INF/jsp/vets/vetsList.jsp @@ -6,12 +6,11 @@ + + -
- - - - +
+

Veterinarians

@@ -44,7 +43,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp index 63d5aacfd..ab7de63aa 100644 --- a/src/main/webapp/WEB-INF/jsp/welcome.jsp +++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp @@ -4,23 +4,16 @@ - +
- - - " align="right" style="position:relative;right:30px;"> -

- - - + +

+ + - +
diff --git a/src/main/webapp/WEB-INF/petclinic-servlet.xml b/src/main/webapp/WEB-INF/petclinic-servlet.xml index c619a4f5c..299409a42 100644 --- a/src/main/webapp/WEB-INF/petclinic-servlet.xml +++ b/src/main/webapp/WEB-INF/petclinic-servlet.xml @@ -42,7 +42,7 @@ - + @@ -101,8 +101,7 @@ - - + diff --git a/src/main/webapp/resources/css/petclinic.css b/src/main/webapp/resources/css/petclinic.css index 5ad24c1b9..e4632fc63 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; } -