From 1e7050304800ebd38d428f25bd972f186bea8c52 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Thu, 11 Jun 2009 14:00:22 +0000
Subject: [PATCH] Reverse-merged
 /alfresco/BRANCHES/DEV/IMAP3:r14500,14521,14560,14563,14632

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/messages/webclient.properties    |   4 ----
 config/alfresco/web-client-config-properties.xml |  12 ------------
 source/web/images/filetypes/eml.gif              | Bin 590 -> 0 bytes
 source/web/images/filetypes32/eml.gif            | Bin 1457 -> 0 bytes
 4 files changed, 16 deletions(-)
 delete mode 100755 source/web/images/filetypes/eml.gif
 delete mode 100755 source/web/images/filetypes32/eml.gif

diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index b013c1338b..8db5cad327 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -1727,10 +1727,6 @@ wf_adhoc_assignee=Assigned To
 # Email Server messages
 email.server.alias=Email Alias
 
-# Imap Server messages
-imap.attachments=Attachments
-imap.attachments.folder=Attachments Folder
-
 # Admin Console messages
 title_admin_console=Administration Console
 admin_console=Administration Console
diff --git a/config/alfresco/web-client-config-properties.xml b/config/alfresco/web-client-config-properties.xml
index 3aff50eb6b..7f27bf66c9 100644
--- a/config/alfresco/web-client-config-properties.xml
+++ b/config/alfresco/web-client-config-properties.xml
@@ -677,18 +677,6 @@
       </property-sheet>
    </config>
 
-   <!-- ******************************** -->
-   <!-- Configuration for Imap Server   -->
-   <!-- ******************************** -->
-   
-   <config evaluator="aspect-name" condition="imap:imapContent">
-      <property-sheet>
-         <show-association name="imap:attachment" display-label-id="imap.attachments" show-in-edit-mode="false"/>
-         <show-association name="imap:attachmentsFolder" display-label-id="imap.attachments.folder" show-in-edit-mode="false"/>
-      </property-sheet>
-   </config>
-   
-
    <!-- ********************************** -->
    <!-- Configuration for Email ID aspects -->
    <!-- ********************************** -->
