root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #14947 from vpavic

Browse Source 
* pr/14947:
  Use message source in Web UI sample
pull/14954/head
Phillip Webb 6 years ago
parent 5e18fe1eaa 4b2f084e28
commit c130956f0f
7 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File

4
spring-boot-samples/spring-boot-sample-web-ui/pom.xml
Unescape Escape View File

@ -24,6 +24,10 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId> <artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
</dependency>
<!-- Test --> <!-- Test -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

2
spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/mvc/MessageController.java
Unescape Escape View File

@ -64,7 +64,7 @@ public class MessageController {
return new ModelAndView("messages/form", "formErrors", result.getAllErrors()); return new ModelAndView("messages/form", "formErrors", result.getAllErrors());
} }
message = this.messageRepository.save(message); message = this.messageRepository.save(message);
redirect.addFlashAttribute("globalMessage", "Successfully created a new message"); redirect.addFlashAttribute("globalMessage", "view.success");
return new ModelAndView("redirect:/{message.id}", "message.id", message.getId()); return new ModelAndView("redirect:/{message.id}", "message.id", message.getId());
} }

21
spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/messages.properties
Unescape Escape View File

@ -0,0 +1,21 @@
form.message=Message
form.messages=Messages
form.submit=Submit
form.summary=Summary
form.title=Messages : Create
list.create=Create Message
list.table.created=Created
list.table.empty=No messages
list.table.id=Id
list.table.summary=Summary
list.title=Messages : View all
navbar.messages=Messages
navbar.thymeleaf=Thymeleaf
view.delete=delete
view.messages=Messages
view.modify=modify
view.success=Successfully created a new message
view.title=Messages : View

4
spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/fragments.html
Unescape Escape View File

@ -8,9 +8,9 @@
<body> <body>
<div class="container"> <div class="container">
<nav th:fragment="navbar" class="navbar navbar-dark bg-primary"> <nav th:fragment="navbar" class="navbar navbar-dark bg-primary">
<a class="navbar-brand" href="http://thymeleaf.org">Thymeleaf</a> <a class="navbar-brand" href="http://thymeleaf.org" th:text="#{navbar.thymeleaf}">Thymeleaf</a>
<ul class="navbar-nav mr-auto mt-2 mt-lg-0"> <ul class="navbar-nav mr-auto mt-2 mt-lg-0">
<li class="nav-item"><a class="nav-link" th:href="@{/}" href="messages.html">Messages</a></li> <li class="nav-item"><a class="nav-link" th:href="@{/}" href="messages.html" th:text="#{navbar.messages}">Messages</a></li>
</ul> </ul>
</nav> </nav>
</div> </div>

12
spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/form.html
Unescape Escape View File

@ -1,15 +1,15 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<head th:replace="fragments :: head(title=~{::title/text()})"> <head th:replace="fragments :: head(title=~{::title/text()})">
<title>Messages : Create</title> <title th:text="#{form.title}">Messages : Create</title>
</head> </head>
<body> <body>
<div class="container"> <div class="container">
<div th:replace="fragments :: navbar"></div> <div th:replace="fragments :: navbar"></div>
<div class="float-right mt-2"> <div class="float-right mt-2">
<a class="btn btn-primary btn-sm" th:href="@{/}" href="messages.html"> Messages </a> <a class="btn btn-primary btn-sm" th:href="@{/}" href="messages.html" th:text="#{form.messages}"> Messages </a>
</div> </div>
<h4 class="float-left mt-2">Messages : Create</h4> <h4 class="float-left mt-2" th:text="#{form.title}">Messages : Create</h4>
<div class="clearfix"></div> <div class="clearfix"></div>
<form id="messageForm" th:action="@{/(form)}" th:object="${message}" action="#" method="post"> <form id="messageForm" th:action="@{/(form)}" th:object="${message}" action="#" method="post">
<div th:if="${#fields.hasErrors('*')}" class="alert alert-danger" role="alert"> <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger" role="alert">
@ -17,14 +17,14 @@
</div> </div>
<input type="hidden" th:field="*{id}" th:class="${'form-control' + (#fields.hasErrors('id') ? ' is-invalid' : '')}"/> <input type="hidden" th:field="*{id}" th:class="${'form-control' + (#fields.hasErrors('id') ? ' is-invalid' : '')}"/>
<div class="form-group"> <div class="form-group">
<label for="summary">Summary</label> <label for="summary" th:text="#{form.summary}">Summary</label>
<input type="text" th:field="*{summary}" th:class="${'form-control' + (#fields.hasErrors('summary') ? ' is-invalid' : '')}"> <input type="text" th:field="*{summary}" th:class="${'form-control' + (#fields.hasErrors('summary') ? ' is-invalid' : '')}">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="text">Message</label> <label for="text" th:text="#{form.message}">Message</label>
<textarea th:field="*{text}" th:class="${'form-control' + (#fields.hasErrors('text') ? ' is-invalid' : '')}"></textarea> <textarea th:field="*{text}" th:class="${'form-control' + (#fields.hasErrors('text') ? ' is-invalid' : '')}"></textarea>
</div> </div>
<button type="submit" class="btn btn-primary">Submit</button> <button type="submit" class="btn btn-primary" th:text="#{form.submit}">Submit</button>
</form> </form>
</div> </div>
</body> </body>

