diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php index b6e8fcf0fd2..6c7cc5a7f66 100644 --- a/htdocs/admin/fckeditor.php +++ b/htdocs/admin/fckeditor.php @@ -109,7 +109,7 @@ if (GETPOST('save', 'alpha')) } else { $error ++; } - + $fckeditor_test = GETPOST('formtestfield'); if (! empty($fckeditor_test)) { if (! dolibarr_set_const($db, 'FCKEDITOR_TEST', $fckeditor_test, 'chaine', 0, '', $conf->entity)) { @@ -156,7 +156,7 @@ else { // Si condition non remplie, on ne propose pas l'option if (! $conditions[$const]) continue; - + print ''; print ''.img_object("", $picto[$const]).''; print ''.$langs->trans($desc).''; @@ -181,12 +181,12 @@ else print '
'."\n"; print '
'."\n"; - + // Skins show_skin(null, 1); print '
'."\n"; - - $listofmodes=array('dolibarr_mailings','dolibarr_notes','dolibarr_details','dolibarr_readonly','Full'); + + $listofmodes=array('dolibarr_mailings', 'dolibarr_notes', 'dolibarr_details', 'dolibarr_readonly', 'Full', 'Full_inline'); $linkstomode=''; foreach($listofmodes as $newmode) { @@ -200,10 +200,19 @@ else $linkstomode.=''; print load_fiche_titre($langs->trans("TestSubmitForm"), $linkstomode, ''); print ''; - $uselocalbrowser=true; - $readonly=($mode=='dolibarr_readonly'?1:0); - $editor=new DolEditor('formtestfield', isset($conf->global->FCKEDITOR_TEST)?$conf->global->FCKEDITOR_TEST:'Test', '', 200, $mode, 'In', true, $uselocalbrowser, 1, 120, 8, $readonly); - $editor->Create(); + if ($mode != 'Full_inline') + { + $uselocalbrowser=true; + $readonly=($mode=='dolibarr_readonly'?1:0); + $editor=new DolEditor('formtestfield', isset($conf->global->FCKEDITOR_TEST)?$conf->global->FCKEDITOR_TEST:'Test', '', 200, $mode, 'In', true, $uselocalbrowser, 1, 120, 8, $readonly); + $editor->Create(); + } + else + { + print '
'; + print $conf->global->FCKEDITOR_TEST; + print '
'; + } print '
'."\n"; print '
'; print '
'."\n"; diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 8be32bec500..3d1027e629e 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -2922,11 +2922,12 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa // Change the contenteditable to "true" or "false" when mode Edit Inline is on or off if (empty($conf->global->WEBSITE_EDITINLINE)) { + // Remove the contenteditable="true" $newcontent = preg_replace('/(div|section)(\s[^\>]*)contenteditable="true"/', '\1\2', $newcontent); } else { - // TODO Add the contenteditable="true" when mode Edit Inline is on + // Keep the contenteditable="true" when mode Edit Inline is on } $out.=dolWebsiteReplacementOfLinks($object, $newcontent)."\n"; //$out.=$newcontent;