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

Merge branch 'master' into 13009

Browse Source
This commit is contained in:
Fred Tempez 2023-11-29 14:12:01 +01:00
commit 548fd25756
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -686,7 +686,8 @@ class template
'label' => '', 'label' => '',
'name' => $nameId, 'name' => $nameId,
'selected' => '', 'selected' => '',
'font' => [] 'font' => [],
'multiple' => ''
], $attributes); ], $attributes);
// Traduction de l'aide et de l'étiquette // Traduction de l'aide et de l'étiquette
$attributes['label'] = helper::translate($attributes['label']); $attributes['label'] = helper::translate($attributes['label']);
@ -715,6 +716,11 @@ class template
$attributes['class'] .= ' notice'; $attributes['class'] .= ' notice';
} }
$html .= self::notice($attributes['id'], $notice); $html .= self::notice($attributes['id'], $notice);
// Attribut multiple
if ($attributes['multiple'] === true) {
echo "ppp";
$attributes['multiple'] = 'multiple';
}
// Début sélection // Début sélection
$html .= sprintf( $html .= sprintf(
'<select %s>', '<select %s>',
@ -744,6 +750,7 @@ class template
return $html; return $html;
} }
/** /**
* Crée une bulle de dialogue * Crée une bulle de dialogue
* @param string $text Texte de la bulle * @param string $text Texte de la bulle

2
core/module/language/view/index/index.php
View File

@ -4,7 +4,7 @@
<?php echo template::button('translateFormBack', [ <?php echo template::button('translateFormBack', [
'class' => 'buttonGrey', 'class' => 'buttonGrey',
'href' => helper::baseUrl(), 'href' => helper::baseUrl(),
'value' => template::ico('left') 'value' => template::ico('home')
]); ?> ]); ?>
</div> </div>
<div class="col1"> <div class="col1">

17
core/module/page/page.php
View File

@ -68,10 +68,10 @@ class page extends common
public static $userProfils = []; public static $userProfils = [];
public static $navIconTemplate = [ public static $navIconTemplate = [
'dir' => 'Petit triangle', 'dir' => 'Petit triangle',
'open' => 'Grand triangle', 'open' => 'Grand triangle',
'big' => 'Flèche', 'big' => 'Flèche',
]; ];
public static $navIconPosition = [ public static $navIconPosition = [
'none' => 'Masqué', 'none' => 'Masqué',
@ -539,6 +539,9 @@ class page extends common
} }
// Construction du formulaire // Construction du formulaire
// Met à jour le sitemap
$this->updateSitemap();
// Création du sélecteur de modules // Création du sélecteur de modules
self::$moduleIds = []; self::$moduleIds = [];
foreach (helper::getModules() as $key => $values) { foreach (helper::getModules() as $key => $values) {
@ -599,7 +602,8 @@ class page extends common
$css = $this->getInput('pageCssEditorContent', helper::FILTER_STRING_LONG) === null ? '' : $this->getInput('pageCssEditorContent', helper::FILTER_STRING_LONG); $css = $this->getInput('pageCssEditorContent', helper::FILTER_STRING_LONG) === null ? '' : $this->getInput('pageCssEditorContent', helper::FILTER_STRING_LONG);
// Enregistre le CSS // Enregistre le CSS
$this->setData([ $this->setData([
'page', $this->getUrl(2), 'page',
$this->getUrl(2),
'css', 'css',
$css $css
]); ]);
@ -633,7 +637,8 @@ class page extends common
$js = $this->getInput('pageJsEditorContent', helper::FILTER_STRING_LONG) === null ? '' : $this->getInput('pageJsEditorContent', helper::FILTER_STRING_LONG); $js = $this->getInput('pageJsEditorContent', helper::FILTER_STRING_LONG) === null ? '' : $this->getInput('pageJsEditorContent', helper::FILTER_STRING_LONG);
// Enregistre le JS // Enregistre le JS
$this->setData([ $this->setData([
'page', $this->getUrl(2), 'page',
$this->getUrl(2),
'js', 'js',
$js $js
]); ]);

2
core/module/plugin/view/index/index.php
View File

@ -3,7 +3,7 @@
<?php echo template::button('configModulesBack', [ <?php echo template::button('configModulesBack', [
'class' => 'buttonGrey', 'class' => 'buttonGrey',
'href' => helper::baseUrl(), 'href' => helper::baseUrl(),
'value' => template::ico('left') 'value' => template::ico('home')
]); ?> ]); ?>
</div> </div>
<div class="col1"> <div class="col1">