Work on branding

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 3c1e1c6e0230209fd4d483f32c0e3d3f4d8ad63a..3ca8acfcfdbfada370159c35648c575e37edeff9 100644 (file)
--- 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);
 
                                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");
                        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 68c2204c7f63000ad620a9238ee8d2918895cf4b..78b54a8cc7b895171395a7e43bff9ac012dfdae5 100644 (file)
--- 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">
                <property name="repository" ref="repository" />
        </bean>
                scope="prototype">
                <property name="repository" ref="repository" />
        </bean>

-       
+

        <bean id="openEntityEditor" class="org.argeo.suite.workbench.commands.OpenEntityEditor"
                scope="prototype">
                <property name="repository" ref="repository" />
        <bean id="openEntityEditor" class="org.argeo.suite.workbench.commands.OpenEntityEditor"
                scope="prototype">
                <property name="repository" ref="repository" />


@@ -27,7 +27,8 @@
        <bean id="defaultDashboardEditor" class="org.argeo.suite.workbench.parts.DefaultDashboardEditor"
                scope="prototype">
                <property name="repository" ref="repository" />
        <bean id="defaultDashboardEditor" class="org.argeo.suite.workbench.parts.DefaultDashboardEditor"
                scope="prototype">
                <property name="repository" ref="repository" />

-               <property name="peopleService" ref="peopleService" />

                <property name="appWorkbenchService" ref="appWorkbenchService" />
                <property name="appWorkbenchService" ref="appWorkbenchService" />

+               <property name="peopleService" ref="peopleService" />
+               <property name="documentsService" ref="documentsService" />

        </bean>
 </beans>
        </bean>
 </beans>

diff --git a/org.argeo.suite.workbench.rap/plugin.xml b/org.argeo.suite.workbench.rap/plugin.xml
index 863eb874a4ea2dc4cee98a20eb0e72d01c08ba0e..334b6844fac58c34fdd6dc98f4b46a1789cd27fc 100644 (file)
--- a/org.argeo.suite.workbench.rap/plugin.xml
+++ b/org.argeo.suite.workbench.rap/plugin.xml
@@ -18,7 +18,7 @@
                <perspective
             class="org.argeo.suite.workbench.DashboardPerspective"
             id="org.argeo.suite.workbench.rap.dashboardPerspective"
                <perspective
             class="org.argeo.suite.workbench.DashboardPerspective"
             id="org.argeo.suite.workbench.rap.dashboardPerspective"

-            icon="theme/argeo-classic/icons/favicon-16px.png"
+            icon="theme/argeo-classic/icons/favicon.ico"

             name="Dashboard">
                </perspective> 
        </extension>
             name="Dashboard">
                </perspective> 
        </extension>


@@ -26,13 +26,13 @@
        <!-- VIEWS -->
         <extension
                point="org.eclipse.ui.views">
        <!-- VIEWS -->
         <extension
                point="org.eclipse.ui.views">

-               <view
+       <!-- <view

                        id="org.argeo.connect.people.workbench.rap.quickSearchView"
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
                        icon="theme/argeo-classic/icons/favicon-16px.png"
                        name="Test View"
                        restorable="true">
                        id="org.argeo.connect.people.workbench.rap.quickSearchView"
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
                        icon="theme/argeo-classic/icons/favicon-16px.png"
                        name="Test View"
                        restorable="true">

-               </view>
+               </view> -->

        </extension>
                
        <!-- EDITORS --> 
        </extension>
                
        <!-- EDITORS --> 


@@ -41,7 +41,7 @@
                <editor
                        id="org.argeo.suite.workbench.rap.defaultDashboardEditor"
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
                <editor
                        id="org.argeo.suite.workbench.rap.defaultDashboardEditor"
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"

-                       icon="theme/argeo-classic/icons/favicon-16px.png"
+                       icon="theme/argeo-classic/icons/dashboard.gif"

                        name="My Dashboard">
                </editor>
        </extension>
                        name="My Dashboard">
                </editor>
        </extension>


@@ -80,8 +80,8 @@
                <branding
                        id="org.argeo.suite.workbench.rap.defaultBranding"
                        themeId="org.eclipse.rap.rwt.theme.Default"
                <branding
                        id="org.argeo.suite.workbench.rap.defaultBranding"
                        themeId="org.eclipse.rap.rwt.theme.Default"

