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

Merge branch '114_dev' into 114_dev_gallery_sort

Browse Source
This commit is contained in:
fredtempez 2022-04-01 09:04:05 +02:00
commit 32154ffd6f
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/include/update.inc.php
View File

@ -934,27 +934,36 @@ if ($this->getData(['core', 'dataVersion']) < 11400) {
'resource' => 'https://fonts.cdnfonts.com/css/vollkorn'
]
];
$this->setData(['fonts', 'imported', $fonts]);
// Conversion des fontes locales
$files = $this->getData(['fonts', 'files']);
if (is_array($files)) {
$this->deleteData(['fonts', 'files']);
foreach ($files as $fontId => $fontName) {
$this->setData(['fonts', 'files', $fontId, [
'name' => ucfirst($fontId),
'font-family'=> $fontId . ', sans-serif',
'resource' => $fontName
]]);
if (file_exists(self::DATA_DIR . 'fonts/' . $fontName)) {
$this->setData(['fonts', 'files', $fontId, [
'name' => ucfirst($fontId),
'font-family'=> '\'' . ucfirst($fontId) . '\', sans-serif',
'resource' => $fontName
]]);
}
}
}
// Rafraichir les thèmes
if (file_exists(self::DATA_DIR . 'admin.css')) {
unlink (self::DATA_DIR . 'admin.css');
// Consersion des fontes importées
$imported = $this->getData(['fonts', 'imported']);
if (is_array($imported)) {
foreach ($imported as $fontId => $fontUrl) {
$this->setData(['fonts', 'imported', $fontId, [
'name' => ucfirst($fontId),
'font-family'=> '\'' . ucfirst($fontId) . '\', sans-serif',
'resource' => 'https:\\fonts.cdnfonts.com\css' . $fontUrl
]]);
}
}
if (file_exists(self::DATA_DIR . 'theme.css')) {
unlink (self::DATA_DIR . 'theme.css');
// Importation des fontes exemples
$template = $fonts;
foreach ($template as $fontId => $fontValue) {
$this->setData(['fonts', 'imported', $fontId, $fontValue]);
}
// Transforme les URL en références relatives

4
core/module/theme/view/index/index.php
View File

@ -15,7 +15,7 @@
</div>
<div class="col2">
<?php echo template::button('themeHelp', [
'href' => 'https://doc.zwiicms.fr/theme-2',
'href' => 'https://doc.zwiicms.fr/gestion-du-theme',
'target' => '_blank',
'ico' => 'help',
'value' => 'Aide',
@ -73,7 +73,7 @@
</div>
<div class="col2">
<?php echo template::button('themeHelp', [
'href' => 'https://doc.zwiicms.fr/theme-2',
'href' => 'https://doc.zwiicms.fr/gestion-du-theme',
'target' => '_blank',
'ico' => 'help',
'value' => 'Aide',