diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 19e52371adb..ad536443502 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -65,7 +65,7 @@ class DolEditor
{
global $conf,$langs;
- dol_syslog("DolEditor::DolEditor htmlname=".$htmlname." toolbarname=".$toolbarname);
+ dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." toolbarname=".$toolbarname);
if (! $rows) $rows=round($height/20);
if (! $cols) $cols=($width?round($width/6):80);
@@ -177,7 +177,7 @@ class DolEditor
customConfig : \''.dol_buildpath('/theme/'.$conf->theme.'/ckeditor/config.js',1).'\',
toolbar: \''.$this->toolbarname.'\',
toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').',
- width: '.($this->width ? $this->width : '\'\'').',
+ width: '.($this->width ? '\''.$this->width.'\'' : '\'\'').',
height: '.$this->height.',
skin: \''.$skin.'\',
on :
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ae906948af0..27b23f7dada 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -118,7 +118,7 @@ class Form
* @param string $value Value to show/edit
* @param object $object Object
* @param boolean $perm Permission to allow button to edit parameter
- * @param string $typeofdata Type of data ('string' by default, 'email', 'numeric:99', 'text' or 'textarea', 'day' or 'datepicker', 'ckeditor:dolibarr_zzz:width:height', 'select:xxx'...)
+ * @param string $typeofdata Type of data ('string' by default, 'email', 'numeric:99', 'text' or 'textarea', 'day' or 'datepicker', 'ckeditor:dolibarr_zzz:width:height:1', 'select:xxx'...)
* @param string $editvalue When in edit mode, use this value as $value instead of value
* @param object $extObject External object
* @param string $success Success message
@@ -174,7 +174,7 @@ class Form
{
$tmp=explode(':',$typeofdata);
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
- $doleditor=new DolEditor($htmlname,($editvalue?$editvalue:$value),($tmp[2]?$tmp[2]:''),($tmp[3]?$tmp[3]:'100'),($tmp[1]?$tmp[1]:'dolibarr_notes'),'In',false,true,true);
+ $doleditor=new DolEditor($htmlname, ($editvalue?$editvalue:$value), ($tmp[2]?$tmp[2]:''), ($tmp[3]?$tmp[3]:'100'), ($tmp[1]?$tmp[1]:'dolibarr_notes'), 'In', ($tmp[4]?$tmp[4]:0), true, true);
$ret.=$doleditor->Create(1);
}
$ret.='';
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index dbb4dc1921a..5d18d4e76ea 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -22,18 +22,19 @@ $note_private = 'note';
if ($module == 'propal') $module = 'propale';
else if ($module == 'fichinter') { $module = 'ficheinter'; $note_private = 'note_private'; }
+$typeofdata='ckeditor:dolibarr_notes:100%:200:1';
?>
-
editfieldkey("NotePublic",$note_public,$object->note_public,$object,$user->rights->$module->creer,'textarea'); ?>
-
editfieldval("NotePublic",$note_public,$object->note_public,$object,$user->rights->$module->creer,'textarea'); ?>
+
editfieldkey("NotePublic",$note_public,$object->note_public,$object,$user->rights->$module->creer,$typeofdata); ?>
+
editfieldval("NotePublic",$note_public,$object->note_public,$object,$user->rights->$module->creer,$typeofdata); ?>
societe_id) { ?>
-
editfieldkey("NotePrivate",$note_private,$object->note_private,$object,$user->rights->$module->creer,'textarea'); ?>
-
editfieldval("NotePrivate",$note_private,$object->note_private,$object,$user->rights->$module->creer,'textarea'); ?>
+
editfieldkey("NotePrivate",$note_private,$object->note_private,$object,$user->rights->$module->creer,$typeofdata); ?>
+
editfieldval("NotePrivate",$note_private,$object->note_private,$object,$user->rights->$module->creer,$typeofdata); ?>
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 97546719028..a1a3f6e4d6b 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -1402,22 +1402,22 @@ border-top: 1px solid #333;
div#stats {
}
-tr.liste_titre {
+div.liste_titre, tr.liste_titre {
text-align: ;
}
-tr.liste_titre a {
+div.liste_titre a, tr.liste_titre a {
color: #333333;
margin: 0px 5px;
}
-tr.liste_titre td {
+div.liste_titre td, tr.liste_titre td {
padding: 0px 5px;
vertical-align: middle;
background: none !important;
}
-th.liste_titre, td.liste_titre
+div.liste_titre, th.liste_titre, td.liste_titre
{
background-repeat: repeat-x;
color: #333333;
@@ -1428,14 +1428,7 @@ th.liste_titre, td.liste_titre
background: none;
}
-/*tr.liste_titre select.flat {
- float: left;
- width: 200px;
- position: relative;
- margin: 30px 10px 10px 0px;
-}*/
-
-tr.liste_titre input.button {
+div.liste_titre input.button, tr.liste_titre input.button {
float: left;
position: relative;
/*margin: 30px 10px 10px 0px;*/
@@ -2200,6 +2193,36 @@ a.cke_dialog_ui_button
}
+/* ============================================================================== */
+/* Table with div */
+/* ============================================================================== */
+
+div.table-border {
+ display:table;
+ width: 100%;
+ border-collapse: collapse;
+ border: 1px solid #9CACBB;
+}
+div.table-border-row {
+ display:table-row;
+}
+div.table-key-border-col {
+ display:table-cell;
+ width: 25%;
+ vertical-align:top;
+ padding: 1px 2px 1px 1px;
+ border: 1px solid #9CACBB;
+ border-collapse: collapse;
+}
+div.table-val-border-col {
+ display:table-cell;
+ width:auto;
+ padding: 1px 2px 1px 1px;
+ border: 1px solid #9CACBB;
+ border-collapse: collapse;
+}
+
+
/* ============================================================================== */
/* Login */
/* ============================================================================== */
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index 107d34a38ae..469e5232f26 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -1319,7 +1319,7 @@ table.liste td {
padding-right: 2px;
}
-tr.liste_titre {
+div.liste_titre, tr.liste_titre {
height: 20px;
color: #842F00;
font-weight: bold;
@@ -2130,6 +2130,37 @@ a.cke_dialog_ui_button
height: 72px !important;
}
+
+/* ============================================================================== */
+/* Table with div */
+/* ============================================================================== */
+
+div.table-border {
+ display:table;
+ width: 100%;
+ border-collapse: collapse;
+ border: 1px solid #9CACBB;
+}
+div.table-border-row {
+ display:table-row;
+}
+div.table-key-border-col {
+ display:table-cell;
+ width: 25%;
+ vertical-align:top;
+ padding: 1px 2px 1px 1px;
+ border: 1px solid #9CACBB;
+ border-collapse: collapse;
+}
+div.table-val-border-col {
+ display:table-cell;
+ width:auto;
+ padding: 1px 2px 1px 1px;
+ border: 1px solid #9CACBB;
+ border-collapse: collapse;
+}
+
+
close();
?>