ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team/ZwiiCMS
10
9
Fork 3
Code Releases 157 Activity

[10.0.023.dev] Favicon switcher

Browse Source
This commit is contained in:
fredtempez 2020-01-02 19:30:23 +01:00
parent 50aeb22034
commit e679ebf1a3
5 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/core.php
View File

@ -34,7 +34,7 @@ class common {
const TEMP_DIR = 'site/tmp/'; const TEMP_DIR = 'site/tmp/';
// Numéro de version // Numéro de version
const ZWII_VERSION = '10.0.022.dev'; const ZWII_VERSION = '10.0.023.dev';
public static $actions = []; public static $actions = [];
public static $coreModuleIds = [ public static $coreModuleIds = [
@ -997,8 +997,6 @@ class common {
$pageList = array(); $pageList = array();
$pageList = array();
foreach ($this->getHierarchy(null,null,null) as $parentKey=>$parentValue) { foreach ($this->getHierarchy(null,null,null) as $parentKey=>$parentValue) {
$pageList [] = $parentKey; $pageList [] = $parentKey;
foreach ($parentValue as $childKey) { foreach ($parentValue as $childKey) {
@ -1818,13 +1816,24 @@ class layout extends common {
* Affiche le favicon * Affiche le favicon
*/ */
public function showFavicon() { public function showFavicon() {
// Light scheme
$favicon = $this->getData(['config', 'favicon']); $favicon = $this->getData(['config', 'favicon']);
if($favicon && if($favicon &&
file_exists(self::FILE_DIR.'source/' . $favicon) file_exists(self::FILE_DIR.'source/' . $favicon)
) { ) {
echo '<link rel="shortcut icon" href="' . helper::baseUrl(false) . self::FILE_DIR.'source/' . $favicon . '">'; echo '<link rel="shortcut icon" media="(prefers-color-scheme:light)" href="' . helper::baseUrl(false) . self::FILE_DIR.'source/' . $favicon . '">';
} else { } else {
echo '<link rel="shortcut icon" href="' . helper::baseUrl(false) . 'core/vendor/zwiico/ico/favicon.ico">'; echo '<link rel="shortcut icon" media="(prefers-color-scheme:light)" href="' . helper::baseUrl(false) . 'core/vendor/zwiico/ico/favicon.ico">';
}
// Dark scheme
$faviconDark = $this->getData(['config', 'faviconDark']);
if($faviconDark &&
file_exists(self::FILE_DIR.'source/' . $faviconDark)
) {
echo '<link rel="shortcut icon" media="(prefers-color-scheme:dark)" href="' . helper::baseUrl(false) . self::FILE_DIR.'source/' . $faviconDark . '">';
echo '<script src="https://unpkg.com/favicon-switcher@1.2.0/dist/index.js" crossorigin="anonymous" type="application/javascript"></script>';
} else {
echo '<link rel="shortcut icon" media="(prefers-color-scheme:dark)" href="' . helper::baseUrl(false) . 'core/vendor/zwiico/ico/faviconDark.ico">';
} }
} }

1
core/module/config/config.php
View File

@ -390,6 +390,7 @@ class config extends common {
'maintenance' => $this->getInput('configMaintenance', helper::FILTER_BOOLEAN), 'maintenance' => $this->getInput('configMaintenance', helper::FILTER_BOOLEAN),
'cookieConsent' => $this->getInput('configCookieConsent', helper::FILTER_BOOLEAN), 'cookieConsent' => $this->getInput('configCookieConsent', helper::FILTER_BOOLEAN),
'favicon' => $this->getInput('configFavicon'), 'favicon' => $this->getInput('configFavicon'),
'faviconDark' => $this->getInput('configFaviconDark'),
'social' => [ 'social' => [
'facebookId' => $this->getInput('configSocialFacebookId'), 'facebookId' => $this->getInput('configSocialFacebookId'),
'linkedinId' => $this->getInput('configSocialLinkedinId'), 'linkedinId' => $this->getInput('configSocialLinkedinId'),

12
core/module/config/view/index/index.php
View File

@ -58,14 +58,22 @@
<div class="block"> <div class="block">
<h4>Réglages</h4> <h4>Réglages</h4>
<div class="row"> <div class="row">
<div class="col6"> <div class="col3">
<?php echo template::file('configFavicon', [ <?php echo template::file('configFavicon', [
'type' => 1, 'type' => 1,
'help' => 'Pensez à supprimer le cache de votre navigateur si la favicon ne change pas.', 'help' => 'Pensez à supprimer le cache de votre navigateur si la favicon ne change pas.',
'label' => 'Favicon', 'label' => 'Favicon thème clair',
'value' => $this->getData(['config', 'favicon']) 'value' => $this->getData(['config', 'favicon'])
]); ?> ]); ?>
</div> </div>
<div class="col3">
<?php echo template::file('configFaviconDark', [
'type' => 1,
'help' => 'Sélectionnez une icône adaptée à un thème sombre.<br>Pensez à supprimer le cache de votre navigateur si la favicon ne change pas.',
'label' => 'Favicon thème sombre',
'value' => $this->getData(['config', 'faviconDark'])
]); ?>
</div>
<div class="col6"> <div class="col6">
<?php echo template::select('itemsperPage', $module::$ItemsList, [ <?php echo template::select('itemsperPage', $module::$ItemsList, [
'label' => 'Articles par page', 'label' => 'Articles par page',

BIN
core/vendor/zwiico/ico/faviconDark.ico vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
sitemap.xml.gz
View File

Binary file not shown.