summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Epp <work@felixepp.de>2016-09-19 16:00:41 +0200
committerFelix A. Epp <work@felixepp.de>2016-11-30 01:06:47 +0100
commit6aa79cacfd8958c68f48f4f230fea9fb972ed3ae (patch)
tree7ef5cc3c4493332f65abbafb28d57889b711bf58
parentf9271ebbd612c42eb33fb2b74023f7f7c8c1e05f (diff)
downloadnextcloud-server-6aa79cacfd8958c68f48f4f230fea9fb972ed3ae.tar.gz
nextcloud-server-6aa79cacfd8958c68f48f4f230fea9fb972ed3ae.zip
Fix mail header logo [fixes #1326]
Signed-off-by: Felix A. Epp <work@felixepp.de>
-rw-r--r--apps/encryption/templates/mail.php5
-rw-r--r--core/img/logo-mail.gifbin518 -> 0 bytes
-rw-r--r--core/img/logo-mail.pngbin1944 -> 1706 bytes
-rw-r--r--core/templates/internalmail.php5
-rw-r--r--core/templates/mail.php5
-rw-r--r--settings/templates/email.new_user.php5
6 files changed, 8 insertions, 12 deletions
diff --git a/apps/encryption/templates/mail.php b/apps/encryption/templates/mail.php
index 3783959b363..3754b4b3e58 100644
--- a/apps/encryption/templates/mail.php
+++ b/apps/encryption/templates/mail.php
@@ -6,9 +6,8 @@
<tr><td>
<table cellspacing="0" cellpadding="0" border="0" width="600px">
<tr>
- <td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
- <td bgcolor="<?php p($theme->getMailHeaderColor());?>">
- <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
+ <td colspan="2" bgcolor="<?php p($theme->getMailHeaderColor());?>">
+ <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
diff --git a/core/img/logo-mail.gif b/core/img/logo-mail.gif
deleted file mode 100644
index 7c14cb8d1af..00000000000
--- a/core/img/logo-mail.gif
+++ /dev/null
Binary files differ
diff --git a/core/img/logo-mail.png b/core/img/logo-mail.png
index 517b821e4be..80304ae7ec7 100644
--- a/core/img/logo-mail.png
+++ b/core/img/logo-mail.png
Binary files differ
diff --git a/core/templates/internalmail.php b/core/templates/internalmail.php
index 9bb10fb5455..555c063c149 100644
--- a/core/templates/internalmail.php
+++ b/core/templates/internalmail.php
@@ -2,9 +2,8 @@
<tr><td>
<table cellspacing="0" cellpadding="0" border="0" width="600px">
<tr>
-<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
-<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
-<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
+<td colspan="2" bgcolor="<?php p($theme->getMailHeaderColor());?>">
+<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
diff --git a/core/templates/mail.php b/core/templates/mail.php
index c2d84184d38..3721d50e27b 100644
--- a/core/templates/mail.php
+++ b/core/templates/mail.php
@@ -2,9 +2,8 @@
<tr><td>
<table cellspacing="0" cellpadding="0" border="0" width="600px">
<tr>
-<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
-<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
-<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
+<td colspan="2" bgcolor="<?php p($theme->getMailHeaderColor());?>">
+<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
diff --git a/settings/templates/email.new_user.php b/settings/templates/email.new_user.php
index 8b13ac753eb..054992532d2 100644
--- a/settings/templates/email.new_user.php
+++ b/settings/templates/email.new_user.php
@@ -2,9 +2,8 @@
<tr><td>
<table cellspacing="0" cellpadding="0" border="0" width="600px">
<tr>
- <td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
- <td bgcolor="<?php p($theme->getMailHeaderColor());?>">
- <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
+ <td colspan="2" bgcolor="<?php p($theme->getMailHeaderColor());?>" bordercolor="<?php p($theme->getMailHeaderColor());?>" border>
+ <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>