From 607f205bdae89086267eeaa18810017347d3592f Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 3 Mar 2014 12:21:08 +0100 Subject: [PATCH 1/3] mail template: remove off-white background color to better blend into mail client --- core/templates/mail.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/templates/mail.php b/core/templates/mail.php index b8b0a2bfe9..c46fd6ab80 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.php @@ -7,10 +7,10 @@ <?php p($theme->getName()); ?> -  +  -  - +  + t('Hey there,

just letting you know that %s shared %s with you.
View it!

', array($_['user_displayname'], $_['filename'], $_['link']))); if ( isset($_['expiration']) ) { @@ -21,17 +21,17 @@ p($l->t('Cheers!')); ?> -  +  -  ---
+  +--
getName()); ?> - getSlogan()); ?>
getBaseUrl());?> -  +  From eac9eebfdb3f7e3770ee70f35d3528a7fa31d153 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 3 Mar 2014 12:42:58 +0100 Subject: [PATCH 2/3] compress mail notification logo --- core/img/logo-mail.gif | Bin 2196 -> 1191 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/core/img/logo-mail.gif b/core/img/logo-mail.gif index 6a1caaa9188d02bb3001b74d3525d77b58934d2a..f1dd108450e80345b170c5a9828289cae4687891 100644 GIT binary patch literal 1191 zcmV;Y1X%k=Nk%w1VW0pi0Q3L=9W6vAHA^i#Q71M`I7V7PPGLz_Xi;8pSY&l$ZhmWZ zg>-(5e1(&Vk)4B#nU0pBl$)lUqphT?w6eFqtg^bdyu-c0$im0X$js8z*WAw1*WBLX z-r?ls=j#9e|L*VcA^8LV00000EC2ui0H6RW000I4ARvxpX`X1Ru59bRa4gSsZQppV z?|kq7z@TtQEE;ME6Wfce>7Xr744+Mu>y6va~>9!njP(TByEEx*G)6&4-E@@>f z1i*6;A%S%3P9ea6M8O0b^ZF!!P;m={0~-DwASiI4TBeO1Kh6*k08ShY21=GW5RRO= zGy)h<*x&``5sxttOdv#nOq`86w_pfq=7Fgx2|7ryB*Lf>q%N*(5r8N_)G`5znYmC! zLWX`_IUbeCVqzy(X5OCVw=j-_DGM-MjT_TN1T%x;Ojxj2%L0gUkX$5i!fO$*D-Ogl zV6)7F!;L*ecpxbP5(y0}%l%4M1xYgz7{q}vDzpO%k}w?L@BxF>5d}7s2wuWK1`-6^ z_HJJ zBaDww(1GB90~BOH831VwX5DHdF#gcN0?r^%0R}Ezhk|w^II!S=B4DP1T4h84i3b%B zz=Q<@gysQWh`5wt25#Udf{Os?S6>Ghiok$eFe-r{0O-^RzysR>AYpbvBCvsq`+UYMXkQP`P4Apjd3aDs*@ zbQXsK0R$w0Yda%S^`QU{!A9>2$P;rDFB0@@W2D^Tsdd2l_Ana91ZYMk^-cGl4c26 zhFhGtBOJhyv?Nd~LSP0O@GP1qtSLe+CjbmU2XIyBs0-~r#Uusw86=5wpZ1Y%!V0iB zu$&{11Xl!>;#=<@Be<1tTJQ2mV+lZ7mjRML2AV(y%8t;1m@i0K#s&sJxrN3e+*6e) z=)@7HkR3E&z<=`5hjc#iaiCxWY)HU?6e5eD?+96KL$ud!`|Y^ruKVu1_ijT7 F06Rxl+d=>U literal 2196 zcmcK4i9geg0|)T$He=3a$+KL|)x#*WTv48Fj5*sJx#pHz?ve-1oZGCHyO1--qFj%J zJagstNbV>TB}$4O>FKGT=a2ZkU!OnW^ZA%tm>KAMmjP(tEda=$GF3QDJfTHIX_+Zv z%oVjsN?4Ne84DF1OI01Kle$*F>RGGl+o&7Zs-Lw*pS_@ANY*qWpE^f5ecn#%ygkO) z9`l=nHqH@?zoonl^PJ|9(c_oDBd$T-ZSKPuh0bV&;*~bMBmFv ze&N^sBWVFq^uTC(P)tg2Y-&hsTIiLuu&e2p<1)gpWrW9PM#M9s5}476teB*%E7#fA zQaJG`w|-B}PDsm6OwUQm$W6-3yPlaxW8^0@3+SxEl&r#3_U$zGo%9<;={JiqIK`Q_ zN*K3FnAvw(Ii*>-W$e7N8~Noo@+)o@RB{R{Z{4oSDXPvbs?IB}$uFtRzgt^ST31-g zy~H$VEb^>NQ19X)NGeUG~O+n@A5?jGpm4R-McpY#kp=^gIw z8|Dp+_6&^mJ{{{D9Pb~R7#RNR>B!{Z=(C}*sp0Xdk%{M{6VqdpGvm)@C#L59dOkP# zeE!+=!qm*-^V!Aexfj!OOEdG!vkS{}i!bM2yjoa#wYaqMVwu16a&_s|>hj9#m;AL? z{PmU9b^hx&t7~sxuWzg!=FPkHx0`P^Hs8M6+Sq*mZu7(D)`zY4+wZq`K78Eyxbu1E z)9$CwySuwzcK5z~`FsEG{jd994;>sFeEat8pZ|RS{{7!WKMwu;`SY-)|EFjIhyL3F z0Q&)eU~;6!vYr&!Q8aa^vAiz>u54LMYN{AuAKt=_4P396 zu4YU>Y!al(Yan`?OQ^WSe@E!`Za2f3ZM3$F+yxYl|iG!DM! zE=Hl)`qxV&e(kWCt1&CR5-GZ0J8tWxg=BeTnsOL|Ms1pnZM#y^Fl1JtHk}VTc9OwF zS7JK$@fuy->!EaXK$D6FMqQ)BI)^0}a5Y|JrSluqhNuk{*53pbg~fLM7#@am)v`99 z$V=sjNSMnY8U(j;iQwlGdK>0iuA_ChQwK)x=*ilKvAxJ6HDv-&RcT2|0pbea?4Y3A zZfAZ(eT|IwgrSF4OyNlQjMIam6?Ur8wKEXW!q9ws?Co|=u7JBi@8}UACT@x@3Bofl z{6JvL)wq`KL*ahiIi?@^-Z2L;gd`A!!E1#pH%{pF^ArtZcL4*>pcI;(`L;^+nGiN% z*_t`sOu!r7>Gw5(tu))~%GAe-ie8c)@NxGW%Y~w$NT~peXske{!x5F;W2&xuk8`9` zrqjfQ)q;4|Fd=zMy9$v7z@LK6a(0lXlejskXt7x#%O5F?$($PHiuDPz6DkPi^iw z!3|yI)h5!Tdl)H1+@#c_bI{1XafFICpsH!Ii}NTZEDLw4tksG4Q^|1o!^7FezZaSA zJAD-Cw~NOmK_?_lGb>DV499m^Ke&I6p**pI?g+sdik4eD&YqP$fUhQjXoILebu7>d zcuxXN&fC~U%)VV8K3vw1>##&B$8{MV>rLajFDZI1K+k#$^CuJ}X#Eg}79QRMt^|M7 z!d#;1gh)@P%bzL@BQGM=Qpg+71J^mU<+ctRTDj+9DSCP~FCC9wA^g+VW<@1v!9LKK zxF*319MNV}zo{y)hhu)!;AC7{f`2&}C@YtZ{q$6(7?ncDd{75qW)iUMjEER3)ODN!R5ZIkxs}0! zXw!6KaPUS38|5cE1dsYeYw8gLEDO`DVOYQ$15z5uw$$>Ogv@TFN{@hfz&ysJF3>~* zRRq%Ro?;!J{)h~tB|{KxjmbM+$0Go|1VT~_BW5D5fINwj^D<49ib9dI5qScip&nl4 z$pGs1Fu59=FKjCQv>gmnnuJ`a&q7712_7>>!DSujNs<&A{3VBBv*RuNHc14e9K{zt zrN%}H(t4z&%0-Bwih@EI5~KnSb8=9YPHU(8U^axD$q<)1xlB=GNpTOUUNFE*RxPH8 z5lBF!dHo7hl%OojC!r{1#N#l;gUGxss!g#erb3Z Date: Mon, 3 Mar 2014 12:43:22 +0100 Subject: [PATCH 3/3] make mail notification header color themable --- core/templates/mail.php | 4 ++-- lib/private/defaults.php | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/core/templates/mail.php b/core/templates/mail.php index c46fd6ab80..854240a976 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.php @@ -2,8 +2,8 @@ - - + diff --git a/lib/private/defaults.php b/lib/private/defaults.php index 59630cda5c..79be211b82 100644 --- a/lib/private/defaults.php +++ b/lib/private/defaults.php @@ -21,6 +21,7 @@ class OC_Defaults { private $defaultDocBaseUrl; private $defaultSlogan; private $defaultLogoClaim; + private $defaultMailHeaderColor; function __construct() { $this->l = OC_L10N::get('core'); @@ -33,6 +34,7 @@ class OC_Defaults { $this->defaultDocBaseUrl = "http://doc.owncloud.org"; $this->defaultSlogan = $this->l->t("web services under your control"); $this->defaultLogoClaim = ""; + $this->defaultMailHeaderColor = "#1d2d44"; /* header color of mail notifications */ if (class_exists("OC_Theme")) { $this->theme = new OC_Theme(); @@ -181,4 +183,16 @@ class OC_Defaults { return $this->getDocBaseUrl() . '/server/6.0/go.php?to=' . $key; } + /** + * Returns mail header color + * @return mail header color + */ + public function getMailHeaderColor() { + if ($this->themeExist('getMailHeaderColor')) { + return $this->theme->getMailHeaderColor(); + } else { + return $this->defaultMailHeaderColor; + } + } + }
  +  <?php p($theme->getName()); ?>