From bd0f8b2d36b86eaf1f770d07d7f2c7036ec36489 Mon Sep 17 00:00:00 2001 From: bsinou Date: Thu, 2 Feb 2017 23:30:28 +0100 Subject: [PATCH] Work on branding --- .../suite/people/PeopleSuiteServiceImpl.java | 3 ++ .../META-INF/spring/parts.xml | 5 ++- org.argeo.suite.workbench.rap/plugin.xml | 16 ++++---- .../parts/AbstractSuiteDashboard.java | 37 ++++++++++++++++++ .../workbench/rap/AsSecureEntryPoint.java | 21 +++++----- .../theme/argeo-classic/icons/dashboard.gif | Bin 0 -> 583 bytes .../argeo-classic/icons/favicon-16px.png | Bin 578 -> 0 bytes .../theme/argeo-classic/icons/favicon.ico | Bin 0 -> 1150 bytes .../theme/argeo-classic/icons/favicon.png | Bin 1125 -> 0 bytes .../theme/argeo-classic/img/logo-argeo.png | Bin 0 -> 38215 bytes 10 files changed, 62 insertions(+), 20 deletions(-) create mode 100644 org.argeo.suite.workbench.rap/theme/argeo-classic/icons/dashboard.gif delete mode 100644 org.argeo.suite.workbench.rap/theme/argeo-classic/icons/favicon-16px.png create mode 100644 org.argeo.suite.workbench.rap/theme/argeo-classic/icons/favicon.ico delete mode 100644 org.argeo.suite.workbench.rap/theme/argeo-classic/icons/favicon.png create mode 100644 org.argeo.suite.workbench.rap/theme/argeo-classic/img/logo-argeo.png diff --git a/org.argeo.suite.core/src/org/argeo/suite/people/PeopleSuiteServiceImpl.java b/org.argeo.suite.core/src/org/argeo/suite/people/PeopleSuiteServiceImpl.java index 3c1e1c6..3ca8acf 100644 --- a/org.argeo.suite.core/src/org/argeo/suite/people/PeopleSuiteServiceImpl.java +++ b/org.argeo.suite.core/src/org/argeo/suite/people/PeopleSuiteServiceImpl.java @@ -137,6 +137,9 @@ public class PeopleSuiteServiceImpl extends PeopleServiceImpl implements PeopleS resourceService.createTagLikeResourceParent(adminSession, null, PeopleTypes.PEOPLE_MAILING_LIST, null, getBasePath(null), PeopleTypes.PEOPLE_ENTITY, PeopleNames.PEOPLE_MAILING_LISTS); + // Initialise catalogues + importCatalogue(adminSession, initResources.get("SimpleTasks"), PeopleTypes.PEOPLE_TASK); + if (adminSession.hasPendingChanges()) { adminSession.save(); log.info("Resources have been added to Argeo Suite model"); diff --git a/org.argeo.suite.workbench.rap/META-INF/spring/parts.xml b/org.argeo.suite.workbench.rap/META-INF/spring/parts.xml index 68c2204..78b54a8 100644 --- a/org.argeo.suite.workbench.rap/META-INF/spring/parts.xml +++ b/org.argeo.suite.workbench.rap/META-INF/spring/parts.xml @@ -10,7 +10,7 @@ scope="prototype"> - + @@ -27,7 +27,8 @@ - + + diff --git a/org.argeo.suite.workbench.rap/plugin.xml b/org.argeo.suite.workbench.rap/plugin.xml index 863eb87..334b684 100644 --- a/org.argeo.suite.workbench.rap/plugin.xml +++ b/org.argeo.suite.workbench.rap/plugin.xml @@ -18,7 +18,7 @@ @@ -26,13 +26,13 @@ - - + --> @@ -41,7 +41,7 @@ @@ -80,8 +80,8 @@ + title="Argeo Suite" + favicon="theme/argeo-classic/icons/favicon.ico"> + alias="/ui/suite/img/logo-argeo.png" + base-name="theme/argeo-classic/img/logo-argeo.png">