work

Author: thomaswoehlke

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

@@ -11,11 +11,11 @@
                 <ul id="rootProject" style="list-style: none;">
                     <li>
                         <span id="tw-project-submenu-root">
-                            <i class="fas fa-folder-open"></i>
                             <a th:href="@{/project/root}" id="project_0"
                                ondrop="drop2project(event)" ondragover="allowDrop2Project(event)"
-                               th:text="#{right.nav.projects}">
-                                Projects
+                               class="m-2 btn btn-outline-dark btn-sm">
+                                <i class="fas fa-folder-open"></i>
+                                <span th:text="#{right.nav.projects}">Projects</span>
                             </a>
                         </span>
                         <span th:if="${rootProjects != null and rootProjects.size() gt 0}">

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

@@ -70,14 +70,6 @@
                         <span th:text="#{layout.page.trash}">Trash</span>
                     </a>
                 </li>
-                <li class="nav-item" ondrop="" ondragover="">
-                  <a id="taskstate_project_view"
-                     th:href="@{/project/root}"
-                     th:class="${taskstateType == 'trash' ? 'nav-link active' : 'nav-link'}">
-                    <i class="fas fa-folder-open"></i>
-                    <span th:text="#{right.nav.projects}">Projects</span>
-                  </a>
-                </li>
             </ul>
         </div>
     </section>

src/main/resources/templates/project/id/show.html

@@ -12,7 +12,7 @@
 <div th:fragment="mytwtitle">
 	<div id="tw-content-title">
 		<h2>
-			<i class="fas fa-folder-open"></i>
+      <i class="fas fa-project-diagram"></i>
 			<span th:text="#{project.show.h1}"class="me-3">Project</span>
 			<span th:if="${thisProject.id gt 0}">
         <a class="btn btn-block btn-outline-dark" data-bs-toggle="collapse"

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

@@ -24,7 +24,7 @@ <h1>
         <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
         <div class="row my-3">
             <div class="col">
-              <a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block"
+              <a th:href="@{/project/{projectId}(projectId=${thisProject.id})}" class="btn btn-secondary btn-block"
                  role="button">
                 <i class="fas fa-angle-double-left"></i>
                 <span th:utext="#{task.show.button.close}">cancel and back</span>

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

@@ -24,8 +24,7 @@ <h1 class="tw-title">
       <div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
       <div class="row my-3">
           <div class="col">
-            <a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block"
-               role="button">
+            <a th:href="@{/project/root/}" class="btn btn-secondary btn-block" role="button">
               <i class="fas fa-angle-double-left"></i>
               <span th:utext="#{task.show.button.close}">cancel and back</span>
             </a>
@@ -37,8 +36,8 @@ <h1 class="tw-title">
               </button>
           </div>
           <div class="col">
-              <a th:href="@{/project/root/task/{id}/transform(id=${task.id})}" class="btn btn-outline-secondary btn-block"
-                 role="button">
+              <a th:href="@{/project/root/task/{id}/transform(id=${task.id})}"
+                 class="btn btn-outline-secondary btn-block" role="button">
                   <i class="fas fa-project-diagram"></i>
                   <span th:utext="#{task.show.transform}">Transform into Project</span>
               </a>