From 7c108edc3603fd18300e5eba2af798dd1cdc41de Mon Sep 17 00:00:00 2001 From: Björn Schießle Date: Wed, 12 Jun 2013 14:33:24 +0200 Subject: mage page title aware of ownCloud edition --- core/templates/layout.base.php | 4 +++- core/templates/layout.guest.php | 4 +++- core/templates/layout.user.php | 7 +++++-- 3 files changed, 11 insertions(+), 4 deletions(-) (limited to 'core/templates') diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 336df27ef1c..cebb9e561f1 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -6,7 +6,9 @@ - ownCloud + + <?php OC_Util::getEditionString() === '' ? p("ownCloud") : p("ownCloud Enterprise Edition") ?> + diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index a3a8dc5f7ba..70c29580a9f 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -6,7 +6,9 @@ - ownCloud + + <?php OC_Util::getEditionString() === '' ? p("ownCloud") : p("ownCloud Enterprise Edition") ?> + diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index a3ebf3abd03..dcd7562fd1c 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -6,8 +6,11 @@ - <?php p(!empty($_['application'])?$_['application'].' | ':'') ?>ownCloud - <?php p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?> + + <?php p(!empty($_['application'])?$_['application'].' | ':''); + OC_Util::getEditionString() === '' ? p("ownCloud") : p("ownCloud Enterprise Edition"); + p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?> + -- cgit v1.2.3 From 918906f04287f12e10c812f719d205a0f2cd6a7b Mon Sep 17 00:00:00 2001 From: Björn Schießle Date: Wed, 12 Jun 2013 14:49:30 +0200 Subject: make footer aware of ownCloud editions --- core/templates/layout.guest.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'core/templates') diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 70c29580a9f..3ccc9e32182 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -38,7 +38,12 @@ -

ownCloud – - t( 'web services under your control' )); ?>

+
+

+ + + – + t( 'web services under your control' )) : p("Your Cloud, Your Data, Your Way!"); ?>

-- cgit v1.2.3 From b29e01d5cf4b1d149373e4b70e83510d7e7cd50f Mon Sep 17 00:00:00 2001 From: Björn Schießle Date: Wed, 12 Jun 2013 15:15:08 +0200 Subject: 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 (limited to 'core/templates') diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index cebb9e561f1..163e8e3ae7e 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 3ccc9e32182..03da7559b8c 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 @@

- - – - t( 'web services under your control' )) : p("Your Cloud, Your Data, Your Way!"); ?>

+ + – +

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index dcd7562fd1c..e2be2f951eb 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 00000000000..59f8d976fe9 --- /dev/null +++ b/lib/defaults.php @@ -0,0 +1,49 @@ +t(self::$communitySlogan); + } else { + return self::$enterpriseSlogan; + } + } + +} \ No newline at end of file -- cgit v1.2.3 From 2141c41d0d76e0363324018d52272ebb82fa7b36 Mon Sep 17 00:00:00 2001 From: Björn Schießle Date: Wed, 12 Jun 2013 17:20:09 +0200 Subject: add logo-claim --- core/templates/layout.guest.php | 3 +++ core/templates/layout.user.php | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'core/templates') diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 03da7559b8c..2f3bf8752cd 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -35,6 +35,9 @@
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index e2be2f951eb..44ae4c6ca35 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -43,7 +43,9 @@
-

– -

+
+

+ '); ?> + +

+
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 2f3bf8752cd..ba0147e6733 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -45,7 +45,8 @@

- – + + '); ?>

-- cgit v1.2.3