From 574883c47a45940f53a7603fb4e107cd7093a741 Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Tue, 25 Feb 2014 23:06:23 +0100
Subject: introduce new theme function to allow full creation of documentation
 links: buildDocLinkToKey()

---
 lib/private/defaults.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'lib/private/defaults.php')

diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index 0b97497baa1..59630cda5c0 100644
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -174,4 +174,11 @@ class OC_Defaults {
 		return $footer;
 	}
 
+	public function buildDocLinkToKey($key) {
+		if ($this->themeExist('buildDocLinkToKey')) {
+			return $this->theme->buildDocLinkToKey($key);
+		}
+		return $this->getDocBaseUrl() . '/server/6.0/go.php?to=' . $key;
+	}
+
 }
-- 
cgit v1.2.3


From b8d0fc94949e6e28b9fcb603deec9759e55cb6a3 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 3 Mar 2014 12:43:22 +0100
Subject: make mail notification header color themable

---
 core/templates/mail.php  |  4 ++--
 lib/private/defaults.php | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'lib/private/defaults.php')

diff --git a/core/templates/mail.php b/core/templates/mail.php
index c46fd6ab805..854240a976f 100644
--- a/core/templates/mail.php
+++ b/core/templates/mail.php
@@ -2,8 +2,8 @@
 <tr><td>
 <table cellspacing="0" cellpadding="0" border="0" width="600px">
 <tr>
-<td bgcolor="#1d2d44" width="20px">&nbsp;</td>
-<td bgcolor="#1d2d44">
+<td bgcolor="<?php print_unescaped($theme->getMailHeaderColor());?>" width="20px">&nbsp;</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>
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;
+		}
+	}
+
 }
-- 
cgit v1.2.3