diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php index b7d504ac9c2..c5338fcf6cd 100644 --- a/htdocs/core/tpl/predefinedproductline_create.tpl.php +++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php @@ -1,6 +1,6 @@ - * Copyright (C) 2010 Laurent Destailleur +/* Copyright (C) 2010-2011 Regis Houssin + * Copyright (C) 2010-2011 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/htdocs/lib/doleditor.class.php b/htdocs/lib/doleditor.class.php index d6af10f71b7..2ec1d372a57 100644 --- a/htdocs/lib/doleditor.class.php +++ b/htdocs/lib/doleditor.class.php @@ -41,6 +41,7 @@ class DolEditor var $content; var $htmlname; var $toolbarname; + var $toolbarstartexpanded; var $rows; var $cols; var $height; @@ -111,13 +112,14 @@ class DolEditor if (in_array($this->tool,array('textarea','ckeditor'))) { - $this->content = $content; - $this->htmlname = $htmlname; - $this->toolbarname = $toolbarname; - $this->rows = max(ROWS_3,$rows); - $this->cols = max(40,$cols); - $this->height = $height; - $this->width = 600; + $this->content = $content; + $this->htmlname = $htmlname; + $this->toolbarname = $toolbarname; + $this->toolbarstartexpanded = $toolbarstartexpanded; + $this->rows = max(ROWS_3,$rows); + $this->cols = max(40,$cols); + $this->height = $height; + $this->width = 600; } } @@ -153,9 +155,9 @@ class DolEditor { customConfig : \''.DOL_URL_ROOT.'/theme/'.$conf->theme.'/ckeditor/config.js\', toolbar: \''.$this->toolbarname.'\', + toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').', //width: '.$this->width.', - height: '.$this->height.', - toolbarStartupExpanded: false + height: '.$this->height.' }); });