Work on the Documents app
authorbsinou <bsinou@argeo.org>
Wed, 1 Feb 2017 14:19:44 +0000 (15:19 +0100)
committerbsinou <bsinou@argeo.org>
Wed, 1 Feb 2017 14:19:44 +0000 (15:19 +0100)
17 files changed:
org.argeo.suite.workbench.rap/META-INF/spring/parts.xml
org.argeo.suite.workbench.rap/bnd.bnd
org.argeo.suite.workbench.rap/plugin.xml
org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/AsWorkbenchServiceImpl.java
org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DashboardPerspective.java
org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/OpenEntityEditor.java [new file with mode: 0644]
org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/fs/FsImages.java [deleted file]
org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/fs/FsSingleColumnLabelProvider.java [deleted file]
org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/MyFilesView.java [deleted file]
org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/addFolder.gif [new file with mode: 0644]
org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/bookmarkFolder.png [new file with mode: 0644]
org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/createFolder.png [deleted file]
org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/open.png
org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/shareFolder.png
org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/upload.png
org.argeo.suite.workbench.rap/theme/argeo-classic/workbench-ext.css
pom.xml

index 932711f28774190b8774b62a7984a5fc9c4c6629..68c2204c7f63000ad620a9238ee8d2918895cf4b 100644 (file)
                scope="prototype">
                <property name="repository" ref="repository" />
        </bean>
                scope="prototype">
                <property name="repository" ref="repository" />
        </bean>
-
-       <!-- VIEWS -->
-       <bean id="myFilesView" class="org.argeo.suite.workbench.parts.MyFilesView"
+       
+       <bean id="openEntityEditor" class="org.argeo.suite.workbench.commands.OpenEntityEditor"
                scope="prototype">
                <property name="repository" ref="repository" />
                scope="prototype">
                <property name="repository" ref="repository" />
-               <property name="nodeFileSystemProvider" ref="nodeFileSystemProvider" />
-               <property name="documentsService" ref="documentsService" />
                <property name="appWorkbenchService" ref="appWorkbenchService" />
        </bean>
                <property name="appWorkbenchService" ref="appWorkbenchService" />
        </bean>
-       
 
 
+       <!-- VIEWS -->
        <bean id="testView" class="org.argeo.suite.workbench.parts.TestView"
                scope="prototype">
                <property name="repository" ref="repository" />
        <bean id="testView" class="org.argeo.suite.workbench.parts.TestView"
                scope="prototype">
                <property name="repository" ref="repository" />
index 17e6138a8c3eaae60fb92e5455843b91399efb0d..57d52a854e8ce29b5a2f604c28360d7bc3695b9f 100644 (file)
@@ -12,7 +12,9 @@ javax.jcr.security,\
 org.argeo.cms,\
 org.argeo.cms.ui.workbench,\
 org.argeo.connect,\
 org.argeo.cms,\
 org.argeo.cms.ui.workbench,\
 org.argeo.connect,\
+org.argeo.connect.ui,\
 org.argeo.connect.people.workbench.rap.views,\
 org.argeo.connect.people.workbench.rap.views,\
+org.argeo.connect.documents.workbench.parts,\
 org.argeo.connect.ui.workbench,\
 org.argeo.eclipse.spring,\
 org.argeo.node,\
 org.argeo.connect.ui.workbench,\
 org.argeo.eclipse.spring,\
 org.argeo.node,\
index bdc68088c93af5afd1e76f25e97821cad6811b8d..863eb874a4ea2dc4cee98a20eb0e72d01c08ba0e 100644 (file)
                        name="Test View"
                        restorable="true">
                </view>
                        name="Test View"
                        restorable="true">
                </view>
-               <view
-                       id="org.argeo.suite.workbench.rap.myFilesView"
-                       class="org.argeo.eclipse.spring.SpringExtensionFactory"
-                       icon="theme/argeo-classic/icons/fs/fsBrowser.png"
-                       name="Files"
-                       restorable="true">
-               </view>
        </extension>
                
        <!-- EDITORS --> 
        </extension>
                
        <!-- EDITORS --> 
                        defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
                        name="createEntity">
        </command>         
                        defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
                        name="createEntity">
        </command>         
