TODO: Layout genĂ¼gend angepasst? exception-handling-todo
authorKai Moritz <kai@juplo.de>
Sun, 20 Sep 2020 12:43:32 +0000 (14:43 +0200)
committerKai Moritz <kai@juplo.de>
Mon, 28 Sep 2020 19:30:52 +0000 (21:30 +0200)
Added a layout

src/main/resources/templates/error.html
src/main/resources/templates/layout.html [new file with mode: 0644]
src/main/resources/templates/resolved.html
src/main/resources/templates/view.html

index e30ef9e..25f54c3 100644 (file)
@@ -1,14 +1,14 @@
 <!doctype html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org" th:replace="~{layout :: pagelayout(~{:: title}, ~{:: h1}, ~{:: table.card-text})}">
   <head>
     <title th:text="|${status}: ${error}">XXX: ERROR</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   </head>
   <body>
     <h1 th:text="|${status}: ${error}">XXX: ERROR</h1>
-      <table>
+      <table class="card-text table">
         <tbody>
-          <tr>
+          <tr class="border-top-0">
             <th scope="row">Status</th>
             <td th:text="${status}">ERROR.STATUS</td>
           </tr>
@@ -21,7 +21,7 @@
             <td th:text="${message}">ERROR.MESSAGE</td>
           </tr>
           <tr th:if="!${#strings.isEmpty(requestId)}">
-            <th scope="row">Request-ID</th>
+            <th class="text-nowrap" scope="row">Request-ID</th>
             <td th:text="${requestId}">ERROR.REQUEST_ID</td>
           </tr>
           <tr>
           <tr th:if="!${#strings.isEmpty(trace)}">
             <th scope="row">Trace</th>
             <td>
-              <div>
-                <pre th:text="${trace}">ERROR.TRACE</pre>
+              <div class="overflow-hidden">
+                <pre class="overflow-hidden" th:text="${trace}">ERROR.TRACE</pre>
               </div>
             </td>
           </tr>
           <!--**/-->
         </tbody>
       </table>
-      <p><a href="#" th:href="@{/}">Back to HOME</a>
+      <p><a href="#" th:href="@{/}" class="btn btn-primary">Back to HOME</a>
     </div>
   </body>
 </html>
diff --git a/src/main/resources/templates/layout.html b/src/main/resources/templates/layout.html
new file mode 100644 (file)
index 0000000..d3f0dfa
--- /dev/null
@@ -0,0 +1,20 @@
+<!doctype html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org" th:fragment="pagelayout(title,header,body)">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <title th:replace="${title}">TITLE</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+  </head>
+  <body>
+    <nav class="navbar navbar-dark bg-primary navbar-expand navbar-dark flex-column">
+      <h2 class="navbar-brand">Demo: Testing Exception-Handling With/In the Springframework</h2>
+    </nav>
+    <main class="container mt-5">
+      <div id="content" class="card">
+        <div class="card-header"><h1 th:replace="${header}">HEADER</h1></div>
+        <div class="card-body"><div th:replace="${body}">BODY</div></div>
+      </div>
+    </main>
+  </body>
+</html>
index 32f64f8..0040116 100644 (file)
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org" th:replace="~{layout :: pagelayout(~{:: title}, ~{:: h1}, ~{:: div.card-text})}">
   <head>
     <title th:text="'503: ' + ${exception.getClass().getSimpleName()}">Testing Exception-Handling - Template for 503</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   </head>
   <body>
     <h1 th:text="'503: ' + ${exception.getClass().getSimpleName()}">Template for 503</h1>
-    <div>
+    <div class="card-text table">
       <p><strong th:text="'Catched exception: ' + ${exception}">EXCEPTION</strong></p>
-      <p><a href="#" th:href="@{/}">Back to HOME</a></p>
+      <p><a href="#" th:href="@{/}" class="btn btn-primary">Back to HOME</a></p>
     </div>
   </body>
 </html>
index 47fdca4..b302cf3 100644 (file)
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org" th:replace="~{layout :: pagelayout(~{:: title}, ~{:: h1}, ~{:: div.card-text})}">
   <head>
     <title>Template: view</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   </head>
   <body>
     <h1>Deeep Thought</h1>
-    <div th:switch="${answer}">
+    <div th:switch="${answer}" class="card-text">
       <p th:case="null">
         <strong>What is the answer to the ultimate question of life, the universe and everything?</strong>
       </p>
         <li>Outcome: <strong th:text="${outcome.get()}">OUTCOME</strong></li>
       </ul>
     </div>
-    <div>
+    <div class="card-text">
       <form action="#" th:action="@{/}" method="get">
-        <div>
+        <div class="form-group">
           <label for="answer">Answer:</label>
-          <input type="text" name="answer" value="42" th:value="${answer}"/>
-          <button type="submit">Submit</button>
+          <input type="text" name="answer" value="42" th:value="${answer}" class="form-control"/>
+          <button type="submit" class="btn btn-primary">Submit</button>
         </div>
       </form>
     </div>