Merge pull request #6 from danielfernandez/master

Minor fixes to the thymeleaf merge and explanatory texts.
This commit is contained in:
Rossen Stoyanchev
2013-02-04 06:38:09 -08:00
2 changed files with 2 additions and 12 deletions

View File

@@ -1,10 +0,0 @@
<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<tiles:insertAttribute name="searchForm" />
<c:if test="${not empty confirmed}">
<div class="confirmed">${confirmed}</div>
</c:if>
<tiles:insertAttribute name="bookingsTable" />

View File

@@ -50,7 +50,7 @@
<div>
<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.
This sample demonstrates how to use Spring MVC and Spring Web Flow together with Thymeleaf and Tiles.
</p>
<hr />
<p>
@@ -65,7 +65,7 @@
<li>Spring MVC custom namespace</li>
<li>Spring Security integration</li>
<li>Annotated POJO @Controllers for implementing RESTful user interactions.</li>
<li>Declarative page authoring with JSP, JSTL, and Spring MVC's form tag library</li>
<li>Declarative page authoring with Thymeleaf and its Spring MVC's integration features.</li>
<li>Page layout and composition with Apache Tiles</li>
<li>A JavaScript API for decorating HTML elements with behaviors such as Ajax, validation, and effects.</li>
<li>A grid layout with Blueprint CSS</li>