Merge branch '114_dev' of https://forge.chapril.org/Zwii/ZwiiCMS into 114_dev
This commit is contained in:
commit
0ecf080d03
@ -934,27 +934,36 @@ if ($this->getData(['core', 'dataVersion']) < 11400) {
|
|||||||
'resource' => 'https://fonts.cdnfonts.com/css/vollkorn'
|
'resource' => 'https://fonts.cdnfonts.com/css/vollkorn'
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
$this->setData(['fonts', 'imported', $fonts]);
|
|
||||||
|
|
||||||
// Conversion des fontes locales
|
// Conversion des fontes locales
|
||||||
$files = $this->getData(['fonts', 'files']);
|
$files = $this->getData(['fonts', 'files']);
|
||||||
if (is_array($files)) {
|
if (is_array($files)) {
|
||||||
$this->deleteData(['fonts', 'files']);
|
|
||||||
foreach ($files as $fontId => $fontName) {
|
foreach ($files as $fontId => $fontName) {
|
||||||
|
if (file_exists(self::DATA_DIR . 'fonts/' . $fontName)) {
|
||||||
$this->setData(['fonts', 'files', $fontId, [
|
$this->setData(['fonts', 'files', $fontId, [
|
||||||
'name' => ucfirst($fontId),
|
'name' => ucfirst($fontId),
|
||||||
'font-family'=> $fontId . ', sans-serif',
|
'font-family'=> '\'' . ucfirst($fontId) . '\', sans-serif',
|
||||||
'resource' => $fontName
|
'resource' => $fontName
|
||||||
]]);
|
]]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Rafraichir les thèmes
|
|
||||||
if (file_exists(self::DATA_DIR . 'admin.css')) {
|
|
||||||
unlink (self::DATA_DIR . 'admin.css');
|
|
||||||
}
|
}
|
||||||
if (file_exists(self::DATA_DIR . 'theme.css')) {
|
|
||||||
unlink (self::DATA_DIR . 'theme.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
|
||||||
|
]]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 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
|
// Transforme les URL en références relatives
|
||||||
|
Loading…
Reference in New Issue
Block a user