diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2013-06-13 07:32:41 -0700 |
|---|---|---|
| committer | Björn Schießle <bjoern@schiessle.org> | 2013-06-13 07:32:41 -0700 |
| commit | 7889f2ef5c086d050cb88e2943253af84362365f (patch) | |
| tree | a955ba46e3581d865d0fef50cf836c5b43b42498 /core | |
| parent | 4bafa4e81acea88c3925a04c392a982c80a1d7c3 (diff) | |
| parent | 15eda5321531b7ae44a6dd2ed1d28ae0e2045c2b (diff) | |
| download | nextcloud-server-7889f2ef5c086d050cb88e2943253af84362365f.tar.gz nextcloud-server-7889f2ef5c086d050cb88e2943253af84362365f.zip | |
Merge pull request #3687 from owncloud/template_updates
Make templates aware of different owncloud editions
Diffstat (limited to 'core')
| -rw-r--r-- | core/templates/layout.base.php | 4 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 16 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 11 |
3 files changed, 24 insertions, 7 deletions
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 336df27ef1c..163e8e3ae7e 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -6,7 +6,9 @@ <!--[if gt IE 9]><html class="ng-csp ie"><![endif]--> <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> <head> - <title>ownCloud</title> + <title> + <?php p(OC_Defaults::getName()); ?> + </title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" /> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index a3a8dc5f7ba..ba0147e6733 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -6,7 +6,9 @@ <!--[if gt IE 9]><html class="ng-csp ie"><![endif]--> <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> <head data-requesttoken="<?php p($_['requesttoken']); ?>"> - <title>ownCloud</title> + <title> + <?php p(OC_Defaults::getName()); ?> + </title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="apple-itunes-app" content="app-id=543672169"> <link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> @@ -33,10 +35,18 @@ <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">Enterprise Edition</div> + <?php endif; ?> </div></header> <?php print_unescaped($_['content']); ?> </div> - <footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> – - <?php p($l->t( 'web services under your control' )); ?></p></footer> + <footer> + <p class="info"> + <?php OC_Util::getEditionString() === '' ? '' : p('© 2013 '); ?> + <a href="<?php p(OC_Defaults::getBaseUrl())?>"> + <?php p(OC_Defaults::getEntity()); ?></a> + <?php OC_Util::getEditionString() === '' ? print_unescaped(' – ') : print_unescaped('<br/>'); ?> + <?php p(OC_Defaults::getSlogan()); ?></p></footer> </body> </html> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index a3ebf3abd03..44ae4c6ca35 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -6,8 +6,11 @@ <!--[if gt IE 9]><html class="ng-csp ie"><![endif]--> <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> <head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>"> - <title><?php p(!empty($_['application'])?$_['application'].' | ':'') ?>ownCloud - <?php p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?></title> + <title> + <?php p(!empty($_['application'])?$_['application'].' | ':''); + p(OC_Defaults::getName()); + p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?> + </title> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta name="apple-itunes-app" content="app-id=543672169"> @@ -40,7 +43,9 @@ <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">Enterprise Edition</div> + <?php endif; ?> <ul id="settings" class="svg"> <span id="expand" tabindex="0" role="link"> <span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span> |