projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support favicon at the default location.
[lgpl/argeo-commons.git]
/
org.argeo.cms.ui.rap
/
src
/
org
/
argeo
/
cms
/
web
/
CmsWebApp.java
diff --git
a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
index 66333858dd933f1bb415167eba0d1eabe9f8005e..c1bd3ad9893c279b0cb9c4f6b715fc6c95916bb5 100644
(file)
--- a/
org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
+++ b/
org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
@@
-3,6
+3,7
@@
package org.argeo.cms.web;
import java.util.Dictionary;
import java.util.HashMap;
import java.util.Map;
import java.util.Dictionary;
import java.util.HashMap;
import java.util.Map;
+import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@
-13,9
+14,9
@@
import org.argeo.cms.ui.CmsView;
import org.argeo.util.LangUtils;
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.application.Application;
import org.argeo.util.LangUtils;
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.application.Application;
+import org.eclipse.rap.rwt.application.Application.OperationMode;
import org.eclipse.rap.rwt.application.ApplicationConfiguration;
import org.eclipse.rap.rwt.application.ExceptionHandler;
import org.eclipse.rap.rwt.application.ApplicationConfiguration;
import org.eclipse.rap.rwt.application.ExceptionHandler;
-import org.eclipse.rap.rwt.application.Application.OperationMode;
import org.eclipse.rap.rwt.client.WebClient;
import org.eclipse.swt.widgets.Display;
import org.osgi.framework.BundleContext;
import org.eclipse.rap.rwt.client.WebClient;
import org.eclipse.swt.widgets.Display;
import org.osgi.framework.BundleContext;
@@
-37,6
+38,8
@@
public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm
private final static String CONTEXT_NAME = "contextName";
private String contextName;
private final static String CONTEXT_NAME = "contextName";
private String contextName;
+ private final static String FAVICON_PNG = "favicon.png";
+
public void init(BundleContext bundleContext, Map<String, String> properties) {
this.bundleContext = bundleContext;
contextName = properties.get(CONTEXT_NAME);
public void init(BundleContext bundleContext, Map<String, String> properties) {
this.bundleContext = bundleContext;
contextName = properties.get(CONTEXT_NAME);
@@
-90,6
+93,11
@@
public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm
if (theme != null) {
properties.put(WebClient.THEME_ID, theme.getThemeId());
properties.put(WebClient.HEAD_HTML, theme.getHtmlHeaders());
if (theme != null) {
properties.put(WebClient.THEME_ID, theme.getThemeId());
properties.put(WebClient.HEAD_HTML, theme.getHtmlHeaders());
+ properties.put(WebClient.BODY_HTML, theme.getBodyHtml());
+ Set<String> imagePaths = theme.getImagesPaths();
+ if (imagePaths.contains(FAVICON_PNG)) {
+ properties.put(WebClient.FAVICON, FAVICON_PNG);
+ }
} else {
properties.put(WebClient.THEME_ID, RWT.DEFAULT_THEME_ID);
}
} else {
properties.put(WebClient.THEME_ID, RWT.DEFAULT_THEME_ID);
}