From 099847cf49ee0c4c6506d64611c3c74cef0f41fc Mon Sep 17 00:00:00 2001 From: Mic Date: Mon, 14 Jan 2013 11:32:32 +0800 Subject: [PATCH] Spring MVC config and layout in 'vets' section - commented out all Spring MVC config related to content negociation so the app works well in HTML for now - Integrated Bootsrap look&Feel in the 'vets' section --- src/main/webapp/WEB-INF/jsp/owners/form.jsp | 4 +- src/main/webapp/WEB-INF/jsp/owners/show.jsp | 6 +- src/main/webapp/WEB-INF/jsp/pets/form.jsp | 80 +++++++++---------- src/main/webapp/WEB-INF/jsp/vets.jsp | 4 +- src/main/webapp/WEB-INF/petclinic-servlet.xml | 79 +++++++++--------- 5 files changed, 82 insertions(+), 91 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/owners/form.jsp b/src/main/webapp/WEB-INF/jsp/owners/form.jsp index f051703a1..7b50fea0c 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/form.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/form.jsp @@ -10,11 +10,9 @@ -
+
-
-
diff --git a/src/main/webapp/WEB-INF/jsp/owners/show.jsp b/src/main/webapp/WEB-INF/jsp/owners/show.jsp index 640d31e86..205cfda8a 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/show.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/show.jsp @@ -92,7 +92,7 @@
- + @@ -100,7 +100,7 @@ - + @@ -108,7 +108,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/pets/form.jsp b/src/main/webapp/WEB-INF/jsp/pets/form.jsp index 495e7df68..2be8b4324 100644 --- a/src/main/webapp/WEB-INF/jsp/pets/form.jsp +++ b/src/main/webapp/WEB-INF/jsp/pets/form.jsp @@ -12,6 +12,7 @@
+ @@ -22,49 +23,42 @@ Owner: ${pet.owner.firstName} ${pet.owner.lastName}
- - - - - - - - - - - - - -
- Name: -
- -
- Birth Date: -
- (yyyy-mm-dd) -
- Type: -
- -
- - -

- - -

- - -
- - - - -

- - - +
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ + +
+
+ + + + + + + + +
+
+ + + +

+ +
diff --git a/src/main/webapp/WEB-INF/jsp/vets.jsp b/src/main/webapp/WEB-INF/jsp/vets.jsp index bb9e0d0a2..2674e75be 100644 --- a/src/main/webapp/WEB-INF/jsp/vets.jsp +++ b/src/main/webapp/WEB-INF/jsp/vets.jsp @@ -15,7 +15,7 @@

Veterinarians

- +
@@ -44,8 +44,8 @@
Name
+ - diff --git a/src/main/webapp/WEB-INF/petclinic-servlet.xml b/src/main/webapp/WEB-INF/petclinic-servlet.xml index 095746eb6..74670042d 100644 --- a/src/main/webapp/WEB-INF/petclinic-servlet.xml +++ b/src/main/webapp/WEB-INF/petclinic-servlet.xml @@ -14,23 +14,42 @@ - The controllers are autodetected POJOs labeled with the @Controller annotation. --> - - + + + + + + + + + + + - + + + + + + + + + @@ -61,14 +80,9 @@ - property of the vets view bean, setting it to 'application/vnd.springsource.samples.petclinic+xml'. --> - - - - - - + - - - + - + + - -