14
spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/list.html
Unescape Escape View File

@ -1,26 +1,26 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<head th:replace="fragments :: head(title=~{::title/text()})"> <head th:replace="fragments :: head(title=~{::title/text()})">
<title>Messages : View all</title> <title th:text="#{list.title}">Messages : View all</title>
</head> </head>
<body> <body>
<div class="container"> <div class="container">
<div th:replace="fragments :: navbar"></div> <div th:replace="fragments :: navbar"></div>
<div class="float-right mt-2"> <div class="float-right mt-2">
<a class="btn btn-primary btn-sm" href="form.html" th:href="@{/(form)}">Create Message</a> <a class="btn btn-primary btn-sm" href="form.html" th:href="@{/(form)}" th:text="#{list.create}">Create Message</a>
</div> </div>
<h4 class="float-left mt-2">Messages : View all</h4> <h4 class="float-left mt-2" th:text="#{list.title}">Messages : View all</h4>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
<tr> <tr>
<th>ID</th> <th th:text="#{list.table.id}">ID</th>
<th>Created</th> <th th:text="#{list.table.created}">Created</th>
<th>Summary</th> <th th:text="#{list.table.summary}">Summary</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr th:if="${messages.empty}"> <tr th:if="${messages.empty}">
<td colspan="3">No messages</td> <td colspan="3" th:text="#{list.table.empty}">No messages</td>
</tr> </tr>
<tr th:each="message : ${messages}"> <tr th:each="message : ${messages}">
<td th:text="${message.id}">1</td> <td th:text="${message.id}">1</td>

12
spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/view.html
Unescape Escape View File

@ -1,25 +1,25 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<head th:replace="fragments :: head(title=~{::title/text()})"> <head th:replace="fragments :: head(title=~{::title/text()})">
<title>Messages : View</title> <title th:text="#{view.title}">Messages : View</title>
</head> </head>
<body> <body>
<div class="container"> <div class="container">
<div th:replace="fragments :: navbar"></div> <div th:replace="fragments :: navbar"></div>
<div class="float-right mt-2"> <div class="float-right mt-2">
<a class="btn btn-primary btn-sm" href="list.html" th:href="@{/}">Messages</a> <a class="btn btn-primary btn-sm" href="list.html" th:href="@{/}" th:text="#{view.messages}">Messages</a>
</div> </div>
<h4 class="float-left mt-2">Messages : View</h4> <h4 class="float-left mt-2" th:text="#{view.title}">Messages : View</h4>
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="alert alert-success" th:if="${globalMessage}" th:text="${globalMessage}">Some Success message <div class="alert alert-success" th:if="${globalMessage}" th:text="#{${globalMessage}}">Some Success message
</div> </div>
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<h4 class="card-title" th:text="${message.id + ': ' + message.summary}">123 - A short summary...</h4> <h4 class="card-title" th:text="${message.id + ': ' + message.summary}">123 - A short summary...</h4>
<h6 class="card-subtitle mb-2 text-muted" th:text="${#calendars.format(message.created)}">July 11, 2012 2:17:16 PM CDT</h6> <h6 class="card-subtitle mb-2 text-muted" th:text="${#calendars.format(message.created)}">July 11, 2012 2:17:16 PM CDT</h6>
<p class="card-text" th:text="${message.text}">A detailed message that is longer than the summary.</p> <p class="card-text" th:text="${message.text}">A detailed message that is longer than the summary.</p>
<a class="card-link" href="messages" th:href="@{'/delete/' + ${message.id}}">delete</a> <a class="card-link" href="messages" th:href="@{'/delete/' + ${message.id}}" th:text="#{view.delete}">delete</a>
<a class="card-link" href="form.html" th:href="@{'/modify/' + ${message.id}}"> modify</a> <a class="card-link" href="form.html" th:href="@{'/modify/' + ${message.id}}" th:text="#{view.modify}"> modify</a>
</div> </div>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save