+       
+       <!-- Open correct editor given the node type --> 
+       <command
+                       id="org.argeo.suite.workbench.rap.openEntityEditor"
+                       defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+                       name="Open Editor">
+                       <commandParameter
+                       id="param.jcrId"
+                       name="The jcr identifier">
+               </commandParameter>
+               </command>    
+               
        </extension>
 
        <!-- MENU CONTRIBUTION --> 
        </extension>
 
        <!-- MENU CONTRIBUTION --> 
index dcc9aa10abf990e7fc7786f90bc0761febaa51bf..eb18dc53e990892a39f667c7b4346a3ec0ea280d 100644 (file)
@@ -6,6 +6,7 @@ import javax.jcr.Node;
 
 import org.argeo.connect.ui.workbench.AppWorkbenchService;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 
 import org.argeo.connect.ui.workbench.AppWorkbenchService;
 import org.argeo.eclipse.ui.EclipseUiUtils;
+import org.argeo.suite.workbench.commands.OpenEntityEditor;
 import org.argeo.suite.workbench.parts.DefaultDashboardEditor;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.swt.graphics.Image;
 import org.argeo.suite.workbench.parts.DefaultDashboardEditor;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.swt.graphics.Image;
@@ -24,13 +25,13 @@ public class AsWorkbenchServiceImpl implements AppWorkbenchService {
 
        @Override
        public String getOpenEntityEditorCmdId() {
 
        @Override
        public String getOpenEntityEditorCmdId() {
-               String result = null;
-               for (AppWorkbenchService appWbService : knownAppWbServices) {
-                       result = appWbService.getOpenEntityEditorCmdId();
-                       if (EclipseUiUtils.notEmpty(result))
-                               return result;
-               }
-               return null;
+//             String result = null;
+//             for (AppWorkbenchService appWbService : knownAppWbServices) {
+//                     result = appWbService.getOpenEntityEditorCmdId();
+//                     if (EclipseUiUtils.notEmpty(result))
+//                             return result;
+//             }
+               return OpenEntityEditor.ID;
        }
 
        @Override
        }
 
        @Override
index f723e8d0c0af9186fd759404a7bd9a0a92712a9e..3e5bcf7cbf8f4c916254a957ec7a92c9648dc084 100644 (file)
@@ -1,8 +1,8 @@
 package org.argeo.suite.workbench;
 
 package org.argeo.suite.workbench;
 
+import org.argeo.connect.documents.workbench.parts.MyFilesView;
 import org.argeo.connect.people.workbench.rap.views.MyTasksView;
 import org.argeo.connect.people.workbench.rap.views.QuickSearchView;
 import org.argeo.connect.people.workbench.rap.views.MyTasksView;
 import org.argeo.connect.people.workbench.rap.views.QuickSearchView;
-import org.argeo.suite.workbench.parts.MyFilesView;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/OpenEntityEditor.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/OpenEntityEditor.java
new file mode 100644 (file)
index 0000000..aad084b
--- /dev/null
@@ -0,0 +1,68 @@
+package org.argeo.suite.workbench.commands;
+
+import javax.jcr.Node;
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.argeo.connect.ui.workbench.AppWorkbenchService;
+import org.argeo.connect.ui.workbench.NodeEditorInput;
+import org.argeo.jcr.JcrUtils;
+import org.argeo.suite.SuiteException;
+import org.argeo.suite.workbench.AsUiPlugin;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/** Workaround to enable opening of a default editor */
+public class OpenEntityEditor extends AbstractHandler {
+       public final static String ID = AsUiPlugin.PLUGIN_ID + ".openEntityEditor";
+
+       public final static String PARAM_JCR_ID = "param.jcrId";
+       // public final static String PARAM_OPEN_FOR_EDIT = "param.openForEdit";
+       // public final static String PARAM_CTAB_ID = "param.cTabId";
+
+       private Repository repository;
+       private AppWorkbenchService appWorkbenchService;
+
+       public Object execute(ExecutionEvent event) throws ExecutionException {
+               NodeEditorInput eei = null;
+               Node entity = null;
+               Session session = null;
+               String jcrId = event.getParameter(PARAM_JCR_ID);
+               try {
+                       session = repository.login();
+                       if (jcrId != null) {
+                               entity = session.getNodeByIdentifier(jcrId);
+                               eei = new NodeEditorInput(jcrId);
+                       } else
+                               return null;
+
+                       String editorId = appWorkbenchService.getEntityEditorId(entity);
+                       if (editorId != null) {
+                               IWorkbenchWindow iww = HandlerUtil.getActiveWorkbenchWindow(event);
+                               IWorkbenchPage iwp = iww.getActivePage();
+                               iwp.openEditor(eei, editorId);
+                       }
+               } catch (PartInitException pie) {
+                       throw new SuiteException("Unexpected PartInitException while opening entity editor", pie);
+               } catch (RepositoryException e) {
+                       throw new SuiteException("unexpected JCR error while opening editor", e);
+               } finally {
+                       JcrUtils.logoutQuietly(session);
+               }
+               return null;
+       }
+
+       public void setRepository(Repository repository) {
+               this.repository = repository;
+       }
+
+       public void setAppWorkbenchService(AppWorkbenchService appWorkbenchService) {
+               this.appWorkbenchService = appWorkbenchService;
+       }
+}
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/fs/FsImages.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/fs/FsImages.java
deleted file mode 100644 (file)
index ec6304f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.argeo.suite.workbench.fs;
-
-import org.argeo.suite.workbench.AsUiPlugin;
-import org.eclipse.swt.graphics.Image;
-
-/** Shared icons for the file system RAP workbench */
-public class FsImages {
-       final private static String BASE_PATH = "/theme/argeo-classic/icons/fs/";
-       // Various types
-       public final static Image ICON_FOLDER = AsUiPlugin.getImageDescriptor(BASE_PATH + "folder.gif").createImage();
-       public final static Image ICON_FILE = AsUiPlugin.getImageDescriptor(BASE_PATH + "file.gif").createImage();
-}
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/fs/FsSingleColumnLabelProvider.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/fs/FsSingleColumnLabelProvider.java
deleted file mode 100644 (file)
index d3c62ff..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.argeo.suite.workbench.fs;
-
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import javax.jcr.nodetype.NodeType;
-
-import org.argeo.connect.people.PeopleNames;
-import org.argeo.connect.ui.ConnectUiUtils;
-import org.argeo.suite.SuiteException;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Provide a single column label provider for file and directory lists. Icon and
- * displayed text vary with the element node type
- */
-public class FsSingleColumnLabelProvider extends LabelProvider implements PeopleNames {
-       private static final long serialVersionUID = -8895136766988459632L;
-
-       public FsSingleColumnLabelProvider() {
-       }
-
-       @Override
-       public String getText(Object element) {
-               try {
-                       Node entity = (Node) element;
-                       String result;
-                       if (entity.isNodeType(NodeType.NT_FILE))
-                               result = entity.getName();
-                       // result = ConnectJcrUtils.get(entity, Property.JCR_TITLE);
-                       else if (entity.isNodeType(NodeType.NT_FOLDER))
-                               result = entity.getName();
-                       // result = ConnectJcrUtils.get(entity, Property.JCR_TITLE);
-                       else
-                               result = "";
-                       return ConnectUiUtils.replaceAmpersand(result);
-               } catch (RepositoryException re) {
-                       throw new SuiteException("Unable to get formatted value for node", re);
-               }
-       }
-
-       /** Overwrite this method to provide project specific images */
-       @Override
-       public Image getImage(Object element) {
-               try {
-                       Node entity = (Node) element;
-                       if (entity.isNodeType(NodeType.NT_FILE))
-                               return FsImages.ICON_FILE;
-                       else if (entity.isNodeType(NodeType.NT_FOLDER))
-                               return FsImages.ICON_FOLDER;
-                       return null;
-               } catch (RepositoryException re) {
-                       throw new SuiteException("Cannot get icon for " + element, re);
-               }
-       }
-}
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/MyFilesView.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/MyFilesView.java
deleted file mode 100644 (file)
index f69710c..0000000
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.suite.workbench.parts;
-
-import static org.argeo.eclipse.ui.EclipseUiUtils.notEmpty;
-
-import java.nio.file.spi.FileSystemProvider;
-
-import javax.jcr.NodeIterator;
-import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.query.Query;
-import javax.jcr.query.QueryManager;
-import javax.jcr.query.QueryResult;
-
-import org.argeo.cms.util.CmsUtils;
-import org.argeo.connect.ConnectConstants;
-import org.argeo.connect.documents.DocumentsService;
-import org.argeo.connect.people.PeopleException;
-import org.argeo.connect.people.workbench.rap.providers.BasicNodeListContentProvider;
-import org.argeo.connect.ui.ConnectUiConstants;
-import org.argeo.connect.ui.widgets.DelayedText;
-import org.argeo.connect.ui.workbench.AppWorkbenchService;
-import org.argeo.connect.util.ConnectJcrUtils;
-import org.argeo.connect.util.XPathUtils;
-import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.eclipse.ui.fs.FsTableViewer;
-import org.argeo.jcr.JcrUtils;
-import org.argeo.suite.workbench.AsUiPlugin;
-import org.argeo.suite.workbench.fs.FsSingleColumnLabelProvider;
-import org.eclipse.jface.layout.TableColumnLayout;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.rap.rwt.service.ServerPushSession;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-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.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.part.ViewPart;
-
-/** Browse the node file system. */
-public class MyFilesView extends ViewPart implements IDoubleClickListener {
-       public final static String ID = AsUiPlugin.PLUGIN_ID + ".myFilesView";
-
-       private Repository repository;
-       private Session session;
-       private AppWorkbenchService appWorkbenchService;
-       private FileSystemProvider nodeFileSystemProvider;
-       private DocumentsService documentsService;
-
-       private DelayedText filterTxt;
-       private TableViewer searchResultsViewer;
-       private Composite searchCmp;
-
-       @Override
-       public void createPartControl(Composite parent) {
-               session = ConnectJcrUtils.login(repository);
-               // MainLayout
-               parent.setLayout(new GridLayout());
-               addFilterPanel(parent);
-               searchCmp = new Composite(parent, SWT.NO_FOCUS);
-               searchCmp.setLayout(EclipseUiUtils.noSpaceGridLayout());
-               searchResultsViewer = createListPart(searchCmp, new FsSingleColumnLabelProvider());
-               GridData gd = EclipseUiUtils.fillWidth();
-               gd.heightHint = 0;
-               searchCmp.setLayoutData(gd);
-
-               Composite bookmarkCmp = new Composite(parent, SWT.NO_FOCUS);
-               bookmarkCmp.setLayoutData(EclipseUiUtils.fillAll());
-               populateBookmarks(bookmarkCmp);
-       }
-
-       public void addFilterPanel(Composite parent) {
-               // Use a delayed text: the query won't be done until the user stop
-               // typing for 800ms
-               int style = SWT.BORDER | SWT.SEARCH | SWT.ICON_CANCEL;
-               filterTxt = new DelayedText(parent, style, ConnectUiConstants.SEARCH_TEXT_DELAY);
-               filterTxt.setLayoutData(EclipseUiUtils.fillWidth());
-
-               final ServerPushSession pushSession = new ServerPushSession();
-               filterTxt.addDelayedModifyListener(pushSession, new ModifyListener() {
-                       private static final long serialVersionUID = 5003010530960334977L;
-
-                       public void modifyText(ModifyEvent event) {
-                               filterTxt.getDisplay().asyncExec(new Runnable() {
-                                       @Override
-                                       public void run() {
-                                               int resultNb = refreshFilteredList();
-                                               if (resultNb > 0)
-                                                       ((GridData) searchCmp.getLayoutData()).heightHint = 120;
-                                               else
-                                                       ((GridData) searchCmp.getLayoutData()).heightHint = 0;
-                                               parent.layout(true, true);
-                                       }
-                               });
-                               pushSession.stop();
-                       }
-               });
-
-               // Jump to the first item of the list using the down arrow
-               filterTxt.addKeyListener(new KeyListener() {
-                       private static final long serialVersionUID = -4523394262771183968L;
-
-                       @Override
-                       public void keyReleased(KeyEvent e) {
-                       }
-
-                       @Override
-                       public void keyPressed(KeyEvent e) {
-                               // boolean shiftPressed = (e.stateMask & SWT.SHIFT) != 0;
-                               // boolean altPressed = (e.stateMask & SWT.ALT) != 0;
-                               if (e.keyCode == SWT.ARROW_DOWN || e.keyCode == SWT.TAB) {
-                                       Object first = searchResultsViewer.getElementAt(0);
-                                       if (first != null) {
-                                               searchResultsViewer.getTable().setFocus();
-                                               searchResultsViewer.setSelection(new StructuredSelection(first), true);
-                                       }
-                                       e.doit = false;
-                               }
-                       }
-               });
-       }
-
-       protected TableViewer createListPart(Composite parent, ILabelProvider labelProvider) {
-               parent.setLayout(new GridLayout());
-
-               Composite tableComposite = new Composite(parent, SWT.NONE);
-               tableComposite.setLayoutData(EclipseUiUtils.fillAll());
-
-               TableViewer v = new TableViewer(tableComposite);
-               v.setLabelProvider(labelProvider);
-
-               TableColumn singleColumn = new TableColumn(v.getTable(), SWT.V_SCROLL);
-               TableColumnLayout tableColumnLayout = new TableColumnLayout();
-               tableColumnLayout.setColumnData(singleColumn, new ColumnWeightData(100));
-               tableComposite.setLayout(tableColumnLayout);
-
-               // Corresponding table & style
-               Table table = v.getTable();
-               table.setLinesVisible(false);
-               table.setHeaderVisible(false);
-               CmsUtils.markup(table);
-               CmsUtils.setItemHeight(table, 26);
-
-               v.setContentProvider(new BasicNodeListContentProvider());
-               v.addDoubleClickListener(this);
-               return v;
-       }
-
-       @Override
-       public void dispose() {
-               JcrUtils.logoutQuietly(session);
-               super.dispose();
-       }
-
-       protected int refreshFilteredList() {
-               try {
-                       String filter = filterTxt.getText();
-                       if (EclipseUiUtils.isEmpty(filter)) {
-                               searchResultsViewer.setInput(null);
-                               return 0;
-                       }
-
-                       // XPATH Query
-                       // TODO manage cleanly jcr: prefix
-                       // String xpathQueryStr = "//element(*, " + NodeType.NT_FILE + ")";
-                       String xpathQueryStr = "//element(*, nt:file)";
-                       String xpathFilter = XPathUtils.getFreeTextConstraint(filter);
-                       if (notEmpty(xpathFilter))
-                               xpathQueryStr += "[" + xpathFilter + "]";
-
-                       QueryManager queryManager = session.getWorkspace().getQueryManager();
-                       Query xpathQuery = queryManager.createQuery(xpathQueryStr, ConnectConstants.QUERY_XPATH);
-                       // xpathQuery.setLimit(TrackerUiConstants.SEARCH_DEFAULT_LIMIT);
-                       QueryResult result = xpathQuery.execute();
-                       NodeIterator nit = result.getNodes();
-                       searchResultsViewer.setInput(JcrUtils.nodeIteratorToList(nit));
-
-                       return (int) nit.getSize();
-               } catch (RepositoryException e) {
-                       throw new PeopleException("Unable to list files", e);
-               }
-       }
-
-       private void populateBookmarks(Composite parent) {
-               CmsUtils.clear(parent);
-               parent.setLayout(new GridLayout());
-               int bookmarkColWith = 200;
-
-               FsTableViewer homeViewer = new FsTableViewer(parent, SWT.SINGLE | SWT.NO_SCROLL);
-               Table table = homeViewer.configureDefaultSingleColumnTable(bookmarkColWith);
-               GridData gd = EclipseUiUtils.fillWidth();
-               gd.horizontalIndent = 10;
-               table.setLayoutData(gd);
-               homeViewer.addDoubleClickListener(this);
-               homeViewer.setPathsInput(documentsService.getMyDocumentsPath(nodeFileSystemProvider, session));
-
-               appendTitle(parent, "Shared files");
-               FsTableViewer groupsViewer = new FsTableViewer(parent, SWT.SINGLE | SWT.NO_SCROLL);
-               table = groupsViewer.configureDefaultSingleColumnTable(bookmarkColWith);
-               gd = EclipseUiUtils.fillWidth();
-               gd.horizontalIndent = 10;
-               table.setLayoutData(gd);
-               groupsViewer.addDoubleClickListener(this);
-               groupsViewer.setPathsInput(documentsService.getMyGroupsFilesPath(nodeFileSystemProvider, session));
-
-               appendTitle(parent, "My bookmarks");
-               FsTableViewer bookmarksViewer = new FsTableViewer(parent, SWT.SINGLE | SWT.NO_SCROLL);
-               table = bookmarksViewer.configureDefaultSingleColumnTable(bookmarkColWith);
-               gd = EclipseUiUtils.fillWidth();
-               gd.horizontalIndent = 10;
-               table.setLayoutData(gd);
-               bookmarksViewer.addDoubleClickListener(this);
-               bookmarksViewer.setPathsInput(documentsService.getMyBookmarks(nodeFileSystemProvider, session));
-       }
-
-       private Label appendTitle(Composite parent, String value) {
-               Label titleLbl = new Label(parent, SWT.NONE);
-               titleLbl.setText(value);
-               titleLbl.setFont(EclipseUiUtils.getBoldFont(parent));
-               GridData gd = EclipseUiUtils.fillWidth();
-               gd.horizontalIndent = 5;
-               gd.verticalIndent = 5;
-               titleLbl.setLayoutData(gd);
-               return titleLbl;
-       }
-
-       @Override
-       public void doubleClick(DoubleClickEvent event) {
-               IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-               if (selection.isEmpty())
-                       return;
-               else {
-
-                       // currNode = ConnectJcrUtils.getNodeFromElement(obj, selectorName);
-                       // if (currNode != null)
-                       // CommandUtils
-                       // .callCommand(peopleWorkbenchService
-                       // .getOpenEntityEditorCmdId(),
-                       // OpenEntityEditor.PARAM_JCR_ID, currNode
-                       // .getIdentifier());
-                       System.out.println("Double clicked");
-                       // TODO open corresponding editor
-                       // Path newSelected = (Path) selection.getFirstElement();
-                       // if (newSelected.equals(currDisplayedFolder) &&
-                       // newSelected.equals(initialPath))
-                       // return;
-                       // initialPath = newSelected;
-                       // setInput(newSelected);
-               }
-       }
-
-       @Override
-       public void setFocus() {
-       }
-
-       /* DEPENDENCY INJECTION */
-       public void setRepository(Repository repository) {
-               this.repository = repository;
-       }
-
-       public void setAppWorkbenchService(AppWorkbenchService appWorkbenchService) {
-               this.appWorkbenchService = appWorkbenchService;
-       }
-
-       public void setNodeFileSystemProvider(FileSystemProvider nodeFileSystemProvider) {
-               this.nodeFileSystemProvider = nodeFileSystemProvider;
-       }
-
-       public void setDocumentsService(DocumentsService documentsService) {
-               this.documentsService = documentsService;
-       }
-}
diff --git a/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/addFolder.gif b/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/addFolder.gif
new file mode 100644 (file)
index 0000000..d3f43d9
Binary files /dev/null and b/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/addFolder.gif differ
diff --git a/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/bookmarkFolder.png b/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/bookmarkFolder.png
new file mode 100644 (file)
index 0000000..8bb2361
Binary files /dev/null and b/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/bookmarkFolder.png differ
diff --git a/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/createFolder.png b/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/createFolder.png
deleted file mode 100644 (file)
index 3f56074..0000000
Binary files a/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/createFolder.png and /dev/null differ
index 3f56074f7817b41c52e978b6d405b1d8a60cb9a9..3836e128c37fbabc9d2d67e98218dbf2c75d34bb 100644 (file)
Binary files a/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/open.png and b/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/open.png differ
index 3f56074f7817b41c52e978b6d405b1d8a60cb9a9..269cdac874bcf113f6f71fee41d682ba9d3fdd03 100644 (file)
Binary files a/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/shareFolder.png and b/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/shareFolder.png differ
index 3f56074f7817b41c52e978b6d405b1d8a60cb9a9..71c80e8e7f73881cf2662d2343f5fa0e741d54cb 100644 (file)
Binary files a/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/upload.png and b/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/fs/upload.png differ
index a5d18b2364d31be947be8b270c5de6c51e90fdb6..111e4135ca4ebe145bb1507286844d612bfedebf 100644 (file)
@@ -80,15 +80,14 @@ Widget-ToolTip {
 
 }
 
 
 }
 
