diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 841a58ba..84b111fb 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.2/apache-maven-3.6.2-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/pom.xml b/pom.xml index 76b93891..2148e8f0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.woehlke simpleworklist - 2.3.63-SNAPSHOT + 2.3.66-SNAPSHOT jar @@ -72,7 +72,7 @@ 11 - 3.6.2 + 3.6.3 ${java.version} ${java.version} JAR @@ -124,7 +124,7 @@ 2.2.2 1.11.1 3.1.0 - 1.4.0 + 1.5.2 1.2022.6 @@ -1397,156 +1397,6 @@ org.apache.maven.plugins maven-dependency-plugin - copy-dependencies package @@ -1557,8 +1407,8 @@ compile maven-plugin test,provided - org.eclipse.aether,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby,com.vladsch.flexmark,org.apache.maven.doxia,org.codehaus.plexus,org.apache.maven.scm,io.netty,org.apache.groovy,org.eclipse.jetty,org.mockito,org.asciidoctor,com.github.jnr,org.apache.maven.surefire,org.apache.maven,net.sourceforge.saxon,net.sf.saxon,com.github.spotbugs,org.eclipse.jgit,org.apache.ant,org.apache.velocity,org.junit.jupiter,org.junit.platform,junit,org.mockito,net.sourceforge.pmd,org.eclipse.sisu,org.ow2.asm - spring-boot-configuration-processor,spring-boot-devtools,ganymed-ssh2,maven-toolchain,weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api,lombok,jcommander,checkstyle,plexus-build-api + org.eclipse.aether,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby,com.vladsch.flexmark,org.apache.maven.doxia,org.codehaus.plexus,org.apache.maven.scm,io.netty,org.apache.groovy,org.eclipse.jetty,org.mockito,org.asciidoctor,com.github.jnr,org.apache.maven.surefire,org.apache.maven,net.sourceforge.saxon,net.sf.saxon,com.github.spotbugs,org.eclipse.jgit,org.apache.ant,org.apache.velocity,org.junit.jupiter,org.junit.platform,junit,org.mockito,net.sourceforge.pmd,org.eclipse.sisu,org.ow2.asmcom.fasterxml.jackson.module, + jboss-transaction-api_1.2_spec,byte-buddy-agent,byte-buddy,backport9,backport-util-concurrent,spring-boot-configuration-processor,spring-boot-devtools,ganymed-ssh2,maven-toolchain,weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api,lombok,jcommander,checkstyle,plexus-build-api diff --git a/src/main/java/org/woehlke/java/simpleworklist/application/framework/AbstractController.java b/src/main/java/org/woehlke/java/simpleworklist/application/framework/AbstractController.java index 85a3b581..436b99cb 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/application/framework/AbstractController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/application/framework/AbstractController.java @@ -29,6 +29,7 @@ import java.util.Locale; import static java.util.Locale.GERMAN; +import static org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState.*; /** * Created by tw on 14.02.16. @@ -107,8 +108,18 @@ public final List getContexts(){ @ModelAttribute("listTaskState") public final List getTaskStates(){ - List listTaskState = new ArrayList<>(TaskState.values().length); - for(TaskState taskState:TaskState.values()){ + TaskState[] listTaskStateArray = { + INBOX, + TODAY, + NEXT, + WAITING, + SCHEDULED, + SOMEDAY, + FOCUS, + COMPLETED + }; + List listTaskState = new ArrayList<>(listTaskStateArray.length); + for(TaskState taskState:listTaskStateArray){ listTaskState.add(taskState); } return listTaskState; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java index 3d89b650..9b133e82 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Locale; +import static org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState.PROJECTS; + /** * Created by tw on 14.02.16. */ @@ -82,6 +84,8 @@ public final String projectTaskAddGet( model.addAttribute("breadcrumb", breadcrumb); model.addAttribute("task", task); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return "project/id/task/add"; } @@ -95,6 +99,8 @@ public final String projectTaskAddPost( ) { Context context = super.getContext(userSession); UserAccount userAccount = context.getUserAccount(); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); if (result.hasErrors()) { for (ObjectError e : result.getAllErrors()) { log.info(e.toString()); @@ -160,12 +166,13 @@ public final String project( model.addAttribute("breadcrumb", breadcrumb); model.addAttribute("thisProject", thisProject); model.addAttribute("taskPage", taskPage); - model.addAttribute("myTaskState","PROJECT"); if(message != null){ model.addAttribute("message",message); model.addAttribute("isDeleted",isDeleted); } model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return "project/id/show"; } @@ -179,6 +186,8 @@ public final String projectAddProjectGet( Context context = super.getContext(userSession); projectControllerService.addNewProjectToProjectIdForm(projectId, userSession, context, locale, model); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return "project/id/project/add"; } @@ -192,6 +201,7 @@ public final String projectAddProjectPost( ) { log.info("private addNewProjectPost (POST) projectId="+projectId+" "+project.toString()); Context context = super.getContext(userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); return projectControllerService.addNewProjectToProjectIdPersist( projectId, userSession, @@ -215,6 +225,8 @@ public final String projectMoveToProjectGet( Project targetProject = projectService.findByProjectId(targetProjectId); thisProject = projectService.moveProjectToAnotherProject(thisProject, targetProject ); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } @@ -235,6 +247,8 @@ public final String projectEditGet( model.addAttribute("thisProject", thisProject); model.addAttribute("project", thisProject); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return "project/id/edit"; } @@ -249,6 +263,8 @@ public final String projectEditPost( Context context = super.getContext(userSession); UserAccount thisUser = context.getUserAccount(); Project thisProject; + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); if (result.hasErrors()) { for (ObjectError e : result.getAllErrors()) { log.info(e.toString()); @@ -327,6 +343,8 @@ public final String projectDeleteGet( model.addAttribute("breadcrumb", breadcrumb); model.addAttribute("thisProject", project); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return "project/id/show"; } } @@ -352,6 +370,7 @@ public String moveTaskToTaskAndChangeTaskOrderInProject( log.info(" DONE: taskMoveService.moveOrderIdProject"); log.info("-------------------------------------------------"); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } @@ -365,6 +384,8 @@ public final String moveAllCompletedToTrash( Context context = super.getContext(userSession); taskService.moveAllCompletedToTrash(context); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } @@ -378,6 +399,8 @@ public final String emptyTrash( Context context = super.getContext(userSession); taskService.emptyTrash(context); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } @@ -400,6 +423,8 @@ public final String editTaskGet( model.addAttribute("task", task); model.addAttribute("contexts", contexts); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return "project/id/task/edit"; } @@ -414,6 +439,8 @@ public final String editTaskPost( Model model ) { log.info("editTaskPost"); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); if(task.getTaskState()==TaskState.SCHEDULED && task.getDueDate()==null){ String objectName="task"; String field="dueDate"; @@ -473,6 +500,8 @@ public final String setDoneTaskGet( task.setOrderIdTaskState(++maxOrderIdTaskState); task = taskService.updatedViaTaskstate(task); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } @@ -489,6 +518,8 @@ public final String unsetDoneTaskGet( task.setOrderIdTaskState(++maxOrderIdTaskState); task = taskService.updatedViaTaskstate(task); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } @@ -503,6 +534,8 @@ public final String setFocusGet( task.setFocus(); task = taskService.updatedViaTaskstate(task); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } @@ -517,6 +550,8 @@ public final String unsetFocusGet( task.unsetFocus(); task = taskService.updatedViaTaskstate(task); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } @@ -529,6 +564,8 @@ public final String moveTaskToAnotherProject( ) { task = taskService.moveTaskToRootProject(task); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return "redirect:/project/root"; } @@ -542,6 +579,8 @@ public final String moveTaskToAnotherProject( ) { task = taskService.moveTaskToAnotherProject(task,otherProject); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return otherProject.getUrl(); } @@ -556,6 +595,8 @@ public final String moveTaskToInbox( task.moveToInbox(); taskService.updatedViaTaskstate(task); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } @@ -570,6 +611,8 @@ public final String moveTaskToToday( task.moveToToday(); taskService.updatedViaTaskstate(task); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } @@ -584,6 +627,8 @@ public final String moveTaskToNext( task.moveToNext(); taskService.updatedViaTaskstate(task); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } @@ -598,6 +643,8 @@ public final String moveTaskToWaiting( task.moveToWaiting(); taskService.updatedViaTaskstate(task); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } @@ -612,6 +659,8 @@ public final String moveTaskToSomeday( task.moveToSomeday(); taskService.updatedViaTaskstate(task); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } @@ -626,6 +675,8 @@ public final String moveTaskToFocus( task.moveToFocus(); taskService.updatedViaTaskstate(task); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } @@ -640,6 +691,8 @@ public final String moveTaskToCompleted( task.moveToCompletedTasks(); taskService.updatedViaTaskstate(task); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } @@ -657,6 +710,8 @@ public final String moveTaskToTrash( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } @@ -671,6 +726,8 @@ public final String transformTaskIntoProjectGet( userSession.setLastProjectId(thisProject.getId()); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return transformTaskIntoProjektService.transformTaskIntoProjectGet(task, userSession, model); } } diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootController.java index 6df02ec0..8b69b889 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootController.java @@ -31,6 +31,8 @@ import java.util.Locale; import java.util.UUID; +import static org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState.PROJECTS; + @Slf4j @Controller @RequestMapping(path = "/project/root") @@ -68,9 +70,10 @@ public final String projectRoot( if(message != null){ model.addAttribute("message",message); model.addAttribute("isDeleted",isDeleted); - model.addAttribute("myTaskState","PROJECT"); } model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return "project/root/show"; } @@ -83,6 +86,8 @@ public final String projectRootAddProjectGet( Context context = super.getContext(userSession); projectControllerService.addNewProjectToProjectRootForm(userSession, context, locale, model); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return "project/root/project/add"; } @@ -144,6 +149,8 @@ public final String projectRootTaskAddGet( model.addAttribute("breadcrumb", breadcrumb); model.addAttribute("task", task); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return "project/root/task/add"; } @@ -157,6 +164,8 @@ public final String projectRootTaskAddPost( ) { log.info("/project/root/task/add (POST)"); Context context = super.getContext(userSession); + model.addAttribute("dataPage", true); + model.addAttribute("taskstateType",PROJECTS.getType()); if (result.hasErrors()) { for (ObjectError e : result.getAllErrors()) { log.info(e.toString()); @@ -203,6 +212,8 @@ public final String editTaskGet( model.addAttribute("task", task); model.addAttribute("contexts", contexts); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return "project/root/task/edit"; } @@ -216,6 +227,8 @@ public final String editTaskPost( Model model ) { log.info("editTaskPost"); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); if(task.getTaskState()==TaskState.SCHEDULED && task.getDueDate()==null){ String objectName="task"; String field="dueDate"; @@ -283,6 +296,8 @@ public String changeTaskOrderId( userSession.setLastTaskState(sourceTask.getTaskState()); userSession.setLastTaskId(sourceTask.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -297,6 +312,8 @@ public final String moveTaskToProjectRoot( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -312,6 +329,8 @@ public final String moveTaskToProject( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return targetProject.getUrl(); } @@ -328,6 +347,8 @@ public final String moveTaskToInbox( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -344,6 +365,8 @@ public final String moveTaskToToday( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -360,6 +383,8 @@ public final String moveTaskToNext( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -376,6 +401,8 @@ public final String moveTaskToWaiting( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -392,6 +419,8 @@ public final String moveTaskToSomeday( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -408,6 +437,8 @@ public final String moveTaskToFocus( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -424,6 +455,8 @@ public final String moveTaskToCompleted( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -440,6 +473,8 @@ public final String moveTaskToTrash( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -453,6 +488,8 @@ public final String moveAllCompletedToTrash( userSession.setLastContextId(context.getId()); userSession.setLastProjectId(Project.rootProjectId); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -466,6 +503,8 @@ public final String emptyTrash( userSession.setLastContextId(context.getId()); userSession.setLastProjectId(Project.rootProjectId); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -484,6 +523,8 @@ public final String deleteTaskGet( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -500,6 +541,8 @@ public final String undeleteTaskGet( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -513,6 +556,8 @@ public final String transformTaskIntoProjectGet( userSession.setLastProjectId(Project.rootProjectId); userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return transformTaskIntoProjektService.transformTaskIntoProjectGet(task, userSession, model); } @@ -530,6 +575,8 @@ public final String setDoneTaskGet( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -547,6 +594,8 @@ public final String unsetDoneTaskGet( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -562,6 +611,8 @@ public final String setFocusGet( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } @@ -577,6 +628,8 @@ public final String unsetFocusGet( userSession.setLastTaskState(task.getTaskState()); userSession.setLastTaskId(task.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("taskstateType",PROJECTS.getType()); + model.addAttribute("dataPage", true); return rootProjectUrl; } } diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTabController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTabController.java index a6475dce..e94510d4 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTabController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTabController.java @@ -41,8 +41,8 @@ public final String inbox( ) { Context context = super.getContext(userSession); return moveTaskToTaskInTaskstateService.getTaskStatePage( - TaskState.INBOX, - context, pageable, userSession, locale, model); + TaskState.INBOX, context, pageable, userSession, locale, model + ); } @RequestMapping(path = "/today", method = RequestMethod.GET) @@ -54,8 +54,8 @@ public final String today( ) { Context context = super.getContext(userSession); return moveTaskToTaskInTaskstateService.getTaskStatePage( - TaskState.TODAY, - context, pageable, userSession, locale, model); + TaskState.TODAY, context, pageable, userSession, locale, model + ); } @RequestMapping(path = "/next", method = RequestMethod.GET) @@ -67,8 +67,8 @@ public final String next( ) { Context context = super.getContext(userSession); return moveTaskToTaskInTaskstateService.getTaskStatePage( - TaskState.NEXT, - context, pageable, userSession, locale, model); + TaskState.NEXT, context, pageable, userSession, locale, model + ); } @RequestMapping(path = "/waiting", method = RequestMethod.GET) @@ -80,8 +80,8 @@ public final String waiting( ) { Context context = super.getContext(userSession); return moveTaskToTaskInTaskstateService.getTaskStatePage( - TaskState.WAITING, - context, pageable, userSession, locale, model); + TaskState.WAITING, context, pageable, userSession, locale, model + ); } @RequestMapping(path = "/scheduled", method = RequestMethod.GET) @@ -92,7 +92,9 @@ public final String scheduled( Model model ) { Context context = super.getContext(userSession); - return moveTaskToTaskInTaskstateService.getTaskStatePage(TaskState.SCHEDULED, context, pageable, userSession, locale, model); + return moveTaskToTaskInTaskstateService.getTaskStatePage( + TaskState.SCHEDULED, context, pageable, userSession, locale, model + ); } @RequestMapping(path = "/someday", method = RequestMethod.GET) @@ -104,8 +106,8 @@ public final String someday( ) { Context context = super.getContext(userSession); return moveTaskToTaskInTaskstateService.getTaskStatePage( - TaskState.SOMEDAY, - context, pageable, userSession, locale, model); + TaskState.SOMEDAY, context, pageable, userSession, locale, model + ); } @RequestMapping(path = "/completed", method = RequestMethod.GET) @@ -117,8 +119,8 @@ public final String completed( ) { Context context = super.getContext(userSession); return moveTaskToTaskInTaskstateService.getTaskStatePage( - TaskState.COMPLETED, - context, pageable, userSession, locale, model); + TaskState.COMPLETED, context, pageable, userSession, locale, model + ); } @RequestMapping(path = "/trash", method = RequestMethod.GET) @@ -130,8 +132,8 @@ public final String trash( ) { Context context = super.getContext(userSession); return moveTaskToTaskInTaskstateService.getTaskStatePage( - TaskState.TRASH, - context, pageable, userSession, locale, model); + TaskState.TRASH, context, pageable, userSession, locale, model + ); } @RequestMapping(path = "/deleted", method = RequestMethod.GET) @@ -141,6 +143,7 @@ public final String deleted( Locale locale, Model model ) { + model.addAttribute("dataPage", true); return trash(pageable, userSession, locale, model); } @@ -153,7 +156,7 @@ public final String focus( ) { Context context = super.getContext(userSession); return moveTaskToTaskInTaskstateService.getTaskStatePage( - TaskState.FOCUS, - context, pageable, userSession, locale, model); + TaskState.FOCUS, context, pageable, userSession, locale, model + ); } } diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTaskController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTaskController.java index 04eec994..0e39ed64 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTaskController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTaskController.java @@ -77,6 +77,7 @@ public final String addNewTaskToInboxGet( model.addAttribute("breadcrumb", breadcrumb); model.addAttribute("task", task); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return "taskstate/task/add"; } @@ -90,6 +91,7 @@ public final String addNewTaskToInboxPost( ) { log.info("addNewTaskToInboxPost"); Context context = super.getContext(userSession); + model.addAttribute("dataPage", true); if (result.hasErrors()) { for (ObjectError e : result.getAllErrors()) { log.info(e.toString()); @@ -134,6 +136,7 @@ public final String editTaskGet( model.addAttribute("task", task); model.addAttribute("contexts", contexts); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return "taskstate/task/edit"; } @@ -147,6 +150,7 @@ public final String editTaskPost( Model model ) { log.info("editTaskPost"); + model.addAttribute("dataPage", true); if(task.getTaskState()==TaskState.SCHEDULED && task.getDueDate()==null){ String objectName="task"; String field="dueDate"; @@ -209,6 +213,7 @@ public String changeTaskOrderId( moveTaskToTaskInTaskstateService.moveTaskToTaskAndChangeTaskOrderInTaskstate(sourceTask, destinationTask); userSession.setLastTaskState(sourceTask.getTaskState()); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return sourceTask.getTaskState().getUrl(); } @@ -222,6 +227,7 @@ public final String moveTaskToAnotherProject( task = taskService.moveTaskToAnotherProject(task,project); userSession.setLastProjectId(project.getId()); model.addAttribute("userSession",userSession); + model.addAttribute("dataPage", true); return project.getUrl(); } @@ -234,6 +240,7 @@ public final String moveTaskToRootProject( task = taskService.moveTaskToRootProject(task); userSession.setLastProjectId(0L); model.addAttribute("userSession",userSession); + model.addAttribute("dataPage", true); return "redirect:/project/root"; } @@ -246,6 +253,7 @@ public final String moveTaskToInbox( log.info("dragged and dropped "+task.getId()+" to inbox"); task = taskService.moveTaskToInbox(task); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return task.getTaskState().getUrl(); } @@ -258,6 +266,7 @@ public final String moveTaskToToday( log.info("dragged and dropped "+task.getId()+" to today"); task = taskService.moveTaskToToday(task); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return task.getTaskState().getUrl(); } @@ -270,6 +279,7 @@ public final String moveTaskToNext( log.info("dragged and dropped "+task.getId()+" to next"); task = taskService.moveTaskToNext(task); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return task.getTaskState().getUrl(); } @@ -282,6 +292,7 @@ public final String moveTaskToWaiting( log.info("dragged and dropped "+task.getId()+" to waiting"); task = taskService.moveTaskToWaiting(task); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return task.getTaskState().getUrl(); } @@ -294,6 +305,7 @@ public final String moveTaskToSomeday( log.info("dragged and dropped "+task.getId()+" to someday"); task = taskService.moveTaskToSomeday(task); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return task.getTaskState().getUrl(); } @@ -306,6 +318,7 @@ public final String moveTaskToFocus( log.info("dragged and dropped "+task.getId()+" to focus"); task = taskService.moveTaskToFocus(task); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return task.getTaskState().getUrl(); } @@ -318,6 +331,7 @@ public final String moveTaskToCompleted( log.info("dragged and dropped "+task.getId()+" to completed"); task = taskService.moveTaskToCompleted(task); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return task.getTaskState().getUrl(); } @@ -330,6 +344,7 @@ public final String moveTaskToTrash( log.info("dragged and dropped "+task.getId()+" to trash"); task = taskService.moveTaskToTrash(task); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return task.getTaskState().getUrl(); } @@ -341,6 +356,7 @@ public final String moveAllCompletedToTrash( Context context = super.getContext(userSession); taskService.moveAllCompletedToTrash(context); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return "redirect:/taskstate/trash"; } @@ -352,6 +368,7 @@ public final String emptyTrash( Context context = super.getContext(userSession); taskService.emptyTrash(context); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return "redirect:/taskstate/trash"; } @@ -366,6 +383,7 @@ public final String deleteTaskGet( task.delete(); taskService.updatedViaTaskstate(task); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return "redirect:/taskstate/trash"; } @@ -379,6 +397,7 @@ public final String undeleteTaskGet( task.undelete(); taskService.updatedViaTaskstate(task); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return "redirect:/taskstate/completed"; } @@ -389,6 +408,7 @@ public final String transformTaskIntoProjectGet( Model model ) { log.info("transformTaskIntoProjectGet"); + model.addAttribute("dataPage", true); return transformTaskIntoProjektService.transformTaskIntoProjectGet(task, userSession, model); } @@ -403,6 +423,7 @@ public final String setDoneTaskGet( task.setOrderIdTaskState(++maxOrderIdTaskState); task = taskService.updatedViaTaskstate(task); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return task.getUrl(); } @@ -417,6 +438,7 @@ public final String unsetDoneTaskGet( task.setOrderIdTaskState(++maxOrderIdTaskState); task = taskService.updatedViaTaskstate(task); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return task.getUrl(); } @@ -429,6 +451,7 @@ public final String setFocusGet( task.setFocus(); task = taskService.updatedViaTaskstate(task); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return task.getUrl(); } @@ -440,7 +463,8 @@ public final String unsetFocusGet( ){ task.unsetFocus(); task = taskService.updatedViaTaskstate(task); - model.addAttribute("userSession", userSession); + model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return task.getUrl(); } } diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java index be7c3b99..96d3a23f 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java @@ -81,7 +81,7 @@ public Breadcrumb getBreadcrumbForTaskstate( Breadcrumb breadcrumb = new Breadcrumb(locale, context); String code = taskstate.getCode(); String name = messageSource.getMessage(code,null,locale); - breadcrumb.addTaskstate(name,taskstate.getUrl()); + breadcrumb.addTaskstate(name, taskstate.getUrlPath()); return breadcrumb; } diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectControllerServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectControllerServiceImpl.java index fe30fa2f..b6ec83ee 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectControllerServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectControllerServiceImpl.java @@ -19,6 +19,8 @@ import javax.validation.constraints.NotNull; import java.util.Locale; +import static org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState.PROJECTS; + @Slf4j @Service public class ProjectControllerServiceImpl implements ProjectControllerService { @@ -133,6 +135,7 @@ public String addNewProjectToProjectRootPersist( project = projectService.add(project); userSession.setLastProjectId(project.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("myTaskState",PROJECTS.getType()); return project.getUrl(); } diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/MoveTaskToTaskInTaskstateServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/MoveTaskToTaskInTaskstateServiceImpl.java index b36a8c83..e984a592 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/MoveTaskToTaskInTaskstateServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/MoveTaskToTaskInTaskstateServiceImpl.java @@ -51,6 +51,7 @@ public String getTaskStatePage( model.addAttribute("taskPage", taskPage); model.addAttribute("taskstateType", taskState.getType() ); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return taskState.getTemplate(); } diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskState.java b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskState.java index b8f5731f..062b367c 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskState.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskState.java @@ -19,7 +19,8 @@ public enum TaskState implements Serializable { FOCUS("fas fa-star"), COMPLETED("fas fa-check-square"), TRASH("fas fa-trash-alt"), - DELETED("fas fa-trash-alt"); + DELETED("fas fa-trash-alt"), + PROJECTS("fas fa-diagram-project"); private String icon; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektServiceImpl.java index 0413300e..03345652 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektServiceImpl.java @@ -48,6 +48,7 @@ public String transformTaskIntoProjectGet( task = taskService.updatedViaTaskstate(task); log.info("tried to transform Task " + task.getId() + " to new Project " + thisProject.getId()); model.addAttribute("userSession", userSession); + model.addAttribute("dataPage", true); return thisProject.getUrl(); } } diff --git a/src/main/resources/messages_de.properties b/src/main/resources/messages_de.properties index ece81b09..0a776885 100644 --- a/src/main/resources/messages_de.properties +++ b/src/main/resources/messages_de.properties @@ -105,6 +105,7 @@ layout.page.completed=Erledigt layout.page.trash=Papierkorb layout.page.deleted=Gelöscht layout.page.all=Alle Aufgaben +layout.page.projects=Projekt searchRequest.resultlist.h1=Suchergebnis für searchRequest.resultlist.h2.noTasks=Keine Aufgaben gefunden searchRequest.resultlist.h2.tasks=Aufgaben diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index a4de71ba..eb40c1ad 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -8,7 +8,7 @@ user.loginForm.gtd.copyright=GTD® and Getting Things Done® are registere user.loginForm.h1 = Welcome to SimpleWorklist user.loginForm.h2=Your Todo-List for Getting Things Done® user.loginForm.login=Log in to your account -user.loginForm.loginButton=Sign in +user.loginForm.loginButton=Log in user.loginForm.loginError=Your login attempt was not successful, try again. user.loginForm.loginError.caused=Caused\: user.loginForm.moreInformation=For More Information please visit\: @@ -103,6 +103,7 @@ layout.page.completed=Completed Tasks layout.page.trash=Trash layout.page.deleted=Deleted layout.page.all=All Tasks +layout.page.projects=Project searchRequest.resultlist.h1=Search Result for searchterm searchRequest.resultlist.h2.noTasks=No Tasks found searchRequest.resultlist.h2.tasks=Tasks diff --git a/src/main/resources/static/css/main.css b/src/main/resources/static/css/main.css index 32d8b602..1a2a9111 100644 --- a/src/main/resources/static/css/main.css +++ b/src/main/resources/static/css/main.css @@ -25,6 +25,10 @@ header { border-radius: 0 !important; } +#user-login-form { + +} + div#tw-content-title-actionbuttons { /* margin-top: 1rem; */ } diff --git a/src/main/resources/templates/layout/page.html b/src/main/resources/templates/layout/page.html index 5a2cf2ea..2086f98f 100644 --- a/src/main/resources/templates/layout/page.html +++ b/src/main/resources/templates/layout/page.html @@ -27,16 +27,18 @@
-
+
- -
-
- -
+
+ +
+
+ +
+
@@ -51,26 +53,30 @@
-
-
+
+
-
-
-
+
+
-
+
+
+
+ +
+ @@ -85,8 +91,9 @@ console.error( error ); } ); - + - diff --git a/src/main/resources/templates/taskstate/task/edit.html b/src/main/resources/templates/taskstate/task/edit.html index fadad596..9a8da1e0 100644 --- a/src/main/resources/templates/taskstate/task/edit.html +++ b/src/main/resources/templates/taskstate/task/edit.html @@ -10,7 +10,6 @@
-

  Edit Task @@ -50,9 +49,5 @@

- - diff --git a/src/main/resources/templates/user/login/loginForm.html b/src/main/resources/templates/user/login/loginForm.html index 17dc2d6e..55e3bb03 100644 --- a/src/main/resources/templates/user/login/loginForm.html +++ b/src/main/resources/templates/user/login/loginForm.html @@ -10,56 +10,72 @@
-

Welcome to SimpleWorklist

-

Your Todo-List for Getting Things Done®

+
+
+
+

Welcome to SimpleWorklist

+

Your Todo-List for Getting Things Done®

+
+
+
-
-
-
- Please login -
-
- - - -
- - -
- -
- - -
-
-
-
-
+
+
+
+ +
+
+ Please login +
+
+ + + +
+ + +
+ +
+ + +
+
+
+
+
-
- - - +
+
+
+
+
+ + +
-
- - - +
+ + + +
+
-
-
- + +
+
+
diff --git a/src/main/resources/templates/user/messages/all.html b/src/main/resources/templates/user/messages/all.html index cf2fc55c..b8bbbcde 100644 --- a/src/main/resources/templates/user/messages/all.html +++ b/src/main/resources/templates/user/messages/all.html @@ -10,10 +10,14 @@
-

- Your Dialog with - otherUser.userFullname -

+
+

+ Your Dialog with +

+

+ otherUser.userFullname +

+
@@ -26,7 +30,8 @@

diff --git a/src/main/resources/templates/user/register/registerConfirmFailed.html b/src/main/resources/templates/user/register/registerConfirmFailed.html index 206c25c7..44b7255e 100644 --- a/src/main/resources/templates/user/register/registerConfirmFailed.html +++ b/src/main/resources/templates/user/register/registerConfirmFailed.html @@ -10,9 +10,11 @@
-

- Register as new User -

+
+

+ Register as new User +

+
diff --git a/src/main/resources/templates/user/register/registerConfirmFinished.html b/src/main/resources/templates/user/register/registerConfirmFinished.html index 87ba2194..095c8f57 100644 --- a/src/main/resources/templates/user/register/registerConfirmFinished.html +++ b/src/main/resources/templates/user/register/registerConfirmFinished.html @@ -10,9 +10,11 @@
+

Register as new User

+
diff --git a/src/main/resources/templates/user/register/registerConfirmForm.html b/src/main/resources/templates/user/register/registerConfirmForm.html index 87dd506f..8f0752d7 100644 --- a/src/main/resources/templates/user/register/registerConfirmForm.html +++ b/src/main/resources/templates/user/register/registerConfirmForm.html @@ -10,9 +10,11 @@
-

- Register as new User -

+
+

+ Register as new User +

+
diff --git a/src/main/resources/templates/user/register/registerConfirmSentMail.html b/src/main/resources/templates/user/register/registerConfirmSentMail.html index b009c763..1a7372c2 100644 --- a/src/main/resources/templates/user/register/registerConfirmSentMail.html +++ b/src/main/resources/templates/user/register/registerConfirmSentMail.html @@ -10,9 +10,11 @@
-

- Register as new User -

+
+

+ Register as new User +

+
diff --git a/src/main/resources/templates/user/register/registerForm.html b/src/main/resources/templates/user/register/registerForm.html index 7290c19d..1c50ebb2 100644 --- a/src/main/resources/templates/user/register/registerForm.html +++ b/src/main/resources/templates/user/register/registerForm.html @@ -10,9 +10,11 @@
-

- Register as new User -

+
+

+ Register as new User +

+
diff --git a/src/main/resources/templates/user/resetPassword/resetPasswordConfirmed.html b/src/main/resources/templates/user/resetPassword/resetPasswordConfirmed.html index f5a650f6..3259e824 100644 --- a/src/main/resources/templates/user/resetPassword/resetPasswordConfirmed.html +++ b/src/main/resources/templates/user/resetPassword/resetPasswordConfirmed.html @@ -10,9 +10,11 @@
+

Password Reset

+
diff --git a/src/main/resources/templates/user/resetPassword/resetPasswordDone.html b/src/main/resources/templates/user/resetPassword/resetPasswordDone.html index d754ee9f..2f4b8ca7 100644 --- a/src/main/resources/templates/user/resetPassword/resetPasswordDone.html +++ b/src/main/resources/templates/user/resetPassword/resetPasswordDone.html @@ -10,9 +10,11 @@
+

Password Reset

+
diff --git a/src/main/resources/templates/user/resetPassword/resetPasswordForm.html b/src/main/resources/templates/user/resetPassword/resetPasswordForm.html index 416aff6e..3390a038 100644 --- a/src/main/resources/templates/user/resetPassword/resetPasswordForm.html +++ b/src/main/resources/templates/user/resetPassword/resetPasswordForm.html @@ -10,9 +10,11 @@
+

Password Reset

+
diff --git a/src/main/resources/templates/user/resetPassword/resetPasswordNotConfirmed.html b/src/main/resources/templates/user/resetPassword/resetPasswordNotConfirmed.html index af5c28ad..3538fd5d 100644 --- a/src/main/resources/templates/user/resetPassword/resetPasswordNotConfirmed.html +++ b/src/main/resources/templates/user/resetPassword/resetPasswordNotConfirmed.html @@ -1,28 +1,30 @@ - - - - Title - - - -
-

- Password Reset -

-
- -
-
-

- Sorry. There is nothing known for your Request. -

-
-
- - - - \ No newline at end of file + + + + Title + + + +
+
+

+ Password Reset +

+
+
+ +
+
+

+ Sorry. There is nothing known for your Request. +

+
+
+ + + + diff --git a/src/main/resources/templates/user/resetPassword/resetPasswordSentMail.html b/src/main/resources/templates/user/resetPassword/resetPasswordSentMail.html index 4ae8e3c6..c7197ab3 100644 --- a/src/main/resources/templates/user/resetPassword/resetPasswordSentMail.html +++ b/src/main/resources/templates/user/resetPassword/resetPasswordSentMail.html @@ -1,29 +1,30 @@ - - - - Title - - - -
- -

- Password Reset -

-
- -
-
-

- Sent an email with Instructions for Password Reset to the given address. Please check your Inbox. -

-
-
- - - - \ No newline at end of file + + + + Title + + + +
+
+

+ Password Reset +

+
+
+ +
+
+

+ Sent an email with Instructions for Password Reset to the given address. Please check your Inbox. +

+
+
+ + + + diff --git a/src/main/resources/templates/user/selfservice/context/add.html b/src/main/resources/templates/user/selfservice/context/add.html index 8de1814d..e4f556e5 100644 --- a/src/main/resources/templates/user/selfservice/context/add.html +++ b/src/main/resources/templates/user/selfservice/context/add.html @@ -10,16 +10,20 @@
+

Add Area +

+

for User: -

+

+
diff --git a/src/main/resources/templates/user/selfservice/context/all.html b/src/main/resources/templates/user/selfservice/context/all.html index 60e729f6..c0ef862f 100644 --- a/src/main/resources/templates/user/selfservice/context/all.html +++ b/src/main/resources/templates/user/selfservice/context/all.html @@ -10,16 +10,20 @@
+

Change Areas +

+

for User: -

+ +
diff --git a/src/main/resources/templates/user/selfservice/context/edit.html b/src/main/resources/templates/user/selfservice/context/edit.html index f19a0aaf..32da9523 100644 --- a/src/main/resources/templates/user/selfservice/context/edit.html +++ b/src/main/resources/templates/user/selfservice/context/edit.html @@ -10,16 +10,20 @@
+

Edit Area +

+

for User: -

+ +
diff --git a/src/main/resources/templates/user/selfservice/language.html b/src/main/resources/templates/user/selfservice/language.html index 82a72939..19f8755f 100644 --- a/src/main/resources/templates/user/selfservice/language.html +++ b/src/main/resources/templates/user/selfservice/language.html @@ -10,16 +10,20 @@
+

- Set Default Language + Set Default Language +

+

for User: -

+ +
diff --git a/src/main/resources/templates/user/selfservice/name.html b/src/main/resources/templates/user/selfservice/name.html index 4f4c0921..fd96412f 100644 --- a/src/main/resources/templates/user/selfservice/name.html +++ b/src/main/resources/templates/user/selfservice/name.html @@ -10,9 +10,12 @@
+

- Change Name + Change Name +

+

thisUser.userFullname for User: @@ -20,7 +23,8 @@

-

+

+
diff --git a/src/main/resources/templates/user/selfservice/password.html b/src/main/resources/templates/user/selfservice/password.html index f1ef4486..9fc6cca0 100644 --- a/src/main/resources/templates/user/selfservice/password.html +++ b/src/main/resources/templates/user/selfservice/password.html @@ -10,6 +10,7 @@
+

Change Password @@ -20,6 +21,7 @@

+
diff --git a/src/main/resources/templates/user/selfservice/profile.html b/src/main/resources/templates/user/selfservice/profile.html index cfc29c8f..a79ec0f7 100644 --- a/src/main/resources/templates/user/selfservice/profile.html +++ b/src/main/resources/templates/user/selfservice/profile.html @@ -10,11 +10,15 @@
-

+
+

  - User Profile - + User Profile +

+

+

+

diff --git a/system.properties b/system.properties index 122be570..a189ce47 100644 --- a/system.properties +++ b/system.properties @@ -1,2 +1,2 @@ java.runtime.version=11 -maven.version=3.6.2 +maven.version=3.6.3