From 92cb694f5560150ed89c435dee8ac4610536117d Mon Sep 17 00:00:00 2001 From: simnandez Date: Sat, 9 Jun 2012 09:05:14 +0200 Subject: [PATCH 1/2] Fix: Missing translation key --- htdocs/langs/ca_ES/products.lang | 3 ++- htdocs/langs/es_ES/products.lang | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang index 1c8215343a2..84dee044a75 100644 --- a/htdocs/langs/ca_ES/products.lang +++ b/htdocs/langs/ca_ES/products.lang @@ -168,4 +168,5 @@ CustomerPrices=Preus clients SuppliersPrices=Preus proveïdors CustomCode=Codi duaner CountryOrigin=País d'origen -HiddenIntoCombo=Ocult en les llistes \ No newline at end of file +HiddenIntoCombo=Ocult en les llistes +Nature=Naturalea \ No newline at end of file diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang index 1f4e5d16ad2..c26b573094b 100644 --- a/htdocs/langs/es_ES/products.lang +++ b/htdocs/langs/es_ES/products.lang @@ -168,4 +168,5 @@ CustomerPrices=Precios clientes SuppliersPrices=Precios proveedores CustomCode=Código aduanero CountryOrigin=País de origen -HiddenIntoCombo=Oculto en las listas \ No newline at end of file +HiddenIntoCombo=Oculto en las listas +Nature=Naturaleza \ No newline at end of file From c8c31b21674548fd810e821b5791815d2f3b5d5d Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 12 Jun 2012 23:07:44 +0200 Subject: [PATCH 2/2] Fix: mutualize ckeditor parameters --- htdocs/core/class/doleditor.class.php | 6 +++--- htdocs/core/js/editinplace.js | 8 +++++++- htdocs/main.inc.php | 8 ++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index 4f16862c82e..d6d1bd86539 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -176,7 +176,7 @@ class DolEditor /* should be editor=CKEDITOR.replace but what if serveral editors ? */ CKEDITOR.replace(\''.$this->htmlname.'\', { - customConfig : \''.dol_buildpath('/theme/'.$conf->theme.'/ckeditor/config.js',1).'\', + customConfig : ckeditorConfig, toolbar: \''.$this->toolbarname.'\', toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').', width: '.($this->width ? '\''.$this->width.'\'' : '\'\'').', @@ -201,8 +201,8 @@ class DolEditor { $out.= ','."\n"; // To use filemanager with old fckeditor (GPL) - $out.= ' filebrowserBrowseUrl : \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\','; - $out.= ' filebrowserImageBrowseUrl : \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\','; + $out.= ' filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,'; + $out.= ' filebrowserImageBrowseUrl : ckeditorFilebrowserImageBrowseUrl,'; //$out.= ' filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=File\','; //$out.= ' filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=Image\','; $out.= "\n"; diff --git a/htdocs/core/js/editinplace.js b/htdocs/core/js/editinplace.js index 7748b73fce6..bf94a47749a 100644 --- a/htdocs/core/js/editinplace.js +++ b/htdocs/core/js/editinplace.js @@ -80,7 +80,13 @@ $(document).ready(function() { indicator : indicatorInPlace, ckeditor : { customConfig: ckeditorConfig, - toolbar: $('#ckeditor_toolbar').val() + toolbar: $('#ckeditor_toolbar').val(), + filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl, + filebrowserImageBrowseUrl : ckeditorFilebrowserImageBrowseUrl, + filebrowserWindowWidth : '900', + filebrowserWindowHeight : '500', + filebrowserImageWindowWidth : '900', + filebrowserImageWindowHeight : '500' }, submitdata : function(result, settings) { return getParameters(this, 'ckeditor'); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index f89e22fb6c6..bc1cee119a4 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -968,7 +968,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print 'var cancelInPlace = \''.$langs->trans('Cancel').'\';'."\n"; print 'var submitInPlace = \''.$langs->trans('Ok').'\';'."\n"; print 'var indicatorInPlace = \'theme."/img/working.gif".'">\';'."\n"; - print 'var ckeditorConfig = \''.dol_buildpath('/theme/'.$conf->theme.'/ckeditor/config.js',1).'\';'."\n"; print ''."\n"; print ''."\n"; print ''."\n"; @@ -1005,7 +1004,12 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs } else { - print ''."\n"; + print ''."\n"; print ''."\n"; } }