From 53f71bea13592e26f095b9bfaf538f8583c99080 Mon Sep 17 00:00:00 2001 From: Roman Perekhod Date: Mon, 22 May 2023 13:29:38 +0200 Subject: [PATCH] remove the email logo --- changelog/unreleased/remove-email-logo.md | 6 ++++++ services/notifications/pkg/email/email.go | 14 -------------- .../pkg/email/templates/html/email.html.tmpl | 9 --------- .../pkg/email/templates/html/img/logo-mail.gif | Bin 2284 -> 0 bytes 4 files changed, 6 insertions(+), 23 deletions(-) create mode 100644 changelog/unreleased/remove-email-logo.md delete mode 100644 services/notifications/pkg/email/templates/html/img/logo-mail.gif diff --git a/changelog/unreleased/remove-email-logo.md b/changelog/unreleased/remove-email-logo.md new file mode 100644 index 0000000000..5082e9216d --- /dev/null +++ b/changelog/unreleased/remove-email-logo.md @@ -0,0 +1,6 @@ +Enhancement: Remove the email logo + +Remove the email logo + +https://github.com/owncloud/ocis/issues/6359 +https://github.com/owncloud/ocis/pull/6361 diff --git a/services/notifications/pkg/email/email.go b/services/notifications/pkg/email/email.go index 6879051e13..e4779779f2 100644 --- a/services/notifications/pkg/email/email.go +++ b/services/notifications/pkg/email/email.go @@ -55,11 +55,6 @@ func RenderEmailTemplate(mt MessageTemplate, locale string, emailTemplatePath st if err != nil { return nil, err } - } else { - data, err = readImagesFs() - if err != nil { - return nil, err - } } return &channels.Message{ @@ -97,15 +92,6 @@ func executeTemplate(tpl *template.Template, vars any) (string, error) { return writer.String(), nil } -func readImagesFs() (map[string][]byte, error) { - dir := filepath.Join(imgDir) - entries, err := templatesFS.ReadDir(dir) - if err != nil { - return nil, err - } - return read(entries, templatesFS) -} - func readImages(emailTemplatePath string) (map[string][]byte, error) { dir := filepath.Join(emailTemplatePath, imgDir) entries, err := os.ReadDir(dir) diff --git a/services/notifications/pkg/email/templates/html/email.html.tmpl b/services/notifications/pkg/email/templates/html/email.html.tmpl index 5ba3adda1a..f7345fe96c 100644 --- a/services/notifications/pkg/email/templates/html/email.html.tmpl +++ b/services/notifications/pkg/email/templates/html/email.html.tmpl @@ -5,15 +5,6 @@ - - - - - - -
  - logo-mail -
 
  diff --git a/services/notifications/pkg/email/templates/html/img/logo-mail.gif b/services/notifications/pkg/email/templates/html/img/logo-mail.gif deleted file mode 100644 index c8bb0c7e51a85e1cc69c7fceeb421f8e8540f274..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2284 zcmb`G`6JW)1Hj)qutsZIm?J(YIVO}cx;A6Es#Rk3P-Epvay^vPvoS}`IUXitm?G4e zvphM=tx1kVO{7CgA*z+<`}_~z*B|iu>Ge8jPbFGv1QJMFyo9Py{P1lhO-+tNc0 zow@9E`qE)Wg!8#;C%pc0@n*SSh&de)bLL{KM^HQ?Fz#$$~6D+tD-B-u<+#Yp}IbJo;j4WLz@*{MG#DuOB~snVVnu@bR;Z7DX1K$Z6Z4 zbZpVORQW9j6}H-~*R#iLv)`cafHiPb-hM>IgoZags%myjbJq#2-7b)Yt2WV9*Xq=k zJ*V{cxoz9;u7AMYfOOiBbjFCxAXqbuDIVKxJWXtwrc|cc!L#P}Ub`KAES!9ahkPv$ z`&k`1znA8}|5(6*;{hb+i`Fhdc7Ob7?-u6Z9`1NL{D?=yv9ni?pSw!;WxM*YPWnat z;U9hKe3aV-4l^{tGvvBwaJ*MolFy|S@9<>5h*aOpDgKdZ=dW-BuBKmzObh%g^WwFP zVD{f3QCXK_bFN&^i-^ySN-bok@L9v-86_z*NEUnAGU0YCAS8}gOaQ8uR<^7_H#yg_sirUulnwFZTPSJzM)%PD& zHFk9N4?pgE_NaI0$+H&&L*xBVpZ5)p&Agopjn2B7m>-#tcT3oGuc7^JeOukbuG)V( z>zlhpV8pZwF&KR7ZW9)8g^Fg*3*qznM>0O3E`e@_6^8i1iR?1cQ* zXcW%StxH(g9*5O+$g`^|dX$LY={M0;Ros~hQ4%!ls|DQ|`p56Mbyt`4W}7m5^6W*o z`g4gPA11m*x1SV{qS2cjYDx!-?J^AAduqytZqte#@*QgL442bIev>`5<)il)?FpM5 z>nfg$e1`70_tsUus1Ka($#<;3J1JDRVl?*Fn~d+YzJ)}I`|UP2$KyhF9Ssmp1EjgZ zO{YfRn4KqqL~*5Iv8abnk(U|9lOfOiJ+9w%?$^%c@-zx?nO4h*qYWVs1haJYlJR`k zse~*_%BSfrigjQGNj2~yTo#wMdo?c=-7Pv_k8+gLRWUK#w-!+J{%De88vPkhAo)@` zzc6hf#r1tjXr(dwti?HPTMs2$e#?nODx+Gq4qDcsO`6=SF@dm6A#K6YN=!-2ixRFH zEGiOS$n3#)xB5C>!Q)f@#GZ$tv!ECO- zdsPRs_hb4g?E2F8biG&4WZBArvJqMG`34M%Ux^+6Eu)A4^5mnaR>~X8asp?VmI@*t zP@sS6599RMA19Q`l+tDq2|Vt>ow;i148IY=T6Ldp&UL@?6L}@d-G~93r*x&N_x2ba ztl?A-L*ZG(Ts2MR7jwpj;r12OImELs6fX-^Zw zkmLixsre?GtK9S6jbq>GdJc@|a2$4r$0vp@c2f&#Nl(LhOD$QO;ypVy)fYEqw*$dB zv8kCHB_bJ`dWH1GgtL3}%{+ zVz<2HaO%cGUoAZbrg&uigx2WVe7KE^LQ&Fs4#$`)=cmAF^?>^-!ujyzqw6*Z-jT5z z&=ad+6G-2ME{wU@jHZ&RE|9|`t_s%~9;n&B@=9nD8jC>gU0_*uY{8HS%?cdUTOd#* zslg479o{{VblGMI5TG9Nl?{R@3yGXosogf)ep0ReaYz!dZmegouxk^GtNd zBUScGCDJwPhJC>^mCy-35=43+VHg_?BYl)IR)|uw;$mQd6ij$&ySumzqFka%N%ZD< z85UBukh%>>P(kKgXz)Q4uyVl~)&LBQMIjTgV828gc#r9*^k*yhGrS?Xev1Jh$$Kkw zD6YeIsr8N3vr83$YiX=0&jPCqF`y0_ME-3TXB^5*M*7+iw@YGz^wS_E6o6!X$(T@G z)D;*@DI$QAMb(T)m-^)%6;aBI+ zF0u@HElABKMWFGHjLWKuLqklp0Y(SOO0g@d2J%80kg>Opu46lsWCsJ)0U*okEx~bI zT)dLMuXN(lh$- d$MQYa`U-}e<5-*8H(~st3Qv`vf3pDC^Dm5E04)Fj