Simplify suite specific branding

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

diff --git a/org.argeo.suite.theme.argeo2/plugin.xml b/org.argeo.suite.theme.argeo2/plugin.xml
index 64e30ac54729dec27b8093edd693170120defebd..e6c1b8a0163fd6c06a7537b6b1dd5c9cc1eda2b4 100644 (file)
--- a/org.argeo.suite.theme.argeo2/plugin.xml
+++ b/org.argeo.suite.theme.argeo2/plugin.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-       <extension
-               point="org.eclipse.rap.ui.themes">
-               <themeContribution
-                       themeId="org.eclipse.rap.rwt.theme.Default"
-                       file="theme.css" />
+       <extension point="org.eclipse.rap.ui.themes">
+               <themeContribution themeId="org.eclipse.rap.rwt.theme.Default" file="theme.css" />
+               <!--<theme id="org.argeo.suite.theme.argeo2.Default" name="Argeo 2" file="theme.css"/>-->
        </extension>
        
-    
-
 </plugin>

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

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

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

diff --git a/org.argeo.suite.workbench.rap/plugin.xml b/org.argeo.suite.workbench.rap/plugin.xml
index 209173f91044c24bf4c736ea8d8b7e5ff8e91822..590481e2f5b52fe4a17d8323cdc4dac6651dfb74 100644 (file)
--- a/org.argeo.suite.workbench.rap/plugin.xml
+++ b/org.argeo.suite.workbench.rap/plugin.xml
@@ -7,7 +7,7 @@
                <perspective
             class="org.argeo.suite.workbench.DashboardPerspective"
             id="org.argeo.suite.workbench.rap.dashboardPerspective"
-            icon="icons/favicon.ico"
+            icon="img/favicon.ico"
             name="Dashboard">
                </perspective> 
        </extension>
@@ -17,7 +17,6 @@
                point="org.eclipse.ui.views">
                <view
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
-                       icon="icons/search.png"
                        id="org.argeo.suite.workbench.rap.quickSearchView"
                        name="Search"
                        restorable="true">
@@ -31,7 +30,6 @@
                <editor
                        id="org.argeo.suite.workbench.rap.defaultDashboardEditor"
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
-                       icon="icons/dashboard.gif"
                        name="Dashboard">
                </editor>
        </extension>
@@ -94,11 +92,11 @@
                base-name="js/leaflet.css">  
          </resource>
           <resource  
-               alias="/ui/office/css/headerExt.css"  
+               alias="/css/headerExt.css"  
                base-name="css/headerExt.css">  
          </resource>  
          <resource  
-               alias="/ui/office/img/logo-argeo.png"  
+               alias="/img/logo-argeo.png"  
                base-name="img/logo-argeo.png">  
          </resource>  
     </extension>  
@@ -121,9 +119,7 @@
                        title="Argeo Suite"
                        favicon="img/favicon.ico">
                        <additionalHeaders>
-                        <link 
-                               href="/ui/office/css/headerExt.css"  
-                               rel="stylesheet" />
+                        <link href="/css/headerExt.css" rel="stylesheet" />
                        </additionalHeaders>
                </branding>
        </extension> 

diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
index 535dc7c60cc97898a792edc6c554b5fec3f7462b..78f2f755e19441dfa7cd050ab57829503216a4b3 100644 (file)
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
@@ -19,6 +19,7 @@ import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.cms.util.CmsUtils;
 import org.argeo.connect.ConnectNames;
+import org.argeo.connect.ui.ConnectImages;
 import org.argeo.connect.ui.ConnectUiUtils;
 import org.argeo.connect.util.ConnectJcrUtils;
 import org.argeo.connect.workbench.Refreshable;
@@ -52,6 +53,9 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Group;
 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;
 
 /** Argeo Suite Default Dashboard */
 public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Refreshable {
@@ -67,6 +71,12 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
        private Composite taskListCmp;
        private TaskVirtualListComposite tvlc;
 
+       @Override
+       public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+               super.init(site, input);
+               setTitleImage(ConnectImages.DASHBOARD);
+       }
+
        @Override
        public void createPartControl(Composite parent) {
                super.createPartControl(parent);

diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java
index 89de0eb593b1df8b081d802a57248c2066617b06..7ec41886643693fe5387a7cb3031e462e7923598 100644 (file)
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java
@@ -15,6 +15,7 @@ import org.argeo.activities.ActivitiesService;
 import org.argeo.cms.util.CmsUtils;
 import org.argeo.connect.ConnectTypes;
 import org.argeo.connect.resources.ResourcesService;
+import org.argeo.connect.ui.ConnectImages;
 import org.argeo.connect.ui.ConnectUiConstants;
 import org.argeo.connect.ui.util.BasicNodeListContentProvider;
 import org.argeo.connect.ui.widgets.DelayedText;
@@ -46,6 +47,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IViewSite;
+import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.ViewPart;
 
 /** A table with a quick search field. */
@@ -65,6 +68,12 @@ public class QuickSearchView extends ViewPart implements Refreshable {
        private TableViewer entityViewer;
        private Text filterTxt;
 
+       @Override
+       public void init(IViewSite site) throws PartInitException {
+               super.init(site);
+               setTitleImage(ConnectImages.SEARCH);
+       }
+
        @Override
        public void createPartControl(Composite parent) {
                session = ConnectJcrUtils.login(repository);

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 37dc8036c84c83d9c3f6f8ba300cb2ff49fc0660..bae894d7cfa3195b758095da47e8c682a8265c1f 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
@@ -39,7 +39,7 @@ public class AsSecureEntryPoint extends RapWorkbenchLogin {
                // 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/office/img/logo-argeo.png\" width=\"200\" height=\"200\"></img> " + "</a>";
+                               + "<img src=\"/img/logo-argeo.png\" width=\"200\" height=\"200\"></img> " + "</a>";
                headerLbl.setText(headerStr);
                GridData gd = new GridData(SWT.LEFT, SWT.CENTER, true, false);
                headerLbl.setLayoutData(gd);