Spring/spring-webflow-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added dependency to thymeleaf-extras-conditionalcomments

Browse Source
This commit is contained in:
Daniel Fernández
2012-12-19 03:07:23 +01:00
committed by Rossen Stoyanchev
parent c7500200b9
commit d00d53793e
5 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
booking-mvc/pom.xml
View File

@@ -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>

2
booking-mvc/src/main/resources/log4j.xml
View File

@@ -40,7 +40,7 @@
</logger>
<logger name="org.thymeleaf">
<level value="debug" />
<level value="info" />
</logger>
<!-- Root Logger -->

21
booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
View File

@@ -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">

6
booking-mvc/src/main/webapp/WEB-INF/intro.html
View File

@@ -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.

1
booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
View File

@@ -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" />