Fix mail header logo [fixes #1326]

Signed-off-by: Felix A. Epp <work@felixepp.de>

diff --git a/apps/encryption/templates/mail.php b/apps/encryption/templates/mail.php
index 3783959b3633905914fe96e07d90d0234dc87a62..3754b4b3e582016ac6b764769f44e84d772c57f4 100644 (file)
--- 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 (file)
index 7c14cb8..0000000
Binary files a/core/img/logo-mail.gif and /dev/null differ

diff --git a/core/img/logo-mail.png b/core/img/logo-mail.png
index 517b821e4be59aa02c906f870b0a6808717c9f7e..80304ae7ec7a2394890dc166fc21cfd69a69ea4b 100644 (file)
Binary files a/core/img/logo-mail.png and b/core/img/logo-mail.png differ

diff --git a/core/templates/internalmail.php b/core/templates/internalmail.php
index 9bb10fb5455e68169979c365b441487fd2614ace..555c063c1494c55d2c48dcb317deb4986225dd62 100644 (file)
--- 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 c2d84184d383c3250effedfafb1a0c3bda4c13e8..3721d50e27b8fce657f08af2ff9895ebfb005676 100644 (file)
--- 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 8b13ac753eb796c18386afae12da69076459e584..054992532d2a25608e8cadfae98871dbdd8311e2 100644 (file)
--- 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>