From 7c108edc3603fd18300e5eba2af798dd1cdc41de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 12 Jun 2013 14:33:24 +0200 Subject: [PATCH 01/12] 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(-) 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'].') ':'') ?> + From 918906f04287f12e10c812f719d205a0f2cd6a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 12 Jun 2013 14:49:30 +0200 Subject: [PATCH 02/12] make footer aware of ownCloud editions --- core/templates/layout.guest.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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!"); ?>

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 03/12] 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 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 From e1e798c623c9a9b26a4e369e5448c9ac3fe1b9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 12 Jun 2013 15:44:11 +0200 Subject: [PATCH 04/12] make footer and urls aware of ownCloud editions --- lib/defaults.php | 10 ++++++++++ settings/personal.php | 2 +- settings/templates/admin.php | 7 ++++++- settings/templates/personal.php | 9 ++++++--- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/lib/defaults.php b/lib/defaults.php index 59f8d976fe9..a43269dd67e 100644 --- a/lib/defaults.php +++ b/lib/defaults.php @@ -5,11 +5,13 @@ class OC_Defaults { private static $communityEntity = "ownCloud"; private static $communityName = "ownCloud"; private static $communityBaseUrl = "http://owncloud.org"; + private static $communitySyncClientUrl = " http://owncloud.org/sync-clients/"; private static $communitySlogan = "web services under your control"; private static $enterpriseEntity = "ownCloud Inc."; private static $enterpriseName = "ownCloud Enterprise Edition"; private static $enterpriseBaseUrl = "https://owncloud.com"; + private static $enterpiseSyncClientUrl = "https://owncloud.com/products/desktop-clients"; private static $enterpriseSlogan = "Your Cloud, Your Data, Your Way!"; @@ -21,6 +23,14 @@ class OC_Defaults { } } + public static function getSyncClientUrl() { + if (OC_Util::getEditionString() === '') { + return self::$communitySyncClientUrl; + } else { + return self::$enterpiseSyncClientUrl; + } + } + public static function getName() { if (OC_Util::getEditionString() === '') { return self::$communityName; diff --git a/settings/personal.php b/settings/personal.php index cab6e56dada..cb411cacc5b 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -60,7 +60,7 @@ usort( $languages, function ($a, $b) { //links to clients $clients = array( - 'desktop' => OC_Config::getValue('customclient_desktop', 'http://owncloud.org/sync-clients/'), + 'desktop' => OC_Config::getValue('customclient_desktop', OC_Defaults::getSyncClientUrl()), 'android' => OC_Config::getValue('customclient_android', 'https://play.google.com/store/apps/details?id=com.owncloud.android'), 'ios' => OC_Config::getValue('customclient_ios', 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8') ); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 28254b7aa18..a74849a2ecc 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -230,10 +230,15 @@ endfor;?> - +
t('Version'));?> ownCloud
t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?>
+ +
+

© 2013 –

+
+ diff --git a/settings/templates/personal.php b/settings/templates/personal.php index f0002c505c8..75aab157605 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -106,12 +106,15 @@ if($_['passwordChangeSupported']) { print_unescaped($form); };?> - +
t('Version'));?> ownCloud
t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?>
- - + +
+

© 2013 –

+
+ From 5c6a8544899728005cc5900913dd21f67e926457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 12 Jun 2013 16:19:28 +0200 Subject: [PATCH 05/12] add default doc url --- lib/defaults.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/defaults.php b/lib/defaults.php index a43269dd67e..ebe18986322 100644 --- a/lib/defaults.php +++ b/lib/defaults.php @@ -6,11 +6,13 @@ class OC_Defaults { private static $communityName = "ownCloud"; private static $communityBaseUrl = "http://owncloud.org"; private static $communitySyncClientUrl = " http://owncloud.org/sync-clients/"; + private static $communityDocBaseUrl = "http://doc.owncloud.org"; private static $communitySlogan = "web services under your control"; private static $enterpriseEntity = "ownCloud Inc."; private static $enterpriseName = "ownCloud Enterprise Edition"; private static $enterpriseBaseUrl = "https://owncloud.com"; + private static $enterpriseDocBaseUrl = "http://doc.owncloud.com"; private static $enterpiseSyncClientUrl = "https://owncloud.com/products/desktop-clients"; private static $enterpriseSlogan = "Your Cloud, Your Data, Your Way!"; @@ -31,6 +33,14 @@ class OC_Defaults { } } + public static function getDocBaseUrl() { + if (OC_Util::getEditionString() === '') { + return self::$communityDocBaseUrl; + } else { + return self::$enterpriseDocBaseUrl; + } + } + public static function getName() { if (OC_Util::getEditionString() === '') { return self::$communityName; From 839bce80c6349e9a84624d0465a3f33706c64093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 12 Jun 2013 16:20:23 +0200 Subject: [PATCH 06/12] make main menu aware of the different owncloud editions --- lib/app.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/app.php b/lib/app.php index 3e6cadfe2c9..f974dd9f594 100644 --- a/lib/app.php +++ b/lib/app.php @@ -349,7 +349,8 @@ class OC_App{ $settings = array(); // by default, settings only contain the help menu - if(OC_Config::getValue('knowledgebaseenabled', true)==true) { + if(OC_Util::getEditionString() === '' && + OC_Config::getValue('knowledgebaseenabled', true)==true) { $settings = array( array( "id" => "help", From 7273f38af627b6a9135ecde5d101d29d1fd0d706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 12 Jun 2013 16:28:47 +0200 Subject: [PATCH 07/12] make pub link share footer aware of different owncloud editions --- apps/files_sharing/templates/public.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 88a4cc242ba..bf2a38de73b 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -46,5 +46,5 @@ -

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

+

– +

From 7a575cc2d74f4793b90b80447ef08ef1453b6ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 12 Jun 2013 16:33:09 +0200 Subject: [PATCH 08/12] short explanation about OC_Defaults --- lib/defaults.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/defaults.php b/lib/defaults.php index ebe18986322..7dc6fbd0ada 100644 --- a/lib/defaults.php +++ b/lib/defaults.php @@ -1,5 +1,10 @@ Date: Wed, 12 Jun 2013 16:59:23 +0200 Subject: [PATCH 09/12] move common settings footer fieldset out of conditional --- settings/templates/admin.php | 7 ++----- settings/templates/personal.php | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/settings/templates/admin.php b/settings/templates/admin.php index a74849a2ecc..1ed3f6ef47f 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -230,15 +230,12 @@ endfor;?> +
-
t('Version'));?> ownCloud
t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?> -
-

© 2013 –

-
- +
diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 75aab157605..d19623dde04 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -106,15 +106,13 @@ if($_['passwordChangeSupported']) { print_unescaped($form); };?> +
-
t('Version'));?> ownCloud
t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?> -
-

© 2013 –

-
+
From 2e1836c1da84395df132cc13e2d28095f855e960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 12 Jun 2013 17:07:43 +0200 Subject: [PATCH 10/12] don't show translation hints in enterprise edition --- settings/templates/personal.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 75aab157605..26bb87fa49e 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -91,8 +91,10 @@ if($_['passwordChangeSupported']) { + t('Help translate'));?> + From 2141c41d0d76e0363324018d52272ebb82fa7b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 12 Jun 2013 17:20:09 +0200 Subject: [PATCH 11/12] add logo-claim --- core/templates/layout.guest.php | 3 +++ core/templates/layout.user.php | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 @@

- – + + '); ?>