-/** HEADER
- **/
+/** HEADER **/
 .people_entity_header {
   font: 14px Helvetica, Verdana, "Lucida Sans", Arial, sans-serif;
   text-decoration: none;
 }
 
 
 .people_entity_header {
   font: 14px Helvetica, Verdana, "Lucida Sans", Arial, sans-serif;
   text-decoration: none;
 }
 
 
-/****** Flat image Buttons *********/
+/** Flat image Buttons **/
 Button[PUSH][FLAT].people_flat_btn,
 Button.people_flat_btn,
 Button.people_flat_btn:default, 
 Button[PUSH][FLAT].people_flat_btn,
 Button.people_flat_btn,
 Button.people_flat_btn:default, 
@@ -105,15 +104,27 @@ Button.people_flat_btn:selected {
   cursor: pointer;
 }
 
   cursor: pointer;
 }
 
-/*
 
 
-Button.createFolder_btn:selected,
-Button.createFolder_btn:disabled, 
-Button.createFolder_btn:pressed, 
+/****** DOCUMENTS  *********/
 
 
-*/
+/* Breadcrumb ***/
+Button.breadCrumb_btn {
+  border: 1px solid  #f4f6f7;
+  border-radius: 3px;
+  padding: 2px 2px 2px 2px;
+  background-color: transparent;
+  background-repeat: no-repeat;
+  animation: hoverOut 500ms ease-out;
+  cursor: pointer;
+  font-color: #00294b;
+  text-decoration: none;
+}
 
 
-/****** Context menu  *********/
+Button.breadCrumb_btn:hover {
+  text-decoration: underline;
+}
+
+/* Documents lists context menu */
 .contextMenu_box {
        border: 0px solid #fde2d5;
        padding: 0px;
 .contextMenu_box {
        border: 0px solid #fde2d5;
        padding: 0px;
@@ -121,13 +132,17 @@ Button.createFolder_btn:pressed,
 }
 
 Button[PUSH][FLAT].createFolder_btn {
 }
 
 Button[PUSH][FLAT].createFolder_btn {
-       background-image: url( theme/argeo-classic/icons/fs/createFolder.png);
+       background-image: url( theme/argeo-classic/icons/fs/addFolder.gif);
 }
 
 Button[PUSH][FLAT].shareFolder_btn {
        background-image: url( theme/argeo-classic/icons/fs/shareFolder.png);
 }
 
 }
 
 Button[PUSH][FLAT].shareFolder_btn {
        background-image: url( theme/argeo-classic/icons/fs/shareFolder.png);
 }
 
