lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ckeditor

Browse Source
This commit is contained in:
Laurent Destailleur 2022-10-24 22:38:45 +02:00
parent afc452b274
commit 68e1509834
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/admin/fckeditor.php
View File

@ -166,7 +166,12 @@ if (empty($conf->use_javascript_ajax)) {
print '<!-- constant = '.$constante.' -->'."\n";
print '<tr class="oddeven">';
print '<td width="16">'.img_object("", $picto[$const]).'</td>';
print '<td>'.$langs->trans($desc).'</td>';
print '<td>';
print $langs->trans($desc);
if ($const == 'DETAILS') {
print '<br><span class="warning">'.$langs->trans("FCKeditorForProductDetails2").'</span>';
}
print '</td>';
print '<td class="center" width="100">';
$value = (isset($conf->global->$constante) ? $conf->global->$constante : 0);
if ($value == 0) {
@ -185,6 +190,7 @@ if (empty($conf->use_javascript_ajax)) {
print '<form name="formtest" method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="page_y" value="">';
// Skins
show_skin(null, 1);
@ -219,7 +225,7 @@ if (empty($conf->use_javascript_ajax)) {
print $conf->global->FCKEDITOR_TEST;
print '</div>';
}
print $form->buttonsSaveCancel("Save", '');
print $form->buttonsSaveCancel("Save", '', null, 0, 'reposition');
print '<div id="divforlog"></div>';
print '</form>'."\n";

3
htdocs/langs/en_US/admin.lang
View File

@ -1748,7 +1748,8 @@ FCKeditorForNotePublic=WYSIWIG creation/edition of the field "public notes" of e
FCKeditorForNotePrivate=WYSIWIG creation/edition of the field "private notes" of elements
FCKeditorForCompany=WYSIWIG creation/edition of the field description of elements (except products/services)
FCKeditorForProduct=WYSIWIG creation/edition of the field description of products/services
FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...).
FCKeditorForProductDetails2=Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.
FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)

3
htdocs/langs/fr_FR/admin.lang
View File

@ -1747,7 +1747,8 @@ FCKeditorForNotePublic=Création/édition WYSIWIG du champ notes publiques des
FCKeditorForNotePrivate=Création/édition WYSIWIG du champ notes privées des éléments
FCKeditorForCompany=Création/édition WYSIWIG de la description des éléments (autre que produits/services)
FCKeditorForProduct=Création/édition WYSIWIG du champ description des produits/services
FCKeditorForProductDetails=Création/édition WYSIWYG des lignes de détails produits sur tous les éléments (commandes, propales, factures, etc...). <span class="warning">Attention: L'utilisation pour ce cas est fortement déconseillée car peut créer des problèmes dans la gestion de caractères et mise en page des fichiers PDF générés.</span>
FCKeditorForProductDetails=Création/édition WYSIWYG des lignes de détails produits sur tous les éléments (commandes, propales, factures, etc...).
FCKeditorForProductDetails2=Attention: L'utilisation pour ce cas est fortement déconseillée car peut créer des problèmes dans la gestion de caractères et mise en page des fichiers PDF générés.
FCKeditorForMailing= Création/édition WYSIWIG des emailings (Outils->Emailings)
FCKeditorForUserSignature=Création/édition WYSIWIG de la signature des utilisateurs
FCKeditorForMail=Création/édition WYSIWIG tous les emails (sauf Outils->Emailings)

1
htdocs/theme/eldy/ckeditor/config.js
View File

@ -100,6 +100,7 @@ CKEDITOR.editorConfig = function( config )
[
['Maximize'],
['Find'],
['Image'],
['Source']
];
};

1
htdocs/theme/md/ckeditor/config.js
View File

@ -100,6 +100,7 @@ CKEDITOR.editorConfig = function( config )
[
['Maximize'],
['Find'],
['Image'],
['Source']
];
};