diff options
| author | mattab <matthieu.aubry@gmail.com> | 2015-12-22 05:43:22 +0300 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2015-12-22 05:43:22 +0300 |
| commit | e7147488dc94d6e527cef767c2be54ad62061314 (patch) | |
| tree | a3b12544d3588cfad7bb8958a36ad504f9618860 | |
| parent | 12174ce107e5f3ddad59996f2cef295b2b6bc85b (diff) | |
Higher resolution 32x32 favicon https://github.com/piwik/piwik/issues/8869
| -rw-r--r-- | core/FrontController.php | 2 | ||||
| -rw-r--r-- | core/SettingsPiwik.php | 2 | ||||
| -rw-r--r-- | core/testMinimumPhpVersion.php | 2 | ||||
| -rw-r--r-- | plugins/CoreHome/images/favicon.png | bin | 0 -> 18085 bytes | |||
| -rw-r--r-- | plugins/CoreHome/templates/_favicon.twig | 2 | ||||
| -rw-r--r-- | plugins/Installation/templates/layout.twig | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/core/FrontController.php b/core/FrontController.php index 780960465e..40f8f38155 100644 --- a/core/FrontController.php +++ b/core/FrontController.php @@ -395,7 +395,7 @@ class FrontController extends Singleton } catch (Exception $ex) { } $logoUrl = $logoUrl ?: 'plugins/Morpheus/images/logo-header.png'; - $faviconUrl = $faviconUrl ?: 'plugins/CoreHome/images/favicon.ico'; + $faviconUrl = $faviconUrl ?: 'plugins/CoreHome/images/favicon.png'; $page = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Morpheus/templates/maintenance.tpl'); $page = str_replace('%logoUrl%', $logoUrl, $page); diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php index f7036dd46a..7a50263e39 100644 --- a/core/SettingsPiwik.php +++ b/core/SettingsPiwik.php @@ -310,7 +310,7 @@ class SettingsPiwik $fetched = "ERROR fetching: " . $e->getMessage(); } // this will match when Piwik not installed yet, or favicon not customised - $expectedStringAlt = 'plugins/CoreHome/images/favicon.ico'; + $expectedStringAlt = 'plugins/CoreHome/images/favicon.png'; // this will match when Piwik is installed and favicon has been customised $expectedString = 'misc/user/'; diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php index 82c0375960..8eab5bdf01 100644 --- a/core/testMinimumPhpVersion.php +++ b/core/testMinimumPhpVersion.php @@ -127,7 +127,7 @@ if (!function_exists('Piwik_GetErrorMessagePage')) { } if (empty($faviconUrl)) { - $faviconUrl = "plugins/CoreHome/images/favicon.ico"; + $faviconUrl = "plugins/CoreHome/images/favicon.png"; } if ($optionalTrace) { diff --git a/plugins/CoreHome/images/favicon.png b/plugins/CoreHome/images/favicon.png Binary files differnew file mode 100644 index 0000000000..9bf27d8b92 --- /dev/null +++ b/plugins/CoreHome/images/favicon.png diff --git a/plugins/CoreHome/templates/_favicon.twig b/plugins/CoreHome/templates/_favicon.twig index 8464b76579..d1fd157ed2 100644 --- a/plugins/CoreHome/templates/_favicon.twig +++ b/plugins/CoreHome/templates/_favicon.twig @@ -1,5 +1,5 @@ {% if isCustomLogo and customFavicon is defined and customFavicon %} <link rel="shortcut icon" href="{{ customFavicon }}"/> {% else %} - <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/> + <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.png"/> {% endif %}
\ No newline at end of file diff --git a/plugins/Installation/templates/layout.twig b/plugins/Installation/templates/layout.twig index 41edabf41e..438ebec820 100644 --- a/plugins/Installation/templates/layout.twig +++ b/plugins/Installation/templates/layout.twig @@ -9,7 +9,7 @@ <link rel="stylesheet" type="text/css" href="index.php?module=Installation&action=getBaseCss"/> <link rel="stylesheet" type="text/css" href="plugins/Installation/stylesheets/installation.css"/> - <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/> + <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.png"/> <script type="text/javascript" src="libs/bower_components/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="libs/bower_components/jquery-ui/ui/minified/jquery-ui.min.js"></script> |