+Button[PUSH][FLAT].bookmarkFolder_btn {
+       background-image: url( theme/argeo-classic/icons/fs/bookmarkFolder.png);
+}
+
 Button[PUSH][FLAT].downloadFolder_btn {
        background-image: url( theme/argeo-classic/icons/fs/downloadFolder.png);
 }
 Button[PUSH][FLAT].downloadFolder_btn {
        background-image: url( theme/argeo-classic/icons/fs/downloadFolder.png);
 }
@@ -144,16 +159,17 @@ Button[PUSH][FLAT].open_btn {
        background-image: url( theme/argeo-classic/icons/fs/open.png);
 }
 
        background-image: url( theme/argeo-classic/icons/fs/open.png);
 }
 
+Button[PUSH][FLAT].createFolder_btn,
 Button[PUSH][FLAT].shareFolder_btn,
 Button[PUSH][FLAT].shareFolder_btn,
+Button[PUSH][FLAT].bookmarkFolder_btn,
 Button[PUSH][FLAT].downloadFolder_btn,
 Button[PUSH][FLAT].delete_btn,
 Button[PUSH][FLAT].uploadFiles_btn,
 Button[PUSH][FLAT].downloadFolder_btn,
 Button[PUSH][FLAT].delete_btn,
 Button[PUSH][FLAT].uploadFiles_btn,
