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

started changes to migrate to Bootstrap 3 (work in progress)

parent 34d8ca46
No related branches found
No related tags found
No related merge requests found
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<!-- Web dependencies --> <!-- 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-ui.version>1.10.3</webjars-jquery-ui.version>
<webjars-jquery.version>2.0.3-1</webjars-jquery.version> <webjars-jquery.version>2.0.3-1</webjars-jquery.version>
<dandelion.datatables.version>0.9.2</dandelion.datatables.version> <dandelion.datatables.version>0.9.2</dandelion.datatables.version>
......
...@@ -4,21 +4,29 @@ ...@@ -4,21 +4,29 @@
<spring:url value="/resources/images/banner-graphic.png" var="banner"/> <spring:url value="/resources/images/banner-graphic.png" var="banner"/>
<img src="${banner}"/> <img src="${banner}"/>
<div class="navbar" style="width: 601px;"> <div class="navbar navbar-default" style="width: 601px;">
<div class="navbar-inner"> <ul class="nav nav-pills">
<ul class="nav"> <li style="width: 100px;"><a href="<spring:url value="/" htmlEscape="true" />">
<li style="width: 100px;"><a href="<spring:url value="/" htmlEscape="true" />"><i class="icon-home"></i> <span class="glyphicon glyphicon-home"></span>
Home</a></li> Home</a>
<li style="width: 130px;"><a href="<spring:url value="/owners/find.html" htmlEscape="true" />"><i </li>
class="icon-search"></i> Find owners</a></li> <li style="width: 130px;"><a href="<spring:url value="/owners/find.html" htmlEscape="true" />"><i
<li style="width: 140px;"><a href="<spring:url value="/vets.html" htmlEscape="true" />"><i class="glyphicon glyphicon-search"></i> Find owners</a></li>
class="icon-th-list"></i> Veterinarians</a></li> <li style="width: 140px;">
<li style="width: 90px;"><a href="<spring:url value="/oups.html" htmlEscape="true" />" <a href="<spring:url value="/vets.html" htmlEscape="true" />">
title="trigger a RuntimeException to see how it is handled"><i <span class="glyphicon glyphicon-th-list"></span> Veterinarians</a>
class="icon-warning-sign"></i> Error</a></li> </li>
<li style="width: 80px;"><a href="#" title="not available yet. Work in progress!!"><i <li style="width: 90px;">
class=" icon-question-sign"></i> Help</a></li> <a href="<spring:url value="/oups.html" htmlEscape="true" />"
</ul> title="trigger a RuntimeException to see how it is handled">
</div> <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> </div>
...@@ -9,7 +9,7 @@ PetClinic :: a Spring Framework demonstration ...@@ -9,7 +9,7 @@ PetClinic :: a Spring Framework demonstration
<title>PetClinic :: a Spring Framework demonstration</title> <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"/> <link href="${bootstrapCss}" rel="stylesheet"/>
<spring:url value="/resources/css/petclinic.css" var="petclinicCss"/> <spring:url value="/resources/css/petclinic.css" var="petclinicCss"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment