From b9f82bee05e1dd3a7c20fc022308cc6e8740e99a Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Thu, 27 Apr 2006 09:02:38 +0000
Subject: [PATCH] Checkpoint for the Manage Deleted Items UI

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2718 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/messages/webclient.properties |  38 +++++
 .../web-client-config-forum-actions.xml       |   1 +
 .../alfresco/web/app/servlet/BaseServlet.java |   1 +
 .../org/alfresco/web/bean/TrashcanBean.java   | 137 ++++++++++++++++++
 source/web/WEB-INF/faces-config-beans.xml     |  19 ++-
 .../web/WEB-INF/faces-config-navigation.xml   |  33 +++++
 source/web/images/icons/delete_all.gif        | Bin 0 -> 970 bytes
 source/web/images/icons/delete_all_large.gif  | Bin 0 -> 778 bytes
 source/web/images/icons/recover.gif           | Bin 0 -> 553 bytes
 source/web/images/icons/recover_all.gif       | Bin 0 -> 553 bytes
 source/web/images/icons/recover_all_large.gif | Bin 0 -> 1304 bytes
 source/web/images/icons/recover_large.gif     | Bin 0 -> 1304 bytes
 source/web/images/icons/trashcan.gif          | Bin 0 -> 970 bytes
 source/web/images/icons/trashcan_large.gif    | Bin 0 -> 778 bytes
 source/web/jsp/users/users.jsp                |   4 +-
 15 files changed, 230 insertions(+), 3 deletions(-)
 create mode 100644 source/java/org/alfresco/web/bean/TrashcanBean.java
 create mode 100644 source/web/images/icons/delete_all.gif
 create mode 100644 source/web/images/icons/delete_all_large.gif
 create mode 100644 source/web/images/icons/recover.gif
 create mode 100644 source/web/images/icons/recover_all.gif
 create mode 100644 source/web/images/icons/recover_all_large.gif
 create mode 100644 source/web/images/icons/recover_large.gif
 create mode 100644 source/web/images/icons/trashcan.gif
 create mode 100644 source/web/images/icons/trashcan_large.gif

diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index 1f60914e0b..4211568f63 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -761,6 +761,44 @@ company_id=Company ID
 home_space_location=Home Space Location
 home_space_name=Home Space Name
 
+# Trashcan messages
+title_deleted_items=Deleted Items
+title_delete_all=Delete All Items
+title_recover_all=Recover All Items
+title_recover_listed=Recover Listed Items
+title_delete_listed=Delete Listed Items
+title_delete_item=Delete Item
+title_recover_item=Recover Item
+deleted_items=Deleted Items
+manage_deleted_items=Manage Deleted Items
+manage_deleted_items_description=Remove or recover previously deleted items
+recover_all_items=Recover All Items
+delete_all_items=Delete All Items
+deleted_items_info=Use the Search to find specific named deleted items and use the Filters to reduce the list.
+original_location=Original Location
+deleted_date=Date Deleted
+deleted_user=Deleted by User
+recover=Recover
+search_deleted_items=Search Deleted Items
+delete_item=Delete Item
+delete_item_info=Permanently delete an item from the deleted file store
+delete_item_confirm=Are you sure you want to permanently delete \"{0}\" from the deleted file store? The item cannot be recovered once this action has been performed.
+recover_item=Recover Item
+recover_item_info=Recover an item from the deleted file store
+recover_item_confirm=Are you sure you want to recover \"{0}\" from the deleted file store?
+delete_all_items=Delete All Items
+delete_all_items_info=Permanently delete all files and spaces from the deleted file store
+delete_all_items_confirm=Are you sure you want to permanently delete all files and spaces from the deleted file store? The items cannot be recovered once this action has been performed.
+recover_all_items=Recover All Items
+recover_all_items_info=Recover all files and spaces from the deleted file store
+recover_all_items_confirm=Are you sure you want to recover all the deleted files and spaces from the deleted file store?
+delete_listed_items=Delete Listed Items
+delete_listed_items_info=Permanently delete the listed files and spaces from the deleted file store
+delete_listed_items_confirm=Are you sure you want to permanently delete the listed deleted files and spaces from the deleted file store?  The items cannot be recovered once this action has been performed.
+recover_listed_items=Recover Listed Items
+recover_listed_items_info=Recover the listed files and spaces from the deleted file store
+recover_listed_items_confirm=Are you sure you want to recover the listed deleted files and spaces from the deleted file store?
+
 # Admin Console messages
 title_admin_console=Administration Console
 admin_console=Administration Console
diff --git a/config/alfresco/web-client-config-forum-actions.xml b/config/alfresco/web-client-config-forum-actions.xml
index b43f12eefc..e5c1f2eaa2 100644
--- a/config/alfresco/web-client-config-forum-actions.xml
+++ b/config/alfresco/web-client-config-forum-actions.xml
@@ -258,6 +258,7 @@
             <action idref="export_space" />
             <action idref="create_shortcut" />
             <action idref="take_ownership_space" />
+            <action idref="manage_space_users" />
             <action idref="manage_space_rules" />
             <action idref="discuss_node" />
             <action idref="create_forum_node" />
diff --git a/source/java/org/alfresco/web/app/servlet/BaseServlet.java b/source/java/org/alfresco/web/app/servlet/BaseServlet.java
index 2e8568a056..5f4a945015 100644
--- a/source/java/org/alfresco/web/app/servlet/BaseServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/BaseServlet.java
@@ -75,6 +75,7 @@ public abstract class BaseServlet extends HttpServlet
       validRedirectJSPs.add("/jsp/dialog/system-info.jsp");
       validRedirectJSPs.add("/jsp/forums/forums.jsp");
       validRedirectJSPs.add("/jsp/users/users.jsp");
+      validRedirectJSPs.add("/jsp/trashcan/trash-list.jsp");
    }
    
    private static Log logger = LogFactory.getLog(BaseServlet.class);
diff --git a/source/java/org/alfresco/web/bean/TrashcanBean.java b/source/java/org/alfresco/web/bean/TrashcanBean.java
new file mode 100644
index 0000000000..3e4882b9e2
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/TrashcanBean.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * 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.alfresco.web.bean;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.web.app.context.IContextListener;
+import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.ui.common.component.data.UIRichList;
+
+/**
+ * @author Kevin Roast
+ */
+public class TrashcanBean implements IContextListener
+{
+   /** NodeService bean reference */
+   protected NodeService nodeService;
+
+   /** SearchService bean reference */
+   protected SearchService searchService;
+   
+   /** Component reference for Deleted Items RichList control */
+   protected UIRichList itemsRichList;
+   
+   /** Search text */
+   private String searchText;
+   
+   
+   // ------------------------------------------------------------------------------
+   // Bean property getters and setters
+
+   /**
+    * @param nodeService        The NodeService to set.
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+
+   /**
+    * @param searchService      the search service
+    */
+   public void setSearchService(SearchService searchService)
+   {
+      this.searchService = searchService;
+   }
+   
+   /**
+    * @return Returns the itemsRichList.
+    */
+   public UIRichList getItemsRichList()
+   {
+      return this.itemsRichList;
+   }
+
+   /**
+    * @param itemsRichList  The itemsRichList to set.
+    */
+   public void setItemsRichList(UIRichList itemsRichList)
+   {
+      this.itemsRichList = itemsRichList;
+   }
+   
+   /**
+    * @return Returns the searchText.
+    */
+   public String getSearchText()
+   {
+      return this.searchText;
+   }
+
+   /**
+    * @param searchText The searchText to set.
+    */
+   public void setSearchText(String searchText)
+   {
+      this.searchText = searchText;
+   }
+   
+   /**
+    * @return the list of deleted items to display
+    */
+   public List<Node> getItems()
+   {
+      // TODO: need the following MapNode properties:
+      //          deletedDate, locationPath, displayPath, deletedUsername [only for admin user]
+      // TODO: get deleted items from deleted items store
+      //       use a search - also use filters by name/username
+      return Collections.<Node>emptyList();
+   }
+   
+   
+   // ------------------------------------------------------------------------------
+   // Action handlers
+   
+   // TODO:
+   //       need the following navigation outcomes
+   // DONE     deleteItem, recoverItem, recoverAllItems, deleteAllItems, recoverListedItems, deleteListedItems
+   //       need the following Action Handlers:
+   //          deleteItemOK, recoverItemOK, deleteAllItemsOK, recoverAllItemsOK, recoverListedItemsOK, deleteListedItemsOK
+   //       and following Action Event Handlers:
+   //          setupItemAction, search
+   //       and following getters:
+   //          listedItems, item (setup by setupItemAction!)
+   
+   
+   // ------------------------------------------------------------------------------
+   // IContextListener implementation
+
+   /**
+    * @see org.alfresco.web.app.context.IContextListener#contextUpdated()
+    */
+   public void contextUpdated()
+   {
+      if (this.itemsRichList != null)
+      {
+         this.itemsRichList.setValue(null);
+      }
+   }
+}
diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml
index e80288e5d2..c1c8347aae 100644
--- a/source/web/WEB-INF/faces-config-beans.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -1394,6 +1394,23 @@
       </managed-property>
    </managed-bean>
    
