From e8092fa0246485a27f8078abfe18b873b62b5c23 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Mon, 29 Jan 2007 11:31:11 +0000 Subject: [PATCH] . Clipboard Paste As Link fix for when pasting into a folder containing a link file with the same name . Minor 2.0 UI CSS fix git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4952 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/web/bean/clipboard/WorkspaceClipboardItem.java | 6 +++--- source/web/css/main.css | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java b/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java index fd6280c247..04a35597ae 100644 --- a/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java +++ b/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java @@ -51,8 +51,8 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem private static final String MSG_LINK_TO = "link_to"; // File extension to use for link nodes + private static final String LINK_NODE_EXTENSION = ".url"; - private static final String LinkNodeExtension = ".url"; /** * @param ref @@ -131,10 +131,10 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem // we create a special Link Object node that has a property to reference the original // create the node using the nodeService (can only use FileFolderService for content) - if (checkExists(name + ".lnk", destRef) == false) + if (checkExists(name + LINK_NODE_EXTENSION, destRef) == false) { Map props = new HashMap(2, 1.0f); - props.put(ContentModel.PROP_NAME, name + LinkNodeExtension); + props.put(ContentModel.PROP_NAME, name + LINK_NODE_EXTENSION); props.put(ContentModel.PROP_LINK_DESTINATION, getNodeRef()); if (dd.isSubClass(getType(), ContentModel.TYPE_CONTENT)) { diff --git a/source/web/css/main.css b/source/web/css/main.css index 842e4f4bc9..6b98c66e82 100644 --- a/source/web/css/main.css +++ b/source/web/css/main.css @@ -435,7 +435,7 @@ a.topToolbarLinkHighlight, a.topToolbarLinkHighlight:link, a.topToolbarLinkHighl .pager { - padding: 3px; + padding: 5px 3px 4px 3px; border: 1px dotted #cccccc; }