From d00d53793eee0c664a101112324d3ff2e244a3b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Fern=C3=A1ndez?= <daniel.fernandez@11thlabs.org>
Date: Wed, 19 Dec 2012 03:07:23 +0100
Subject: [PATCH] Added dependency to thymeleaf-extras-conditionalcomments

---
 booking-mvc/pom.xml                           |  7 ++++---
 booking-mvc/src/main/resources/log4j.xml      |  2 +-
 .../webapp/WEB-INF/config/webmvc-config.xml   | 21 ++++++++++---------
 .../src/main/webapp/WEB-INF/intro.html        |  6 ++++++
 .../main/webapp/WEB-INF/layouts/standard.html |  1 +
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index 211dcf7..bfdb618 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -13,9 +13,10 @@
 		<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
 		<webflow-version>2.4.0.BUILD-SNAPSHOT</webflow-version>
 		<slf4j-version>1.5.10</slf4j-version>
-		<thymeleaf-version>2.0.14-SNAPSHOT</thymeleaf-version>
-		<thymeleaf-extras-tiles2-version>1.0.0-beta3-SNAPSHOT</thymeleaf-extras-tiles2-version>
-		<thymeleaf-extras-springsecurity3-version>1.0.0-beta2-SNAPSHOT</thymeleaf-extras-springsecurity3-version>
+		<thymeleaf-version>2.0.15</thymeleaf-version>
+		<thymeleaf-extras-tiles2-version>1.0.0-beta3</thymeleaf-extras-tiles2-version>
+		<thymeleaf-extras-springsecurity3-version>1.0.0-beta2</thymeleaf-extras-springsecurity3-version>
+		<thymeleaf-extras-conditionalcomments-version>1.0.0-beta1</thymeleaf-extras-conditionalcomments-version>
 		<tiles-version>2.2.2</tiles-version>
 	</properties>
 
diff --git a/booking-mvc/src/main/resources/log4j.xml b/booking-mvc/src/main/resources/log4j.xml
index a24fc28..d8ab4b0 100644
--- a/booking-mvc/src/main/resources/log4j.xml
+++ b/booking-mvc/src/main/resources/log4j.xml
@@ -40,7 +40,7 @@
 	</logger>
 
 	<logger name="org.thymeleaf">
-		<level value="debug" />
+		<level value="info" />
 	</logger>
 		
 	<!-- Root Logger -->
diff --git a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
index fd03282..ce2e8da 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
@@ -55,16 +55,17 @@
 	</bean>
 
 	<!-- Thymeleaf Template Engine -->
-  	<bean id="templateEngine"
-		  class="org.thymeleaf.spring3.SpringTemplateEngine">
-		<property name="templateResolver" ref="templateResolver" />
-		<property name="additionalDialects">
-			<set>
-				<bean class="org.thymeleaf.extras.tiles2.dialect.TilesDialect"/>
-				<bean class="org.thymeleaf.extras.springsecurity3.dialect.SpringSecurityDialect"/>
-			</set>
-		</property>
-	</bean>
+    <bean id="templateEngine"
+          class="org.thymeleaf.spring3.SpringTemplateEngine">
+        <property name="templateResolver" ref="templateResolver" />
+        <property name="additionalDialects">
+            <set>
+                <bean class="org.thymeleaf.extras.tiles2.dialect.TilesDialect"/>
+                <bean class="org.thymeleaf.extras.springsecurity3.dialect.SpringSecurityDialect"/>
+                <bean class="org.thymeleaf.extras.conditionalcomments.dialect.ConditionalCommentsDialect"/>
+            </set>
+        </property>
+    </bean>
 
 	<!-- Resolves logical view names returned by Controllers to Tiles; a view name to resolve is treated as the name of a tiles definition -->
 	<bean id="tilesViewResolver" class="org.thymeleaf.spring3.view.AjaxThymeleafViewResolver">
diff --git a/booking-mvc/src/main/webapp/WEB-INF/intro.html b/booking-mvc/src/main/webapp/WEB-INF/intro.html
index 4212158..66b4cca 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/intro.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/intro.html
@@ -1,4 +1,10 @@
 <div xmlns:th="http://www.thymeleaf.org">
+    <!-- Following this, we will see a conditional comment! -->
+    <!--[if lt IE 8]>
+            <link rel="stylesheet" href="/resources/blueprint/ie.css" type="text/css" media="screen, projection">
+              <p>
+    <![endif]-->
+
 	<h1>Welcome to Spring Travel</h1>
 	<p>
 	 	This sample demonstrates how to use Spring MVC and Spring Web Flow together with JavaServerPages (JSP) and Tiles.
diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
index c91dc1a..3441a74 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
@@ -8,6 +8,7 @@
 	<link rel="stylesheet" href="#" th:href="@{/resources/styles/blueprint/screen.css}" type="text/css" media="screen, projection" />
 	<link rel="stylesheet" href="#" th:href="@{/resources/styles/blueprint/print.css}" type="text/css" media="print" />
 	<!--[if lt IE 8]>
+    
 	        <link rel="stylesheet" href="<c:url value="/resources/blueprint/ie.css" />" type="text/css" media="screen, projection" />
 	<![endif]-->
 	<link rel="stylesheet" href="#" th:href="@{/resources/styles/booking.css}" type="text/css" media="screen" />