Skip to content
Snippets Groups Projects
Commit 44b591f5 authored by Antoine Rey's avatar Antoine Rey
Browse files

Using Spring Boot Dataflow UI graphic theme

parent e74b1bc1
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1635 additions and 303 deletions
pom.xml
+ 27
− 0
View file @ 44b591f5
......@@ -427,6 +427,33 @@
</plugins>
</build>
</profile>
<profile>
<id>less-install</id>
<build>
<plugins>
<plugin>
<groupId>org.lesscss</groupId>
<artifactId>lesscss-maven-plugin</artifactId>
<version>1.7.0.1.1</version>
<configuration>
<sourceDirectory>${project.basedir}/src/main/webapp/resources/less</sourceDirectory>
<outputDirectory>${project.basedir}/src/main/webapp/resources/css</outputDirectory>
<compress>true</compress>
<includes>
<include>petclinic.less</include>
</includes>
</configuration>
<executions>
<execution>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<url>demopetclinic</url>
......
src/main/webapp/WEB-INF/jsp/exception.jsp
+ 9
− 6
View file @ 44b591f5
......@@ -10,20 +10,23 @@
<body>
<petclinic:bodyHeader menuName="error"/>
<div class="container">
<div class="container-fluid">
<div class="container xd-container">
<spring:url value="/resources/images/pets.png" var="petsImage"/>
<img src="${petsImage}"/>
<spring:url value="/resources/images/pets.png" var="petsImage"/>
<img src="${petsImage}"/>
<h2>Something happened...</h2>
<h2>Something happened...</h2>
<p>${exception.message}</p>
<p>${exception.message}</p>
<!-- Exception: ${exception.message}.
<!-- Exception: ${exception.message}.
<c:forEach items="${exception.stackTrace}" var="stackTrace">
${stackTrace}
</c:forEach>
-->
<petclinic:pivotal/>
</div>
</div>
<jsp:include page="fragments/footer.jsp"/>
</body>
......
src/main/webapp/WEB-INF/jsp/fragments/footer.jsp
+ 0
− 7
View file @ 44b591f5
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<div class="container">
<div class="row">
<div class="col-12 text-center"><img src="<spring:url value="/resources/images/spring-pivotal-logo.png" htmlEscape="true" />"
alt="Sponsored by Pivotal"/></div>
</div>
</div>
<%-- Placed at the end of the document so the pages load faster --%>
<spring:url value="/vendors/jquery/jquery.min.js" var="jQuery"/>
<script src="${jQuery}"></script>
......
src/main/webapp/WEB-INF/jsp/fragments/htmlHeader.jsp
+ 1
− 8
View file @ 44b591f5
......@@ -16,14 +16,7 @@ PetClinic :: a Spring Framework demonstration
<title>PetClinic :: a Spring Framework demonstration</title>
<%-- Bootstrap CSS --%>
<spring:url value="/vendors/bootstrap/dist/css/bootstrap.min.css" var="bootstrapCss"/>
<link href="${bootstrapCss}" rel="stylesheet">
<spring:url value="/vendors/bootstrap/dist/css/bootstrap-theme.min.css" var="bootstrapThemeCss"/>
<link href="${bootstrapThemeCss}" rel="stylesheet">
<%-- Custom styles for Petclinic --%>
<%-- CSS generated from LESS --%>
<spring:url value="/resources/css/petclinic.css" var="petclinicCss"/>
<link href="${petclinicCss}" rel="stylesheet"/>
......
src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp
+ 27
− 24
View file @ 44b591f5
......@@ -15,31 +15,34 @@
<body>
<petclinic:bodyHeader menuName="owners"/>
<div class="container">
<h2>
<c:if test="${owner['new']}">New </c:if> Owner
</h2>
<form:form modelAttribute="owner" class="form-horizontal" id="add-owner-form">
<div class="form-group has-feedback">
<petclinic:inputField label="First Name" name="firstName"/>
<petclinic:inputField label="Last Name" name="lastName"/>
<petclinic:inputField label="Address" name="address"/>
<petclinic:inputField label="City" name="city"/>
<petclinic:inputField label="Telephone" name="telephone"/>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<c:choose>
<c:when test="${owner['new']}">
<button class="btn btn-primary" type="submit">Add Owner</button>
</c:when>
<c:otherwise>
<button class="btn btn-primary" type="submit">Update Owner</button>
</c:otherwise>
</c:choose>
<div class="container-fluid">
<div class="container xd-container">
<h2>
<c:if test="${owner['new']}">New </c:if> Owner
</h2>
<form:form modelAttribute="owner" class="form-horizontal" id="add-owner-form">
<div class="form-group has-feedback">
<petclinic:inputField label="First Name" name="firstName"/>
<petclinic:inputField label="Last Name" name="lastName"/>
<petclinic:inputField label="Address" name="address"/>
<petclinic:inputField label="City" name="city"/>
<petclinic:inputField label="Telephone" name="telephone"/>
</div>
</div>
</form:form>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<c:choose>
<c:when test="${owner['new']}">
<button class="btn btn-default" type="submit">Add Owner</button>
</c:when>
<c:otherwise>
<button class="btn btn-default" type="submit">Update Owner</button>
</c:otherwise>
</c:choose>
</div>
</div>
</form:form>
<petclinic:pivotal/>
</div>
</div>
<jsp:include page="../fragments/footer.jsp"/>
</body>
......
src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp
+ 25
− 21
View file @ 44b591f5
......@@ -13,32 +13,36 @@
<body>
<petclinic:bodyHeader menuName="owners"/>
<div class="container">
<h2>Find Owners</h2>
<spring:url value="/owners.html" var="formUrl"/>
<form:form modelAttribute="owner" action="${fn:escapeXml(formUrl)}" method="get" class="form-horizontal"
id="search-owner-form">
<div class="form-group">
<div class="control-group" id="lastName">
<label class="col-sm-2 control-label">Last name </label>
<div class="col-sm-10">
<form:input class="form-control" path="lastName" size="30" maxlength="80"/>
<span class="help-inline"><form:errors path="*"/></span>
<div class="container-fluid">
<div class="container xd-container">
<h2>Find Owners</h2>
<spring:url value="/owners.html" var="formUrl"/>
<form:form modelAttribute="owner" action="${fn:escapeXml(formUrl)}" method="get" class="form-horizontal"
id="search-owner-form">
<div class="form-group">
<div class="control-group" id="lastName">
<label class="col-sm-2 control-label">Last name </label>
<div class="col-sm-10">
<form:input class="form-control" path="lastName" size="30" maxlength="80"/>
<span class="help-inline"><form:errors path="*"/></span>
</div>
</div>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary">Find Owner</button>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-default">Find Owner</button>
</div>
</div>
</div>
</form:form>
</form:form>
<br/>
<a class="btn btn-default" href='<spring:url value="/owners/new" htmlEscape="true"/>'>Add Owner</a>
<br/>
<a class="btn btn-default" href='<spring:url value="/owners/new" htmlEscape="true"/>'>Add Owner</a>
<petclinic:pivotal/>
</div>
</div>
<jsp:include page="../fragments/footer.jsp"/>
......
src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
+ 87
− 82
View file @ 44b591f5
......@@ -14,94 +14,99 @@
<body>
<petclinic:bodyHeader menuName="owners"/>
<div class="container">
<h2>Owner Information</h2>
<table class="table table-striped">
<tr>
<th>Name</th>
<td><b><c:out value="${owner.firstName} ${owner.lastName}"/></b></td>
</tr>
<tr>
<th>Address</th>
<td><c:out value="${owner.address}"/></td>
</tr>
<tr>
<th>City</th>
<td><c:out value="${owner.city}"/></td>
</tr>
<tr>
<th>Telephone</th>
<td><c:out value="${owner.telephone}"/></td>
</tr>
</table>
<spring:url value="{ownerId}/edit.html" var="editUrl">
<spring:param name="ownerId" value="${owner.id}"/>
</spring:url>
<a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Edit Owner</a>
<spring:url value="{ownerId}/pets/new.html" var="addUrl">
<spring:param name="ownerId" value="${owner.id}"/>
</spring:url>
<a href="${fn:escapeXml(addUrl)}" class="btn btn-primary">Add New Pet</a>
<h2>Pets and Visits</h2>
<table class="table table-striped">
<c:forEach var="pet" items="${owner.pets}">
<div class="container-fluid">
<div class="container xd-container">
<h2>Owner Information</h2>
<table class="table table-striped">
<tr>
<th>Name</th>
<td><b><c:out value="${owner.firstName} ${owner.lastName}"/></b></td>
</tr>
<tr>
<th>Address</th>
<td><c:out value="${owner.address}"/></td>
</tr>
<tr>
<td valign="top">
<dl class="dl-horizontal">
<dt>Name</dt>
<dd><c:out value="${pet.name}"/></dd>
<dt>Birth Date</dt>
<dd><joda:format value="${pet.birthDate}" pattern="yyyy-MM-dd"/></dd>
<dt>Type</dt>
<dd><c:out value="${pet.type.name}"/></dd>
</dl>
</td>
<td valign="top">
<table class="table-condensed">
<thead>
<tr>
<th>Visit Date</th>
<th>Description</th>
</tr>
</thead>
<c:forEach var="visit" items="${pet.visits}">
<th>City</th>
<td><c:out value="${owner.city}"/></td>
</tr>
<tr>
<th>Telephone</th>
<td><c:out value="${owner.telephone}"/></td>
</tr>
</table>
<spring:url value="{ownerId}/edit.html" var="editUrl">
<spring:param name="ownerId" value="${owner.id}"/>
</spring:url>
<a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Edit Owner</a>
<spring:url value="{ownerId}/pets/new.html" var="addUrl">
<spring:param name="ownerId" value="${owner.id}"/>
</spring:url>
<a href="${fn:escapeXml(addUrl)}" class="btn btn-default">Add New Pet</a>
<br/>
<br/>
<br/>
<h2>Pets and Visits</h2>
<table class="table table-striped">
<c:forEach var="pet" items="${owner.pets}">
<tr>
<td valign="top">
<dl class="dl-horizontal">
<dt>Name</dt>
<dd><c:out value="${pet.name}"/></dd>
<dt>Birth Date</dt>
<dd><joda:format value="${pet.birthDate}" pattern="yyyy-MM-dd"/></dd>
<dt>Type</dt>
<dd><c:out value="${pet.type.name}"/></dd>
</dl>
</td>
<td valign="top">
<table class="table-condensed">
<thead>
<tr>
<td><joda:format value="${visit.date}" pattern="yyyy-MM-dd"/></td>
<td><c:out value="${visit.description}"/></td>
<th>Visit Date</th>
<th>Description</th>
</tr>
</c:forEach>
<tr>
<td>
<spring:url value="/owners/{ownerId}/pets/{petId}/edit" var="petUrl">
<spring:param name="ownerId" value="${owner.id}"/>
<spring:param name="petId" value="${pet.id}"/>
</spring:url>
<a href="${fn:escapeXml(petUrl)}">Edit Pet</a>
</td>
<td>
<spring:url value="/owners/{ownerId}/pets/{petId}/visits/new" var="visitUrl">
<spring:param name="ownerId" value="${owner.id}"/>
<spring:param name="petId" value="${pet.id}"/>
</spring:url>
<a href="${fn:escapeXml(visitUrl)}">Add Visit</a>
</td>
</tr>
</table>
</td>
</tr>
</thead>
<c:forEach var="visit" items="${pet.visits}">
<tr>
<td><joda:format value="${visit.date}" pattern="yyyy-MM-dd"/></td>
<td><c:out value="${visit.description}"/></td>
</tr>
</c:forEach>
<tr>
<td>
<spring:url value="/owners/{ownerId}/pets/{petId}/edit" var="petUrl">
<spring:param name="ownerId" value="${owner.id}"/>
<spring:param name="petId" value="${pet.id}"/>
</spring:url>
<a href="${fn:escapeXml(petUrl)}">Edit Pet</a>
</td>
<td>
<spring:url value="/owners/{ownerId}/pets/{petId}/visits/new" var="visitUrl">
<spring:param name="ownerId" value="${owner.id}"/>
<spring:param name="petId" value="${pet.id}"/>
</spring:url>
<a href="${fn:escapeXml(visitUrl)}">Add Visit</a>
</td>
</tr>
</table>
</td>
</tr>
</c:forEach>
</table>
</c:forEach>
</table>
<petclinic:pivotal/>
</div>
</div>
<jsp:include page="../fragments/footer.jsp"/>
......
src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
+ 28
− 24
View file @ 44b591f5
......@@ -14,30 +14,34 @@
<body>
<petclinic:bodyHeader menuName="owners"/>
<div class="container">
<h2>Owners</h2>
<datatables:table id="owners" data="${selections}" row="owner"
cssClass="table table-striped" pageable="false" info="false" export="pdf">
<datatables:column title="Name" cssStyle="width: 150px;" display="html">
<spring:url value="/owners/{ownerId}.html" var="ownerUrl">
<spring:param name="ownerId" value="${owner.id}"/>
</spring:url>
<a href="${fn:escapeXml(ownerUrl)}"><c:out value="${owner.firstName} ${owner.lastName}"/></a>
</datatables:column>
<datatables:column title="Name" display="pdf">
<c:out value="${owner.firstName} ${owner.lastName}"/>
</datatables:column>
<datatables:column title="Address" property="address" cssStyle="width: 200px;"/>
<datatables:column title="City" property="city"/>
<datatables:column title="Telephone" property="telephone"/>
<datatables:column title="Pets" cssStyle="width: 100px;">
<c:forEach var="pet" items="${owner.pets}">
<c:out value="${pet.name}"/>
</c:forEach>
</datatables:column>
<datatables:export type="pdf" cssClass="btn" cssStyle="height: 25px;"/>
</datatables:table>
<div class="container-fluid">
<div class="container xd-container">
<h2>Owners</h2>
<datatables:table id="owners" data="${selections}" row="owner"
cssClass="table table-striped" pageable="false" info="false" export="pdf">
<datatables:column title="Name" cssStyle="width: 150px;" display="html">
<spring:url value="/owners/{ownerId}.html" var="ownerUrl">
<spring:param name="ownerId" value="${owner.id}"/>
</spring:url>
<a href="${fn:escapeXml(ownerUrl)}"><c:out value="${owner.firstName} ${owner.lastName}"/></a>
</datatables:column>
<datatables:column title="Name" display="pdf">
<c:out value="${owner.firstName} ${owner.lastName}"/>
</datatables:column>
<datatables:column title="Address" property="address" cssStyle="width: 200px;"/>
<datatables:column title="City" property="city"/>
<datatables:column title="Telephone" property="telephone"/>
<datatables:column title="Pets" cssStyle="width: 100px;">
<c:forEach var="pet" items="${owner.pets}">
<c:out value="${pet.name}"/>
</c:forEach>
</datatables:column>
<datatables:export type="pdf" cssClass="btn" cssStyle="height: 25px;"/>
</datatables:table>
<petclinic:pivotal/>
</div>
</div>
<jsp:include page="../fragments/footer.jsp"/>
......
src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
+ 36
− 33
View file @ 44b591f5
......@@ -13,43 +13,46 @@
<body>
<petclinic:bodyHeader menuName="owners"/>
<div class="container">
<h2>
<c:if test="${pet['new']}">New </c:if> Pet
</h2>
<form:form modelAttribute="pet"
class="form-horizontal">
<input type="hidden" name="id" value="${pet.id}"/>
<div class="form-group has-feedback">
<div class="form-group">
<label class="col-sm-2 control-label">Owner</label>
<div class="col-sm-10">
<c:out value="${pet.owner.firstName} ${pet.owner.lastName}"/>
<div class="container-fluid">
<div class="container xd-container">
<h2>
<c:if test="${pet['new']}">New </c:if> Pet
</h2>
<form:form modelAttribute="pet"
class="form-horizontal">
<input type="hidden" name="id" value="${pet.id}"/>
<div class="form-group has-feedback">
<div class="form-group">
<label class="col-sm-2 control-label">Owner</label>
<div class="col-sm-10">
<c:out value="${pet.owner.firstName} ${pet.owner.lastName}"/>
</div>
</div>
<petclinic:inputField label="Name" name="name"/>
<petclinic:inputField label="Birth Date" name="birthDate"/>
<div class="control-group">
<petclinic:selectField name="type" label="Type " names="${types}" size="5"/>
</div>
</div>
<petclinic:inputField label="Name" name="name"/>
<petclinic:inputField label="Birth Date" name="birthDate"/>
<div class="control-group">
<petclinic:selectField name="type" label="Type " names="${types}" size="5"/>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<c:choose>
<c:when test="${pet['new']}">
<button class="btn btn-primary" type="submit">Add Pet</button>
</c:when>
<c:otherwise>
<button class="btn btn-primary" type="submit">Update Pet</button>
</c:otherwise>
</c:choose>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<c:choose>
<c:when test="${pet['new']}">
<button class="btn btn-default" type="submit">Add Pet</button>
</c:when>
<c:otherwise>
<button class="btn btn-default" type="submit">Update Pet</button>
</c:otherwise>
</c:choose>
</div>
</div>
</div>
</form:form>
<c:if test="${!pet['new']}">
</c:if>
</div>
</form:form>
<c:if test="${!pet['new']}">
</c:if>
<petclinic:pivotal/>
</div>
</div>
<jsp:include page="../fragments/footer.jsp"/>
<script>
......
src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp
+ 49
− 46
View file @ 44b591f5
......@@ -16,58 +16,61 @@
<body>
<petclinic:bodyHeader menuName="owners"/>
<div class="container">
<h2><c:if test="${visit['new']}">New </c:if>Visit</h2>
<div class="container-fluid">
<div class="container xd-container">
<h2><c:if test="${visit['new']}">New </c:if>Visit</h2>
<b>Pet</b>
<table class="table table-striped">
<thead>
<tr>
<th>Name</th>
<th>Birth Date</th>
<th>Type</th>
<th>Owner</th>
</tr>
</thead>
<tr>
<td><c:out value="${visit.pet.name}"/></td>
<td><joda:format value="${visit.pet.birthDate}" pattern="yyyy/MM/dd"/></td>
<td><c:out value="${visit.pet.type.name}"/></td>
<td><c:out value="${visit.pet.owner.firstName} ${visit.pet.owner.lastName}"/></td>
</tr>
</table>
<b>Pet</b>
<table class="table table-striped">
<thead>
<tr>
<th>Name</th>
<th>Birth Date</th>
<th>Type</th>
<th>Owner</th>
</tr>
</thead>
<tr>
<td><c:out value="${visit.pet.name}"/></td>
<td><joda:format value="${visit.pet.birthDate}" pattern="yyyy/MM/dd"/></td>
<td><c:out value="${visit.pet.type.name}"/></td>
<td><c:out value="${visit.pet.owner.firstName} ${visit.pet.owner.lastName}"/></td>
</tr>
</table>
<form:form modelAttribute="visit" class="form-horizontal">
<div class="form-group has-feedback">
<petclinic:inputField label="Date" name="date"/>
<petclinic:inputField label="Description" name="description"/>
</div>
<form:form modelAttribute="visit" class="form-horizontal">
<div class="form-group has-feedback">
<petclinic:inputField label="Date" name="date"/>
<petclinic:inputField label="Description" name="description"/>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<input type="hidden" name="petId" value="${visit.pet.id}"/>
<button class="btn btn-primary" type="submit">Add Visit</button>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<input type="hidden" name="petId" value="${visit.pet.id}"/>
<button class="btn btn-default" type="submit">Add Visit</button>
</div>
</div>
</div>
</form:form>
</form:form>
<br/>
<b>Previous Visits</b>
<table class="table table-striped">
<tr>
<th>Date</th>
<th>Description</th>
</tr>
<c:forEach var="visit" items="${visit.pet.visits}">
<c:if test="${!visit['new']}">
<tr>
<td><joda:format value="${visit.date}" pattern="yyyy/MM/dd"/></td>
<td><c:out value="${visit.description}"/></td>
</tr>
</c:if>
</c:forEach>
</table>
<br/>
<b>Previous Visits</b>
<table class="table table-striped">
<tr>
<th>Date</th>
<th>Description</th>
</tr>
<c:forEach var="visit" items="${visit.pet.visits}">
<c:if test="${!visit['new']}">
<tr>
<td><joda:format value="${visit.date}" pattern="yyyy/MM/dd"/></td>
<td><c:out value="${visit.description}"/></td>
</tr>
</c:if>
</c:forEach>
</table>
<petclinic:pivotal/>
</div>
</div>
<jsp:include page="../fragments/footer.jsp"/>
<script>
......
src/main/webapp/WEB-INF/jsp/vets/vetList.jsp
+ 32
− 30
View file @ 44b591f5
......@@ -12,37 +12,39 @@
<jsp:include page="../fragments/htmlHeader.jsp"/>
<body>
<div class="container">
<petclinic:bodyHeader menuName="vets"/>
<h2>Veterinarians</h2>
<datatables:table id="vets" data="${vets.vetList}" row="vet" cssClass="table table-striped"
pageable="false" info="false">
<datatables:column title="Name">
<c:out value="${vet.firstName} ${vet.lastName}"/>
</datatables:column>
<datatables:column title="Specialties">
<c:forEach var="specialty" items="${vet.specialties}">
<c:out value="${specialty.name}"/>
</c:forEach>
<c:if test="${vet.nrOfSpecialties == 0}">none</c:if>
</datatables:column>
</datatables:table>
<table class="table-buttons">
<tr>
<td>
<a href="<spring:url value="/vets.xml" htmlEscape="true" />">View as XML</a>
</td>
<td>
<a href="<spring:url value="/vets.json" htmlEscape="true" />">View as JSON</a>
</td>
</tr>
</table>
<jsp:include page="../fragments/footer.jsp"/>
<petclinic:bodyHeader menuName="vets"/>
<div class="container-fluid">
<div class="container xd-container">
<h2>Veterinarians</h2>
<datatables:table id="vets" data="${vets.vetList}" row="vet" cssClass="table table-striped"
pageable="false" info="false">
<datatables:column title="Name">
<c:out value="${vet.firstName} ${vet.lastName}"/>
</datatables:column>
<datatables:column title="Specialties">
<c:forEach var="specialty" items="${vet.specialties}">
<c:out value="${specialty.name}"/>
</c:forEach>
<c:if test="${vet.nrOfSpecialties == 0}">none</c:if>
</datatables:column>
</datatables:table>
<table class="table-buttons">
<tr>
<td>
<a href="<spring:url value="/vets.xml" htmlEscape="true" />">View as XML</a>
</td>
<td>
<a href="<spring:url value="/vets.json" htmlEscape="true" />">View as JSON</a>
</td>
</tr>
</table>
<petclinic:pivotal/>
</div>
</div>
<jsp:include page="../fragments/footer.jsp"/>
</body>
</html>
src/main/webapp/WEB-INF/jsp/welcome.jsp
+ 10
− 6
View file @ 44b591f5
......@@ -13,13 +13,17 @@
<body>
<petclinic:bodyHeader menuName="home"/>
<div class="container">
<h2><fmt:message key="welcome"/></h2>
<div class="row">
<div class="col-md-12">
<spring:url value="/resources/images/pets.png" htmlEscape="true" var="petsImage"/>
<img class="img-responsive" src="${petsImage}"/>
<div class="container-fluid">
<div class="container xd-container">
<h2><fmt:message key="welcome"/></h2>
<div class="row">
<div class="col-md-12">
<spring:url value="/resources/images/pets.png" htmlEscape="true" var="petsImage"/>
<img class="img-responsive" src="${petsImage}"/>
</div>
</div>
<petclinic:pivotal/>
</div>
</div>
<jsp:include page="fragments/footer.jsp"/>
......
src/main/webapp/WEB-INF/tags/bodyHeader.tag
+ 1
− 12
View file @ 44b591f5
......@@ -4,15 +4,4 @@
<%@ attribute name="menuName" required="true" rtexprvalue="true"
description="Name of the active menu: home, owners, vets or error" %>
<div class="container">
<div class="row">
<div class="col-md-12">
<spring:url value="/resources/images/banner-graphic.png" var="banner"/>
<img class="img-responsive" src="${banner}"/>
</div>
</div>
</div>
<div class="container">
<petclinic:menu name="${menuName}"/>
</div>
<petclinic:menu name="${menuName}"/>
src/main/webapp/WEB-INF/tags/menu.tag
+ 5
− 4
View file @ 44b591f5
......@@ -5,10 +5,11 @@
description="Name of the active menu: home, owners, vets or error" %>
<%-- Static navbar --%>
<nav class="navbar navbar-default">
<div class="container-fluid">
<nav class="navbar navbar-default" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<a class="navbar-brand" href="<spring:url value="/" htmlEscape="true" />"><span></span></a>
<button type="button" class="navbar-toggle" data-toggle="collapse">
<span class="sr-only"><os-p>Toggle navigation</os-p></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
......@@ -16,7 +17,7 @@
</button>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<ul class="nav navbar-nav navbar-right">
<c:choose>
<c:when test="${name eq 'home'}">
<c:set var="cssMenu" value="active"/>
......
src/main/webapp/WEB-INF/tags/pivotal.tag 0 → 100644
+ 10
− 0
View file @ 44b591f5
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<br/>
<br/>
<div class="container">
<div class="row">
<div class="col-12 text-center"><img src="<spring:url value="/resources/images/spring-pivotal-logo.png" htmlEscape="true" />"
alt="Sponsored by Pivotal"/></div>
</div>
</div>
src/main/webapp/resources/css/petclinic.css
+ 5
− 0
View file @ 44b591f5
This diff is collapsed.
src/main/webapp/resources/fonts/montserrat-webfont.eot 0 → 100644
+ 0
− 0
View file @ 44b591f5
File added
src/main/webapp/resources/fonts/montserrat-webfont.svg 0 → 100644
+ 1283
− 0
View file @ 44b591f5
This diff is collapsed.
src/main/webapp/resources/fonts/montserrat-webfont.ttf 0 → 100644
+ 0
− 0
View file @ 44b591f5
File added
src/main/webapp/resources/fonts/montserrat-webfont.woff 0 → 100644
+ 0
− 0
View file @ 44b591f5
File added
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