-Button[PUSH][FLAT].open_btn,
-Button[PUSH][FLAT].createFolder_btn {
+Button[PUSH][FLAT].open_btn {
   border: 0px solid white;
   border-left: 10px solid transparent;
   border-radius: 0px;
   border: 0px solid white;
   border-left: 10px solid transparent;
   border-radius: 0px;
-  padding: 8px 5px 8px 24px;
+  padding: 4px 5px 4px 24px;
   background-color: transparent;
   background-repeat: no-repeat;
   background-position: left; 
   background-color: transparent;
   background-repeat: no-repeat;
   background-position: left; 
@@ -161,27 +177,28 @@ Button[PUSH][FLAT].createFolder_btn {
   cursor: pointer;
 }
 
   cursor: pointer;
 }
 
+Button[PUSH][FLAT].createFolder_btn:hover,
 Button[PUSH][FLAT].shareFolder_btn:hover,
 Button[PUSH][FLAT].shareFolder_btn:hover,
+Button[PUSH][FLAT].bookmarkFolder_btn:hover,
 Button[PUSH][FLAT].downloadFolder_btn:hover,
 Button[PUSH][FLAT].delete_btn:hover,
 Button[PUSH][FLAT].uploadFiles_btn:hover,
 Button[PUSH][FLAT].downloadFolder_btn:hover,
 Button[PUSH][FLAT].delete_btn:hover,
 Button[PUSH][FLAT].uploadFiles_btn:hover,
-Button[PUSH][FLAT].open_btn:hover,
-Button[PUSH][FLAT].createFolder_btn:hover {
+Button[PUSH][FLAT].open_btn:hover {
   background-color: #fef0ea;
 }
 
   background-color: #fef0ea;
 }
 
+Button[PUSH][FLAT].createFolder_btn:pressed,
+Button[PUSH][FLAT].shareFolder_btn:pressed,
+Button[PUSH][FLAT].bookmarkFolder_btn:pressed,
 Button[PUSH][FLAT].shareFolder_btn:pressed,
 Button[PUSH][FLAT].downloadFolder_btn:pressed,
 Button[PUSH][FLAT].delete_btn:pressed,
 Button[PUSH][FLAT].uploadFiles_btn:pressed,
 Button[PUSH][FLAT].shareFolder_btn:pressed,
 Button[PUSH][FLAT].downloadFolder_btn:pressed,
 Button[PUSH][FLAT].delete_btn:pressed,
 Button[PUSH][FLAT].uploadFiles_btn:pressed,
-Button[PUSH][FLAT].open_btn:pressed,
-Button[PUSH][FLAT].createFolder_btn:pressed {
+Button[PUSH][FLAT].open_btn:pressed {
   background-color: #fde2d5;
 }
 
   background-color: #fde2d5;
 }
 
-/*******************************/
-/*   People Generic Styling  **/
-/*******************************/
+/*  PEOPLE  **/
 
 /**  TEXTS **/
 
 
 /**  TEXTS **/
 
diff --git a/pom.xml b/pom.xml
index 14d4581e05f8225af60984279f976357e15f6f8e..a0e84caec6752661b2f46dc4e2069f09392f9e2a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.58</version>
+               <version>2.1.59-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>