Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean ckeditor setup

Browse Source
This commit is contained in:
Laurent Destailleur 2024-10-26 16:22:05 +02:00
parent 2a39e9edca
commit 9396be1dbc
3 changed files with 50 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
htdocs/admin/fckeditor.php
View File

@ -53,13 +53,12 @@ $modules = array(
'NOTE_PUBLIC' => 'FCKeditorForNotePublic',
'NOTE_PRIVATE' => 'FCKeditorForNotePrivate',
'SOCIETE' => 'FCKeditorForCompany',
//'PRODUCTDESC' => 'FCKeditorForProduct',
'DETAILS' => 'FCKeditorForProductDetails',
'USERSIGN' => 'FCKeditorForUserSignature',
'MAILING' => 'FCKeditorForMailing',
'MAIL' => 'FCKeditorForMail',
'TICKET' => 'FCKeditorForTicket',
'SPECIALCHAR' => 'SpecialCharActivation',
//'SPECIALCHAR' => 'SpecialCharActivation',
);
// Conditions for the option to be offered
$conditions = array(
@ -72,7 +71,7 @@ $conditions = array(
'MAILING' => isModEnabled('mailing'),
'MAIL' => (isModEnabled('invoice') || isModEnabled("propal") || isModEnabled('order')),
'TICKET' => isModEnabled('ticket'),
'SPECIALCHAR' => 1,
//'SPECIALCHAR' => 1,
);
// Picto
$picto = array(
@ -85,7 +84,7 @@ $picto = array(
'MAILING' => 'email',
'MAIL' => 'email',
'TICKET' => 'ticket',
'SPECIALCHAR' => 'generic'
//'SPECIALCHAR' => 'generic'
);
@ -157,7 +156,7 @@ if (empty($conf->use_javascript_ajax)) {
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("ActivateFCKeditor").'</td>';
print '<td class="center" width="100">'.$langs->trans("Action").'</td>';
print '<td class="center width100"></td>';
print "</tr>\n";
// Modules
@ -193,13 +192,43 @@ if (empty($conf->use_javascript_ajax)) {
print '<br>'."\n";
// Other options
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Other").'</td>';
print '<td class="center"></td>';
print "</tr>\n";
$constante = 'FCKEDITOR_ENANLE_SPECIALCHAR';
print '<!-- constant = '.$constante.' -->'."\n";
print '<tr class="oddeven">';
print '<td>';
print $langs->trans('SpecialCharActivation');
print '</td>';
print '<td class="center width100">';
$value = getDolGlobalInt($constante, 0);
if ($value == 0) {
print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=enable_'.strtolower($const).'&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
} elseif ($value == 1) {
print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=disable_'.strtolower($const).'&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
}
print "</td>";
print '</tr>';
print '</table>'."\n";
print '<br>'."\n";
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);
print '<br>'."\n";
//show_skin(null, 1);
//print '<br>'."\n";
$listofmodes = array('dolibarr_mailings', 'dolibarr_notes', 'dolibarr_details', 'dolibarr_readonly', 'Full', 'Full_inline');
$linkstomode = '';

23
htdocs/core/class/html.form.class.php
View File

@ -4845,17 +4845,17 @@ class Form
}
/**
* Return list of transport mode for intracomm report
* Return list of transport mode for intracomm report
*
* @param string $selected Id of the transport mode preselected
* @param string $htmlname Name of the select field
* @param int $format 0=id+label, 1=code+code, 2=code+label, 3=id+code
* @param int $empty 1=can be empty, 0 else
* @param int $noadmininfo 0=Add admin info, 1=Disable admin info
* @param int $maxlength Max length of label
* @param int $active Active or not, -1 = all
* @param string $morecss Add more CSS on select tag
* @return void
* @param string $selected Id of the transport mode preselected
* @param string $htmlname Name of the select field
* @param int $format 0=id+label, 1=code+code, 2=code+label, 3=id+code
* @param int $empty 1=can be empty, 0 else
* @param int $noadmininfo 0=Add admin info, 1=Disable admin info
* @param int $maxlength Max length of label
* @param int $active Active or not, -1 = all
* @param string $morecss Add more CSS on select tag
* @return void
*/
public function selectTransportMode($selected = '', $htmlname = 'transportmode', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '')
{
@ -4910,6 +4910,9 @@ class Form
print '</option>';
}
print '</select>';
print ajax_combobox("select".$htmlname);
if ($user->admin && !$noadmininfo) {
print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
}

2
htdocs/core/lib/doleditor.lib.php
View File

@ -53,7 +53,7 @@ function show_skin($fuser, $edit = 0)
$colspan = 2;
$thumbsbyrow = 6;
print '<table class="noborder centpercent">';
$var = false;