remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

Supprime la propriété fonts du template select

Browse Source
This commit is contained in:
Fred Tempez 2022-04-20 16:38:54 +02:00
parent 4ec08675be
commit e4b84b024f
7 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/class/template.class.php
View File

@ -611,8 +611,7 @@ class template {
'id' => $nameId, 'id' => $nameId,
'label' => '', 'label' => '',
'name' => $nameId, 'name' => $nameId,
'selected' => '', 'selected' => ''
'fonts' => false
], $attributes); ], $attributes);
// Sauvegarde des données en cas d'erreur // Sauvegarde des données en cas d'erreur
if($attributes['before'] AND array_key_exists($attributes['id'], common::$inputBefore)) { if($attributes['before'] AND array_key_exists($attributes['id'], common::$inputBefore)) {
@ -638,13 +637,7 @@ class template {
helper::sprintAttributes($attributes) helper::sprintAttributes($attributes)
); );
foreach($options as $value => $text) { foreach($options as $value => $text) {
$html .= $attributes['fonts'] === true ? sprintf( $html .= sprintf(
'<option value="%s"%s style="font-family: %s;">%s</option>',
$value,
$attributes['selected'] == $value ? ' selected' : '', // Double == pour ignorer le type de variable car $_POST change les types en string
$text,
$text
) : sprintf(
'<option value="%s"%s>%s</option>', '<option value="%s"%s>%s</option>',
$value, $value,
$attributes['selected'] == $value ? ' selected' : '', // Double == pour ignorer le type de variable car $_POST change les types en string $attributes['selected'] == $value ? ' selected' : '', // Double == pour ignorer le type de variable car $_POST change les types en string

5
core/module/theme/theme.php
View File

@ -571,7 +571,6 @@ class theme extends common {
]; ];
// Récupérer le détail des fontes installées // Récupérer le détail des fontes installées
//$f = $this->getFonts();
$f ['files'] = $this->getData(['fonts', 'files']); $f ['files'] = $this->getData(['fonts', 'files']);
$f ['imported'] = $this->getData(['fonts', 'imported']); $f ['imported'] = $this->getData(['fonts', 'imported']);
$f ['websafe'] = self::$fontsWebSafe; $f ['websafe'] = self::$fontsWebSafe;
@ -1125,7 +1124,8 @@ class theme extends common {
// Retourne un tableau simple des fonts installées idfont avec le nom // Retourne un tableau simple des fonts installées idfont avec le nom
// Cette fonction est utile aux sélecteurs de fonts dans les formulaires. // Cette fonction est utile aux sélecteurs de fonts dans les formulaires.
public function enumFonts() { // Génère une feuille de style pour l'aperçu des sélecteurs
private function enumFonts() {
// Récupère la liste des fontes installées // Récupère la liste des fontes installées
$f ['files'] = $this->getData(['fonts', 'files']); $f ['files'] = $this->getData(['fonts', 'files']);
$f ['imported'] = $this->getData(['fonts', 'imported']); $f ['imported'] = $this->getData(['fonts', 'imported']);
@ -1140,6 +1140,7 @@ class theme extends common {
} }
ksort($fonts); ksort($fonts);
self::$fontsList = $fonts; self::$fontsList = $fonts;
} }
} }

6
core/module/theme/view/admin/admin.php
View File

@ -130,8 +130,7 @@
<div class="col4"> <div class="col4">
<?php echo template::select('adminFontText', $module::$fontsList, [ <?php echo template::select('adminFontText', $module::$fontsList, [
'label' => 'Police du texte', 'label' => 'Police du texte',
'selected' => $this->getData(['admin', 'fontText']), 'selected' => $this->getData(['admin', 'fontText'])
'fonts' => true
]); ?> ]); ?>
</div> </div>
<div class="col4"> <div class="col4">
@ -143,8 +142,7 @@
<div class="col4"> <div class="col4">
<?php echo template::select('adminFontTitle', $module::$fontsList, [ <?php echo template::select('adminFontTitle', $module::$fontsList, [
'label' => 'Police des titres', 'label' => 'Police des titres',
'selected' => $this->getData(['admin', 'fontTitle']), 'selected' => $this->getData(['admin', 'fontTitle'])
'fonts' => true
]); ?> ]); ?>
</div> </div>
</div> </div>

3
core/module/theme/view/footer/footer.php
View File

@ -173,8 +173,7 @@
<div class="col3"> <div class="col3">
<?php echo template::select('themeFooterFont', $module::$fontsList, [ <?php echo template::select('themeFooterFont', $module::$fontsList, [
'label' => 'Fonte', 'label' => 'Fonte',
'selected' => $this->getData(['theme', 'footer', 'font']), 'selected' => $this->getData(['theme', 'footer', 'font'])
'fonts' => true
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col3">

3
core/module/theme/view/header/header.php
View File

@ -108,8 +108,7 @@
<div class="col4"> <div class="col4">
<?php echo template::select('themeHeaderFont', $module::$fontsList, [ <?php echo template::select('themeHeaderFont', $module::$fontsList, [
'label' => 'Fonte', 'label' => 'Fonte',
'selected' => $this->getData(['theme', 'header', 'font']), 'selected' => $this->getData(['theme', 'header', 'font'])
'fonts' => true
]); ?> ]); ?>
</div> </div>
<div class="col4"> <div class="col4">

3
core/module/theme/view/menu/menu.php
View File

@ -185,8 +185,7 @@
<div class="col6"> <div class="col6">
<?php echo template::select('themeMenuFont', $module::$fontsList, [ <?php echo template::select('themeMenuFont', $module::$fontsList, [
'label' => 'Fonte', 'label' => 'Fonte',
'selected' => $this->getData(['theme', 'menu', 'font']), 'selected' => $this->getData(['theme', 'menu', 'font'])
'fonts' => true
]); ?> ]); ?>
</div> </div>
<div class="col6"> <div class="col6">

6
core/module/theme/view/site/site.php
View File

@ -160,8 +160,7 @@
<div class="col6"> <div class="col6">
<?php echo template::select('themeTextFont', $module::$fontsList, [ <?php echo template::select('themeTextFont', $module::$fontsList, [
'label' => 'Fonte', 'label' => 'Fonte',
'selected' => $this->getData(['theme', 'text', 'font']), 'selected' => $this->getData(['theme', 'text', 'font'])
'fonts' => true
]); ?> ]); ?>
</div> </div>
<div class="col6"> <div class="col6">
@ -181,8 +180,7 @@
<div class="col4"> <div class="col4">
<?php echo template::select('themeTitleFont', $module::$fontsList, [ <?php echo template::select('themeTitleFont', $module::$fontsList, [
'label' => 'Fonte', 'label' => 'Fonte',
'selected' => $this->getData(['theme', 'title', 'font']), 'selected' => $this->getData(['theme', 'title', 'font'])
'fonts' => true
]); ?> ]); ?>
</div> </div>
<div class="col4"> <div class="col4">