Merge branch '2.1.x'

This commit is contained in:
Andy Wilkinson
2019-03-28 11:48:47 +00:00
125 changed files with 450 additions and 447 deletions

View File

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<html xmlns:th="https://www.thymeleaf.org">
<head th:fragment="head (title)">
<title th:text="${title}">Fragments</title>
<link rel="stylesheet" th:href="@{/css/bootstrap.min.css}"
@@ -8,7 +8,7 @@
<body>
<div class="container">
<nav th:fragment="navbar" class="navbar navbar-dark bg-primary">
<a class="navbar-brand" href="http://thymeleaf.org" th:text="#{navbar.thymeleaf}">Thymeleaf</a>
<a class="navbar-brand" href="https://www.thymeleaf.org/" th:text="#{navbar.thymeleaf}">Thymeleaf</a>
<ul class="navbar-nav mr-auto mt-2 mt-lg-0">
<li class="nav-item"><a class="nav-link" th:href="@{/}" href="messages.html" th:text="#{navbar.messages}">Messages</a></li>
</ul>

View File

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<html xmlns:th="https://www.thymeleaf.org">
<head th:replace="fragments :: head(title=~{::title/text()})">
<title th:text="#{form.title}">Messages : Create</title>
</head>

View File

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<html xmlns:th="https://www.thymeleaf.org">
<head th:replace="fragments :: head(title=~{::title/text()})">
<title th:text="#{list.title}">Messages : View all</title>
</head>

View File

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<html xmlns:th="https://www.thymeleaf.org">
<head th:replace="fragments :: head(title=~{::title/text()})">
<title th:text="#{view.title}">Messages : View</title>
</head>