X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=core%2Forg.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FSuiteApp.java;fp=core%2Forg.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FSuiteApp.java;h=e499463781ac7a59795839abb2a929e49c8f1286;hp=9a6208b7e0d86ef2e3a120a341e7124e87561e5f;hb=f10ff4072b25721d82e083d2b200fdb8c4506b6e;hpb=6bb643f74b8a6ef00aa6f5903ab70d4719695119

diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
index 9a6208b..e499463 100644
--- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
+++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
@@ -8,6 +8,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
@@ -65,11 +66,13 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 	private String headerPid;
 	private String footerPid;
 	private String leadPanePid;
+	private String adminLeadPanePid;
 	private String loginScreenPid;
 
 	private String defaultLayerPid = "argeo.suite.ui.dashboardLayer";
 
 	private String defaultUiName = "app";
+	private String adminUiName = "admin";
 	private String defaultThemeId = "org.argeo.suite.theme.default";
 
 	private Map<String, RankedObject<CmsUiProvider>> uiProvidersByPid = Collections.synchronizedMap(new HashMap<>());
@@ -107,6 +110,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 		headerPid = pidPrefix + "header";
 		footerPid = pidPrefix + "footer";
 		leadPanePid = pidPrefix + "leadPane";
+		adminLeadPanePid = pidPrefix + "adminLeadPane";
 		loginScreenPid = pidPrefix + "loginScreen";
 	}
 
@@ -123,6 +127,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 	public Set<String> getUiNames() {
 		HashSet<String> uiNames = new HashSet<>();
 		uiNames.add(defaultUiName);
+		uiNames.add(adminUiName);
 		return uiNames;
 	}
 
@@ -156,10 +161,19 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 		try {
 			Node context = null;
 			SuiteUi ui = (SuiteUi) parent;
+
+			String uiName = Objects.toString(ui.getParent().getData(UI_NAME_PROPERTY), null);
+			if (uiName == null)
+				throw new IllegalStateException("UI name should not be null");
 			CmsView cmsView = CmsView.getCmsView(parent);
 			CmsUiProvider headerUiProvider = findUiProvider(headerPid);
 			CmsUiProvider footerUiProvider = findUiProvider(footerPid);
-			CmsUiProvider leadPaneUiProvider = findUiProvider(leadPanePid);
+			CmsUiProvider leadPaneUiProvider;
+			if (adminUiName.equals(uiName)) {
+				leadPaneUiProvider = findUiProvider(adminLeadPanePid);
+			} else {
+				leadPaneUiProvider = findUiProvider(leadPanePid);
+			}
 
 			Localized appTitle = null;
 			if (headerUiProvider instanceof DefaultHeader) {