also rename defaultMailHeaderColor to defaultColorPrimary
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
This commit is contained in:
parent
698396a927
commit
354a24e0aa
|
@ -46,7 +46,7 @@ class OC_Defaults {
|
||||||
private $defaultDocVersion;
|
private $defaultDocVersion;
|
||||||
private $defaultSlogan;
|
private $defaultSlogan;
|
||||||
private $defaultLogoClaim;
|
private $defaultLogoClaim;
|
||||||
private $defaultMailHeaderColor;
|
private $defaultColorPrimary;
|
||||||
|
|
||||||
function __construct() {
|
function __construct() {
|
||||||
$this->l = \OC::$server->getL10N('lib');
|
$this->l = \OC::$server->getL10N('lib');
|
||||||
|
@ -63,7 +63,7 @@ class OC_Defaults {
|
||||||
$this->defaultDocVersion = '11'; // used to generate doc links
|
$this->defaultDocVersion = '11'; // used to generate doc links
|
||||||
$this->defaultSlogan = $this->l->t('a safe home for all your data');
|
$this->defaultSlogan = $this->l->t('a safe home for all your data');
|
||||||
$this->defaultLogoClaim = '';
|
$this->defaultLogoClaim = '';
|
||||||
$this->defaultMailHeaderColor = '#0082c9'; /* header color of mail notifications */
|
$this->defaultColorPrimary = '#0082c9';
|
||||||
|
|
||||||
$themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php';
|
$themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php';
|
||||||
if (file_exists($themePath)) {
|
if (file_exists($themePath)) {
|
||||||
|
@ -272,7 +272,7 @@ class OC_Defaults {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns mail header color
|
* Returns primary color
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getColorPrimary() {
|
public function getColorPrimary() {
|
||||||
|
@ -283,7 +283,7 @@ class OC_Defaults {
|
||||||
if ($this->themeExist('getMailHeaderColor')) {
|
if ($this->themeExist('getMailHeaderColor')) {
|
||||||
return $this->theme->getMailHeaderColor();
|
return $this->theme->getMailHeaderColor();
|
||||||
}
|
}
|
||||||
return $this->defaultMailHeaderColor;
|
return $this->defaultColorPrimary;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function shouldReplaceIcons() {
|
public function shouldReplaceIcons() {
|
||||||
|
|
Loading…
Reference in New Issue