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

Logo claim is not used anymore

Browse source 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2017-08-02 17:10:25 +02:00 committed by Lukas Reschke
parent c40352c030
commit 585e5c6ea5
No known key found for this signature in database
GPG key ID: B9F6980CF6E759B1
6 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/files_sharing/templates/public.php
View file

@ -47,7 +47,6 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
</span> </span>
</div> </div>
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
<div class="header-right"> <div class="header-right">
<?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) { <?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) {
if ($_['server2serversharing']) { if ($_['server2serversharing']) {

1
core/templates/layout.guest.php
View file

@ -33,7 +33,6 @@
<img src="<?php p($theme->getLogo()); ?>"/> <img src="<?php p($theme->getLogo()); ?>"/>
<?php endif; ?> <?php endif; ?>
</div> </div>
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
</div> </div>
</header> </header>
<?php endif; ?> <?php endif; ?>

2
lib/private/Template/JSConfigHelper.php
View file

@ -238,7 +238,7 @@ class JSConfigHelper {
'docBaseUrl' => $this->defaults->getDocBaseUrl(), 'docBaseUrl' => $this->defaults->getDocBaseUrl(),
'docPlaceholderUrl' => $this->defaults->buildDocLinkToKey('PLACEHOLDER'), 'docPlaceholderUrl' => $this->defaults->buildDocLinkToKey('PLACEHOLDER'),
'slogan' => $this->defaults->getSlogan(), 'slogan' => $this->defaults->getSlogan(),
'logoClaim' => $this->defaults->getLogoClaim(), 'logoClaim' => '',
'shortFooter' => $this->defaults->getShortFooter(), 'shortFooter' => $this->defaults->getShortFooter(),
'longFooter' => $this->defaults->getLongFooter(), 'longFooter' => $this->defaults->getLongFooter(),
'folder' => \OC_Util::getTheme(), 'folder' => \OC_Util::getTheme(),

9
lib/private/legacy/defaults.php
View file

@ -45,7 +45,6 @@ class OC_Defaults {
private $defaultDocBaseUrl; private $defaultDocBaseUrl;
private $defaultDocVersion; private $defaultDocVersion;
private $defaultSlogan; private $defaultSlogan;
private $defaultLogoClaim;
private $defaultColorPrimary; private $defaultColorPrimary;
public function __construct() { public function __construct() {
@ -62,7 +61,6 @@ class OC_Defaults {
$this->defaultDocBaseUrl = 'https://docs.nextcloud.com'; $this->defaultDocBaseUrl = 'https://docs.nextcloud.com';
$this->defaultDocVersion = '12'; // used to generate doc links $this->defaultDocVersion = '12'; // 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->defaultColorPrimary = '#0082c9'; $this->defaultColorPrimary = '#0082c9';
$themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php'; $themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php';
@ -222,13 +220,10 @@ class OC_Defaults {
/** /**
* Returns logo claim * Returns logo claim
* @return string logo claim * @return string logo claim
* @deprecated 13.0.0
*/ */
public function getLogoClaim() { public function getLogoClaim() {
if ($this->themeExist('getLogoClaim')) { return '';
return $this->theme->getLogoClaim();
} else {
return $this->defaultLogoClaim;
}
} }
/** /**

3
lib/public/Defaults.php
View file

@ -143,9 +143,10 @@ class Defaults {
* logo claim * logo claim
* @return string * @return string
* @since 6.0.0 * @since 6.0.0
* @deprecated 13.0.0
*/ */
public function getLogoClaim() { public function getLogoClaim() {
return $this->defaults->getLogoClaim(); return '';
} }
/** /**

1
themes/example/defaults.php
View file

@ -111,6 +111,7 @@ class OC_Theme {
/** /**
* Returns logo claim * Returns logo claim
* @return string logo claim * @return string logo claim
* @deprecated 13.0.0 not used anymore
*/ */
public function getLogoClaim() { public function getLogoClaim() {
return ''; return '';