X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fscript%2FCmsScriptApp.java;h=3f0987199077a0550fcad4f5c74f18b6614f3473;hb=b2c3ef991bc34596830e31e58a2b74147010374f;hp=c3e1a72e66b3a5d2c6e4e334ecfb8494ee936cc0;hpb=5b3108fe285bca50565b58b63fa4feddc96c0765;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/script/CmsScriptApp.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/CmsScriptApp.java
index c3e1a72e6..3f0987199 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/script/CmsScriptApp.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/script/CmsScriptApp.java
@@ -24,10 +24,12 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.ui.CmsConstants;
+import org.argeo.cms.ui.CmsTheme;
 import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.cms.ui.util.BundleResourceLoader;
 import org.argeo.cms.ui.util.CmsUiUtils;
-import org.argeo.cms.ui.util.SimpleErgonomics;
+import org.argeo.cms.web.BundleResourceLoader;
+import org.argeo.cms.web.SimpleErgonomics;
+import org.argeo.cms.web.WebThemeUtils;
 import org.eclipse.rap.rwt.application.Application;
 import org.eclipse.rap.rwt.application.Application.OperationMode;
 import org.eclipse.rap.rwt.application.ApplicationConfiguration;
@@ -54,7 +56,7 @@ public class CmsScriptApp implements Branding {
 	private String repo = "(cn=node)";
 
 	// private Branding branding = new Branding();
-	private Theme theme;
+	private CmsTheme theme;
 
 	private List<String> resources = new ArrayList<>();
 
@@ -99,8 +101,8 @@ public class CmsScriptApp implements Branding {
 		}
 
 		if (theme != null) {
-			theme.apply(application);
-			String themeHeaders = theme.getAdditionalHeaders();
+			WebThemeUtils.apply(application, theme);
+			String themeHeaders = theme.getHtmlHeaders();
 			if (themeHeaders != null) {
 				if (additionalHeaders == null)
 					additionalHeaders = themeHeaders;
@@ -269,11 +271,11 @@ public class CmsScriptApp implements Branding {
 		// TODO
 	}
 
-	public Theme getTheme() {
+	public CmsTheme getTheme() {
 		return theme;
 	}
 
-	public void setTheme(Theme theme) {
+	public void setTheme(CmsTheme theme) {
 		this.theme = theme;
 	}