work in progress

Author: thomaswoehlke

src/main/resources/templates/project/id/task/add.html

@@ -20,7 +20,7 @@ <h1>
 <div th:fragment="mytwcontent">
 	<form id="formId" class="was-validated" method="post"
           th:action="@{/project/{projectId}/task/add(projectId=${thisProject.id})}" th:object="${task}">
-        <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
+        <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
         <div class="form-row">
             <div class="col-md-12 mb-12">
                 <button id="createNewTask" type="submit" class="btn btn-block btn-primary">

src/main/resources/templates/project/id/task/edit.html

@@ -21,7 +21,7 @@ <h1>
 	<div>
 		<form id="formId" th:object="${task}" method="post" class="was-validated"
               th:action="@{/project/{projectId}/task/{taskId}/edit(taskId=${task.id},projectId=${thisProject.id})}" >
-            <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
+            <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
             <div class="form-row">
                 <div class="col-md-6 mb-6">
                     <button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">

src/main/resources/templates/project/root/task/add.html

@@ -20,7 +20,7 @@ <h1>
 <div th:fragment="mytwcontent">
 	<form id="formId" class="was-validated" method="post"
           th:action="@{/project/root/task/add/}" th:object="${task}">
-        <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
+        <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
         <div class="form-row">
             <div class="col-md-12 mb-12">
                 <button id="createNewTask" type="submit" class="btn btn-block btn-primary">

src/main/resources/templates/project/root/task/edit.html

@@ -21,7 +21,7 @@ <h1 class="tw-title">
 	<div class="tw-content">
 		<form id="formId" method="post" class="was-validated"
               th:action="@{/project/root/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}">
-            <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
+            <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
             <div class="form-row">
                 <div class="col-md-6 mb-6">
                     <button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">

src/main/resources/templates/taskstate/task/add.html

@@ -20,7 +20,7 @@ <h1>
 <div th:fragment="mytwcontent">
 	<form id="formId" class="was-validated"
           th:action="@{/taskstate/task/add}" th:object="${task}" method="post">
-        <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
+        <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
         <div class="form-row">
             <div class="col-md-12 mb-12">
                 <button id="createNewTask" type="submit" class="btn btn-block btn-primary">

src/main/resources/templates/taskstate/task/edit.html

@@ -21,7 +21,7 @@ <h1>
 	<div>
 		<form id="formId" method="post" class="was-validated"
               th:action="@{/taskstate/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}">
-            <div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
+            <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
             <div class="form-row">
                 <div class="col-md-6 mb-6">
                     <button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">