wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1026 from nextcloud/theming-extend-defaults

Browse source 
Theming: Add logo and background to ThemingDefaults
This commit is contained in:
Roeland Jago Douma 2016-08-26 11:53:24 +02:00 committed by GitHub
commit 044d7c3bb7
3 changed files with 90 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
apps/theming/lib/ThemingDefaults.php
View file

@ -23,12 +23,10 @@
namespace OCA\Theming;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\Files\IRootFolder;
class ThemingDefaults extends \OC_Defaults {
@ -38,6 +36,8 @@ class ThemingDefaults extends \OC_Defaults {
private $l;
/** @var IURLGenerator */
private $urlGenerator;
/** @var IRootFolder */
private $rootFolder;
/** @var string */
private $name;
/** @var string */
@ -54,16 +54,19 @@ class ThemingDefaults extends \OC_Defaults {
* @param IL10N $l
* @param IURLGenerator $urlGenerator
* @param \OC_Defaults $defaults
* @param IRootFolder $rootFolder
*/
public function __construct(IConfig $config,
IL10N $l,
IURLGenerator $urlGenerator,
\OC_Defaults $defaults
\OC_Defaults $defaults,
IRootFolder $rootFolder
) {
parent::__construct();
$this->config = $config;
$this->l = $l;
$this->urlGenerator = $urlGenerator;
$this->rootFolder = $rootFolder;
$this->name = $defaults->getName();
$this->url = $defaults->getBaseUrl();
@ -113,6 +116,34 @@ class ThemingDefaults extends \OC_Defaults {
return $this->config->getAppValue('theming', 'color', $this->color);
}
/**
* Themed logo url
*
* @return string
*/
public function getLogo() {
$logo = $this->config->getAppValue('theming', 'logoMime');
if(!$logo || !$this->rootFolder->nodeExists('/themedinstancelogo')) {
return $this->urlGenerator->imagePath('core','logo.svg');
} else {
return $this->urlGenerator->linkToRoute('theming.Theming.getLogo');
}
}
/**
* Themed background image url
*
* @return string
*/
public function getBackground() {
$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime');
if(!$backgroundLogo || !$this->rootFolder->nodeExists('/themedbackgroundlogo')) {
return $this->urlGenerator->imagePath('core','background.jpg');
} else {
return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground');
}
}
/**
* Increases the cache buster key
*/

52
apps/theming/tests/ThemingDefaultsTest.php
View file

@ -27,6 +27,7 @@ use OCA\Theming\ThemingDefaults;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\Files\IRootFolder;
use Test\TestCase;
class ThemingDefaultsTest extends TestCase {
@ -40,11 +41,17 @@ class ThemingDefaultsTest extends TestCase {
private $defaults;
/** @var ThemingDefaults */
private $template;
/** @var IRootFolder */
private $rootFolder;
public function setUp() {
parent::setUp();
$this->config = $this->getMock('\\OCP\\IConfig');
$this->l10n = $this->getMock('\\OCP\\IL10N');
$this->urlGenerator = $this->getMock('\\OCP\\IURLGenerator');
$this->rootFolder = $this->getMockBuilder('OCP\Files\IRootFolder')
->disableOriginalConstructor()
->getMock();
$this->defaults = $this->getMockBuilder('\\OC_Defaults')
->disableOriginalConstructor()
->getMock();
@ -68,10 +75,9 @@ class ThemingDefaultsTest extends TestCase {
$this->config,
$this->l10n,
$this->urlGenerator,
$this->defaults
$this->defaults,
$this->rootFolder
);
return parent::setUp();
}
public function testGetNameWithDefault() {
@ -368,4 +374,44 @@ class ThemingDefaultsTest extends TestCase {
$this->assertSame('', $this->template->undo('defaultitem'));
}
public function testGetBackgroundDefault() {
$this->config
->expects($this->once())
->method('getAppValue')
->with('theming', 'backgroundMime')
->willReturn('');
$expected = $this->urlGenerator->imagePath('core','background.jpg');
$this->assertEquals($expected, $this->template->getBackground());
}
public function testGetBackgroundCustom() {
$this->config
->expects($this->once())
->method('getAppValue')
->with('theming', 'backgroundMime')
->willReturn('image/svg+xml');
$expected = $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground');
$this->assertEquals($expected, $this->template->getBackground());
}
public function testGetLogoDefault() {
$this->config
->expects($this->once())
->method('getAppValue')
->with('theming', 'logoMime')
->willReturn('');
$expected = $this->urlGenerator->imagePath('core','logo.svg');
$this->assertEquals($expected, $this->template->getLogo());
}
public function testGetLogoCustom() {
$this->config
->expects($this->once())
->method('getAppValue')
->with('theming', 'logoMime')
->willReturn('image/svg+xml');
$expected = $this->urlGenerator->linkToRoute('theming.Theming.getLogo');
$this->assertEquals($expected, $this->template->getLogo());
}
}

11
lib/private/Server.php
View file

@ -656,12 +656,13 @@ class Server extends ServerContainer implements IServerContainer {
$classExists = false;
}
if ($classExists && $this->getConfig()->getSystemValue('installed', false) && $this->getAppManager()->isInstalled('theming')) {
if ($classExists && $c->getConfig()->getSystemValue('installed', false) && $c->getAppManager()->isInstalled('theming')) {
return new ThemingDefaults(
$this->getConfig(),
$this->getL10N('theming'),
$this->getURLGenerator(),
new \OC_Defaults()
$c->getConfig(),
$c->getL10N('theming'),
$c->getURLGenerator(),
new \OC_Defaults(),
$c->getLazyRootFolder()
);
}
return new \OC_Defaults();