diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index 622919870f..e0e21d9a69 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -114,6 +114,7 @@ remove=Remove change_roles=Change Roles change_user_roles=Change User Roles paste_item=Paste Item +paste_link=Paste As Link paste_all=Paste All remove_item=Remove Item remove_all=Remove All diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml index 75a746f075..4f3dae4037 100644 --- a/config/alfresco/web-client-config-actions.xml +++ b/config/alfresco/web-client-config-actions.xml @@ -251,7 +251,7 @@ - + Delete @@ -261,16 +261,43 @@ #{ClipboardBean.cutNode} #{actionContext.id} + #{NavigationBean.currentNodeId} - + copy /images/icons/copy.gif #{ClipboardBean.copyNode} #{actionContext.id} + #{NavigationBean.currentNodeId} + + + + + + + Delete + + cut + /images/icons/cut.gif + #{ClipboardBean.cutNode} + + #{actionContext.id} + #{SpaceDetailsBean.space} + + + + + + copy + /images/icons/copy.gif + #{ClipboardBean.copyNode} + + #{actionContext.id} + #{SpaceDetailsBean.space} @@ -424,7 +451,7 @@ - diff --git a/config/alfresco/web-client-config-forum-actions.xml b/config/alfresco/web-client-config-forum-actions.xml index a2dd3781e7..3a5449a514 100644 --- a/config/alfresco/web-client-config-forum-actions.xml +++ b/config/alfresco/web-client-config-forum-actions.xml @@ -42,8 +42,136 @@ + + + + CreateChildren + + create_forums + /images/icons/create_forums.gif + dialog:createForums + #{CreateForumsDialog.startWizard} + - + + + CreateChildren + + create_forum + /images/icons/create_forum.gif + dialog:createForum + #{CreateForumDialog.startWizard} + + + + + + Delete + + delete_forums + /images/icons/delete_forums.gif + dialog:deleteForums + #{BrowseBean.setupContentAction} + + #{actionContext.id} + + + + + + + Delete + + delete_forum + /images/icons/delete_forum.gif + dialog:deleteForum + #{BrowseBean.setupContentAction} + + #{actionContext.id} + + + + + + + CreateChildren + + create_topic + /images/icons/create_topic.gif + dialog:createTopic + #{CreateTopicDialog.startWizard} + + + + + + Delete + + delete_topic + /images/icons/delete_topic.gif + dialog:deleteTopic + #{BrowseBean.setupContentAction} + + #{actionContext.id} + + + + + + + CreateChildren + + post_to_topic + /images/icons/create_post.gif + dialog:createPost + #{CreatePostDialog.startWizard} + + + + + + CreateChildren + + post_reply + /images/icons/post_reply.gif + dialog:createReply + #{CreateReplyDialog.startWizard} + + #{actionContext.id} + + + + + + + Write + + edit_post + /images/icons/edit_post.gif + dialog:editPost + #{EditPostDialog.startWizardForEdit} + + #{actionContext.id} + + + + + + + Delete + + delete_post + /images/icons/delete.gif + dialog:deletePost + #{BrowseBean.setupContentAction} + + #{actionContext.id} + + + + + @@ -141,6 +269,7 @@ + @@ -148,6 +277,7 @@ + @@ -155,6 +285,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + false + inlineAction + + + + + + + + + + + + + + + + + + + + + + + + + false + inlineAction + + + + + + + + + + + + + + + + + + + + + + + + + false + inlineAction + + + + diff --git a/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java b/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java index 3947bfb804..92d75275d0 100644 --- a/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java +++ b/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java @@ -26,9 +26,10 @@ import javax.faces.event.ActionEvent; import javax.transaction.UserTransaction; import org.alfresco.model.ContentModel; -import org.alfresco.service.cmr.dictionary.DictionaryService; +import org.alfresco.service.cmr.model.FileExistsException; +import org.alfresco.service.cmr.model.FileFolderService; +import org.alfresco.service.cmr.model.FileNotFoundException; import org.alfresco.service.cmr.repository.ChildAssociationRef; -import org.alfresco.service.cmr.repository.CopyService; import org.alfresco.service.cmr.repository.InvalidNodeRefException; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; @@ -50,14 +51,6 @@ public class ClipboardBean { // ------------------------------------------------------------------------------ // Bean property getters and setters - - /** - * @return Returns the NodeService. - */ - public NodeService getNodeService() - { - return this.nodeService; - } /** * @param nodeService The NodeService to set. @@ -66,29 +59,12 @@ public class ClipboardBean { this.nodeService = nodeService; } - /** - * @return Returns the NodeOperationsService. + * @param fileFolderService The FileFolderService to set. */ - public CopyService getNodeOperationsService() + public void setFileFolderService(FileFolderService fileFolderService) { - return this.nodeOperationsService; - } - - /** - * @param nodeOperationsService The NodeOperationsService to set. - */ - public void setNodeOperationsService(CopyService nodeOperationsService) - { - this.nodeOperationsService = nodeOperationsService; - } - - /** - * @return Returns the navigation bean instance. - */ - public NavigationBean getNavigator() - { - return this.navigator; + this.fileFolderService = fileFolderService; } /** @@ -152,7 +128,7 @@ public class ClipboardBean */ public void pasteAll(ActionEvent event) { - performPasteItems(-1); + performPasteItems(-1, UIClipboardShelfItem.ACTION_PASTE_ALL); } /** @@ -168,15 +144,16 @@ public class ClipboardBean throw new IllegalStateException("Clipboard attempting paste a non existent item index: " + index); } - performPasteItems(index); + performPasteItems(index, clipEvent.Action); } /** * Perform a paste for the specified clipboard item(s) * * @param index of clipboard item to paste or -1 for all + * @param action the clipboard action to perform (see UIClipboardShelfItem) */ - private void performPasteItems(int index) + private void performPasteItems(int index, int action) { UserTransaction tx = null; try @@ -189,7 +166,7 @@ public class ClipboardBean // paste all for (int i=0; i newItems = new ArrayList(this.items.size()); @@ -208,7 +185,7 @@ public class ClipboardBean { // single paste operation ClipboardItem item = this.items.get(index); - performClipboardOperation(item); + performClipboardOperation(item, action); if (item.Mode == ClipboardStatus.CUT) { this.items.remove(index); @@ -233,45 +210,56 @@ public class ClipboardBean /** * Perform the operation for the specified clipboard item * - * @param item + * @param item the ClipboardItem + * @param action the clipboard action to perform (see UIClipboardShelfItem) */ - private void performClipboardOperation(ClipboardItem item) + private void performClipboardOperation(ClipboardItem item, int action) + throws FileExistsException, FileNotFoundException { - NodeRef parentRef = new NodeRef(Repository.getStoreRef(), - this.navigator.getCurrentNodeId()); + NodeRef destRef = new NodeRef(Repository.getStoreRef(), this.navigator.getCurrentNodeId()); - // TODO: should we use primary parent here? - // The problem is we can't pass round ChildAssocRefs as form params etc. in the UI! - // It's tricky if we need to pass childassocref around everywhere...! + // TODO: Should we use primary parent here? + // We are assuming that the item exists in only a single parent and that the source for + // the clipboard operation (e.g. the source folder) is specifically that parent node. + // This does not allow for more than one possible parent node - or for linked objects! ChildAssociationRef assocRef = this.nodeService.getPrimaryParent(item.Node.getNodeRef()); if (item.Mode == ClipboardStatus.COPY) { - if (logger.isDebugEnabled()) - logger.debug("Trying to copy node ID: " + item.Node.getId() + " into node ID: " + parentRef.getId()); - - // call the node ops service to initiate the copy - // TODO: should the assoc qname be derived from the type...? - DictionaryService dd = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getDictionaryService(); - boolean copyChildren = dd.isSubClass(item.Node.getType(), ContentModel.TYPE_FOLDER); - NodeRef copyRef = this.nodeOperationsService.copy( - item.Node.getNodeRef(), - parentRef, - ContentModel.ASSOC_CONTAINS, - assocRef.getQName(), - copyChildren); + if (action == UIClipboardShelfItem.ACTION_PASTE_LINK) + { + if (logger.isDebugEnabled()) + logger.debug("Attempting to link node ID: " + item.Node.getId() + " into node ID: " + destRef.getId()); + + // copy as link was specifically requested by the user + this.nodeService.addChild( + destRef, + item.Node.getNodeRef(), + ContentModel.ASSOC_CONTAINS, + assocRef.getQName()); + } + else + { + if (logger.isDebugEnabled()) + logger.debug("Attempting to copy node ID: " + item.Node.getId() + " into node ID: " + destRef.getId()); + + // call the node ops service to initiate the copy + this.fileFolderService.copy( + item.Node.getNodeRef(), + destRef, + null); // TODO: could add "Copy of ..." here if copy fails + } } else { if (logger.isDebugEnabled()) - logger.debug("Trying to move node ID: " + item.Node.getId() + " into node ID: " + parentRef.getId()); + logger.debug("Attempting to move node ID: " + item.Node.getId() + " into node ID: " + destRef.getId()); // move the node - this.nodeService.moveNode( + this.fileFolderService.move( item.Node.getNodeRef(), - parentRef, - ContentModel.ASSOC_CONTAINS, - assocRef.getQName()); + destRef, + null); // TODO: could add "Copy of ..." here if move fails } } @@ -325,8 +313,8 @@ public class ClipboardBean /** The NodeService to be used by the bean */ protected NodeService nodeService; - /** The NodeOperationsService to be used by the bean */ - protected CopyService nodeOperationsService; + /** The FileFolderService to be used by the bean */ + protected FileFolderService fileFolderService; /** The NavigationBean reference */ protected NavigationBean navigator; diff --git a/source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java b/source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java index 8785283ab7..699e499390 100644 --- a/source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java +++ b/source/java/org/alfresco/web/ui/repo/component/AbstractItemSelector.java @@ -128,9 +128,11 @@ public abstract class AbstractItemSelector extends UIInput public abstract Collection getRootChildren(FacesContext context); /** - * @return The icon image to display next to the item links, or null for no icon + * @param ref NodeRef to the item to get the icon for + * + * @return The icon image to display next to the item links, or null for no icon */ - public abstract String getItemIcon(); + public abstract String getItemIcon(FacesContext context, NodeRef ref); /** * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object) @@ -278,12 +280,6 @@ public abstract class AbstractItemSelector extends UIInput boolean showValueInHiddenField = false; NodeRef value = null; - String image = null; - if (getItemIcon() != null) - { - image = "" + Utils.buildImageTag(context, getItemIcon(), null, "absmiddle") + ""; - } - switch (this.mode) { case MODE_BEFORE_SELECTION: @@ -486,7 +482,15 @@ public abstract class AbstractItemSelector extends UIInput // get the name for the child and output as link NodeRef childNodeRef = new NodeRef(Repository.getStoreRef(), childId); String name = Repository.getNameForNode(service, childNodeRef); - renderNodeLink(context, childId, name, image, buf); + String prefixHtml = null; + String icon = getItemIcon(context, childNodeRef); + if (icon != null) + { + prefixHtml = "" + + Utils.buildImageTag(context, icon, null, "absmiddle") + + ""; + } + renderNodeLink(context, childId, name, prefixHtml, buf); buf.append(""); } diff --git a/source/java/org/alfresco/web/ui/repo/component/UICategorySelector.java b/source/java/org/alfresco/web/ui/repo/component/UICategorySelector.java index 4082787a69..6c5cac8f42 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UICategorySelector.java +++ b/source/java/org/alfresco/web/ui/repo/component/UICategorySelector.java @@ -144,7 +144,7 @@ public class UICategorySelector extends AbstractItemSelector /** * @see org.alfresco.web.ui.repo.component.AbstractItemSelector#getItemIcon() */ - public String getItemIcon() + public String getItemIcon(FacesContext context, NodeRef ref) { return WebResources.IMAGE_CATEGORY; } diff --git a/source/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java b/source/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java index cce1ce3fd5..5179316dbf 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java +++ b/source/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java @@ -141,8 +141,17 @@ public class UISpaceSelector extends AbstractItemSelector /** * @see org.alfresco.web.ui.repo.component.AbstractItemSelector#getItemIcon() */ - public String getItemIcon() + public String getItemIcon(FacesContext context, NodeRef ref) { - return WebResources.IMAGE_SPACE; + String icon = (String)getNodeService(context).getProperty(ref, ContentModel.PROP_ICON); + if (icon != null) + { + icon = "/images/icons/" + icon + "-16.gif"; + } + else + { + icon = WebResources.IMAGE_SPACE; + } + return icon; } } diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java index 43cb00f289..a278162063 100644 --- a/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java +++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIClipboardShelfItem.java @@ -122,6 +122,7 @@ public class UIClipboardShelfItem extends UIShelfItem case ACTION_PASTE_ALL: case ACTION_PASTE_ITEM: + case ACTION_PASTE_LINK: Utils.processActionMethod(getFacesContext(), getPasteActionListener(), clipEvent); break; } @@ -158,7 +159,7 @@ public class UIClipboardShelfItem extends UIShelfItem ClipboardItem item = items.get(i); // start row with cut/copy state icon - out.write(""); + out.write(""); if (item.Mode == ClipboardStatus.COPY) { out.write(Utils.buildImageTag(context, WebResources.IMAGE_COPY, 14, 16, bundle.getString(MSG_COPY), null, "absmiddle")); @@ -167,17 +168,26 @@ public class UIClipboardShelfItem extends UIShelfItem { out.write(Utils.buildImageTag(context, WebResources.IMAGE_CUT, 13, 16, bundle.getString(MSG_CUT), null, "absmiddle")); } - out.write(""); + out.write(""); if (dd.isSubClass(item.Node.getType(), ContentModel.TYPE_FOLDER)) { - // start row with Space icon - out.write(Utils.buildImageTag(context, WebResources.IMAGE_SPACE, 16, 16, null, null, "absmiddle")); + // start row with correct node icon + String icon = (String)item.Node.getProperties().get("app:icon"); + if (icon != null) + { + icon = "/images/icons/" + icon + "-16.gif"; + } + else + { + icon = WebResources.IMAGE_SPACE; + } + out.write(Utils.buildImageTag(context, icon, 16, 16, null, null, "absmiddle")); } else if (dd.isSubClass(item.Node.getType(), ContentModel.TYPE_CONTENT)) { String image = Utils.getFileTypeImage(item.Node.getName(), true); - out.write(Utils.buildImageTag(context, image, 16, 16, null, null, "absmiddle")); + out.write(Utils.buildImageTag(context, image, null, "absmiddle")); } // output cropped item label - we also output with no breaks, this is ok @@ -190,6 +200,11 @@ public class UIClipboardShelfItem extends UIShelfItem out.write(buildActionLink(ACTION_REMOVE_ITEM, i, bundle.getString(MSG_REMOVE_ITEM), WebResources.IMAGE_REMOVE)); out.write(" "); out.write(buildActionLink(ACTION_PASTE_ITEM, i, bundle.getString(MSG_PASTE_ITEM), WebResources.IMAGE_PASTE)); + //if (item.Mode == ClipboardStatus.COPY) + //{ + // out.write(" "); + // out.write(buildActionLink(ACTION_PASTE_LINK, i, bundle.getString(MSG_PASTE_LINK), WebResources.IMAGE_PASTE_LINK)); + //} // end actions cell and end row out.write(""); @@ -337,17 +352,19 @@ public class UIClipboardShelfItem extends UIShelfItem // Private data /** I18N messages */ - private static final String MSG_REMOVE_ALL = "remove_all"; - private static final String MSG_PASTE_ALL = "paste_all"; - private static final String MSG_PASTE_ITEM = "paste_item"; + private static final String MSG_REMOVE_ALL = "remove_all"; + private static final String MSG_PASTE_ALL = "paste_all"; + private static final String MSG_PASTE_ITEM = "paste_item"; + private static final String MSG_PASTE_LINK = "paste_link"; private static final String MSG_REMOVE_ITEM = "remove_item"; private static final String MSG_CUT = "cut"; private static final String MSG_COPY = "copy"; - private final static int ACTION_REMOVE_ITEM = 0; - private final static int ACTION_REMOVE_ALL = 1; - private final static int ACTION_PASTE_ITEM = 2; - private final static int ACTION_PASTE_ALL = 3; + public final static int ACTION_REMOVE_ITEM = 0; + public final static int ACTION_REMOVE_ALL = 1; + public final static int ACTION_PASTE_ITEM = 2; + public final static int ACTION_PASTE_ALL = 3; + public final static int ACTION_PASTE_LINK = 4; /** the current list of clipboard items */ private List collections; diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIRecentSpacesShelfItem.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIRecentSpacesShelfItem.java index daddef9c09..667097a8b1 100644 --- a/source/java/org/alfresco/web/ui/repo/component/shelf/UIRecentSpacesShelfItem.java +++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIRecentSpacesShelfItem.java @@ -153,9 +153,18 @@ public class UIRecentSpacesShelfItem extends UIShelfItem { Node item = items.get(i); - // start row with Space icon - out.write(""); - out.write(Utils.buildImageTag(context, WebResources.IMAGE_SPACE, 16, 16, null, null, "absmiddle")); + // start row with correct node icon + out.write(""); + String icon = (String)item.getProperties().get("app:icon"); + if (icon != null) + { + icon = "/images/icons/" + icon + "-16.gif"; + } + else + { + icon = WebResources.IMAGE_SPACE; + } + out.write(Utils.buildImageTag(context, icon, 16, 16, null, null, "absmiddle")); // output cropped item label - we also output with no breaks, this is ok // as the copped label will ensure a sensible maximum width diff --git a/source/java/org/alfresco/web/ui/repo/component/shelf/UIShortcutsShelfItem.java b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShortcutsShelfItem.java index a22c69a410..5a9cf4675c 100644 --- a/source/java/org/alfresco/web/ui/repo/component/shelf/UIShortcutsShelfItem.java +++ b/source/java/org/alfresco/web/ui/repo/component/shelf/UIShortcutsShelfItem.java @@ -179,16 +179,25 @@ public class UIShortcutsShelfItem extends UIShelfItem { Node item = items.get(i); - out.write(""); + out.write(""); if (dd.isSubClass(item.getType(), ContentModel.TYPE_FOLDER)) { - // start row with Space icon - out.write(Utils.buildImageTag(context, WebResources.IMAGE_SPACE, 16, 16, null, null, "absmiddle")); + // start row with correct node icon + String icon = (String)item.getProperties().get("app:icon"); + if (icon != null) + { + icon = "/images/icons/" + icon + "-16.gif"; + } + else + { + icon = WebResources.IMAGE_SPACE; + } + out.write(Utils.buildImageTag(context, icon, 16, 16, null, null, "absmiddle")); } else if (dd.isSubClass(item.getType(), ContentModel.TYPE_CONTENT)) { String image = Utils.getFileTypeImage(item.getName(), true); - out.write(Utils.buildImageTag(context, image, 16, 16, null, null, "absmiddle")); + out.write(Utils.buildImageTag(context, image, null, "absmiddle")); } // output cropped item label - we also output with no breaks, this is ok diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml index cb9fe84049..0396b275c9 100644 --- a/source/web/WEB-INF/faces-config-beans.xml +++ b/source/web/WEB-INF/faces-config-beans.xml @@ -111,8 +111,8 @@ #{NodeService} - nodeOperationsService - #{CopyService} + fileFolderService + #{FileFolderService} diff --git a/source/web/jsp/forums/forum.jsp b/source/web/jsp/forums/forum.jsp index 2804320886..cac63efbca 100644 --- a/source/web/jsp/forums/forum.jsp +++ b/source/web/jsp/forums/forum.jsp @@ -79,38 +79,14 @@ <%-- Create actions menu --%> - - - + + <%-- More actions menu --%> - - - - - - - - - - - - - - - - - - - - - - - - + @@ -183,22 +159,9 @@ - - - - - - - - - - - - - - - - + + <%-- actions are configured in web-client-config-forum-actions.xml --%> + diff --git a/source/web/jsp/forums/forums.jsp b/source/web/jsp/forums/forums.jsp index 0c82bce9b1..9c77a2c0bb 100644 --- a/source/web/jsp/forums/forums.jsp +++ b/source/web/jsp/forums/forums.jsp @@ -80,47 +80,14 @@ <%-- Create actions menu --%> - - - - - - + + <%-- More actions menu --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -250,22 +217,9 @@ - - - - - - - - - - - - - - - - + + <%-- actions are configured in web-client-config-forum-actions.xml --%> + diff --git a/source/web/jsp/forums/topic.jsp b/source/web/jsp/forums/topic.jsp index b413e30a5d..a125e03556 100644 --- a/source/web/jsp/forums/topic.jsp +++ b/source/web/jsp/forums/topic.jsp @@ -79,38 +79,14 @@ <%-- Create actions menu --%> - - - + + <%-- More actions menu --%> - - - - - - - - - - - - - - - - - - - - - - - - + @@ -217,21 +193,9 @@ - - - - - - - - - - - - - - - + + <%-- actions are configured in web-client-config-forum-actions.xml --%> +