|
|
|
@ -34,7 +34,7 @@ class common {
|
|
|
|
|
const TEMP_DIR = 'site/tmp/'; |
|
|
|
|
|
|
|
|
|
// Numéro de version |
|
|
|
|
const ZWII_VERSION = '10.0.022.dev'; |
|
|
|
|
const ZWII_VERSION = '10.0.023.dev'; |
|
|
|
|
|
|
|
|
|
public static $actions = []; |
|
|
|
|
public static $coreModuleIds = [ |
|
|
|
@ -995,8 +995,6 @@ class common {
|
|
|
|
|
// Préparation des clés de légendes pour la v10 |
|
|
|
|
// Construire une liste plate de parents et d'enfants |
|
|
|
|
|
|
|
|
|
$pageList = array(); |
|
|
|
|
|
|
|
|
|
$pageList = array(); |
|
|
|
|
|
|
|
|
|
foreach ($this->getHierarchy(null,null,null) as $parentKey=>$parentValue) { |
|
|
|
@ -1818,14 +1816,25 @@ class layout extends common {
|
|
|
|
|
* Affiche le favicon |
|
|
|
|
*/ |
|
|
|
|
public function showFavicon() { |
|
|
|
|
$favicon = $this->getData(['config', 'favicon']); |
|
|
|
|
// Light scheme |
|
|
|
|
$favicon = $this->getData(['config', 'favicon']); |
|
|
|
|
if($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 { |
|
|
|
|
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">'; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|