Merge branch '12000'

This commit is contained in:
Fred Tempez 2022-02-15 13:27:33 +01:00
commit 51e4b03c1c
2 changed files with 21 additions and 10 deletions

View File

@ -714,7 +714,7 @@ if ($this->getData(['core', 'dataVersion']) < 11200) {
// Option de dévoilement du mdp // Option de dévoilement du mdp
$this->setData(['config', 'connect', 'showPassword', true]); $this->setData(['config', 'connect', 'showPassword', true]);
// Mise à jour // Mise à jour
$this->setData(['core', 'dataVersion', 11200]); $this->setData(['core', 'dataVersion', 11200]);
} }
@ -722,7 +722,7 @@ if ($this->getData(['core', 'dataVersion']) < 11200) {
// Version 11.2.02 // Version 11.2.02
if ($this->getData(['core', 'dataVersion']) < 11202) { if ($this->getData(['core', 'dataVersion']) < 11202) {
// Renommer les champs // Renommer les champs
$this->setData(['locale', 'cookies', 'mainLabel', $this->getData(['locale', 'cookies', 'cookiesZwiiText']) ]); $this->setData(['locale', 'cookies', 'mainLabel', $this->getData(['locale', 'cookies', 'cookiesZwiiText']) ]);
$this->setData(['locale', 'cookies', 'gaLabel', $this->getData(['locale', 'cookies', 'cookiesGaText']) ]); $this->setData(['locale', 'cookies', 'gaLabel', $this->getData(['locale', 'cookies', 'cookiesGaText']) ]);
$this->setData(['locale', 'cookies', 'titleLabel', $this->getData(['locale', 'cookies', 'cookiesTitleText']) ]); $this->setData(['locale', 'cookies', 'titleLabel', $this->getData(['locale', 'cookies', 'cookiesTitleText']) ]);
@ -784,10 +784,22 @@ if ($this->getData(['core', 'dataVersion']) < 11300) {
$this->setData(['theme', 'title', 'font', $fonts[ $this->getData (['theme', 'title', 'font' ]) ] ]); $this->setData(['theme', 'title', 'font', $fonts[ $this->getData (['theme', 'title', 'font' ]) ] ]);
$this->setData(['admin', 'fontTitle', $fonts[ $this->getData (['admin', 'fontTitle' ]) ] ]); $this->setData(['admin', 'fontTitle', $fonts[ $this->getData (['admin', 'fontTitle' ]) ] ]);
$this->setData(['admin', 'fontText', $fonts[$this->getData (['admin','fontText' ]) ] ]); $this->setData(['admin', 'fontText', $fonts[$this->getData (['admin','fontText' ]) ] ]);
unlink(self::DATA_DIR . 'admin.css'); unlink(self::DATA_DIR . 'admin.css');
unlink(self::DATA_DIR . 'theme.css'); unlink(self::DATA_DIR . 'theme.css');
// Mise à jour // Mise à jour
$this->setData(['core', 'dataVersion', 11300]); $this->setData(['core', 'dataVersion', 11300]);
} }
// Version 12.0.00
if ($this->getData(['core', 'dataVersion']) < 12000) {
// Effacer le dossier
if (is_dir('core/module/addon')) {
$this->removeDir('core/module/addon');
}
// Mise à jour
$this->setData(['core', 'dataVersion', 12000]);
}

View File

@ -1,17 +1,16 @@
<div class="row"> <div class="row">
<div class="col2"> <div class="col1">
<?php echo template::button('themeFontBack', [ <?php echo template::button('themeFontBack', [
'class' => 'buttonGrey', 'class' => 'buttonGrey',
'href' => helper::baseUrl() . 'theme', 'href' => helper::baseUrl() . 'theme',
'ico' => 'left', 'value' => template::ico('left')
'value' => 'Retour'
]); ?> ]); ?>
</div> </div>
<div class="col2 offset8"> <div class="col1 offset10">
<?php echo template::button('themeFontAdd', [ <?php echo template::button('themeFontAdd', [
'href' => helper::baseUrl() . $this->getUrl(0) . '/fontAdd', 'href' => helper::baseUrl() . $this->getUrl(0) . '/fontAdd',
'ico' => 'plus', 'value' => template::ico('plus'),
'value' => 'Fonte' 'help' => 'Ajouter une fonte'
]); ?> ]); ?>
</div> </div>
</div> </div>