ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 143 Activity

Merge 9.2.09

This commit is contained in:
fredtempez 2019-10-07 18:36:49 +02:00
parent 2d81499f67 b5fb1a6a91
commit 318778bb54
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/vendor/tinymce/init.js vendored
View File

@ -5,11 +5,11 @@ tinymce.init({
// Classe où appliquer l'éditeur
selector: ".editorWysiwyg",
// Aperçu dans le pied de page
setup:function(ed) {
ed.on('change', function(e) {
$("#footerText").html(ed.getContent());
});
},
// setup:function(ed) {
// ed.on('change', function(e) {
// $("#footerText").html(ed.getContent());
// });
//},
// Langue
language: "fr_FR",
// Plugins

6
module/form/form.php
View File

@ -32,7 +32,7 @@ class form extends common {
public static $pagination;
const FORM_VERSION = '1.9';
const FORM_VERSION = '2.0';
const TYPE_MAIL = 'mail';
const TYPE_SELECT = 'select';
@ -88,6 +88,8 @@ class form extends common {
'subject' => $this->getInput('formConfigSubject')
]
]);
// Génération des données vides
$this->setData(['module', $this->getUrl(0), 'data', []]);
// Génération des champs
$inputs = [];
foreach($this->getInput('formConfigPosition', null) as $index => $position) {
@ -379,4 +381,4 @@ class form extends common {
'view' => 'index',
]);
}
}
}