From c193916ea4a406fd74cfde7bf9bec25db5a05dcb Mon Sep 17 00:00:00 2001
From: Mic <misvy@vmware.com>
Date: Sun, 24 Nov 2013 06:46:02 +0530
Subject: [PATCH] started changes to migrate to Bootstrap 3 (work in progress)
---
pom.xml | 2 +-
.../WEB-INF/jsp/fragments/bodyHeader.jsp | 40 +++++++++++--------
.../webapp/WEB-INF/jsp/fragments/headTag.jsp | 2 +-
3 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 36f8a73..c8493e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<!-- Web dependencies -->
- <webjars-bootstrap.version>2.3.0</webjars-bootstrap.version>
+ <webjars-bootstrap.version>3.0.1</webjars-bootstrap.version>
<webjars-jquery-ui.version>1.10.3</webjars-jquery-ui.version>
<webjars-jquery.version>2.0.3-1</webjars-jquery.version>
<dandelion.datatables.version>0.9.2</dandelion.datatables.version>
diff --git a/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp b/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp
index 76c1844..738b4b1 100644
--- a/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp
@@ -4,21 +4,29 @@
<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 style="width: 100px;"><a href="<spring:url value="/" htmlEscape="true" />"><i class="icon-home"></i>
- Home</a></li>
- <li style="width: 130px;"><a href="<spring:url value="/owners/find.html" htmlEscape="true" />"><i
- class="icon-search"></i> Find owners</a></li>
- <li style="width: 140px;"><a href="<spring:url value="/vets.html" htmlEscape="true" />"><i
- class="icon-th-list"></i> Veterinarians</a></li>
- <li style="width: 90px;"><a href="<spring:url value="/oups.html" htmlEscape="true" />"
- title="trigger a RuntimeException to see how it is handled"><i
- class="icon-warning-sign"></i> Error</a></li>
- <li style="width: 80px;"><a href="#" title="not available yet. Work in progress!!"><i
- class=" icon-question-sign"></i> Help</a></li>
- </ul>
- </div>
+<div class="navbar navbar-default" style="width: 601px;">
+ <ul class="nav nav-pills">
+ <li style="width: 100px;"><a href="<spring:url value="/" htmlEscape="true" />">
+ <span class="glyphicon glyphicon-home"></span>
+ Home</a>
+ </li>
+ <li style="width: 130px;"><a href="<spring:url value="/owners/find.html" htmlEscape="true" />"><i
+ class="glyphicon glyphicon-search"></i> Find owners</a></li>
+ <li style="width: 140px;">
+ <a href="<spring:url value="/vets.html" htmlEscape="true" />">
+ <span class="glyphicon glyphicon-th-list"></span> Veterinarians</a>
+ </li>
+ <li style="width: 90px;">
+ <a href="<spring:url value="/oups.html" htmlEscape="true" />"
+ title="trigger a RuntimeException to see how it is handled">
+ <i class="glyphicon glyphicon-warning-sign"></i> Error</a>
+ </li>
+ <li style="width: 80px;">
+ <a href="#" title="not available yet. Work in progress!!">
+ <i class=" glyphicon glyphicon-question-sign"></i>
+ Help
+ </a>
+ </li>
+ </ul>
</div>
diff --git a/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp b/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp
index f1eea21..6b1b358 100644
--- a/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp
@@ -9,7 +9,7 @@ PetClinic :: a Spring Framework demonstration
<title>PetClinic :: a Spring Framework demonstration</title>
- <spring:url value="/webjars/bootstrap/2.3.0/css/bootstrap.min.css" var="bootstrapCss"/>
+ <spring:url value="/webjars/bootstrap/3.0.1/css/bootstrap.min.css" var="bootstrapCss"/>
<link href="${bootstrapCss}" rel="stylesheet"/>
<spring:url value="/resources/css/petclinic.css" var="petclinicCss"/>
--
GitLab