From 78b6dfe21e8f73e11cf9bd68b0a17dff36cb6beb Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Tue, 9 Oct 2007 10:59:55 +0000
Subject: [PATCH] Fixed a couple of issues in converted trashcan item details
 dialog

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6937 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/web-client-config-actions.xml | 28 +++++++++++++++++++
 config/alfresco/web-client-config-dialogs.xml |  2 +-
 .../web/bean/TrashcanItemDetailsDialog.java   | 18 ++++--------
 source/web/jsp/trashcan/item-details.jsp      | 12 ++------
 4 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml
index e088456f6c..5f8a753313 100644
--- a/config/alfresco/web-client-config-actions.xml
+++ b/config/alfresco/web-client-config-actions.xml
@@ -705,6 +705,28 @@
                <param name="groupName">#{actionContext.groupName}</param>
             </params>
          </action>
+         
+         <!-- recover item action -->
+         <action id="recover_item">
+            <label-id>recover</label-id>
+            <image>/images/icons/recover.gif</image>
+            <action>dialog:recoverItem</action>
+            <action-listener>#{DialogManager.setupParameters}</action-listener>
+            <params>
+               <param name="id">#{actionContext.id}</param>
+            </params>
+         </action>
+         
+         <!-- delete item action -->
+         <action id="delete_item">
+            <label-id>delete</label-id>
+            <image>/images/icons/delete.gif</image>
+            <action>dialog:deleteItem</action>
+            <action-listener>#{DialogManager.setupParameters}</action-listener>
+            <params>
+               <param name="id">#{actionContext.id}</param>
+            </params>
+         </action>
 
          <!-- the 'action-group' elements define unique blocks of actions that reference the actions
               as defined above and can override or supply display elements for the group of actions -->
@@ -900,6 +922,12 @@
             <action idref="delete_group" />
          </action-group>
          
+         <action-group id="deleteditem_actions">
+            <style-class>inlineAction</style-class>
+            <action idref="recover_item" />
+            <action idref="delete_item" />
+         </action-group>
+         
       </actions>
    </config>
 
diff --git a/config/alfresco/web-client-config-dialogs.xml b/config/alfresco/web-client-config-dialogs.xml
index 8b9378a91b..23d62232e4 100644
--- a/config/alfresco/web-client-config-dialogs.xml
+++ b/config/alfresco/web-client-config-dialogs.xml
@@ -414,7 +414,7 @@
          
          <dialog name="itemDetails" page="/jsp/trashcan/item-details.jsp" managed-bean="TrashcanItemDetailsDialog"
                  icon="/images/icons/details_large.gif" description-id="deleteditem_details_description" 
-                 show-ok-button="false" />
+                 show-ok-button="false" actions-config-id="deleteditem_actions" />
          
          <dialog name="recoverItem" page="/jsp/trashcan/recover-item.jsp" managed-bean="TrashcanRecoverItemDialog"
                  icon="/images/icons/recover_large.gif" title-id="recover_item"
diff --git a/source/java/org/alfresco/web/bean/TrashcanItemDetailsDialog.java b/source/java/org/alfresco/web/bean/TrashcanItemDetailsDialog.java
index 67789a1507..434b360a05 100644
--- a/source/java/org/alfresco/web/bean/TrashcanItemDetailsDialog.java
+++ b/source/java/org/alfresco/web/bean/TrashcanItemDetailsDialog.java
@@ -26,16 +26,13 @@ package org.alfresco.web.bean;
 
 import javax.faces.context.FacesContext;
 
-import org.alfresco.service.cmr.repository.Path;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.web.app.Application;
-
 import org.alfresco.web.bean.repository.Node;
 
 public class TrashcanItemDetailsDialog extends TrashcanDialog
 {
    private static final String MSG_DETAILS_OF = "details_of";
-   private static final String MSG_ORIGINAL_LOCATION = "original_location";
    private static final String MSG_CLOSE = "close";
    
    protected PermissionService permissionService;
@@ -52,15 +49,6 @@ public class TrashcanItemDetailsDialog extends TrashcanDialog
       return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DETAILS_OF) + " '" + 
              property.getItem().getName() + "'";
    }
-   
-   @Override
-   public String getContainerSubTitle()
-   {
-      Path path = (Path) property.getItem().getProperties().get("locationPath");
-      
-      return Application.getMessage(FacesContext.getCurrentInstance(), MSG_ORIGINAL_LOCATION) + ": " + 
-             path.toDisplayPath(nodeService, permissionService);
-   }
 
    @Override
    public String getCancelButtonLabel()
@@ -68,6 +56,12 @@ public class TrashcanItemDetailsDialog extends TrashcanDialog
       return Application.getMessage(FacesContext.getCurrentInstance(), MSG_CLOSE);
    }
    
+   @Override
+   public Object getActionsContext()
+   {
+      return getItem();
+   }
+
    public Node getItem()
    {
       return property.getItem();
diff --git a/source/web/jsp/trashcan/item-details.jsp b/source/web/jsp/trashcan/item-details.jsp
index 24ea40c929..7d50a8488b 100644
--- a/source/web/jsp/trashcan/item-details.jsp
+++ b/source/web/jsp/trashcan/item-details.jsp
@@ -28,6 +28,9 @@
 <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
+<h:outputText value="#{msg.original_location}: " styleClass="mainSubTitle" />
+<r:nodePath value="#{TrashcanDialogProperty.item.properties.locationPath}" breadcrumb="true" actionListener="#{BrowseBean.clickSpacePath}" showLeaf="true" />
+<f:verbatim><div style="padding:4px"></div></f:verbatim>
 
 <a:panel label="#{msg.view_links}" id="link-panel" progressive="true"
 border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white">
@@ -87,15 +90,6 @@ columns="1" mode="view" labelStyleClass="propertiesLabel" externalConfig="true"
 
 </f:verbatim>
 </a:panel>
-<f:verbatim><div style="padding:4px"></div></f:verbatim>
-<a:panel label="#{msg.actions}" id="actions-panel" border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" style="text-align:center;white-space:nowrap" progressive="true">
-<a:actionLink value="#{msg.recover}" image="/images/icons/recover.gif" action="dialog:recoverItem" padding="3">
-<f:param name="id" value="#{TrashcanDialogProperty.item.id}" />
-</a:actionLink>
-<a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" action="dialog:deleteItem" padding="3">
-<f:param name="id" value="#{TrashcanDialogProperty.item.id}" />
-</a:actionLink>
-</a:panel>