diff --git a/core/img/logo-mail.gif b/core/img/logo-mail.gif index 6a1caaa918..f1dd108450 100644 Binary files a/core/img/logo-mail.gif and b/core/img/logo-mail.gif differ diff --git a/core/templates/mail.php b/core/templates/mail.php index b8b0a2bfe9..854240a976 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.php @@ -2,15 +2,15 @@ - - + - + - - + - + - - + - +
  +  <?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());?>
  
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; + } + } + }