Changeset 3549

Timestamp:

Jul 4, 2007, 2:59:34 PM (16 years ago)

Author:

Martin Svensson

Message:

References #611. Added new icon and text on the delete button in trashcan-listpage.
Added item-is-used-icon for those child items which are deleted but not possible to delete from trashcan.

Location:

trunk/www

Files:

• images/delete_permanently.png (added)
• images/delete_permanently_disabled.png (added)
• views/trashcan/list_trash.jsp (modified) (1 diff)
• views/trashcan/view_item.jsp (modified) (4 diffs)

trunk/www/views/trashcan/list_trash.jsp

@@ -201 +201 @@
         />
         <tbl:button 
-          image="<%=totalCount > 0 ? "delete.gif" : "delete_disabled.gif"%>"
+          image="<%=totalCount > 0 ? "delete_permanently.png" : "delete_permanently_disabled.png"%>"
           onclick="deleteItems()" 
-          title="Delete&hellip;" 
-          tooltip="Delete the selected items" 
+          title="Delete permanently&hellip;" 
+          tooltip="Delete the selected items permanently" 
           disabled="<%=totalCount <= 0%>"
         />

trunk/www/views/trashcan/view_item.jsp

@@ -166 +166 @@
       frm.submit();
     }
+    function showUsingItems(itemType, itemId)
+    {
+      var url = 'index.jsp?ID=<%=ID%>&cmd=ViewUsingItems&item_type='+itemType+'&item_id='+itemId;
+      location.href = url;
+    }
     
   </script>
@@ -323 +328 @@
             boolean usedByIsRemoved = false;
             boolean usedByRemovable = false;
+            boolean usedByIsUsed = false;
             BasicItem usedBy = null;
             String usedByName = String.valueOf(proxy.getId());
@@ -330 +336 @@
               usedBy = proxy.getItem(dc);
               writePermissionOnUsedBy = usedBy.hasPermission(Permission.WRITE);
+              usedByIsUsed = usedBy.isUsed();
               if (usedBy instanceof Removable)
               {
@@ -385 +392 @@
                   tooltip="This item has been scheduled for deletion" 
                   visible="<%=usedByIsRemoved%>"
+                />
+                <base:icon 
+                  image="used.gif"
+                  tooltip="This item is used by other items"
+                  visible="<%=usedByIsRemoved &&  usedByIsUsed%>"
+                  onclick="<%="showUsingItems('" + usedBy.getType().name() + "', " +  usedBy.getId() + ")"%>"
                 />&nbsp;</tbl:header>
               <tbl:cell column="name"><%=Base.getLink(ID, HTML.encodeTags(usedByName), proxy.getType(), proxy.getId(), writePermissionOnUsedBy)%></tbl:cell>