Adapt branding, use latest connect snapshot

diff --git a/org.argeo.suite.web/META-INF/spring/ui.xml b/org.argeo.suite.web/META-INF/spring/ui.xml
index bbf332543c3d020e8883255dd7c554330e82df67..4e80f83cfecf6c6043dd3479db14e9bc2626209e 100644 (file)
--- a/org.argeo.suite.web/META-INF/spring/ui.xml
+++ b/org.argeo.suite.web/META-INF/spring/ui.xml
@@ -48,8 +48,8 @@
                                </entry>
                                <entry key="">
                                        <map>
-                                               <entry value="Smart Data Productivity Suite" key="org.eclipse.rap.rwt.webclient.pageTitle" />
-                                               <entry value="theme/argeo-classic/icons/favicon.png" key="org.eclipse.rap.rwt.webclient.favicon" />
+                                               <entry value="Argeo Suite" key="org.eclipse.rap.rwt.webclient.pageTitle" />
+                                               <entry value="theme/argeo-classic/icons/favicon.ico" key="org.eclipse.rap.rwt.webclient.favicon" />
                                        </map>
                                </entry>
                                <entry key="people">

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 7b3ae2efdbbd1922ba3e976c466c3c9e164defc5..d7ae0324669d78c3ab2986b1b0c1ab93942dbc9a 100644 (file)
--- 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;
@@ -32,8 +31,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 {
 
@@ -89,7 +88,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;
 
        }

diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/favicon.ico b/org.argeo.suite.web/theme/argeo-classic/icons/favicon.ico
new file mode 100644 (file)
index 0000000..6e6a050
Binary files /dev/null and b/org.argeo.suite.web/theme/argeo-classic/icons/favicon.ico differ

diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/favicon.png b/org.argeo.suite.web/theme/argeo-classic/icons/favicon.png
deleted file mode 100644 (file)
index cd8207a..0000000
Binary files a/org.argeo.suite.web/theme/argeo-classic/icons/favicon.png and /dev/null differ

diff --git a/pom.xml b/pom.xml
index 0873cd00b9a3b04b6111040e575113bebfa5ae7d..bfcd3c29c449c78a45bb0d9721998acdda551e78 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
        <properties>
                <version.argeo-suite>0.1.5-SNAPSHOT</version.argeo-suite>
                <developmentCycle.argeo-suite>0.1</developmentCycle.argeo-suite>
-               <version.argeo-connect>2.1.67</version.argeo-connect>
+               <version.argeo-connect>2.1.68-SNAPSHOT</version.argeo-connect>
                <version.argeo-tp-extras>2.1.9</version.argeo-tp-extras>
                <git.rw />
        </properties>