'."\n";
+ print '
'."\n";
print $form->editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam, '', 0);
print '
'."\n";
- print '
'."\n";
+ print '
'."\n";
print $form->editfieldval("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, '', null, null, $moreparam, 1);
print '
'."\n";
print '
'."\n";
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index c6386ba7ea2..670734e6706 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -23,6 +23,10 @@ body {
trans("DIRECTION").";\n"; ?>
}
+.sensiblehtmlcontent * {
+ position: static !important;
+}
+
.thumbstat { font-weight: bold !important; }
th a { font-weight: !important; }
a.tab { font-weight: 500 !important; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 2f76ee382e9..0293513109d 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -247,6 +247,10 @@ body {
trans("DIRECTION").";\n"; ?>
}
+.sensiblehtmlcontent * {
+ position: static !important;
+}
+
.thumbstat { font-weight: bold !important; }
th a { font-weight: !important; }
a.tab { font-weight: 500 !important; }
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index cd8607a764b..19c52b6fa7f 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -386,7 +386,9 @@ else
// Note
print '
| '.$langs->trans("Description").' | ';
- print ''.dol_htmlentitiesbr($object->note).' | ';
+ print '';
+ print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note));
+ print ' | ';
print "
\n";
// Other attributes
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 448f38aea50..eca923f68be 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -126,7 +126,9 @@ if (! empty($conf->mutlicompany->enabled))
// Note
print '
| '.$langs->trans("Description").' | ';
-print ''.dol_htmlentitiesbr($object->note).' | ';
+print '';
+print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note));
+print ' | ';
print "
\n";
// LDAP DN
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 39dc2e61f9f..576cbebff8d 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -212,7 +212,9 @@ if ($object->id > 0)
// Note
print '
| '.$langs->trans("Description").' | ';
- print ''.dol_htmlentitiesbr($object->note).' | ';
+ print '';
+ print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note));
+ print ' | ';
print "
\n";
print '
';
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index cdf6f65b9a1..dc2f11b96fa 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -111,19 +111,19 @@ if ($id)
// Note
print '
| '.$langs->trans("Note").' | ';
- print '';
+ print ' | ';
if ($action == 'edit' && $user->rights->user->user->creer)
{
print "";
print "id."\">";
// Editeur wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor=new DolEditor('note_private', $object->note, '', 280, 'dolibarr_notes', 'In', true, false, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_8, '90%');
+ $doleditor=new DolEditor('note_private', $object->note_private, '', 280, 'dolibarr_notes', 'In', true, false, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_8, '90%');
$doleditor->Create();
}
else
{
- print dol_htmlentitiesbr($object->note);
+ print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private));
}
print " |
";