diff --git a/html/js/nicEdit.js b/html/js/nicEdit.js deleted file mode 100644 index d95c76720..000000000 --- a/html/js/nicEdit.js +++ /dev/null @@ -1,1741 +0,0 @@ -/* NicEdit - Micro Inline WYSIWYG - * Copyright 2007-2008 Brian Kirchoff - * - * NicEdit is distributed under the terms of the MIT license - * For more information visit http://nicedit.com/ - * Do not remove this copyright message - */ -var bkExtend = function(){ - var args = arguments; - if (args.length == 1) args = [this, args[0]]; - for (var prop in args[1]) args[0][prop] = args[1][prop]; - return args[0]; -}; -function bkClass() { } -bkClass.prototype.construct = function() {}; -bkClass.extend = function(def) { - var classDef = function() { - if (arguments[0] !== bkClass) { return this.construct.apply(this, arguments); } - }; - var proto = new this(bkClass); - bkExtend(proto,def); - classDef.prototype = proto; - classDef.extend = this.extend; - return classDef; -}; - -var bkElement = bkClass.extend({ - construct : function(elm,d) { - if(typeof(elm) == "string") { - elm = (d || document).createElement(elm); - } - elm = $BK(elm); - return elm; - }, - - appendTo : function(elm) { - elm.appendChild(this); - return this; - }, - - appendBefore : function(elm) { - elm.parentNode.insertBefore(this,elm); - return this; - }, - - addEvent : function(type, fn) { - bkLib.addEvent(this,type,fn); - return this; - }, - - setContent : function(c) { - this.innerHTML = c; - return this; - }, - - pos : function() { - var curleft = curtop = 0; - var o = obj = this; - if (obj.offsetParent) { - do { - curleft += obj.offsetLeft; - curtop += obj.offsetTop; - } while (obj = obj.offsetParent); - } - var b = (!window.opera) ? parseInt(this.getStyle('border-width') || this.style.border) || 0 : 0; - return [curleft+b,curtop+b+this.offsetHeight]; - }, - - noSelect : function() { - bkLib.noSelect(this); - return this; - }, - - parentTag : function(t) { - var elm = this; - do { - if(elm && elm.nodeName && elm.nodeName.toUpperCase() == t) { - return elm; - } - elm = elm.parentNode; - } while(elm); - return false; - }, - - hasClass : function(cls) { - return this.className.match(new RegExp('(\\s|^)nicEdit-'+cls+'(\\s|$)')); - }, - - addClass : function(cls) { - if (!this.hasClass(cls)) { this.className += " nicEdit-"+cls }; - return this; - }, - - removeClass : function(cls) { - if (this.hasClass(cls)) { - this.className = this.className.replace(new RegExp('(\\s|^)nicEdit-'+cls+'(\\s|$)'),' '); - } - return this; - }, - - setStyle : function(st) { - var elmStyle = this.style; - for(var itm in st) { - switch(itm) { - case 'float': - elmStyle['cssFloat'] = elmStyle['styleFloat'] = st[itm]; - break; - case 'opacity': - elmStyle.opacity = st[itm]; - elmStyle.filter = "alpha(opacity=" + Math.round(st[itm]*100) + ")"; - break; - case 'className': - this.className = st[itm]; - break; - default: - //if(document.compatMode || itm != "cursor") { // Nasty Workaround for IE 5.5 - elmStyle[itm] = st[itm]; - //} - } - } - return this; - }, - - getStyle : function( cssRule, d ) { - var doc = (!d) ? document.defaultView : d; - if(this.nodeType == 1) - return (doc && doc.getComputedStyle) ? doc.getComputedStyle( this, null ).getPropertyValue(cssRule) : this.currentStyle[ bkLib.camelize(cssRule) ]; - }, - - remove : function() { - this.parentNode.removeChild(this); - return this; - }, - - setAttributes : function(at) { - for(var itm in at) { - this[itm] = at[itm]; - } - return this; - } -}); - -var bkLib = { - isMSIE : (navigator.appVersion.indexOf("MSIE") != -1), - - addEvent : function(obj, type, fn) { - (obj.addEventListener) ? obj.addEventListener( type, fn, false ) : obj.attachEvent("on"+type, fn); - }, - - toArray : function(iterable) { - var length = iterable.length, results = new Array(length); - while (length--) { results[length] = iterable[length] }; - return results; - }, - - noSelect : function(element) { - if(element.setAttribute && element.nodeName.toLowerCase() != 'input' && element.nodeName.toLowerCase() != 'textarea') { - element.setAttribute('unselectable','on'); - } - for(var i=0;i.nicEdit-main p { margin: 0; }<\/scr"+"ipt>"); - $BK("__ie_onload").onreadystatechange = function() { - if (this.readyState == "complete"){bkLib.domLoaded();} - }; - } - window.onload = bkLib.domLoaded; - } -}; - -function $BK(elm) { - if(typeof(elm) == "string") { - elm = document.getElementById(elm); - } - return (elm && !elm.appendTo) ? bkExtend(elm,bkElement.prototype) : elm; -} - -var bkEvent = { - addEvent : function(evType, evFunc) { - if(evFunc) { - this.eventList = this.eventList || {}; - this.eventList[evType] = this.eventList[evType] || []; - this.eventList[evType].push(evFunc); - } - return this; - }, - fireEvent : function() { - var args = bkLib.toArray(arguments), evType = args.shift(); - if(this.eventList && this.eventList[evType]) { - for(var i=0;i'); - } - this.instanceDoc = document.defaultView; - this.elm.addEvent('mousedown',this.selected.closureListener(this)).addEvent('keypress',this.keyDown.closureListener(this)).addEvent('focus',this.selected.closure(this)).addEvent('blur',this.blur.closure(this)).addEvent('keyup',this.selected.closure(this)); - this.ne.fireEvent('add',this); - }, - - remove : function() { - this.saveContent(); - if(this.copyElm || this.options.hasPanel) { - this.editorContain.remove(); - this.e.setStyle({'display' : 'block'}); - this.ne.removePanel(); - } - this.disable(); - this.ne.fireEvent('remove',this); - }, - - disable : function() { - this.elm.setAttribute('contentEditable','false'); - }, - - getSel : function() { - return (window.getSelection) ? window.getSelection() : document.selection; - }, - - getRng : function() { - var s = this.getSel(); - if(!s || s.rangeCount === 0) { return; } - return (s.rangeCount > 0) ? s.getRangeAt(0) : s.createRange(); - }, - - selRng : function(rng,s) { - if(window.getSelection) { - s.removeAllRanges(); - s.addRange(rng); - } else { - rng.select(); - } - }, - - selElm : function() { - var r = this.getRng(); - if(!r) { return; } - if(r.startContainer) { - var contain = r.startContainer; - if(r.cloneContents().childNodes.length == 1) { - for(var i=0;i'+((css) ? '' : '')+''+this.initialContent+''); - fd.close(); - this.frameDoc = fd; - - this.frameWin = $BK(this.elmFrame.contentWindow); - this.frameContent = $BK(this.frameWin.document.body).setStyle(this.savedStyles); - this.instanceDoc = this.frameWin.document.defaultView; - - this.heightUpdate(); - this.frameDoc.addEvent('mousedown', this.selected.closureListener(this)).addEvent('keyup',this.heightUpdate.closureListener(this)).addEvent('keydown',this.keyDown.closureListener(this)).addEvent('keyup',this.selected.closure(this)); - this.ne.fireEvent('add',this); - }, - - getElm : function() { - return this.frameContent; - }, - - setContent : function(c) { - this.content = c; - this.ne.fireEvent('set',this); - this.frameContent.innerHTML = this.content; - this.heightUpdate(); - }, - - getSel : function() { - return (this.frameWin) ? this.frameWin.getSelection() : this.frameDoc.selection; - }, - - heightUpdate : function() { - this.elmFrame.style.height = Math.max(this.frameContent.offsetHeight,this.initialHeight)+'px'; - }, - - nicCommand : function(cmd,args) { - this.frameDoc.execCommand(cmd,false,args); - setTimeout(this.heightUpdate.closure(this),100); - } - - -}); -var nicEditorPanel = bkClass.extend({ - construct : function(e,options,nicEditor) { - this.elm = e; - this.options = options; - this.ne = nicEditor; - this.panelButtons = new Array(); - this.buttonList = bkExtend([],this.ne.options.buttonList); - - this.panelContain = new bkElement('DIV').setStyle({overflow : 'hidden', width : '100%', border : '1px solid #cccccc', backgroundColor : '#efefef'}).addClass('panelContain'); - this.panelElm = new bkElement('DIV').setStyle({margin : '2px', marginTop : '0px', zoom : 1, overflow : 'hidden'}).addClass('panel').appendTo(this.panelContain); - this.panelContain.appendTo(e); - - var opt = this.ne.options; - var buttons = opt.buttons; - for(button in buttons) { - this.addButton(button,opt,true); - } - this.reorder(); - e.noSelect(); - }, - - addButton : function(buttonName,options,noOrder) { - var button = options.buttons[buttonName]; - var type = (button['type']) ? eval('(typeof('+button['type']+') == "undefined") ? null : '+button['type']+';') : nicEditorButton; - var hasButton = bkLib.inArray(this.buttonList,buttonName); - if(type && (hasButton || this.ne.options.fullPanel)) { - this.panelButtons.push(new type(this.panelElm,buttonName,options,this.ne)); - if(!hasButton) { - this.buttonList.push(buttonName); - } - } - }, - - findButton : function(itm) { - for(var i=0;i'+this.sel[itm]+''); - } - } -}); - -var nicEditorFontFamilySelect = nicEditorSelect.extend({ - sel : {'arial' : 'Arial','comic sans ms' : 'Comic Sans','courier new' : 'Courier New','georgia' : 'Georgia', 'helvetica' : 'Helvetica', 'impact' : 'Impact', 'times new roman' : 'Times', 'trebuchet ms' : 'Trebuchet', 'verdana' : 'Verdana'}, - - init : function() { - this.setDisplay('Font Family...'); - for(itm in this.sel) { - this.add(itm,''+this.sel[itm]+''); - } - } -}); - -var nicEditorFontFormatSelect = nicEditorSelect.extend({ - /** original selection up to 6*/ - // sel : {'p' : 'Paragraph', 'pre' : 'Pre', 'h1' : '1 Heading ', 'h2' : '2 Heading', 'h3' : '3 Heading', 'h4' : '4 Heading', 'h5' : '5 Heading', 'p6' : '6 Heading'}, - sel : {'p' : 'Paragraph', 'pre' : 'Pre', 'h1' : '1 Heading ', 'h2' : '2 Heading', 'h3' : '3 Heading', 'h4' : '4 Heading'}, - init : function() { - this.setDisplay('Font Format...'); - for(itm in this.sel) { - var tag = itm.toUpperCase(); - this.add('<'+tag+'>',this.sel[itm]); - } - } -}); - -nicEditors.registerPlugin(nicPlugin,nicSelectOptions); - - - -/* START CONFIG */ -var nicLinkOptions = { - buttons : { - 'link' : {name : 'Add Link', type : 'nicLinkButton', tags : ['A']}, - 'unlink' : {name : 'Remove Link', command : 'unlink', noActive : true} - } -}; -/* END CONFIG */ - -var nicLinkButton = nicEditorAdvancedButton.extend({ - addPane : function() { - this.ln = this.ne.selectedInstance.selElm().parentTag('A'); - this.addForm({ - '' : {type : 'title', txt : 'Add/Edit Link'}, - 'href' : {type : 'text', txt : 'URL', value : 'https://', style : {width: '150px'}}, - 'title' : {type : 'text', txt : 'Title'}, - 'target' : {type : 'select', txt : 'Open In', options : {'' : 'Current Window', '_blank' : 'New Window'},style : {width : '100px'}} - },this.ln); - }, - - submit: function(e) { - var url = this.inputs['href'].value; - if (url === "https://" || url === "") { - alert("You must enter a URL to Create a Link"); - return false; - } - this.removePane(); - - if (!this.ln) { - var tmp = 'javascript:nicTemp();'; - this.ne.nicCommand("createlink", tmp); - this.ln = this.findElm('A', 'href', tmp); - // set the link text to the title or the url if there is no text selected - if (this.ln.innerHTML == tmp) { - this.ln.innerHTML = this.inputs['title'].value || url; - } - } - if (this.ln) { - var oldTitle = this.ln.title; - this.ln.setAttributes({ - href: this.inputs['href'].value, - title: this.inputs['title'].value, - target: this.inputs['target'].options[this.inputs['target'].selectedIndex].value - }); - // set the link text to the title or the url if the old text was the old title - if (this.ln.innerHTML == oldTitle) { - this.ln.innerHTML = this.inputs['title'].value || this.inputs['href'].value; - } - } - } -}); - -nicEditors.registerPlugin(nicPlugin,nicLinkOptions); - - - -/* START CONFIG */ -var nicColorOptions = { - buttons : { - 'forecolor' : {name : __('Change Text Color'), type : 'nicEditorColorButton', noClose : true}, - 'bgcolor' : {name : __('Change Background Color'), type : 'nicEditorBgColorButton', noClose : true} - } -}; -/* END CONFIG */ - -var nicEditorColorButton = nicEditorAdvancedButton.extend({ - addPane : function() { - - var colorItems = new bkElement('DIV').setStyle({width: '270px'}); - const aColorCode=['000000','808080','C0C0C0','800000','FFFFFF','FF0000','FFB6C1','ff8c00','800080','FF00FF','008000','00FF00','808000','FFFF00','000080','0000FF','008080','00FFFF']; - - for ( let x=0;x'; - } - - if(attrTxt == "" && nName == "span") { - r = false; - } - if(r) { - txt += '<'+nName; - if(nName != 'br') { - txt += attrTxt; - } - } - } - - - - if(!nChild && !bkLib.inArray(this.noShort,attributeName)) { - if(r) { - txt += ' />'; - } - } else { - if(r) { - txt += '>'; - } - - for(var i=0;i'; - } - - for(var i=0;i'; - } - - break; - case 3: - //if(n.nodeValue != '\n') { - txt += n.nodeValue; - //} - break; - } - - return txt; - } -}); -nicEditors.registerPlugin(nicXHTML); - - - -var nicBBCode = bkClass.extend({ - construct : function(nicEditor) { - this.ne = nicEditor; - if(this.ne.options.bbCode) { - nicEditor.addEvent('get',this.bbGet.closure(this)); - nicEditor.addEvent('set',this.bbSet.closure(this)); - - var loadedPlugins = this.ne.loadedPlugins; - for(itm in loadedPlugins) { - if(loadedPlugins[itm].toXHTML) { - this.xhtml = loadedPlugins[itm]; - } - } - } - }, - - bbGet : function(ni) { - var xhtml = this.xhtml.toXHTML(ni.getElm()); - ni.content = this.toBBCode(xhtml); - }, - - bbSet : function(ni) { - ni.content = this.fromBBCode(ni.content); - }, - - toBBCode : function(xhtml) { - function rp(r,m) { - xhtml = xhtml.replace(r,m); - } - - rp(/\n/gi,""); - rp(/(.*?)<\/strong>/gi,"[b]$1[/b]"); - rp(/(.*?)<\/em>/gi,"[i]$1[/i]"); - rp(/(.*?)<\/span>/gi,"[u]$1[/u]"); - rp(/
    (.*?)<\/ul>/gi,"[list]$1[/list]"); - rp(/
  • (.*?)<\/li>/gi,"[*]$1[/*]"); - rp(/
      (.*?)<\/ol>/gi,"[list=1]$1[/list]"); - rp(//gi,"[img]$1[/img]"); - rp(/(.*?)<\/a>/gi,"[url=$1]$2[/url]"); - rp(//gi,"\n"); - rp(/<.*?>.*?<\/.*?>/gi,""); - - return xhtml; - }, - - fromBBCode : function(bbCode) { - function rp(r,m) { - bbCode = bbCode.replace(r,m); - } - - rp(/\[b\](.*?)\[\/b\]/gi,"$1"); - rp(/\[i\](.*?)\[\/i\]/gi,"$1"); - rp(/\[u\](.*?)\[\/u\]/gi,"$1"); - rp(/\[list\](.*?)\[\/list\]/gi,"
        $1
      "); - rp(/\[list=1\](.*?)\[\/list\]/gi,"
        $1
      "); - rp(/\[\*\](.*?)\[\/\*\]/gi,"
    1. $1
    2. "); - rp(/\[img\](.*?)\[\/img\]/gi,""); - rp(/\[url=(.*?)\](.*?)\[\/url\]/gi,"$2"); - rp(/\n/gi,"
      "); - //rp(/\[.*?\](.*?)\[\/.*?\]/gi,"$1"); - - return bbCode; - } - - -}); -nicEditors.registerPlugin(nicBBCode); - - - -nicEditor = nicEditor.extend({ - floatingPanel : function() { - this.floating = new bkElement('DIV').setStyle({position: 'absolute', top : '-1000px'}).appendTo(document.body); - this.addEvent('focus', this.reposition.closure(this)).addEvent('blur', this.hide.closure(this)); - this.setPanel(this.floating); - }, - - reposition : function() { - var e = this.selectedInstance.e; - this.floating.setStyle({ width : (parseInt(e.getStyle('width')) || e.clientWidth)+'px' }); - var top = e.offsetTop-this.floating.offsetHeight; - if(top < 0) { - top = e.offsetTop+e.offsetHeight; - } - - this.floating.setStyle({ top : top+'px', left : e.offsetLeft+'px', display : 'block' }); - }, - - hide : function() { - this.floating.setStyle({ top : '-1000px'}); - } -}); - - - -/* START CONFIG */ -var nicCodeOptions = { - buttons : { - 'xhtml' : {name : 'Edit HTML', type : 'nicCodeButton'} - } - -}; -/* END CONFIG */ - -var nicCodeButton = nicEditorAdvancedButton.extend({ - width : '350px', - - addPane : function() { - this.addForm({ - '' : {type : 'title', txt : 'Edit HTML'}, - 'code' : {type : 'content', 'value' : this.ne.selectedInstance.getContent(), style : {width: '340px', height : '200px'}} - }); - }, - - submit : function(e) { - var code = this.inputs['code'].value; - this.ne.selectedInstance.setContent(code); - this.removePane(); - } -}); - -nicEditors.registerPlugin(nicPlugin,nicCodeOptions); - - diff --git a/html/js/noalyss_script.js b/html/js/noalyss_script.js index 78e461ae4..943328823 100644 --- a/html/js/noalyss_script.js +++ b/html/js/noalyss_script.js @@ -2265,7 +2265,7 @@ function filter_list(phrase, _id) { ele += la_content[e].innerText; } - console.debug(`ele = ${ele}`); + if (ele.toLowerCase().indexOf(words) >= 0) { tot_found++; l_list.childNodes[r].style.display = 'block'; @@ -4326,7 +4326,7 @@ function check_password_strength(p_pass_domid, p_result_domid, details) { return; } var answer = req.responseJSON; - console.debug(answer); + if (answer['password'] == 'nok') { id$(p_pass_domid).setStyle("background-color:red"); @@ -4724,20 +4724,25 @@ Noalyss = function () { * @param {string} mode min for minimum or full , gives an error if the mode doesn't exist * @returns {undefined} */ -Noalyss.prototype.activate_tinymce=function (domid,mode) { + +Noalyss.prototype.activate_tinymce=function (domid,mode,p_height) { tinymce.remove('#'+domid); - if ( mode == 'min' || ! mode ) + if (! p_height) p_height=500; + if ( mode == 'minimal' || ! mode ) { tinymce.init({ selector: 'textarea#'+domid, - height: 500, + plugins:'link quickbars ', + height: p_height, menubar: false, toolbar: 'undo redo | ' + - 'bold italic underline forecolor backcolor |fontsize styles ' + + 'bold italic underline forecolor backcolor |fontsize ' + ' | bullist numlist | ' + 'removeformat | help', content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:16px }', + quickbars_insert_toolbar:false, promotion: false, + quickbars_selection_toolbar:' bold italic underline forecolor backcolor ', license_key:'gpl', statusbar: false, branding: false @@ -4754,22 +4759,43 @@ Noalyss.prototype.activate_tinymce=function (domid,mode) { */ tinymce.init({ selector: 'textarea#'+domid, - height: 500, + height: p_height, menubar: false, plugins:'link lists emoticons quickbars pagebreak table', toolbar: 'undo redo ' + - 'bold italic underline strikethrough | hr quickimage | forecolor backcolor|emoticons |fontsize styles ' + + 'bold italic underline strikethrough | hr quickimage | forecolor backcolor|emoticons |fontsize styles fontfamily ' + ' table tabledelete |' + ' | link unlink bullist numlist | ' + 'removeformat | help', content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:16px }', + quickbars_insert_toolbar:false, promotion: false, + quickbars_selection_toolbar:' bold italic underline forecolor backcolor ', license_key:'gpl', - statusbar: false, + statusbar: true, branding: false }); - }else { + }else if ( mode == 'no-toolbar' ) + { + console.debug(`no toolbar ${domid} height ${p_height}`) + tinymce.init({ + selector: 'textarea#'+domid, + height: p_height, + plugins:' quickbars', + menubar:false, + toolbar: false, + quickbars_selection_toolbar:' bold italic underline forecolor backcolor hide', + content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:16px }', + promotion: false, + license_key:'gpl', + statusbar: false, + toolbar_mode: 'hide', + quickbars_insert_toolbar:false, + branding: false + }); + } else { + console.error(`Noalyss.activate_tinymce unknow mode`); } diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php index 3edab1571..cc9a05487 100644 --- a/include/class/follow_up.class.php +++ b/include/class/follow_up.class.php @@ -225,7 +225,7 @@ class Follow_Up // Description $desc=new ITextArea(); - $desc->set_enrichText("enrich"); + $desc->set_enrichText("full"); $desc->style=' class="itextarea" style="width:80%;margin-left:5%;"'; $desc->name="ag_comment"; $desc->readOnly=$readonly; diff --git a/include/lib/function_javascript.php b/include/lib/function_javascript.php index 01ce75770..7ca37901b 100644 --- a/include/lib/function_javascript.php +++ b/include/lib/function_javascript.php @@ -2779,7 +2779,6 @@ EOF; echo js_include('todo_list.js'); echo js_include('anc_script.js'); echo js_include('sorttable.js'); - echo js_include('nicEdit.js'); echo js_include('managetable.js'); echo js_include('acc_currency.js'); echo js_include('taggroup.js'); diff --git a/include/lib/itextarea.class.php b/include/lib/itextarea.class.php index 4912e27b5..f594a38e6 100644 --- a/include/lib/itextarea.class.php +++ b/include/lib/itextarea.class.php @@ -35,6 +35,7 @@ class ITextarea extends HtmlInput parent::__construct($p_name, $p_value, $p_id); $this->style=' class="itextarea" '; $this->enrichText="plain"; + $this->heigh=500; } /** @@ -53,9 +54,10 @@ class ITextarea extends HtmlInput */ public function set_enrichText($enrich) { - if ( ! in_array($enrich,['plain','enrich',"min"])) { - throw new \Exception("IT57.Invalid option"); + if ( ! in_array($enrich,['enrich','plain','full',"minimal","no-toolbar"])) { + throw new \Exception("IT57.Invalid option [$enrich]"); } + if ( $enrich == 'enrich') $enrich='full'; $this->enrichText = $enrich; return $this; } @@ -69,36 +71,26 @@ class ITextarea extends HtmlInput $this->value=($p_value==null)?$this->value:$p_value; $this->id=($this->id=="")?$this->name:$this->id; if ( $this->readOnly==true) return $this->display(); - + if ( empty($this->id)) $this->id=$this->name; + if ( $this->enrichText == "plain" ) { $r=""; $r.='"; - } elseif ($this->enrichText=='enrich') { - if ( empty($this->id)) $this->id=$this->name; + } else { $r=<<style}>{$this->value} -EOF; - }elseif ($this->enrichText=='min') { - if ( empty($this->id)) $this->id=$this->name; - - $r=<<style}>{$this->value} - EOF; } + return $r; } diff --git a/include/template/follow_up-display.php b/include/template/follow_up-display.php index d76725d8f..3c69974dc 100644 --- a/include/template/follow_up-display.php +++ b/include/template/follow_up-display.php @@ -334,7 +334,7 @@ function small(p_id_textarea){ $style_enl='style="display:inline"';$style_small='style="display:none"'; // description $description = new ITextarea("ag_description"); - $description->set_enrichText("enrich"); + $description->set_enrichText("full"); $description->id="ag_description"; $has_description = false; //---------------------------------- Description ------------------------------------------------------------------- diff --git a/include/template/ledger_detail_ach.php b/include/template/ledger_detail_ach.php index 3633f348e..1f088d878 100644 --- a/include/template/ledger_detail_ach.php +++ b/include/template/ledger_detail_ach.php @@ -5,6 +5,7 @@ /** * @var $str_anc String HTML contains the detail of analytic * @var $g_user Noalyss_User inherited , it is the connected user + * @var $div (string) current DIV ID */ $str_anc=""; global $div,$g_parameter,$cn,$access,$jr_id,$obj; @@ -107,6 +108,7 @@ global $div,$g_parameter,$cn,$access,$jr_id,$obj; id="jrn_note"; $inote->style=' class="itextarea" style="width:90%;height:100%;"'; $inote->value = strip_tags($obj->det->note); echo $inote->input(); diff --git a/include/template/ledger_detail_fin.php b/include/template/ledger_detail_fin.php index 640afc4eb..35a95680a 100644 --- a/include/template/ledger_detail_fin.php +++ b/include/template/ledger_detail_fin.php @@ -3,6 +3,8 @@ //see licence.txt $str_anc=""; global $g_parameter,$g_user; + +//* @var $div (string) current DIV ID ?>
      det->jr_tech_per); $exercice=$periode_id->get_exercice(); $owner = new Noalyss_Parameter_Folder($cn); +//* @var $div (string) current DIV ?> diff --git a/include/template/ledger_detail_ven.php b/include/template/ledger_detail_ven.php index c0dcbc5ae..0aafd1148 100644 --- a/include/template/ledger_detail_ven.php +++ b/include/template/ledger_detail_ven.php @@ -1,6 +1,8 @@ diff --git a/scenario/LIB/itextarea-test.php b/scenario/LIB/itextarea-test.php index b6d3896d6..22766c2b6 100644 --- a/scenario/LIB/itextarea-test.php +++ b/scenario/LIB/itextarea-test.php @@ -38,15 +38,38 @@ echo '
      '; $itext=new \ITextarea("enrich"); $itext->value= $http->post("enrich","raw",""); -$itext->set_enrichText("enrich"); +$itext->set_enrichText("full"); echo $itext->input(); ?>
      -

      Plain Area

      +

      Minimum Area

      value= $http->post("enrich2","raw",""); + + $itext->set_enrichText("minimal"); + echo $itext->input(); + ?> + + +

      +

      No Toolbar

      + value= $http->post("enrich3","raw",""); + $itext->heigh=130; + $itext->set_enrichText("no-toolbar"); + echo $itext->input(); + ?> + + +

      + +

      Plain Area

      + value= strip_tags($http->post("enrich2","raw","")); $itext->set_enrichText("plain");