mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7094 from nextcloud/theming-capabilities-element 

Theming: expose element color though capabilities API
This commit is contained in:
Roeland Jago Douma 2017-11-07 16:12:51 +01:00 committed by GitHub
parent aa789989bf 00956c00b2
commit 8566f8b8ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/theming/lib/Capabilities.php
View File

@ -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() :

3
apps/theming/lib/Util.php
View File

@ -81,9 +81,8 @@ class Util {
$l = $this->calculateLuminance($color);
if($l>0.8) {
return '#555555';
} else {
return $color;
}
return $color;
}
/**

3
apps/theming/tests/CapabilitiesTest.php
View File

@ -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',
]],