From aed845570b770e19dc00cc06b88b4ad6ce1c1c23 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Wed, 23 Sep 2020 21:13:04 +0200 Subject: [PATCH] Changed order of admin pages to get the mosted used one the left most position --- .../org/libreccm/ui/admin/applications/ApplicationsPage.java | 2 +- .../java/org/libreccm/ui/admin/imexport/ImExportPage.java | 4 +--- .../src/main/java/org/libreccm/ui/admin/sites/SitesPage.java | 2 +- .../ui/admin/usersgroupsroles/UsersGroupsRolesPage.java | 5 ++--- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java index 0eb0e7f4a..cedd9abc6 100644 --- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java +++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java @@ -72,7 +72,7 @@ public class ApplicationsPage implements AdminPage { @Override public int getPosition() { - return 10; + return 40; } } diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java index d97224905..4c758bd0e 100644 --- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java +++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java @@ -18,10 +18,8 @@ */ package org.libreccm.ui.admin.imexport; -import org.libreccm.ui.admin.configuration.*; import org.libreccm.ui.admin.AdminConstants; import org.libreccm.ui.admin.AdminPage; -import org.libreccm.ui.admin.categories.CategoriesController; import java.util.HashSet; import java.util.Set; @@ -73,6 +71,6 @@ public class ImExportPage implements AdminPage { @Override public int getPosition() { - return 40; + return 60; } } diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java index bab4b12cf..ae42934e7 100644 --- a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java +++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java @@ -71,6 +71,6 @@ public class SitesPage implements AdminPage { @Override public int getPosition() { - return 60; + return 50; } } diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java index 1800ba090..4212574cb 100644 --- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java +++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java @@ -18,10 +18,8 @@ */ package org.libreccm.ui.admin.usersgroupsroles; -import org.libreccm.ui.admin.configuration.*; import org.libreccm.ui.admin.AdminConstants; import org.libreccm.ui.admin.AdminPage; -import org.libreccm.ui.admin.categories.CategoriesController; import java.util.HashSet; import java.util.Set; @@ -38,6 +36,7 @@ public class UsersGroupsRolesPage implements AdminPage { public Set> getControllerClasses() { final Set> classes = new HashSet<>(); classes.add(UsersGroupsRolesController.class); + classes.add(UsersController.class); return classes; } @@ -73,6 +72,6 @@ public class UsersGroupsRolesPage implements AdminPage { @Override public int getPosition() { - return 80; + return 10; } }