-                       title="Smart Data Productivity Suite"
-                       favicon="theme/argeo-classic/icons/favicon.png">
+                       title="Argeo Suite"
+                       favicon="theme/argeo-classic/icons/favicon.ico">

                        <additionalHeaders>
                         <link 
                                href="suite/theme/classic-headerExt.css"  
                        <additionalHeaders>
                         <link 
                                href="suite/theme/classic-headerExt.css"  


@@ -99,8 +99,8 @@
          </resource>  
          <!-- images -->
          <resource  
          </resource>  
          <!-- images -->
          <resource  

-               alias="/ui/suite/img/logo.jpg"  
-               base-name="theme/argeo-classic/img/logo.jpg">  
+               alias="/ui/suite/img/logo-argeo.png"  
+               base-name="theme/argeo-classic/img/logo-argeo.png">  

          </resource>  
          <!-- javascript libraries -->
          <!--          <resource  
          </resource>  
          <!-- javascript libraries -->
          <!--          <resource  

diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java
index 1b0b9500eabc71c4f587dc8c7219530429f9529c..39ea5ec8b85d3ebce721e69454e881013dd3b568 100644 (file)
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java
@@ -1,9 +1,15 @@
 package org.argeo.suite.workbench.parts;
 
 package org.argeo.suite.workbench.parts;
 

+import java.util.HashMap;
+import java.util.Map;
+
+import javax.jcr.Node;

 import javax.jcr.Repository;
 import javax.jcr.Session;
 
 import javax.jcr.Repository;
 import javax.jcr.Session;
 

+import org.argeo.cms.ui.workbench.util.CommandUtils;

 import org.argeo.cms.util.CmsUtils;
 import org.argeo.cms.util.CmsUtils;

+import org.argeo.connect.documents.DocumentsService;

 import org.argeo.connect.people.PeopleService;
 import org.argeo.connect.people.workbench.rap.PeopleStyles;
 import org.argeo.connect.people.workbench.rap.editors.util.EntityEditorInput;
 import org.argeo.connect.people.PeopleService;
 import org.argeo.connect.people.workbench.rap.PeopleStyles;
 import org.argeo.connect.people.workbench.rap.editors.util.EntityEditorInput;


@@ -13,11 +19,14 @@ import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.swt.SWT;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.swt.SWT;

+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;

 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Link;

 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;


@@ -30,6 +39,7 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
        // DEPENDENCY INJECTION
        private Repository repository;
        private PeopleService peopleService;
        // DEPENDENCY INJECTION
        private Repository repository;
        private PeopleService peopleService;

+       private DocumentsService documentsService;

        private AppWorkbenchService appWorkbenchService;
 
        private Session session;
        private AppWorkbenchService appWorkbenchService;
 
        private Session session;


@@ -116,6 +126,25 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
                return bodyCmp;
        }
 
                return bodyCmp;
        }
 

+       protected Link createOpenEntityEditorLink(final AppWorkbenchService peopleUiService, Composite parent,
+                       final String label, final Node entity) {
+               Link link = new Link(parent, SWT.NONE);
+               link.setText("<a>" + label + "</a>");
+               link.setLayoutData(EclipseUiUtils.fillWidth());
+               link.addSelectionListener(new SelectionAdapter() {
+                       private static final long serialVersionUID = 1L;
+
+                       @Override
+                       public void widgetSelected(final SelectionEvent event) {
+                               Map<String, String> params = new HashMap<String, String>();
+                               // FIXME
+                               params.put("param.jcrId", ConnectJcrUtils.getIdentifier(entity));
+                               CommandUtils.callCommand(peopleUiService.getOpenEntityEditorCmdId(), params);
+                       }
+               });
+               return link;
+       }
+

        // LIFE CYCLE
        @Override
        public void dispose() {
        // LIFE CYCLE
        @Override
        public void dispose() {


@@ -165,6 +194,10 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
                return logoImg;
        }
 
                return logoImg;
        }
 

+       protected DocumentsService getDocumentsService() {
+               return documentsService;
+       }
+

        protected FormToolkit getFormToolkit() {
                return toolkit;
        }
        protected FormToolkit getFormToolkit() {
                return toolkit;
        }


@@ -178,6 +211,10 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
                this.appWorkbenchService = appWorkbenchService;
        }
 
                this.appWorkbenchService = appWorkbenchService;
        }
 

+       public void setDocumentsService(DocumentsService documentsService) {
+               this.documentsService = documentsService;
+       }
+

        public void setPeopleService(PeopleService peopleService) {
                this.peopleService = peopleService;
        }
        public void setPeopleService(PeopleService peopleService) {
                this.peopleService = peopleService;
        }

diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsSecureEntryPoint.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsSecureEntryPoint.java
index abae312413ab1213608dbf09af7de139ddbc01f8..22b355c45256f9ea98ec6180b04e4ecb56c9a8a4 100644 (file)
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsSecureEntryPoint.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsSecureEntryPoint.java
@@ -38,8 +38,8 @@ public class AsSecureEntryPoint extends RapWorkbenchLogin {
                CmsUtils.markup(headerLbl);
                // Images are declared via the resources extension point in plugin.xml
                String headerStr = "<a href=\"http://argeo.org\" "
                CmsUtils.markup(headerLbl);
                // Images are declared via the resources extension point in plugin.xml
                String headerStr = "<a href=\"http://argeo.org\" "

-                               + "title=\"Smart Data Productivity Suite, by Argeo\" target=\"_blank\"> "
-                               + "<img src=\"/ui/suite/img/logo.jpg\" width=\"200\" height=\"140\"></img> " + "</a>";
+                               + "title=\"Smart Data Productivity Suite by Argeo\" target=\"_blank\"> "
+                               + "<img src=\"/ui/suite/img/logo-argeo.png\" width=\"250\" height=\"250\"></img> " + "</a>";

                headerLbl.setText(headerStr);
                GridData gd = new GridData(SWT.LEFT, SWT.CENTER, true, false);
                headerLbl.setLayoutData(gd);
                headerLbl.setText(headerStr);
                GridData gd = new GridData(SWT.LEFT, SWT.CENTER, true, false);
                headerLbl.setLayoutData(gd);


@@ -50,7 +50,7 @@ public class AsSecureEntryPoint extends RapWorkbenchLogin {
                String titleStr = "<big> Please sign in to your personal dashboard</big>";
                titleLbl.setText(titleStr);
                gd = new GridData(SWT.CENTER, SWT.BOTTOM, false, false);
                String titleStr = "<big> Please sign in to your personal dashboard</big>";
                titleLbl.setText(titleStr);
                gd = new GridData(SWT.CENTER, SWT.BOTTOM, false, false);

-               gd.verticalIndent = 80;
+               // gd.verticalIndent = 40;

                titleLbl.setLayoutData(gd);
 
                // Login composite
                titleLbl.setLayoutData(gd);
 
                // Login composite


@@ -60,12 +60,13 @@ public class AsSecureEntryPoint extends RapWorkbenchLogin {
                gd.verticalIndent = 15;
                loginCmp.setLayoutData(gd);
 
                gd.verticalIndent = 15;
                loginCmp.setLayoutData(gd);
 

-               // Footer
-               Label footerLbl = new Label(bodyCmp, SWT.WRAP | SWT.CENTER);
-               CmsUtils.markup(footerLbl);
-               String footerStr = "<small>SDPS is a private service. <br/>"
-                               + " Please <a href=\"mailto:contact@argeo.org\">contact us</a> if you have any question.</small>";
-               footerLbl.setText(footerStr);
-               footerLbl.setLayoutData(EclipseUiUtils.fillWidth());
+               // // Footer
+               // Label footerLbl = new Label(bodyCmp, SWT.WRAP | SWT.CENTER);
+               // CmsUtils.markup(footerLbl);
+               // String footerStr = "<small>SDPS is a private service. <br/>"
+               // + " Please <a href=\"mailto:contact@argeo.org\">contact us</a> if you
+               // have any question.</small>";
+               // footerLbl.setText(footerStr);
+               // footerLbl.setLayoutData(EclipseUiUtils.fillWidth());

        }
 }
        }
 }

diff --git a/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/dashboard.gif b/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/dashboard.gif
new file mode 100644 (file)
index 0000000..fd0c669
Binary files /dev/null and b/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/dashboard.gif differ

diff --git a/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/favicon-16px.png b/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/favicon-16px.png
deleted file mode 100644 (file)
index 037f929..0000000
Binary files a/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/favicon-16px.png and /dev/null differ

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

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

diff --git a/org.argeo.suite.workbench.rap/theme/argeo-classic/img/logo-argeo.png b/org.argeo.suite.workbench.rap/theme/argeo-classic/img/logo-argeo.png
new file mode 100644 (file)
index 0000000..f107230
Binary files /dev/null and b/org.argeo.suite.workbench.rap/theme/argeo-classic/img/logo-argeo.png differ