+   <managed-bean>
+      <description>
+         The bean that holds state for the Manage Deleted Items screen.
+      </description>
+      <managed-bean-name>TrashcanBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.TrashcanBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>searchService</property-name>
+         <value>#{SearchService}</value>
+      </managed-property>
+   </managed-bean>
+   
    <managed-bean>
       <description>
          Helper bean that caches the last item added to a multi
@@ -1404,8 +1421,8 @@
       <managed-bean-scope>session</managed-bean-scope>
    </managed-bean>
    
-   <!-- ==================== COMPONENT GENERATOR BEANS ==================== -->
    
+   <!-- ==================== COMPONENT GENERATOR BEANS ==================== -->
    <managed-bean>
       <description>
          Bean that generates a text field component
diff --git a/source/web/WEB-INF/faces-config-navigation.xml b/source/web/WEB-INF/faces-config-navigation.xml
index a484145a45..4ba20bbf82 100644
--- a/source/web/WEB-INF/faces-config-navigation.xml
+++ b/source/web/WEB-INF/faces-config-navigation.xml
@@ -174,6 +174,10 @@
          <from-outcome>saveEditSearch</from-outcome>
          <to-view-id>/jsp/dialog/edit-search.jsp</to-view-id>
       </navigation-case>
+      <navigation-case>
+         <from-outcome>manageDeletedItems</from-outcome>
+         <to-view-id>/jsp/trashcan/trash-list.jsp</to-view-id>
+      </navigation-case>
    </navigation-rule>
    
    <!-- Admin Console rules -->
@@ -1153,5 +1157,34 @@
          <to-view-id>/jsp/forums/forum.jsp</to-view-id>
       </navigation-case>
    </navigation-rule>
