Merge pull request #11928 from owncloud/support-HTML-in-logo
Support HTML in logo
This commit is contained in:
commit
06267fec8f
|
@ -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>
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue