summaryrefslogtreecommitdiffstats
path: root/apps/theming/lib
diff options
context:
space:
mode:
authorGuillaume COMPAGNON <gcompagnon@outlook.com>2019-08-21 17:18:23 +0200
committerDaniel Kesselberg <mail@danielkesselberg.de>2019-11-24 21:51:43 +0100
commited399a31bdf501dd2a5cf35a736b85ecbc9cf4a2 (patch)
treec95fab03907150266c090fb565b6abbb6ef821ec /apps/theming/lib
parentcd7af395d7d0442fbe9b87a28345fb70ddd9b7a4 (diff)
downloadnextcloud-server-ed399a31bdf501dd2a5cf35a736b85ecbc9cf4a2.tar.gz
nextcloud-server-ed399a31bdf501dd2a5cf35a736b85ecbc9cf4a2.zip
add var for theming images , advanced options
Signed-off-by: Guillaume COMPAGNON <gcompagnon@outlook.com>
Diffstat (limited to 'apps/theming/lib')
-rw-r--r--apps/theming/lib/Capabilities.php2
-rw-r--r--apps/theming/lib/ThemingDefaults.php6
2 files changed, 5 insertions, 3 deletions
diff --git a/apps/theming/lib/Capabilities.php b/apps/theming/lib/Capabilities.php
index a75403a1fd5..e48c63d50fa 100644
--- a/apps/theming/lib/Capabilities.php
+++ b/apps/theming/lib/Capabilities.php
@@ -83,6 +83,8 @@ class Capabilities implements IPublicCapability {
$this->url->getAbsoluteURL($this->theming->getBackground()),
'background-plain' => $backgroundLogo === 'backgroundColor',
'background-default' => !$this->util->isBackgroundThemed(),
+ 'logoheader' => $this->url->getAbsoluteURL($this->theming->getLogo()),
+ 'favicon' => $this->url->getAbsoluteURL($this->theming->getLogo()),
],
];
}
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
index bca3d70e4ef..32a1eaad4cf 100644
--- a/apps/theming/lib/ThemingDefaults.php
+++ b/apps/theming/lib/ThemingDefaults.php
@@ -285,10 +285,10 @@ class ThemingDefaults extends \OC_Defaults {
'theming-logoheader-mime' => "'" . $this->config->getAppValue('theming', 'logoheaderMime') . "'",
'theming-favicon-mime' => "'" . $this->config->getAppValue('theming', 'faviconMime') . "'"
];
-
+
$variables['image-logo'] = "url('".$this->imageManager->getImageUrl('logo')."')";
- $variables['image-logoheader'] = "'".$this->imageManager->getImageUrl('logoheader')."'";
- $variables['image-favicon'] = "'".$this->imageManager->getImageUrl('favicon')."'";
+ $variables['image-logoheader'] = "url('".$this->imageManager->getImageUrl('logoheader')."')";
+ $variables['image-favicon'] = "url('".$this->imageManager->getImageUrl('favicon')."')";
$variables['image-login-background'] = "url('".$this->imageManager->getImageUrl('background')."')";
$variables['image-login-plain'] = 'false';