diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index 111f5ff9f57..aa500ab64df 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -273,20 +273,20 @@ class DolEditor var statusBar = new StatusBar(aceEditor, document.getElementById("statusBar'.$this->htmlname.'")); // Init status bar. Need lib ext-statusbar var oldNbOfLines = 0 jQuery(".morelines'.$this->htmlname.'").click(function() { - var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid"); - currentline = aceEditor.getOption("maxLines"); + var aceEditorClicked = window.ace.edit("'.$this->htmlname.'aceeditorid"); + currentline = aceEditorClicked.getOption("maxLines"); if (oldNbOfLines == 0) { oldNbOfLines = currentline; } - console.log("We click on more lines - we have currently "+oldNbOfLines); + console.log("We click on more lines, oldNbOfLines is "+oldNbOfLines+", we have currently "+currentline); if (currentline < 500) { - aceEditor.setOptions({ maxLines: 500 }); + aceEditorClicked.setOptions({ maxLines: 500 }); } else { - aceEditor.setOptions({ maxLines: oldNbOfLines }); + aceEditorClicked.setOptions({ maxLines: oldNbOfLines }); } }); })'; diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang index a978fdc4498..739bfd3cf9b 100644 --- a/htdocs/langs/en_US/website.lang +++ b/htdocs/langs/en_US/website.lang @@ -5,11 +5,11 @@ DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file PageNameAliasHelp=Name or alias of the page.
This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 742b308c89f..16d19907883 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -1695,7 +1695,7 @@ if ($action == 'editcss') print ''; $doleditor=new DolEditor('WEBSITE_ROBOT', $robotcontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', ''); - print $doleditor->Create(1, '', true, 'Robot file', 'txt'); + print $doleditor->Create(1, '', true, 'Robot file', 'text'); print ''; @@ -1705,7 +1705,7 @@ if ($action == 'editcss') print ''; $doleditor=new DolEditor('WEBSITE_HTACCESS', $htaccesscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', ''); - print $doleditor->Create(1, '', true, $langs->trans("File").' .htaccess', 'txt'); + print $doleditor->Create(1, '', true, $langs->trans("File").' .htaccess', 'text'); print '';