diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-02-07 13:29:18 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-02-07 13:29:18 +0100 |
| commit | b05e4e085c438b6fc2fca43052261b638843362c (patch) | |
| tree | 09e2f97ea331f6da70c417e5cd2e11439e775d59 /core | |
| parent | 108f3327e6aaca3f70064ec318d1b84e23ecf584 (diff) | |
| parent | 96f81961ed695122ae9b3c8e5d4276bb0b1006c5 (diff) | |
| download | nextcloud-server-b05e4e085c438b6fc2fca43052261b638843362c.tar.gz nextcloud-server-b05e4e085c438b6fc2fca43052261b638843362c.zip | |
Merge pull request #13435 from Zillode/app-favicon
Allow application-specific favicons
Diffstat (limited to 'core')
| -rw-r--r-- | core/templates/layout.base.php | 4 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 4 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 96229fd370a..aeebc2d6439 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -13,8 +13,8 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"> - <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> - <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" /> + <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path($_['appid'], 'favicon.png')); ?>" /> + <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>" /> <?php foreach ($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" /> <?php endforeach; ?> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index c799205b7cf..c1a75447210 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -14,8 +14,8 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"> <meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>"> - <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> - <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" /> + <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path($_['appid'], 'favicon.png')); ?>" /> + <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>" /> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" /> <?php endforeach; ?> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 4ffec917c9b..ffa5e557c64 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -21,8 +21,8 @@ <meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!='files')? $_['application']:'ownCloud'); ?>"> <meta name="mobile-web-app-capable" content="yes"> - <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> - <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" /> + <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path($_['appid'], 'favicon.png')); ?>" /> + <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>" /> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" type="text/css" media="screen" /> <?php endforeach; ?> |