From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 8 Oct 2018 07:08:31 +0000 (+0200)
Subject: Improve UI scripting
X-Git-Tag: argeo-commons-2.1.76~41
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=159cc8cda9b61c23c1b43366c0b8873d1e896063;p=lgpl%2Fargeo-commons.git

Improve UI scripting
---

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 2f1ed0efe..3fa4bc451 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
@@ -82,9 +82,13 @@ public class Theme {
 	public void apply(Application application) {
 		for (String name : resources.keySet()) {
 			application.addResource(name, resources.get(name));
+			if (log.isDebugEnabled())
+				log.debug("Added resource " + name);
 		}
 		for (String name : css.keySet()) {
 			application.addStyleSheet(themeId, name, css.get(name));
+			if (log.isDebugEnabled())
+				log.debug("Added RAP CSS " + name);
 		}
 	}
 
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/cms.js b/org.argeo.cms.ui/src/org/argeo/cms/script/cms.js
index 2005b4ce8..e4eca6800 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/script/cms.js
+++ b/org.argeo.cms.ui/src/org/argeo/cms/script/cms.js
@@ -1,4 +1,6 @@
 // CMS
+var ScrolledPage = Java.type('org.argeo.cms.widgets.ScrolledPage');
+
 var CmsScriptApp = Java.type('org.argeo.cms.script.CmsScriptApp');
 var AppUi = Java.type('org.argeo.cms.script.AppUi');
 var Theme = Java.type('org.argeo.cms.script.Theme');
@@ -60,4 +62,15 @@ function newText(parent, style, msg) {
 	return control
 }
 
+function newScrolledPage(parent) {
+	var scrolled = new ScrolledPage(parent, SWT.NONE)
+	scrolled.setLayoutData(CmsUtils.fillAll())
+	scrolled.setLayout(CmsUtils.noSpaceGridLayout())
+	var page = new Composite(scrolled, SWT.NONE)
+	page.setLayout(CmsUtils.noSpaceGridLayout())
+	page.setBackgroundMode(SWT.INHERIT_NONE)
+	
+	return page
+}
+
 // print(__FILE__, __LINE__, __DIR__)
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/BundleResourceLoader.java b/org.argeo.cms.ui/src/org/argeo/cms/util/BundleResourceLoader.java
index 21ee78ec8..7342e1052 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/util/BundleResourceLoader.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/util/BundleResourceLoader.java
@@ -19,8 +19,11 @@ public class BundleResourceLoader implements ResourceLoader {
 	@Override
 	public InputStream getResourceAsStream(String resourceName) throws IOException {
 		URL res = bundle.getEntry(resourceName);
-		if (res == null)
-			throw new CmsException("Resource " + resourceName + " not found in bundle " + bundle.getSymbolicName());
+		if (res == null) {
+			res = bundle.getResource(resourceName);
+			if (res == null)
+				throw new CmsException("Resource " + resourceName + " not found in bundle " + bundle.getSymbolicName());
+		}
 		return res.openStream();
 	}
 
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleErgonomics.java b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleErgonomics.java
index de6ce1c59..ca563600c 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleErgonomics.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleErgonomics.java
@@ -39,6 +39,7 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint {
 
 	private CmsUiProvider header;
 	private Integer headerHeight = 0;
+	private Integer footerHeight = 0;
 	private CmsUiProvider lead;
 	private CmsUiProvider end;
 	private CmsUiProvider footer;
@@ -84,7 +85,7 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint {
 		footerArea = new Composite(parent, SWT.NONE);
 		// footerArea.setLayout(new FillLayout());
 		GridData footerData = new GridData(SWT.FILL, SWT.FILL, false, false, 3, 1);
-		footerData.heightHint = headerHeight;
+		footerData.heightHint = footerHeight;
 		footerArea.setLayoutData(footerData);
 
 		uiInitialized = true;
@@ -222,4 +223,8 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint {
 		return header;
 	}
 
+	public void setFooterHeight(Integer footerHeight) {
+		this.footerHeight = footerHeight;
+	}
+
 }