From b29e01d5cf4b1d149373e4b70e83510d7e7cd50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 12 Jun 2013 15:15:08 +0200 Subject: [PATCH] keep all strings in one place to make it easier to change them --- core/templates/layout.base.php | 2 +- core/templates/layout.guest.php | 9 +++--- core/templates/layout.user.php | 2 +- lib/defaults.php | 49 +++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 lib/defaults.php diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index cebb9e561f..163e8e3ae7 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -7,7 +7,7 @@ - <?php OC_Util::getEditionString() === '' ? p("ownCloud") : p("ownCloud Enterprise Edition") ?> + <?php p(OC_Defaults::getName()); ?> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 3ccc9e3218..03da7559b8 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -7,7 +7,7 @@ - <?php OC_Util::getEditionString() === '' ? p("ownCloud") : p("ownCloud Enterprise Edition") ?> + <?php p(OC_Defaults::getName()); ?> @@ -41,9 +41,8 @@ + + – +

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index dcd7562fd1..e2be2f951e 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -8,7 +8,7 @@ <?php p(!empty($_['application'])?$_['application'].' | ':''); - OC_Util::getEditionString() === '' ? p("ownCloud") : p("ownCloud Enterprise Edition"); + p(OC_Defaults::getName()); p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?> diff --git a/lib/defaults.php b/lib/defaults.php new file mode 100644 index 0000000000..59f8d976fe --- /dev/null +++ b/lib/defaults.php @@ -0,0 +1,49 @@ +t(self::$communitySlogan); + } else { + return self::$enterpriseSlogan; + } + } + +} \ No newline at end of file