diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index e8bf80b872..8875d5a8fb 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -10,7 +10,7 @@ + src="" alt="getName()); ?>" /> getLogoClaim()); ?> diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 09e1006d50..2399512eac 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -10,7 +10,7 @@ - getName()); ?> + getTitle()); ?> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 329744e382..e20d28970a 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -10,7 +10,7 @@ - getName()); ?> + getTitle()); ?> @@ -22,7 +22,7 @@ - + - + getLogoClaim()); ?> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index dacbe79bd3..87c02a83d3 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -7,11 +7,11 @@ - + getName()); + p($defaults->getTitle()); p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?> @@ -45,7 +45,7 @@ + src="" alt="getName()); ?>" /> getLogoClaim()); ?> diff --git a/core/templates/mail.php b/core/templates/mail.php index 562ad82e95..a9fdff0606 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.php @@ -5,7 +5,7 @@ - + diff --git a/lib/defaults.php b/lib/defaults.php index 196bb5cf14..10813a3e8d 100644 --- a/lib/defaults.php +++ b/lib/defaults.php @@ -16,6 +16,7 @@ class OC_Defaults { private $defaultEntity; private $defaultName; + private $defaultTitle; private $defaultBaseUrl; private $defaultSyncClientUrl; private $defaultDocBaseUrl; @@ -25,8 +26,9 @@ class OC_Defaults { function __construct() { $l = OC_L10N::get('core'); - $this->defaultEntity = "ownCloud"; - $this->defaultName = "ownCloud"; + $this->defaultEntity = "ownCloud"; /* e.g. company name, used for footers and copyright notices */ + $this->defaultName = "ownCloud"; /* short name, used when referring to the software */ + $this->defaultTitle = "ownCloud"; /* can be a longer name, for titles */ $this->defaultBaseUrl = "http://owncloud.org"; $this->defaultSyncClientUrl = " http://owncloud.org/sync-clients/"; $this->defaultDocBaseUrl = "http://doc.owncloud.org"; @@ -69,6 +71,14 @@ class OC_Defaults { } } + public function getTitle() { + if ($this->themeExist('getTitle')) { + return $this->theme->getTitle(); + } else { + return $this->defaultTitle; + } + } + public function getName() { if ($this->themeExist('getName')) { return $this->theme->getName();