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

Update to Thymeleaf 3.0.2 and remove tiles

Browse Source 
Spring 5 removed support for Tiles 2 and Thymeleaf does not support
Tiles 3 yet. This commit updates to Thymeleaf 3.0.2 and uses
Thymeleaf's build in layout support.

Issue gh-4080
This commit is contained in:
Rob Winch
2016-10-17 09:12:24 -05:00
parent c1e9140940
commit 5e35e37a2b
24 changed files with 180 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/javaconfig/openid/src/main/resources/views/login.html
View File

@@ -1,11 +1,11 @@
<html xmlns:th="http://www.thymeleaf.org" xmlns:tiles="http://www.thymeleaf.org">
<head>
<title tiles:fragment="title">Messages : Login</title>
<html xmlns:th="http://www.thymeleaf.org">
<head th:include="layout :: head(title=~{::title},links=~{::link})">
<title>Messages : Login</title>
<!-- /Simple OpenID Selector -->
<link rel="stylesheet" th:href="@{/resources/css/openid.css}" />
</head>
<body>
<div tiles:fragment="content">
<body th:include="layout :: body" th:with="content=~{::content}">
<div th:fragment="content">
<form name="f" th:action="@{/login/openid}" method="post" id="openid_form">
<input type="hidden" name="action" value="verify" />
<fieldset>
@@ -32,7 +32,7 @@
</noscript>
</fieldset>
</form>
<script type="text/javascript" th:src="@{/resources/js/jquery-1.2.6.min.js}"><!-- --></script>
<script type="text/javascript" th:src="@{/resources/js/openid-jquery.js}"><!-- --></script>
<script type="text/javascript">

10
samples/javaconfig/openid/src/main/resources/views/user/show.html
View File

@@ -1,11 +1,11 @@
<html xmlns:th="http://www.thymeleaf.org" xmlns:tiles="http://www.thymeleaf.org">
<head>
<title tiles:fragment="title">Messages : Login</title>
<html xmlns:th="http://www.thymeleaf.org">
<head th:include="layout :: head(title=~{::title},links=~{})">
<title>Messages : Login</title>
<!-- /Simple OpenID Selector -->
<link rel="stylesheet" th:href="@{/resources/css/openid.css}" />
</head>
<body>
<div tiles:fragment="content">
<body th:include="layout :: body" th:with="content=~{::content}">
<div th:fragment="content">
<h1>User Attributes</h1>
<table class="table table-border">
<thead>