From fd0450457d76a9f4235b5522827174f959655e51 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Jun 2012 13:16:55 +0200 Subject: [PATCH] New: Can insert links into elements lines. Also reported into PDF. --- ChangeLog | 3 +++ htdocs/product/fiche.php | 10 +++++----- htdocs/theme/auguria/ckeditor/config.js | 2 +- htdocs/theme/bureau2crea/ckeditor/config.js | 2 +- htdocs/theme/cameleo/ckeditor/config.js | 2 +- htdocs/theme/eldy/ckeditor/config.js | 2 +- htdocs/theme/eldy/fckeditor/fckconfig.js | 2 +- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index f21ab790c3a..b7545eea13e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,9 @@ For users: - New: Cloning project allow to clones task, notes, files, contacts. - New: Enhance default style. - New: Can edit and resiliate member status from list. +- New: Can insert links into elements lines. Also reported into PDF. +- Fix: No images into product description lines as PDF generation does + not work with this. For developers: - New: A module can overwrite templates parts. diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 5393ee4fa6e..e6c3240fd4a 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -251,7 +251,7 @@ if (empty($reshook)) if ($object->fetch($id,$ref)) { $object->oldcopy=dol_clone($object); - + $object->ref = $ref; $object->libelle = $_POST["libelle"]; $object->description = dol_htmlcleanlastbr($_POST["desc"]); @@ -745,7 +745,7 @@ else print ''.$langs->trans("Description").''; require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); - $doleditor=new DolEditor('desc',$_POST["desc"],'',160,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,4,90); + $doleditor=new DolEditor('desc',$_POST["desc"],'',160,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,4,90); $doleditor->Create(); print ""; @@ -821,7 +821,7 @@ else // Note (private, no output on invoices, propales...) print ''.$langs->trans("NoteNotVisibleOnBill").''; require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); - $doleditor=new DolEditor('note',$_POST["note"],'',180,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,8,70); + $doleditor=new DolEditor('note',$_POST["note"],'',180,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,8,70); $doleditor->Create(); print ""; @@ -932,7 +932,7 @@ else // Description (used in invoice, propal...) print ''.$langs->trans("Description").''; require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); - $doleditor=new DolEditor('desc',$object->description,'',160,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,4,90); + $doleditor=new DolEditor('desc',$object->description,'',160,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,4,90); $doleditor->Create(); print ""; print "\n"; @@ -1024,7 +1024,7 @@ else // Note print ''.$langs->trans("NoteNotVisibleOnBill").''; require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); - $doleditor=new DolEditor('note',$object->note,'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,8,70); + $doleditor=new DolEditor('note',$object->note,'',200,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,8,70); $doleditor->Create(); print ""; print ''; diff --git a/htdocs/theme/auguria/ckeditor/config.js b/htdocs/theme/auguria/ckeditor/config.js index 699f7d61ec7..c1031560845 100644 --- a/htdocs/theme/auguria/ckeditor/config.js +++ b/htdocs/theme/auguria/ckeditor/config.js @@ -77,6 +77,6 @@ CKEDITOR.editorConfig = function( config ) ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], ['NumberedList','BulletedList','Outdent','Indent'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], - ['SpecialChar'] + ['Link','Unlink','SpecialChar'] ]; }; diff --git a/htdocs/theme/bureau2crea/ckeditor/config.js b/htdocs/theme/bureau2crea/ckeditor/config.js index 699f7d61ec7..c1031560845 100644 --- a/htdocs/theme/bureau2crea/ckeditor/config.js +++ b/htdocs/theme/bureau2crea/ckeditor/config.js @@ -77,6 +77,6 @@ CKEDITOR.editorConfig = function( config ) ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], ['NumberedList','BulletedList','Outdent','Indent'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], - ['SpecialChar'] + ['Link','Unlink','SpecialChar'] ]; }; diff --git a/htdocs/theme/cameleo/ckeditor/config.js b/htdocs/theme/cameleo/ckeditor/config.js index d7bf8a6fd19..fa3b7b38cbe 100644 --- a/htdocs/theme/cameleo/ckeditor/config.js +++ b/htdocs/theme/cameleo/ckeditor/config.js @@ -77,6 +77,6 @@ CKEDITOR.editorConfig = function( config ) ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], ['NumberedList','BulletedList','Outdent','Indent'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], - ['SpecialChar'] + ['Link','Unlink','SpecialChar'] ]; }; diff --git a/htdocs/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js index 0672ec12f27..036b7df4447 100644 --- a/htdocs/theme/eldy/ckeditor/config.js +++ b/htdocs/theme/eldy/ckeditor/config.js @@ -77,6 +77,6 @@ CKEDITOR.editorConfig = function( config ) ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], ['NumberedList','BulletedList','Outdent','Indent'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], - ['SpecialChar'] + ['Link','Unlink','SpecialChar'] ]; }; diff --git a/htdocs/theme/eldy/fckeditor/fckconfig.js b/htdocs/theme/eldy/fckeditor/fckconfig.js index 96ec6dd9b4a..0f57805541e 100644 --- a/htdocs/theme/eldy/fckeditor/fckconfig.js +++ b/htdocs/theme/eldy/fckeditor/fckconfig.js @@ -128,7 +128,7 @@ FCKConfig.ToolbarSets["dolibarr_details"] = [ ['Bold','Italic','Underline','StrikeThrough','Subscript','Superscript','-','TextColor','RemoveFormat'], ['OrderedList','UnorderedList','-','Outdent','Indent'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], - ['SpecialChar'], + ['Link','Unlink','SpecialChar'], ['FontSize'] ] ;