add logo claim to defaults.php

diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index d609e1e5372d8196110102c8b1cf0cebbc7d5344..a97b9e04ac5a787fe8f141dd99a06ac7d73b2b31 100644 (file)
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -5,9 +5,7 @@
 <header><div id="header">
        <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
                src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a>
-       <?php if (OC_Util::getEditionString() !== ''): ?>
-               <div id="logo-claim" style="display:none;">Enterprise Edition</div>
-       <?php endif; ?>
+       <div id="logo-claim" style="display:none;"><?php p(OC_Defaults::getLogoClaim()); ?></div>
        <div class="header-right">
        <?php if (isset($_['folder'])): ?>
                <span id="details"><?php p($l->t('%s shared the folder %s with you',

diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index ec73ad5456caef38c16b5d28765dc106881ee6cd..fde970554c646312c93966085435afd6dfb220f8 100644 (file)
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -35,9 +35,7 @@
                <div id="login">
                        <header><div id="header">
                                <img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" />
-                               <?php if (OC_Util::getEditionString() !== ''): ?>
-                               <div id="logo-claim" style="display:none;">Enterprise Edition</div>
-                               <?php endif; ?>
+                               <div id="logo-claim" style="display:none;"><?php p(OC_Defaults::getLogoClaim()); ?></div>
                        </div></header>
                        <?php print_unescaped($_['content']); ?>
                </div>

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index ace0d683fc437ad0d4580d7b9435a3f20b1c9800..3a84b8efed86f745052626a0767bf4d70bdd7527 100644 (file)
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -39,9 +39,7 @@
        <header><div id="header">
                        <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
                                src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a>
-                       <?php if (OC_Util::getEditionString() !== ''): ?>
-                       <div id="logo-claim" style="display:none;">Enterprise Edition</div>
-                       <?php endif; ?>
+                       <div id="logo-claim" style="display:none;"><?php p(OC_Defaults::getLogoClaim()); ?></div>
                        <ul id="settings" class="svg">
                                <span id="expand">
                                        <span id="expandDisplayName"><?php  p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>

diff --git a/lib/defaults.php b/lib/defaults.php
index 44c1a7e150b2eb9febf0f3ced67314a6d6ae1b50..215b148f946cd99e1591e77cfaf0b8e0a67d543c 100644 (file)
--- a/lib/defaults.php
+++ b/lib/defaults.php
@@ -17,6 +17,7 @@ class OC_Defaults {
        private static $defaultSyncClientUrl = " http://owncloud.org/sync-clients/";
        private static $defaultDocBaseUrl = "http://doc.owncloud.org";
        private static $defaultSlogan = "web services under your control";
+       private static $defaultLogoClaim = "ownCloud Community";
 
        private function themeExist($method) {
                if (OC_Util::getTheme() !== '' && method_exists('OC_Theme', $method)) {
@@ -74,6 +75,14 @@ class OC_Defaults {
                }
        }
 
+       public static function getLogoClaim() {
+               if (self::themeExist('getLogoClaim')) {
+                       return OC_Theme::getLogoClaim();
+               } else {
+                       return self::$defaultLogoClaim;
+               }
+       }
+
        public static function getShortFooter() {
                if (self::themeExist('getShortFooter')) {
                        $footer = OC_Theme::getShortFooter();