diff --git a/source/web/images/filetypes/eml.gif b/source/web/images/filetypes/eml.gif
deleted file mode 100755
index 31ddcd03a0b148dcc693cd031755b97f1d279b2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 590
zcmb7>`%6=C0L5=*xUB5Xw>h)9${MRyYB{Hq#K*K|&FS2<Oqcn{45Fw=32B;kE$ElP
zg6M}_&a|`#(ZeF4elX4H9yedx^?}mlhR|=q7f!SPpu^$(cHr<i**RHBigKEwsYPm4
z0J!I&TyHe@O8V!k0=87xR2a)7wrtpQV9$j^14ka5S~&BGT?bboTzarZjGOquQcTuh
z>H<GhMJ6x7eFdKD;BF9)8FLI4?ql&GmY!kx^Y8=8{@CC4NWeY`U^@b*yJ)sU$XbH9
zo)Fd&Jl7jOVGU=W`W)$f8_m5Cv7J$Dr-*+q=K3W3hh1FX4(??f-!J3)_maT_7*60n
z$uXQrz9-^GlJ{dgMwA#yfh`TTBN)x#2huU7CZn2_5#MqhoCR<d@!zy?8HvL{97eDu
z#8Hf&Wf-p@Y$YbDF<FbLi~LXxrZ2;N74B>BG?3{A%$PCLgxMD2X~z6LEVSd71>P<!
zb%TG6-|w*e#mDd;%l{7Xir*TFs-tA9&DBpR|L(@Ro93qGTP;lzrtQvMCZXh9?D^W7
zN>g}VR^lP1A|aw$T(x~$sebceDb18e$A`w8Jrfm{r<7>}nXRHS`SH^y4Z$i|fiQ;&
zD?SyuUtJialI9CH`ZKx^gVAs2`eaG^mVnGOW|QVblA>teo}+Qe8EL6ZreNK{W5V1G
v*^TYiv3XBx%v!x)q^V3z*Qe;;$XjEx2HGO(dknMIc|j0E-xe8n)0FZr<BJ={

diff --git a/source/web/images/filetypes32/eml.gif b/source/web/images/filetypes32/eml.gif
deleted file mode 100755
index ac879afcdb6a356dabc464a408bce179fbbe19f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1457
zcmd6m|1;Ei9LHC_Evdtze2W!f$wWq!u6B25<!+){t$evf`hw|9S5Z@}SYP9)_QYY>
z7CD@yZx|J=UDVoLyR2_%DQ&4Oyr<7x&3tBFr~51J`NMObKR)L%&*y=#(7>PsXM!`~
zAHsJ5fV|d7US}e&GgUX+YJ_Ce?|}xqb&q|}Gv9B+{z$YFMgw$Dc4CqMkOhHkHzo<h
zrF)QgFDR&>pdraVTt-I{s%~H(jD><S43q~!^)vP&9F2s-cqFbof}Tgf1QXQJm@Ept
zVB+I3Fc}9^378^YHyi`g$=KKlm^rgNnvBL$VeSGxn*pybBh>}aTm?-Q%;(^9*)V?%
zO<aWqF8(SPUKin-0&F@DUKe9C`Dl`h&zHcPGFYrY)1{!TLNgVhtwysvcvpvB-iG&l
zSZaa~E%50feC~zi$FTfFT1Al8=*w#i<h4Zg9aHrkGqqsj%NBFBz(UhzrEVmt8?C1A
zTC1CEH0_(U_w1G)I;xxP)XfgM9<uhn^Kzf7uGdu~+=`yMYah62gs$3$+puR8O{Y61
z+K!2Qw2!>;5noN0H#X=CQh#laAB+Yf(Jqh$e;e6@OZTF|-MXhi+TK8r?*lm%AKkC(
z55|Vq0v!|~NJ7*0{fNs#V2pu{gy8ZpG!&|ROb68=P(>_D*4Q4wl}BOX7)-EmRWzt$
zaMf{qJPsy*!N=o~^f*kiVJZoY#xIFuFhv4PpMvSrNR|XMsW6j<<frhdG?@JrX4B#2
zZ!nhubD8+;CD3s2xi!?;uuuRCg}9~&USCI(`S7M37H^`d5`5tXEb`!OCA?kZd;`r^
z!n=BS-v~=B@Sznxw86&?_$UP3J<#2UPu;LQur{;*=Jx+G@;3uL0zpRb{$A_*CkR9!
z)S5Ujg!KctL=q)-SlA#cAht4U7@d4^38|K88<A|)9(&;0_A@SNVV3dqi{osIGZoHz
zFU$+b^!#w157YlyAbtOEXY%2@{;2`nDnAcVmi5>wg=cE%VDz>qiCfCAVJ4a{cn-3<
zk|X&Z^eCx`W!!_bZc3x)U_SAv=5#NI$*gEM-~{I+N?E>%B984UIXqt#zJ(&~L~bfK
zQ`Vtr%DIoys`#JsHze^FD}9^-*_|n47xlMDJp7sK@|d^Ej(2C>4x$fMcEt6jua+CO
z@>;B1cL#SPE-5|iiZH7yC%54DEhnW?)5H?vjrM+5a%tW<-OX0FY3G5>!Sc-PcAZ}t
zj;!xDv-gkhIXJ;5Z3`>x%b-M#h>Q$brTxWT9SU}?cPE=Hp|lGS&0{E`Uc9MJH>oko
zbLLnRn*_>YFTZ|T?s^typ~%#8<(-}jiC><WUCJ^a&|^{gwDpc%sKLvNxWXm!7)mOc
zbe2EjM$R-(a@ue|hiT*{sHb@}_HhnUZV@BIHrLZu3T&8H5=>0O&a(AxUJ7inFyzHr
zCc7U=i4Z#qi1p%i(L{D3Aud>{mw&pc$l7TO!*ZR;S);>Thhx?CjRdFIbHg?<Uws({
z8x|W{s+k_;jIEBDJBsv~o6BkLwSpDu=CWHsRGVXpvWBI$8W)8z*(Pm1)Y>G|oJQp3
z?I<$Nj^ea9Mzbu2+ODOHhw7Vu@eQ?3HA|$r*q`{b(6I94U!GmhmBmc^>dTRacGUqw
zV*`u*!h%QAKT-{QN292J_k5AGc0Bp2ZZ+Dp@YyT9@9Vjg5bIdQ(NKG{UAh&~52qrz
aJ$4BvR>ihd!K%a|L$^BQOtLa3?D-cXRm&v+