pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.8</version>
+		<version>3.5.3</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>wanijo</groupId>

src/main/kotlin/wanijo/wanijo2/domain/document.kt

@@ -46,11 +46,7 @@ interface DocumentDao : Repository<Document, DocumentId> {
 
     @Query(
         """
-            SELECT doc.id,
+            SELECT doc.*
-                   doc.name,
-                   doc.description,
-                   doc.updated_at,
-                   doc.created_at
               FROM t_document doc
               JOIN t_document_tagging tagging
                 ON tagging.document_id = doc.id

src/main/kotlin/wanijo/wanijo2/http/controller/RemoveLabelFieldController.kt

@@ -1,7 +0,0 @@
-package wanijo.wanijo2.http.controller
-
-import org.springframework.stereotype.Controller
-
-@Controller
-class RemoveLabelFieldController {
-}

src/main/resources/static/stylesheet.css

@@ -2,8 +2,6 @@ body {
     --dark-grey: #717171;
     --light-grey: #858585;
     --warning: #ce0000;
-    --table-header: #c0c0c0;
-    --table-highlight: #e5e4e4;
 
     margin: 0 3%;
     font-family: sans-serif;
@@ -89,10 +87,6 @@ main {
     h2 .low-key-hint {
         color: var(--light-grey);
     }
-
-    button {
-        padding: .3rem;
-    }
 }
 
 table {
@@ -103,12 +97,12 @@ table {
     }
 
     thead {
-        background-color: var(--table-header);
+        background-color: ButtonFace;
     }
 
     tbody {
         tr:hover {
-            background-color: var(--table-highlight);
+            background-color: ButtonBorder;
         }
     }
 }
@@ -130,6 +124,10 @@ form {
     textarea {
         min-height: 20rem;
     }
+
+    [type=submit] {
+        padding: .3rem;
+    }
 }
 
 .form-link {
@@ -148,10 +146,6 @@ form {
     }
 }
 
-.form-single {
-    display: block;
-}
-
 .form-inline {
-    display: inline;
+    display: block;
 }

src/main/resources/templates/addLabelField.html

@@ -20,7 +20,7 @@
                 <input type="hidden" th:field="*{documentId}">
 
                 <label for="labelName">name</label>
-                <input id="labelName" type="text" th:field="*{labelName}" required autofocus>
+                <input id="labelName" type="text" th:field="*{labelName}" required>
 
                 <label for="labelValue">wert</label>
                 <input id="labelValue" th:field="*{labelValue}" type="text" required>

src/main/resources/templates/show.html

@@ -56,21 +56,11 @@
             <h2 class="low-key-hint">felder</h2>
             <h3 class="low-key-hint">
                 label
-                <a th:href="@{/document/{id}/field/label/add(id=${document.id})}">
+                <a th:href="@{/document/{id}/field/label/add(id=${document.id})}">(+)</a>
-                    <button>
-                        neu
-                    </button>
-                </a>
             </h3>
             <dl>
                 <th:block th:each="field : ${document.labelFields}">
-                    <dt>
+                    <dt th:text="${field.name}"></dt>
-                        <th:block th:text="${field.name}" />
-                        <form class="form-inline" th:action="@{/document/{id}/field/label/delete(id=${document.id})}" method="post">
-                            <input type="hidden" name="labelId" th:value="${field.id}">
-                            <button type="submit" class="warning">weg</button>
-                        </form>
-                    </dt>
                     <dd th:text="${field.value}"></dd>
                 </th:block>
             </dl>
@@ -98,7 +88,7 @@
             </ul>
 
             <h2 class="warning">gefahr</h2>
-            <form class="form-single" th:action="@{/document/delete}" method="post">
+            <form class="form-inline" th:action="@{/document/delete}" method="post">
                 <input type="hidden" name="documentId" th:value="${document.id}">
                 <button type="submit" class="warning">
                     LÖSCHEN