diff -r bb4c52bf3439 -r f64255a88d66 src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java --- a/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java Sat May 23 13:52:04 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java Sat May 23 14:13:09 2020 +0200 @@ -49,11 +49,6 @@ import static de.uapcore.lightpit.Functions.fqn; -@LightPITModule( - bundleBaseName = "localization.projects", - modulePath = "projects", - defaultPriority = 20 -) @WebServlet( name = "ProjectsModule", urlPatterns = "/projects/*" @@ -149,18 +144,18 @@ MenuEntry entry; final var breadcrumbs = new ArrayList(); - entry = new MenuEntry(new ResourceKey("localization.projects", "menuLabel"), - "projects/", 0); + entry = new MenuEntry(new ResourceKey("localization.lightpit", "menu.projects"), + "projects/"); breadcrumbs.add(entry); if (level == 0) entry.setActive(true); if (sessionSelection.project != null) { if (sessionSelection.project.getId() < 0) { entry = new MenuEntry(new ResourceKey("localization.projects", "button.create"), - "projects/edit", 1); + "projects/edit"); } else { entry = new MenuEntry(sessionSelection.project.getName(), - "projects/view?pid=" + sessionSelection.project.getId(), 1); + "projects/view?pid=" + sessionSelection.project.getId()); } if (level == 1) entry.setActive(true); breadcrumbs.add(entry); @@ -169,11 +164,11 @@ if (sessionSelection.version != null) { if (sessionSelection.version.getId() < 0) { entry = new MenuEntry(new ResourceKey("localization.projects", "button.version.create"), - "projects/versions/edit", 2); + "projects/versions/edit"); } else { entry = new MenuEntry(sessionSelection.version.getName(), // TODO: change link to issue overview for that version - "projects/versions/edit?id=" + sessionSelection.version.getId(), 2); + "projects/versions/edit?id=" + sessionSelection.version.getId()); } if (level == 2) entry.setActive(true); breadcrumbs.add(entry); @@ -182,15 +177,15 @@ if (sessionSelection.issue != null) { entry = new MenuEntry(new ResourceKey("localization.projects", "menu.issues"), // TODO: change link to a separate issue view (maybe depending on the selected version) - "projects/view?pid=" + sessionSelection.issue.getProject().getId(), 3); + "projects/view?pid=" + sessionSelection.issue.getProject().getId()); breadcrumbs.add(entry); if (sessionSelection.issue.getId() < 0) { entry = new MenuEntry(new ResourceKey("localization.projects", "button.issue.create"), - "projects/issues/edit", 2); + "projects/issues/edit"); } else { entry = new MenuEntry("#" + sessionSelection.issue.getId(), // TODO: maybe change link to a view rather than directly opening the editor - "projects/issues/edit?id=" + sessionSelection.issue.getId(), 4); + "projects/issues/edit?id=" + sessionSelection.issue.getId()); } if (level == 3) entry.setActive(true); breadcrumbs.add(entry);