X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.web%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fweb%2FDefaultMainPage.java;h=b2617e376e5bc1bf0ebca74de35e8e939f8260a9;hp=d1ecbf272373c88a724529b1d3fb17fc77bd3253;hb=e51dee49ebe0d118c9ce3a5cbf06054e7e2df516;hpb=0887c47a0a7086f298401cb331462fc0444db41c

diff --git a/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java b/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java
index d1ecbf2..b2617e3 100644
--- a/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java
+++ b/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java
@@ -11,7 +11,6 @@ import javax.jcr.nodetype.NodeType;
 
 import org.argeo.cms.CmsMsg;
 import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.text.TextStyles;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.ui.CmsView;
 import org.argeo.cms.ui.LifeCycleUiProvider;
@@ -20,8 +19,9 @@ import org.argeo.cms.widgets.auth.CmsLogin;
 import org.argeo.connect.people.PeopleService;
 import org.argeo.connect.people.PeopleTypes;
 import org.argeo.connect.people.web.pages.PeopleDefaultPage;
+import org.argeo.connect.resources.ResourcesService;
 import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.suite.fs.MyFilesBrowserPage;
+import org.argeo.suite.web.fs.MyFilesBrowserPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
@@ -32,8 +32,8 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 
 /**
- * Default entry point for the Argeo Suite CMS. Forwards the request to the relevant
- * CmsUiProvider
+ * Default entry point for the Argeo Suite CMS. Forwards the request to the
+ * relevant CmsUiProvider
  */
 public class DefaultMainPage implements LifeCycleUiProvider {
 
@@ -42,6 +42,7 @@ public class DefaultMainPage implements LifeCycleUiProvider {
 	private CmsUiProvider fsBrowserPage;
 
 	/* DEPENDENCY INJECTION */
+	private ResourcesService resourceService;
 	private PeopleService peopleService;
 	private FileSystemProvider nodeFileSystemProvider;
 	private Map<String, String> peopleIconPaths;
@@ -51,8 +52,8 @@ public class DefaultMainPage implements LifeCycleUiProvider {
 
 	@Override
 	public void init(Session adminSession) throws RepositoryException {
-		dashboardPage = new DefaultDashboard(peopleService, peopleIconPaths);
-		peoplePage = new PeopleDefaultPage(peopleService, peopleIconPaths);
+		dashboardPage = new DefaultDashboard(resourceService, peopleService, peopleIconPaths);
+		peoplePage = new PeopleDefaultPage(resourceService, peopleService, peopleIconPaths);
 		fsBrowserPage = new MyFilesBrowserPage(nodeFileSystemProvider);
 	}
 
@@ -63,7 +64,7 @@ public class DefaultMainPage implements LifeCycleUiProvider {
 
 		if (context.isNodeType(PeopleTypes.PEOPLE_ENTITY))
 			return peoplePage.createUi(parent, context);
-		else if (peopleService.getBasePath(null).equals(context.getPath()))
+		else if (peopleService.getDefaultBasePath().equals(context.getPath()))
 			return peoplePage.createUi(parent, context);
 		else if (context.isNodeType(NodeType.NT_FOLDER) || context.isNodeType(NodeType.NT_FILE))
 			return fsBrowserPage.createUi(parent, context);
@@ -89,7 +90,7 @@ public class DefaultMainPage implements LifeCycleUiProvider {
 
 		Label anonymousLbl = new Label(body, SWT.WRAP);
 		anonymousLbl.setText("You should login or register to access your private dashboard");
-		
+
 		return body;
 
 	}
@@ -122,6 +123,10 @@ public class DefaultMainPage implements LifeCycleUiProvider {
 	}
 
 	/* DEPENDENCY INJECTION */
+	public void setResourceService(ResourcesService resourceService) {
+		this.resourceService = resourceService;
+	}
+
 	public void setPeopleService(PeopleService peopleService) {
 		this.peopleService = peopleService;
 	}