diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2014-03-03 17:22:33 +0100 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2014-03-03 17:22:33 +0100 |
| commit | 7983c90fdcdf2d5e2dd385d3a3c8c97c60d530de (patch) | |
| tree | 195766356963017ba9be2b1344cc73d0cfec4fe3 | |
| parent | 11054c6bb0d916f46f3876d367d89c66771df169 (diff) | |
| parent | b8d0fc94949e6e28b9fcb603deec9759e55cb6a3 (diff) | |
| download | nextcloud-server-7983c90fdcdf2d5e2dd385d3a3c8c97c60d530de.tar.gz nextcloud-server-7983c90fdcdf2d5e2dd385d3a3c8c97c60d530de.zip | |
Merge pull request #7500 from owncloud/theme-mailtemplate
Enable theming of the mail template header
| -rw-r--r-- | core/img/logo-mail.gif | bin | 2196 -> 1191 bytes | |||
| -rw-r--r-- | core/templates/mail.php | 18 | ||||
| -rw-r--r-- | lib/private/defaults.php | 14 |
3 files changed, 23 insertions, 9 deletions
diff --git a/core/img/logo-mail.gif b/core/img/logo-mail.gif Binary files differindex 6a1caaa9188..f1dd108450e 100644 --- a/core/img/logo-mail.gif +++ b/core/img/logo-mail.gif diff --git a/core/templates/mail.php b/core/templates/mail.php index b8b0a2bfe96..854240a976f 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.php @@ -2,15 +2,15 @@ <tr><td> <table cellspacing="0" cellpadding="0" border="0" width="600px"> <tr> -<td bgcolor="#1d2d44" width="20px"> </td> -<td bgcolor="#1d2d44"> +<td bgcolor="<?php print_unescaped($theme->getMailHeaderColor());?>" width="20px"> </td> +<td bgcolor="<?php print_unescaped($theme->getMailHeaderColor());?>"> <img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/> </td> </tr> -<tr><td bgcolor="#f8f8f8" colspan="2"> </td></tr> +<tr><td colspan="2"> </td></tr> <tr> -<td bgcolor="#f8f8f8" width="20px"> </td> -<td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;"> +<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 %s shared <strong>%s</strong> with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link']))); if ( isset($_['expiration']) ) { @@ -21,17 +21,17 @@ p($l->t('Cheers!')); ?> </td> </tr> -<tr><td bgcolor="#f8f8f8" colspan="2"> </td></tr> +<tr><td colspan="2"> </td></tr> <tr> -<td bgcolor="#f8f8f8" width="20px"> </td> -<td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br> +<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 print_unescaped($theme->getBaseUrl()); ?>"><?php print_unescaped($theme->getBaseUrl());?></a> </td> </tr> <tr> -<td bgcolor="#f8f8f8" colspan="2"> </td> +<td colspan="2"> </td> </tr> </table> </td></tr> diff --git a/lib/private/defaults.php b/lib/private/defaults.php index 59630cda5c0..79be211b82f 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; + } + } + } |
