diff options
author | Morris Jobke <hey@morrisjobke.de> | 2016-11-30 11:31:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-30 11:31:43 +0100 |
commit | 86168c8ea7d233e7aef7e6a6bda758646a6480e3 (patch) | |
tree | 6f287a39ed59995df27fa05c9213c64d0bbe529f | |
parent | 62ec31eb7bf937c9a7ba01864c0845517ede548c (diff) | |
parent | 8e361b723c76cf5c71ee5cbbad886afa48c10833 (diff) | |
download | nextcloud-server-86168c8ea7d233e7aef7e6a6bda758646a6480e3.tar.gz nextcloud-server-86168c8ea7d233e7aef7e6a6bda758646a6480e3.zip |
Merge pull request #1446 from nextcloud/fix-mail-design
Fix mail design
-rw-r--r-- | apps/encryption/templates/mail.php | 5 | ||||
-rw-r--r-- | apps/sharebymail/templates/mail.php | 5 | ||||
-rw-r--r-- | core/img/logo-mail.gif | bin | 518 -> 0 bytes | |||
-rw-r--r-- | core/img/logo-mail.png | bin | 1944 -> 1706 bytes | |||
-rw-r--r-- | core/templates/internalaltmail.php | 13 | ||||
-rw-r--r-- | core/templates/internalmail.php | 39 | ||||
-rw-r--r-- | core/templates/mail.php | 5 | ||||
-rw-r--r-- | settings/templates/email.new_user.php | 7 | ||||
-rw-r--r-- | settings/templates/email.new_user_plain_text.php | 2 |
9 files changed, 10 insertions, 66 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"> </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"> </td></tr> diff --git a/apps/sharebymail/templates/mail.php b/apps/sharebymail/templates/mail.php index 48f7dcb063a..ea3531809a9 100644 --- a/apps/sharebymail/templates/mail.php +++ b/apps/sharebymail/templates/mail.php @@ -27,9 +27,8 @@ <tr><td> <table cellspacing="0" cellpadding="0" border="0" width="600px"> <tr> - <td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px"> </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"> </td></tr> diff --git a/core/img/logo-mail.gif b/core/img/logo-mail.gif Binary files differdeleted file mode 100644 index 7c14cb8d1af..00000000000 --- a/core/img/logo-mail.gif +++ /dev/null diff --git a/core/img/logo-mail.png b/core/img/logo-mail.png Binary files differindex 517b821e4be..80304ae7ec7 100644 --- a/core/img/logo-mail.png +++ b/core/img/logo-mail.png diff --git a/core/templates/internalaltmail.php b/core/templates/internalaltmail.php deleted file mode 100644 index 38531d109b7..00000000000 --- a/core/templates/internalaltmail.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php -print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link']))); -if ( isset($_['expiration']) ) { - print_unescaped($l->t("The share will expire on %s.", array($_['expiration']))); - print_unescaped("\n\n"); -} -// TRANSLATORS term at the end of a mail -p($l->t("Cheers!")); -?> - --- -<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?> -<?php print_unescaped("\n".$theme->getBaseUrl()); diff --git a/core/templates/internalmail.php b/core/templates/internalmail.php deleted file mode 100644 index 9bb10fb5455..00000000000 --- a/core/templates/internalmail.php +++ /dev/null @@ -1,39 +0,0 @@ -<table cellspacing="0" cellpadding="0" border="0" width="100%"> -<tr><td> -<table cellspacing="0" cellpadding="0" border="0" width="600px"> -<tr> -<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px"> </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> -</tr> -<tr><td colspan="2"> </td></tr> -<tr> -<td width="20px"> </td> -<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:'Open Sans',Frutiger,Calibri,'Myriad Pro',Myriad,sans-serif;"> -<?php -print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link']))); -if ( isset($_['expiration']) ) { - p($l->t("The share will expire on %s.", array($_['expiration']))); - print_unescaped('<br><br>'); -} -// TRANSLATORS term at the end of a mail -p($l->t('Cheers!')); -?> -</td> -</tr> -<tr><td colspan="2"> </td></tr> -<tr> -<td width="20px"> </td> -<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br> -<?php p($theme->getName()); ?> - -<?php p($theme->getSlogan()); ?> -<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a> -</td> -</tr> -<tr> -<td colspan="2"> </td> -</tr> -</table> -</td></tr> -</table> 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"> </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"> </td></tr> diff --git a/settings/templates/email.new_user.php b/settings/templates/email.new_user.php index 8b13ac753eb..bd2d4249d9a 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"> </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"> </td></tr> @@ -12,7 +11,7 @@ <td width="20px"> </td> <td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;"> <?php - print_unescaped($l->t('Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href="%s">%s</a><br><br>', array($theme->getName(), $_['username'], $_['url'], $_['url']))); + print_unescaped($l->t('Hey there,<br><br>just letting you know that you now have a %s account.<br><br>Your username: <strong>%s</strong><br>Access it: <strong><a href="%s">%s</a></strong><br><br>', array($theme->getName(), $_['username'], $_['url'], $_['url']))); // TRANSLATORS term at the end of a mail p($l->t('Cheers!')); diff --git a/settings/templates/email.new_user_plain_text.php b/settings/templates/email.new_user_plain_text.php index 79559a87020..2cc70ddfa2f 100644 --- a/settings/templates/email.new_user_plain_text.php +++ b/settings/templates/email.new_user_plain_text.php @@ -1,5 +1,5 @@ <?php -print_unescaped($l->t("Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n", array($theme->getName(), $_['username'], $_['url']))); +print_unescaped($l->t("Hey there,\n\njust letting you know that you now have a %s account.\n\nYour username: %s\nAccess it: %s\n\n", array($theme->getName(), $_['username'], $_['url']))); // TRANSLATORS term at the end of a mail p($l->t("Cheers!")); |