work in progress

Author: thomaswoehlke

src/main/resources/templates/layout/taskedit.html

@@ -127,14 +127,6 @@
                 </div>
             </div>
         </div>
-        <div class="form-row">
-            <div class="col-md-12 mb-12">
-                <button id="editTaskSubmit" type="submit" class="btn btn-primary">
-                    <i class="fas fa-save"></i>
-                    <span th:utext="#{task.show.button}">Save Task</span>
-                </button>
-            </div>
-        </div>
     </div>
 
 </html>

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

@@ -22,11 +22,21 @@ <h1>
 		<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>
-			<a class="btn btn-secondary" role="button"
-               th:href="@{/project/{projectId}/task/{id}/transform(id=${task.id},projectId=${thisProject.id})}">
-				<i class="fas fa-project-diagram"></i>
-				<span th:utext="#{task.show.transform}">Transform into Project</span>
-			</a>
+            <div class="form-row">
+                <div class="col-md-6 mb-6">
+                    <button id="editTaskSubmit" type="submit" class="btn btn-primary">
+                        <i class="fas fa-save"></i>
+                        <span th:utext="#{task.show.button}">Save Task</span>
+                    </button>
+                </div>
+                <div class="col-md-6 mb-6">
+                    <a class="btn btn-secondary" role="button"
+                       th:href="@{/project/{projectId}/task/{id}/transform(id=${task.id},projectId=${thisProject.id})}">
+                        <i class="fas fa-project-diagram"></i>
+                        <span th:utext="#{task.show.transform}">Transform into Project</span>
+                    </a>
+                </div>
+            </div>
 		</form>
 	</div>
 </div>

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

@@ -22,10 +22,20 @@ <h1 class="tw-title">
 		<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>
-			<a th:href="@{/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
-				<i class="fas fa-project-diagram"></i>
-				<span th:utext="#{task.show.transform}">Transform into Project</span>
-			</a>
+            <div class="form-row">
+                <div class="col-md-6 mb-6">
+                    <button id="editTaskSubmit" type="submit" class="btn btn-primary">
+                        <i class="fas fa-save"></i>
+                        <span th:utext="#{task.show.button}">Save Task</span>
+                    </button>
+                </div>
+                <div class="col-md-6 mb-6">
+                    <a th:href="@{/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
+                        <i class="fas fa-project-diagram"></i>
+                        <span th:utext="#{task.show.transform}">Transform into Project</span>
+                    </a>
+                </div>
+            </div>
 		</form>
 	</div>
 </div>

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

@@ -22,10 +22,20 @@ <h1>
 		<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>
-			<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
-				<i class="fas fa-project-diagram"></i>
-				<span th:utext="#{task.show.transform}">Transform into Project</span>
-			</a>
+            <div class="form-row">
+                <div class="col-md-6 mb-6">
+                    <button id="editTaskSubmit" type="submit" class="btn btn-primary">
+                        <i class="fas fa-save"></i>
+                        <span th:utext="#{task.show.button}">Save Task</span>
+                    </button>
+                </div>
+                <div class="col-md-6 mb-6">
+                    <a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary" role="button">
+                        <i class="fas fa-project-diagram"></i>
+                        <span th:utext="#{task.show.transform}">Transform into Project</span>
+                    </a>
+                </div>
+            </div>
 		</form>
 	</div>
 </div>