Browse Source
Theming: expose element color though capabilities API
Signed-off-by: Julius Härtl <jus@bitgrid.net>
pull/7094/head
Julius Härtl
8 years ago
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
3 changed files with
8 additions and
5 deletions
-
apps/theming/lib/Capabilities.php
-
apps/theming/lib/Util.php
-
apps/theming/tests/CapabilitiesTest.php
|
|
@ -68,14 +68,15 @@ class Capabilities implements IPublicCapability { |
|
|
|
*/ |
|
|
|
public function getCapabilities() { |
|
|
|
$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', false); |
|
|
|
|
|
|
|
$color = $this->theming->getColorPrimary(); |
|
|
|
return [ |
|
|
|
'theming' => [ |
|
|
|
'name' => $this->theming->getName(), |
|
|
|
'url' => $this->theming->getBaseUrl(), |
|
|
|
'slogan' => $this->theming->getSlogan(), |
|
|
|
'color' => $this->theming->getColorPrimary(), |
|
|
|
'color-text' => $this->util->invertTextColor($this->theming->getColorPrimary()) ? '#000000' : '#FFFFFF', |
|
|
|
'color' => $color, |
|
|
|
'color-text' => $this->util->invertTextColor($color) ? '#000000' : '#FFFFFF', |
|
|
|
'color-element' => $this->util->elementColor($color), |
|
|
|
'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()), |
|
|
|
'background' => $backgroundLogo === 'backgroundColor' ? |
|
|
|
$this->theming->getColorPrimary() : |
|
|
|
|
|
@ -81,9 +81,8 @@ class Util { |
|
|
|
$l = $this->calculateLuminance($color); |
|
|
|
if($l>0.8) { |
|
|
|
return '#555555'; |
|
|
|
} else { |
|
|
|
return $color; |
|
|
|
} |
|
|
|
return $color; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|
|
@ -71,6 +71,7 @@ class CapabilitiesTest extends TestCase { |
|
|
|
'slogan' => 'slogan', |
|
|
|
'color' => '#FFFFFF', |
|
|
|
'color-text' => '#000000', |
|
|
|
'color-element' => '#555555', |
|
|
|
'logo' => 'http://absolute/logo', |
|
|
|
'background' => 'http://absolute/background', |
|
|
|
]], |
|
|
@ -80,6 +81,7 @@ class CapabilitiesTest extends TestCase { |
|
|
|
'slogan' => 'slogan3', |
|
|
|
'color' => '#01e4a0', |
|
|
|
'color-text' => '#FFFFFF', |
|
|
|
'color-element' => '#01e4a0', |
|
|
|
'logo' => 'http://localhost/logo5', |
|
|
|
'background' => 'http://localhost/background6', |
|
|
|
]], |
|
|
@ -89,6 +91,7 @@ class CapabilitiesTest extends TestCase { |
|
|
|
'slogan' => 'slogan3', |
|
|
|
'color' => '#000000', |
|
|
|
'color-text' => '#FFFFFF', |
|
|
|
'color-element' => '#000000', |
|
|
|
'logo' => 'http://localhost/logo5', |
|
|
|
'background' => '#000000', |
|
|
|
]], |
|
|
|