From 9b0996e1dd6b7cd59e998b7f4210898c42c3631f Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 9 Dec 2018 11:19:14 +0100
Subject: [PATCH] Improve scripted theming

---
 .../src/org/argeo/cms/script/Branding.java      |  2 --
 .../src/org/argeo/cms/script/Theme.java         | 17 +++++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/Branding.java b/org.argeo.cms.ui/src/org/argeo/cms/script/Branding.java
index 2a99191d2..39b5b531e 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/script/Branding.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/script/Branding.java
@@ -2,8 +2,6 @@ package org.argeo.cms.script;
 
 import java.util.Map;
 
-import org.eclipse.rap.rwt.client.WebClient;
-
 public interface Branding {
 	public void applyBranding(Map<String, String> properties);
 
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/Theme.java b/org.argeo.cms.ui/src/org/argeo/cms/script/Theme.java
index 3fa4bc451..c256a6920 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/script/Theme.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/script/Theme.java
@@ -18,6 +18,7 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.util.BundleResourceLoader;
 import org.argeo.cms.util.ThemeUtils;
+import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.application.Application;
 import org.eclipse.rap.rwt.service.ResourceLoader;
 import org.osgi.framework.Bundle;
@@ -26,7 +27,7 @@ import org.osgi.framework.BundleContext;
 public class Theme {
 	private final static Log log = LogFactory.getLog(Theme.class);
 
-	private final String themeId;
+	private String themeId;
 	private Map<String, ResourceLoader> css = new HashMap<>();
 	private Map<String, ResourceLoader> resources = new HashMap<>();
 
@@ -44,14 +45,14 @@ public class Theme {
 		Bundle themeBundle;
 		if (symbolicName == null) {
 			themeBundle = bundleContext.getBundle();
-			basePath = "/theme/internal/";
-			cssPath = basePath;
+//			basePath = "/theme/";
+//			cssPath = basePath;
 		} else {
 			themeBundle = ThemeUtils.findThemeBundle(bundleContext, symbolicName);
-			basePath = "/";
-			cssPath = "/rap/";
 		}
-		this.themeId = themeBundle.getSymbolicName();
+		basePath = "/";
+		cssPath = "/rap/";
+		this.themeId = RWT.DEFAULT_THEME_ID;
 		addStyleSheets(themeBundle, new BundleResourceLoader(themeBundle));
 		BundleResourceLoader themeBRL = new BundleResourceLoader(themeBundle);
 		addResources(themeBRL, "*.png");
@@ -165,6 +166,10 @@ public class Theme {
 		return themeId;
 	}
 
+	public void setThemeId(String themeId) {
+		this.themeId = themeId;
+	}
+
 	public String getBasePath() {
 		return basePath;
 	}
-- 
2.30.2