Merge pull request #11928 from owncloud/support-HTML-in-logo

Support HTML in logo
This commit is contained in:
Thomas Müller 2014-11-05 13:54:29 +01:00
commit 06267fec8f
3 changed files with 21 additions and 1 deletions

View File

@ -49,7 +49,7 @@
if(OC_Util::getEditionString() === '') { if(OC_Util::getEditionString() === '') {
p(!empty($_['application'])?$_['application']: $l->t('Apps')); p(!empty($_['application'])?$_['application']: $l->t('Apps'));
} else { } else {
p($theme->getName()); print_unescaped($theme->getHTMLName());
} }
?> ?>
</div> </div>

View File

@ -156,6 +156,18 @@ class OC_Defaults {
} }
} }
/**
* Returns the short name of the software containing HTML strings
* @return string title
*/
public function getHTMLName() {
if ($this->themeExist('getHTMLName')) {
return $this->theme->getHTMLName();
} else {
return $this->defaultName;
}
}
/** /**
* Returns entity (e.g. company name) - used for footer, copyright * Returns entity (e.g. company name) - used for footer, copyright
* @return string entity name * @return string entity name

View File

@ -97,6 +97,14 @@ class Defaults {
return $this->defaults->getName(); return $this->defaults->getName();
} }
/**
* name of your ownCloud instance containing HTML styles
* @return string
*/
public function getHTMLName() {
return $this->defaults->getHTMLName();
}
/** /**
* Entity behind your onwCloud instance * Entity behind your onwCloud instance
* @return string * @return string