+   
+   <!-- Manage Deleted Items screen action outcomes -->
+   <navigation-rule>
+      <from-view-id>/jsp/trashcan/*</from-view-id>
+      <navigation-case>
+         <from-outcome>deleteItem</from-outcome>
+         <to-view-id>/jsp/trashcan/delete-item.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>recoverItem</from-outcome>
+         <to-view-id>/jsp/trashcan/recover-item.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>recoverAllItems</from-outcome>
+         <to-view-id>/jsp/trashcan/recover-all.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>deleteAllItems</from-outcome>
+         <to-view-id>/jsp/trashcan/delete-all.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>recoverListedItems</from-outcome>
+         <to-view-id>/jsp/trashcan/recover-listed.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>deleteListedItems</from-outcome>
+         <to-view-id>/jsp/trashcan/delete-listed.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
 
 </faces-config>
diff --git a/source/web/images/icons/delete_all.gif b/source/web/images/icons/delete_all.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4ee6ccfce4f019ea02c099c3d5971f589cfa7fd1
GIT binary patch
literal 970
zcmZ?wbhEHb<Yf?G_|CxK=jRs~7#JKJ91;=|8X6iI85t836Bid3A0MBPkdU9BUr<m`
zSXfw8R8&z>QCnMEUtizY*x1z6)ZE<M($dn}+S=CE*3r??)z#JA-QCmE)7#tI*VotI
z-#>BU#HmxKPM<z~#*7(r=FFKlZ{Fg?i<c}}vSP)Gl`B`SS+i#C+O_M}ty{l-{e}%2
zHg4RwY15|7n>TOUwr%_N?K^ht*u8uAzJ2=+9z1yH(4oVJ4<9*l<ml0($BrF4e*E}}
z6DLldJbC)`=`&}}oIQK?%9ShEu3fu+{rZg?H*Vj)efRF&d-v`=di3bovu7Vae*6yx
z45MH)1h9pG;!hSv1_mDn9grj_PcU#SXPC*6GHFrsK@n!*Lpu_dD7Hy(MmH2NEOh0T
z5S42vP`uzYNmXI0#7D=+t*nj0dQ&V6nOfL+#Wg$xIF#Dkl|2+hI2DuFIc8ZiU2sTr
zIKjkcm-$H|A(@p)iPuUcm1z-sqqL5Y!_;4sSB0*LTI{#B%JlWMjqzu@-f}gyH%Mvm
v@gyFYx{Qy(*iVFGQNrN}8JB`z21?3DLlne(mMADba&G4ltTW)`V6X-NG>^|W

literal 0
HcmV?d00001

diff --git a/source/web/images/icons/delete_all_large.gif b/source/web/images/icons/delete_all_large.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cfe75d348b54f6a400630de26c5e0223e61611ee
GIT binary patch
literal 778
zcmZ?wbhEHbRA5kGc*Xz%|NsC0_wV1|zkh%K{{8FMuOB~teEat8>({TJKYxDv_U+4;
zFP}Yo_Vnq~$B!RBdi3bw!-o$ZJh*@V{=Iwm?%ut7=gytmw{PFLapU^+>({PbyL$EN
zl`B^+U%q_){P}a|&YeAb_RN_xr%s(ZapJ`B<HwI3J9hNw(L;w0?ccwD@7}$8_UzfU
zYuC=5J9q5Zv32X#&6_uG+O%oo#*G^`Y*@d3{knDQ)~;Q<X3d(_t5>gDwQA+cl`B@P
zSiXGuvSrJbE?v50$&$s37cW}0XyL+z^XJc>H*enDxpU{tnKOI#>{+vB&73)N#*7)$
zr%#_YZQ9hSQ>RRsGI{dki4!OG_xJbq_V)Djba!`mb#--gbhNj(x3#skwzjskv@|z2
zH#IdiHa6DP)z#M4*3{HgS65e6Rh5^Qmz0zg6&2;?<^sbC9A;D_6o0ZXGBBhv=zvTF
z#R&uZ|Ay42=9bpB_Kr416)k&rcb|aJ2-D7KO^(()vw8UhMWO?yw`#iCnj3pM>KmGv
zSz6orML9XUy6R7lGglVjVq;?F<Q9^YSJlupwzPMO-L+@mfkQ`*oj7&o+;q*vC?7jx
z0~0F;7calS(5RS%#3YNwDdC0^9IRXdQi|$&7EazlTN)INSDl$A?PDfjaN&_l3zuF_
z&4cAfj_~QSZkL#OiLtTKP(v+b#v<m!oN}Qy2M$<xDZBS8xTak!e3)`-s-$_@ABjze
z&dkyX-L&UPQM%83lU%N|KPN3ev&6A*+ZE2u&;6GMbq1AoiM%+wa9USb?W@w4SC+Z2
zcVnIHp%cC}K7FRtRxZ<bH+QCN+~oSiEH`#@)Wu7>vrXTG?Qi)m_sTkA{hf`mviDng
z#5W}NvGdfteCfi@escPf6B7~>6+3wOwJHJ>AF*&NXxAiYMjYZ2k~2)%^NKO0Lr~Rs
Up2xyXs^JG8pP1aw#lm0>002O1+W-In

literal 0
HcmV?d00001

diff --git a/source/web/images/icons/recover.gif b/source/web/images/icons/recover.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c49ece5db07707b47c0c9eef3f993dd407d46a60
GIT binary patch
literal 553
zcmZ?wbhEHb6krfwc*Xz%|Ns9lSlL^@X(nfmC2z3<e~F_&frDVFlVGu<aFMe}xr<zr
zzjAGWL35--Pg=mV;)DeaqQ#El6|VA?o(k38I*lRrJ<0M_9?CUdHZ#*y>wVPfyfqs9
zG#mZ2>U|Acf-JftLswOpb%c4(&h(j+6|%HAaYJ3|hI;4z*vPp##XH+mmX_qLtF7DD
zo3pwqb6HvS&W^@?y{!i)Htgt_aD3XNW78V9G*3S@Yu>rJT{}7!Usy0{U*FP;3zuD3
zu<G*SRhJg6xw3S__2rvytk`;U<@Q^vw%=H}>-L&Gch>H^yKcv|Wt%T9I(UEm(TAH3
z-`{Zj(dJW+w;Z~)`ox2cXP#_5dS~sqr`s+(+kW}^j_WUX-+I00-rIc--yL}R;n1s3
zM}WZs4j$SPia%Kx85rUibU@aC;)H>{ts$<dxuvy@ow=<`#HzEaMLfh?u)movFxE@c
zKubZ4sg=(rCMqH<z|X@)Uuc?nbYyt2ucxb%y|tNivwTpfzmL1KqphWdsgY>2jGKpp
zj<TGrqM@;#N{ghOi9idVs<sAyi-d09G&Ob3R+i_@!b;q2@0tXpIHtDpu>EXd<^9X1
KSs}o|U=0A9_sOXM

literal 0
HcmV?d00001

diff --git a/source/web/images/icons/recover_all.gif b/source/web/images/icons/recover_all.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c49ece5db07707b47c0c9eef3f993dd407d46a60
GIT binary patch
literal 553
zcmZ?wbhEHb6krfwc*Xz%|Ns9lSlL^@X(nfmC2z3<e~F_&frDVFlVGu<aFMe}xr<zr
zzjAGWL35--Pg=mV;)DeaqQ#El6|VA?o(k38I*lRrJ<0M_9?CUdHZ#*y>wVPfyfqs9
zG#mZ2>U|Acf-JftLswOpb%c4(&h(j+6|%HAaYJ3|hI;4z*vPp##XH+mmX_qLtF7DD
zo3pwqb6HvS&W^@?y{!i)Htgt_aD3XNW78V9G*3S@Yu>rJT{}7!Usy0{U*FP;3zuD3
zu<G*SRhJg6xw3S__2rvytk`;U<@Q^vw%=H}>-L&Gch>H^yKcv|Wt%T9I(UEm(TAH3
z-`{Zj(dJW+w;Z~)`ox2cXP#_5dS~sqr`s+(+kW}^j_WUX-+I00-rIc--yL}R;n1s3
zM}WZs4j$SPia%Kx85rUibU@aC;)H>{ts$<dxuvy@ow=<`#HzEaMLfh?u)movFxE@c
zKubZ4sg=(rCMqH<z|X@)Uuc?nbYyt2ucxb%y|tNivwTpfzmL1KqphWdsgY>2jGKpp
zj<TGrqM@;#N{ghOi9idVs<sAyi-d09G&Ob3R+i_@!b;q2@0tXpIHtDpu>EXd<^9X1
KSs}o|U=0A9_sOXM

literal 0
HcmV?d00001

diff --git a/source/web/images/icons/recover_all_large.gif b/source/web/images/icons/recover_all_large.gif
new file mode 100644
index 0000000000000000000000000000000000000000..035d0764208c35b46ecada9a2cd8eaefa42eb8a8
GIT binary patch
literal 1304
zcmc)J+glO_00nRwYWQV^mzJe0b5>e@tF~$?WeBC<rN~On)Olf+MYg=BSw>`9h#~@l
zi698#g#ZB+Lj+L}Q}LRbm87YeU0hjf+c%f{Cw3mr^Lh9kKa{VBXN(hI3*a+gCCkgp
z(DI9im{=dyB?SBO?$W5A7_q*b-%#A7U9|8(Uh;8%YH)R$O9^^A<>V<r`stdCu-dE6
zB|#p{U(VKNMGCJ)3A3HZC{$HKjOcot_y$It6EC@$AicGX>VKd-6j>FImEnJ8h6L9n
zUXtSz<+m?4=9(5~zAf@_C_V`1M8=9UlAG?ND)Q1>?xrd7dBY91h5H=HUXElagnY=E
z>f=m-ZKEOF=)SucetXM<yjZ6XbHibr@ME>-A|)x<=A5jyf~zfe^L2DuFHbh1(oQ`Z
zoFCg!3U{R=+!=mQ_DMMROtd&TOL^~_l91h6aJ{wQhKdO1h9)*%&ruO^ZH0$8=orbB
zTn*{AnsleV7+D<_FHOO#iFxhCr|V;}jp>)0ucoxz$WY?$X~_j0lq5wav6E8RNhRrM
z*rw!5O{v)`d_gCftS|jlcJZ7Xo36~hsm`Tz(a+1V*{U3>fnM6ppcxox$_%Q3R`%#V
zqq_{JxmBnuyx()bqL<0+DbMS;U1?;o`zngM2$g*mM15XWKbzan<PTKx`q?FhdzHpA
z!62t@xT<!D%jh8qhk0xxwW5#mV1y?c;d2K{C6B8mkNFLw)v_^xe5|H%yhc7I5REdM
zpVTUz)U{01sh$a2p9+-|^|EnR^8`oz>_PjaSUV}!JQpdSRq0+dbWKV1FB)_vNr$Q4
zFeUAtmi4@p_e{(BUdsDt8V6^ahUS`w=M<y!EhDcK<F6l%%|CqlrgdULIr&!g{Ef==
zwr%>odg`6}<$KM{V*9J#wR4N@uRnAweC&9)q<j0ZbMce@!{@H0KMWr~cYTHTAHe^!
zwtg{N1po{I+*d}dd;$Pk1_&%2k!U9p4rII2WpqlXxwAei`U*(wjDQMV!|O)diBf`t
zXC{H_AE(Dd_&!;=hG|r863a7A?mk4^;&H{sEy)G5-m{nCh6urqFj4fKXS}rA2{xNx
z1lWT0EM0=p<yrz~0yYZ6#bJUU_s^dwbAe`75)gx7;%Jp(MqwThQX9<oP8~mj8nEB&
z0}h7#`6={4WHYwESmr<Mc7o{<S!{-~cJ>a)+_QkAjD|!-sqb$4E8mufEVAEVW9QoE
z0D)O_7MVc82vJ%9X`nmQ=KG^Ki!W-RUk}akD5e{U58E53tAr&m{(fR)d1p@6dB*t$
zY;bTbv0bWJ@?Q{~ARR|skSdNdy)F)ve&yhA_Z=M6`_G_ZDDhaCJI-Q*hdz4JDiE`1
zZhtmnYlrP_Q8dD*;ptXG6b%py1Rq?Bhg%(<nAF;#txWJW+b3Dnq~r+PX2=iL82noA
zHlxPUIb)B;$Ig(Gdm&Ma1lt^_L*rIMuwYzKL;hamCiuDpprzyaXderx>%Ov$m?J2(
z_5KL-O*61wWW)w#pp5ICju-*Jc&6Je1`xvj2DrurJWEemCk2{=>_oG0)0tD+)n-<E
s<^n+MA{=0KpneVxwP(R9c9@&mfa0JUu(f?)8;1{q#IUSatpY&*1%3Zn&Hw-a

literal 0
HcmV?d00001

diff --git a/source/web/images/icons/recover_large.gif b/source/web/images/icons/recover_large.gif
new file mode 100644
index 0000000000000000000000000000000000000000..035d0764208c35b46ecada9a2cd8eaefa42eb8a8
GIT binary patch
literal 1304
zcmc)J+glO_00nRwYWQV^mzJe0b5>e@tF~$?WeBC<rN~On)Olf+MYg=BSw>`9h#~@l
zi698#g#ZB+Lj+L}Q}LRbm87YeU0hjf+c%f{Cw3mr^Lh9kKa{VBXN(hI3*a+gCCkgp
z(DI9im{=dyB?SBO?$W5A7_q*b-%#A7U9|8(Uh;8%YH)R$O9^^A<>V<r`stdCu-dE6
zB|#p{U(VKNMGCJ)3A3HZC{$HKjOcot_y$It6EC@$AicGX>VKd-6j>FImEnJ8h6L9n
zUXtSz<+m?4=9(5~zAf@_C_V`1M8=9UlAG?ND)Q1>?xrd7dBY91h5H=HUXElagnY=E
z>f=m-ZKEOF=)SucetXM<yjZ6XbHibr@ME>-A|)x<=A5jyf~zfe^L2DuFHbh1(oQ`Z
zoFCg!3U{R=+!=mQ_DMMROtd&TOL^~_l91h6aJ{wQhKdO1h9)*%&ruO^ZH0$8=orbB
zTn*{AnsleV7+D<_FHOO#iFxhCr|V;}jp>)0ucoxz$WY?$X~_j0lq5wav6E8RNhRrM
z*rw!5O{v)`d_gCftS|jlcJZ7Xo36~hsm`Tz(a+1V*{U3>fnM6ppcxox$_%Q3R`%#V
zqq_{JxmBnuyx()bqL<0+DbMS;U1?;o`zngM2$g*mM15XWKbzan<PTKx`q?FhdzHpA
z!62t@xT<!D%jh8qhk0xxwW5#mV1y?c;d2K{C6B8mkNFLw)v_^xe5|H%yhc7I5REdM
zpVTUz)U{01sh$a2p9+-|^|EnR^8`oz>_PjaSUV}!JQpdSRq0+dbWKV1FB)_vNr$Q4
zFeUAtmi4@p_e{(BUdsDt8V6^ahUS`w=M<y!EhDcK<F6l%%|CqlrgdULIr&!g{Ef==
zwr%>odg`6}<$KM{V*9J#wR4N@uRnAweC&9)q<j0ZbMce@!{@H0KMWr~cYTHTAHe^!
zwtg{N1po{I+*d}dd;$Pk1_&%2k!U9p4rII2WpqlXxwAei`U*(wjDQMV!|O)diBf`t
zXC{H_AE(Dd_&!;=hG|r863a7A?mk4^;&H{sEy)G5-m{nCh6urqFj4fKXS}rA2{xNx
z1lWT0EM0=p<yrz~0yYZ6#bJUU_s^dwbAe`75)gx7;%Jp(MqwThQX9<oP8~mj8nEB&
z0}h7#`6={4WHYwESmr<Mc7o{<S!{-~cJ>a)+_QkAjD|!-sqb$4E8mufEVAEVW9QoE
z0D)O_7MVc82vJ%9X`nmQ=KG^Ki!W-RUk}akD5e{U58E53tAr&m{(fR)d1p@6dB*t$
zY;bTbv0bWJ@?Q{~ARR|skSdNdy)F)ve&yhA_Z=M6`_G_ZDDhaCJI-Q*hdz4JDiE`1
zZhtmnYlrP_Q8dD*;ptXG6b%py1Rq?Bhg%(<nAF;#txWJW+b3Dnq~r+PX2=iL82noA
zHlxPUIb)B;$Ig(Gdm&Ma1lt^_L*rIMuwYzKL;hamCiuDpprzyaXderx>%Ov$m?J2(
z_5KL-O*61wWW)w#pp5ICju-*Jc&6Je1`xvj2DrurJWEemCk2{=>_oG0)0tD+)n-<E
s<^n+MA{=0KpneVxwP(R9c9@&mfa0JUu(f?)8;1{q#IUSatpY&*1%3Zn&Hw-a

literal 0
HcmV?d00001

diff --git a/source/web/images/icons/trashcan.gif b/source/web/images/icons/trashcan.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4ee6ccfce4f019ea02c099c3d5971f589cfa7fd1
GIT binary patch
literal 970
zcmZ?wbhEHb<Yf?G_|CxK=jRs~7#JKJ91;=|8X6iI85t836Bid3A0MBPkdU9BUr<m`
zSXfw8R8&z>QCnMEUtizY*x1z6)ZE<M($dn}+S=CE*3r??)z#JA-QCmE)7#tI*VotI
z-#>BU#HmxKPM<z~#*7(r=FFKlZ{Fg?i<c}}vSP)Gl`B`SS+i#C+O_M}ty{l-{e}%2
zHg4RwY15|7n>TOUwr%_N?K^ht*u8uAzJ2=+9z1yH(4oVJ4<9*l<ml0($BrF4e*E}}
z6DLldJbC)`=`&}}oIQK?%9ShEu3fu+{rZg?H*Vj)efRF&d-v`=di3bovu7Vae*6yx
z45MH)1h9pG;!hSv1_mDn9grj_PcU#SXPC*6GHFrsK@n!*Lpu_dD7Hy(MmH2NEOh0T
z5S42vP`uzYNmXI0#7D=+t*nj0dQ&V6nOfL+#Wg$xIF#Dkl|2+hI2DuFIc8ZiU2sTr
zIKjkcm-$H|A(@p)iPuUcm1z-sqqL5Y!_;4sSB0*LTI{#B%JlWMjqzu@-f}gyH%Mvm
v@gyFYx{Qy(*iVFGQNrN}8JB`z21?3DLlne(mMADba&G4ltTW)`V6X-NG>^|W

literal 0
HcmV?d00001

diff --git a/source/web/images/icons/trashcan_large.gif b/source/web/images/icons/trashcan_large.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cfe75d348b54f6a400630de26c5e0223e61611ee
GIT binary patch
literal 778
zcmZ?wbhEHbRA5kGc*Xz%|NsC0_wV1|zkh%K{{8FMuOB~teEat8>({TJKYxDv_U+4;
zFP}Yo_Vnq~$B!RBdi3bw!-o$ZJh*@V{=Iwm?%ut7=gytmw{PFLapU^+>({PbyL$EN
zl`B^+U%q_){P}a|&YeAb_RN_xr%s(ZapJ`B<HwI3J9hNw(L;w0?ccwD@7}$8_UzfU
zYuC=5J9q5Zv32X#&6_uG+O%oo#*G^`Y*@d3{knDQ)~;Q<X3d(_t5>gDwQA+cl`B@P
zSiXGuvSrJbE?v50$&$s37cW}0XyL+z^XJc>H*enDxpU{tnKOI#>{+vB&73)N#*7)$
zr%#_YZQ9hSQ>RRsGI{dki4!OG_xJbq_V)Djba!`mb#--gbhNj(x3#skwzjskv@|z2
zH#IdiHa6DP)z#M4*3{HgS65e6Rh5^Qmz0zg6&2;?<^sbC9A;D_6o0ZXGBBhv=zvTF
z#R&uZ|Ay42=9bpB_Kr416)k&rcb|aJ2-D7KO^(()vw8UhMWO?yw`#iCnj3pM>KmGv
zSz6orML9XUy6R7lGglVjVq;?F<Q9^YSJlupwzPMO-L+@mfkQ`*oj7&o+;q*vC?7jx
z0~0F;7calS(5RS%#3YNwDdC0^9IRXdQi|$&7EazlTN)INSDl$A?PDfjaN&_l3zuF_
z&4cAfj_~QSZkL#OiLtTKP(v+b#v<m!oN}Qy2M$<xDZBS8xTak!e3)`-s-$_@ABjze
z&dkyX-L&UPQM%83lU%N|KPN3ev&6A*+ZE2u&;6GMbq1AoiM%+wa9USb?W@w4SC+Z2
zcVnIHp%cC}K7FRtRxZ<bH+QCN+~oSiEH`#@)Wu7>vrXTG?Qi)m_sTkA{hf`mviDng
z#5W}NvGdfteCfi@escPf6B7~>6+3wOwJHJ>AF*&NXxAiYMjYZ2k~2)%^NKO0Lr~Rs
Up2xyXs^JG8pP1aw#lm0>002O1+W-In

literal 0
HcmV?d00001

diff --git a/source/web/jsp/users/users.jsp b/source/web/jsp/users/users.jsp
index 875eb30e9b..cec237c38e 100644
--- a/source/web/jsp/users/users.jsp
+++ b/source/web/jsp/users/users.jsp
@@ -144,11 +144,11 @@
                               </table>
                               <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
                               
-                              <div style="padding: 6px;" />
+                              <div style="padding: 6px;"></div>
                               <h:inputText id="search-text" value="#{UsersBean.searchCriteria}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />&nbsp;
                               <h:commandButton id="search-btn" value="#{msg.search}" action="#{UsersBean.search}" disabled="true" />&nbsp;
                               <h:commandButton value="#{msg.show_all}" action="#{UsersBean.showAll}" />
-                              <div style="padding: 6px;" />
+                              <div style="padding: 6px;"></div>
                               
                               <a:richList id="users-list" binding="#{UsersBean.usersRichList}" viewMode="details" pageSize="10"
                                     styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"