Skip to content
Snippets Groups Projects
Commit c4b5a98a authored by Mic's avatar Mic
Browse files

navbar, reorganized JSP folders

parent f06cf8c3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 65 additions and 79 deletions
src/main/java/org/springframework/samples/petclinic/web/VetController.java
+ 1
− 1
View file @ c4b5a98a
......@@ -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";
}
......
src/main/webapp/WEB-INF/jsp/exception.jsp
+ 3
− 4
View file @ c4b5a98a
<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>
......
src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp 0 → 100644
+ 16
− 0
View file @ c4b5a98a
<%@ 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>
src/main/webapp/WEB-INF/jsp/footer.jsp → src/main/webapp/WEB-INF/jsp/fragments/footer.jsp
+ 1
− 1
View file @ c4b5a98a
......@@ -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>
......
src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp
+ 3
− 4
View file @ c4b5a98a
......@@ -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>
src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp
+ 4
− 5
View file @ c4b5a98a
......@@ -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>
......
src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
+ 14
− 22
View file @ c4b5a98a
......@@ -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>
......
src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
+ 3
− 6
View file @ c4b5a98a
......@@ -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>
......
src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
+ 3
− 6
View file @ c4b5a98a
......@@ -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>
......
src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp
+ 4
− 7
View file @ c4b5a98a
......@@ -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>
src/main/webapp/WEB-INF/jsp/vetsList.jsp → src/main/webapp/WEB-INF/jsp/vets/vetsList.jsp
+ 5
− 6
View file @ c4b5a98a
......@@ -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>
......
src/main/webapp/WEB-INF/jsp/welcome.jsp
+ 6
− 13
View file @ c4b5a98a
......@@ -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>
......
src/main/webapp/WEB-INF/petclinic-servlet.xml
+ 2
− 3
View file @ c4b5a98a
......@@ -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>
......
src/main/webapp/resources/css/petclinic.css
+ 0
− 1
View file @ c4b5a98a
......@@ -11,4 +11,3 @@
input[type="text"] {
height: 25px;
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment