Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/dialog.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/dialog.js,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/dialog.js 2 Nov 2005 09:20:03 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/dialog.js 11 Nov 2005 20:32:40 -0000 1.3 @@ -19,7 +19,7 @@ init = window; // pass this window object by default } Dialog._geckoOpenModal(url, action, init); -}; +} Dialog._parentEvent = function(ev) { setTimeout( function() { if (Dialog._modal && !Dialog._modal.closed) { Dialog._modal.focus() } }, 50); @@ -50,13 +50,13 @@ HTMLArea._addEvent(w, "click", Dialog._parentEvent); HTMLArea._addEvent(w, "mousedown", Dialog._parentEvent); HTMLArea._addEvent(w, "focus", Dialog._parentEvent); - }; + } // release the captured events function relwin(w) { HTMLArea._removeEvent(w, "click", Dialog._parentEvent); HTMLArea._removeEvent(w, "mousedown", Dialog._parentEvent); HTMLArea._removeEvent(w, "focus", Dialog._parentEvent); - }; + } capwin(window); // capture other frames, note the exception trapping, this is because // we are not permitted to add events to frames outside of the current @@ -73,4 +73,4 @@ Dialog._modal = null; }; Dialog._modal.focus(); -}; +}; \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/htmlarea.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/htmlarea.js,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/htmlarea.js 2 Nov 2005 09:20:03 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/htmlarea.js 11 Nov 2005 20:32:40 -0000 1.3 @@ -27,17 +27,17 @@ -- included in the top 10 lines of the file (see the embedded edit mode) -- -- $HeadURL: http://svn.xinha.python-hosting.com/trunk/htmlarea.js $ - -- $LastChangedDate: 2005-10-26 19:42:49 +1300 (Wed, 26 Oct 2005) $ - -- $LastChangedRevision: 402 $ + -- $LastChangedDate: 2005-11-07 21:36:41 +1300 (Mon, 07 Nov 2005) $ + -- $LastChangedRevision: 421 $ -- $LastChangedBy: gocher $ --------------------------------------------------------------------------*/ HTMLArea.version = { 'Release' : 'Trunk', 'Head' : '$HeadURL: http://svn.xinha.python-hosting.com/trunk/htmlarea.js $'.replace(/^[^:]*: (.*) \$$/, '$1'), - 'Date' : '$LastChangedDate: 2005-10-26 19:42:49 +1300 (Wed, 26 Oct 2005) $'.replace(/^[^:]*: ([0-9-]*) ([0-9:]*) ([+0-9]*) \((.*)\) \$/, '$4 $2 $3'), - 'Revision' : '$LastChangedRevision: 402 $'.replace(/^[^:]*: (.*) \$$/, '$1'), + 'Date' : '$LastChangedDate: 2005-11-07 21:36:41 +1300 (Mon, 07 Nov 2005) $'.replace(/^[^:]*: ([0-9-]*) ([0-9:]*) ([+0-9]*) \((.*)\) \$/, '$4 $2 $3'), + 'Revision' : '$LastChangedRevision: 421 $'.replace(/^[^:]*: (.*) \$$/, '$1'), 'RevisionBy': '$LastChangedBy: gocher $'.replace(/^[^:]*: (.*) \$$/, '$1') }; @@ -152,7 +152,7 @@ } HTMLArea.freeLater(this, '_textArea'); } -}; +} HTMLArea.onload = function(){}; HTMLArea.init = function() { @@ -791,7 +791,7 @@ tb_body.appendChild(tb_row); table.className = 'toolbarRow'; // meh, kinda. - }; // END of function: newLine + } // END of function: newLine // init first line newLine(); @@ -823,7 +823,7 @@ } this[id] = newval; } - }; // END of function: setButtonStatus + } // END of function: setButtonStatus // this function will handle creation of combo boxes. Receives as // parameter the name of a button as defined in the toolBar config. @@ -894,7 +894,7 @@ }); } return el; - }; // END of function: createSelect + } // END of function: createSelect // appends a new button to toolbar function createButton(txt) { @@ -1009,14 +1009,14 @@ img.style.top = '0px'; img.style.left = '0px'; } - } + }; } else if (!el) { el = createSelect(txt); } return el; - }; + } var first = true; for (var i = 0; i < this.config.toolbar.length; ++i) { @@ -1440,13 +1440,13 @@ case 'toolbar': { - width = this._toolBar.offsetWidth; + width = this._toolBar.offsetWidth + 'px'; } break; default : { - width = this.config.width; + width = /[^0-9]/.test(this.config.width) ? this.config.width : this.config.width + 'px'; } break; } @@ -1461,7 +1461,7 @@ default : { - height = this.config.height; + height = /[^0-9]/.test(this.config.height) ? this.config.height : this.config.height + 'px'; } break; } @@ -2239,15 +2239,15 @@ for (; --indent >= 0;) ta.value += " "; ta.value += str + "\n"; - }; + } function _dt(root, level) { var tag = root.tagName.toLowerCase(), i; var ns = HTMLArea.is_ie ? root.scopeName : root.prefix; debug(level, "- " + tag + " [" + ns + "]"); for (i = root.firstChild; i; i = i.nextSibling) if (i.nodeType == 1) _dt(i, level + 2); - }; + } _dt(this._doc.body, 0); document.body.appendChild(ta); }; @@ -2289,7 +2289,7 @@ txt += "Final document length: " + editor._doc.body.innerHTML.length + "\n"; txt += "Clean-up took " + (((new Date()).getTime() - stats.T) / 1000) + " seconds"; alert(txt); - }; + } function clearClass(node) { var newc = node.className.replace(/(^|\s)mso.*?(\s|$)/ig, ' '); if (newc != node.className) { @@ -2299,7 +2299,7 @@ ++stats.mso_class; } } - }; + } function clearStyle(node) { var declarations = node.style.cssText.split(/\s*;\s*/); for (var i = declarations.length; --i >= 0;) @@ -2309,7 +2309,7 @@ declarations.splice(i, 1); } node.style.cssText = declarations.join("; "); - }; + } function stripTag(el) { if (HTMLArea.is_ie) el.outerHTML = HTMLArea.htmlEncode(el.innerText); @@ -2319,14 +2319,14 @@ HTMLArea.removeFromParent(el); } ++stats.mso_xmlel; - }; + } function checkEmpty(el) { if (/^(a|span|b|strong|i|em|font)$/i.test(el.tagName) && !el.firstChild) { HTMLArea.removeFromParent(el); ++stats.empty_tags; } - }; + } function parseTree(root) { var tag = root.tagName.toLowerCase(), i, next; if ((HTMLArea.is_ie && root.scopeName != 'HTML') || (!HTMLArea.is_ie && /:/.test(tag))) { @@ -2342,7 +2342,7 @@ } } return true; - }; + } parseTree(this._doc.body); // showStats(); // this.debugTree(); @@ -2827,7 +2827,7 @@ if (TestRange.inRange(range)) break; if ((parent.nodeType != 1) || (parent.tagName.toLowerCase() == 'body')) break; parent = parent.parentElement; - }; + } return parent; case "None": // It seems that even for selection of type "None", @@ -3369,18 +3369,20 @@ return false; } var img = image; - if (!img) { - var sel = editor._getSelection(); - var range = editor._createRange(sel); - editor._doc.execCommand("insertimage", false, param.f_url); + if (!img) { if (HTMLArea.is_ie) { + var sel = editor._getSelection(); + var range = editor._createRange(sel); + editor._doc.execCommand("insertimage", false, param.f_url); img = range.parentElement(); // wonder if this works... if (img.tagName.toLowerCase() != "img") { img = img.previousSibling; } } else { - img = range.startContainer.previousSibling; + img = document.createElement('img'); + img.src = param.f_url; + editor.insertNodeAtSelection(img); if (!img.tagName) { // if the cursor is at the beginning of the document img = range.startContainer.firstChild; @@ -3443,8 +3445,8 @@ if (cellwidth) td.style.width = cellwidth + "%"; tr.appendChild(td); - // Mozilla likes to see something inside the cell. - (HTMLArea.is_gecko) && td.appendChild(doc.createElement("br")); + // Browsers like to see something inside the cell ( ). + td.appendChild(doc.createTextNode('\u00a0')); } } if (HTMLArea.is_ie) { @@ -3471,7 +3473,7 @@ case "fontsize": this.execCommand(txt, false, value); break; case "formatblock": // (HTMLArea.is_ie) && (value = "<" + value + ">"); - value = "<" + value + ">" + if(!HTMLArea.is_gecko || value !== 'blockquote') { value = "<" + value + ">";} this.execCommand(txt, false, value); break; default: @@ -4330,12 +4332,12 @@ var newObj = new Object; // check for array objects - if (obj.constructor.toString().indexOf("function Array(") == 1) { + if (obj.constructor.toString().match( /\s*function Array\(/ )) { newObj = obj.constructor(); } // check for function objects (as usual, IE is fucked up) - if (obj.constructor.toString().indexOf("function Function(") == 1) { + if (obj.constructor.toString().match( /\s*function Function\(/ )) { newObj = obj; // just copy reference to it } else for (var n in obj) { var node = obj[n]; @@ -4644,7 +4646,11 @@ return el && el.nodeType == 1 && (HTMLArea._paraContainerTags.indexOf(" " + el.tagName.toLowerCase() + " ") != -1); }; -HTMLArea._closingTags = " head script style div span tr td tbody table em strong b i strike code cite dfn abbr acronym font a title textarea select form "; +// These are all the tags for which the end tag is not optional or +// forbidden, taken from the list at: +// http://www.w3.org/TR/REC-html40/index/elements.html +HTMLArea._closingTags = " a abbr acronym address applet b bdo big blockquote button caption center cite code del dfn dir div dl em fieldset font form frameset h1 h2 h3 h4 h5 h6 i iframe ins kbd label legend map menu noframes noscript object ol optgroup pre q s samp script select small span strike strong style sub sup table textarea title tt u ul var "; + HTMLArea.needsClosingTag = function(el) { return el && el.nodeType == 1 && (HTMLArea._closingTags.indexOf(" " + el.tagName.toLowerCase() + " ") != -1); }; @@ -4879,7 +4885,7 @@ // returns the hex representation of one byte (2 digits) function hex(d) { return (d < 16) ? ("0" + d.toString(16)) : d.toString(16); - }; + } if (typeof v == "number") { // we're talking to IE here @@ -5090,7 +5096,7 @@ alert('An error has occurred: ' + req.statusText); } } - }; + } req.onreadystatechange = callBack; @@ -5129,7 +5135,7 @@ alert('An error has occurred: ' + req.statusText); } } - }; + } req.onreadystatechange = callBack; req.open('GET', url, true); @@ -5578,4 +5584,4 @@ }; HTMLArea.init(); -HTMLArea.addDom0Event(window,'unload',HTMLArea.collectGarbageForIE); +HTMLArea.addDom0Event(window,'unload',HTMLArea.collectGarbageForIE); \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/popupwin.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/popupwin.js,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/popupwin.js 2 Nov 2005 09:20:03 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/popupwin.js 11 Nov 2005 20:32:40 -0000 1.3 @@ -54,9 +54,9 @@ self.element = body; initFunction(self); dlg.focus(); - }; + } init2(); -}; +} PopupWin.prototype.callHandler = function() { var tags = ["input", "textarea", "select"]; @@ -137,4 +137,4 @@ self.window.resizeTo(w + 8, h + 35); } }, 25); -}; +}; \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/examples/full_example.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/examples/full_example.js,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/examples/full_example.js 2 Nov 2005 09:20:04 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/examples/full_example.js 11 Nov 2005 20:32:40 -0000 1.3 @@ -5,17 +5,18 @@ -- from full_example-body.html. -- -- $HeadURL: http://svn.xinha.python-hosting.com/trunk/examples/full_example.js $ - -- $LastChangedDate: 2005-09-29 21:03:01 +1200 (Thu, 29 Sep 2005) $ - -- $LastChangedRevision: 359 $ - -- $LastChangedBy: gocher $ + -- $LastChangedDate: 2005-10-30 05:28:08 +1300 (Sun, 30 Oct 2005) $ + -- $LastChangedRevision: 416 $ + -- $LastChangedBy: gogo $ --------------------------------------------------------------------------*/ var num = 1; if(window.parent && window.parent != window) { var f = window.parent.menu.document.forms[0]; - _editor_lang = f.lang.value; - _editor_skin = f.skin.value; + _editor_lang = f.lang[f.lang.selectedIndex].value; + _editor_skin = f.skin[f.skin.selectedIndex].value; + num = parseInt(f.num.value); if(isNaN(num)) { Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/BackgroundImage/background-image.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/BackgroundImage/background-image.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/BackgroundImage/background-image.js 2 Nov 2005 08:55:58 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/BackgroundImage/background-image.js 11 Nov 2005 20:32:40 -0000 1.2 @@ -20,7 +20,7 @@ } }) cfg.addToolbarElement("bgImage", "inserthorizontalrule", 1); -}; +} BackgroundImage._pluginInfo = { name : "BackgroundImage", Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/BackgroundImage/popups/bgimage.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/BackgroundImage/popups/bgimage.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/BackgroundImage/popups/bgimage.html 2 Nov 2005 08:55:58 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/BackgroundImage/popups/bgimage.html 11 Nov 2005 20:32:40 -0000 1.2 @@ -10,12 +10,12 @@ __dlg_translate("BackgroundImage"); __dlg_init(); window.resizeTo(300, 195); -}; +} function onCancel() { __dlg_close(null); return false; -}; +} function insertbg(image) { __dlg_close(window.opener._editor_url + "/plugins/BackgroundImage/backgrounds/" + image); @@ -33,10 +33,10 @@
Set Page Background Image
- - - - + + + +
Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/CSS/css.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/CSS/Attic/css.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/CSS/css.js 2 Nov 2005 08:55:59 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/CSS/css.js 11 Nov 2005 20:32:40 -0000 1.2 @@ -70,7 +70,7 @@ cfg.registerDropdown(css_class); cfg.addToolbarElement(["T[" + combo.label + "]", id, "separator"] , "formatblock", -1); } -}; +} CSS._pluginInfo = { name : "CSS", @@ -146,4 +146,4 @@ } } select.selectedIndex = 0; -}; +}; \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/CharCounter/char-counter.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/CharCounter/char-counter.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/CharCounter/char-counter.js 2 Nov 2005 08:55:59 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/CharCounter/char-counter.js 11 Nov 2005 20:32:41 -0000 1.2 @@ -5,7 +5,7 @@ function CharCounter(editor) { this.editor = editor; -}; +} CharCounter._pluginInfo = { name : "CharCounter", Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/CharacterMap/character-map.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/CharacterMap/character-map.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/CharacterMap/character-map.js 2 Nov 2005 08:55:58 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/CharacterMap/character-map.js 11 Nov 2005 20:32:41 -0000 1.2 @@ -53,7 +53,7 @@ editor.hidePanel( editor._CharacterMap ); } -}; +} // configuration mode : panel or popup HTMLArea.Config.prototype.CharacterMap = Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/CharacterMap/popups/select_character.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/CharacterMap/popups/select_character.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/CharacterMap/popups/select_character.html 2 Nov 2005 08:55:59 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/CharacterMap/popups/select_character.html 11 Nov 2005 20:32:41 -0000 1.2 @@ -37,7 +37,7 @@ { __dlg_close( null ); return false; -}; +} Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/ClientsideSpellcheck/clientside-spellcheck.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/ClientsideSpellcheck/clientside-spellcheck.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/ClientsideSpellcheck/clientside-spellcheck.js 2 Nov 2005 08:55:59 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/ClientsideSpellcheck/clientside-spellcheck.js 11 Nov 2005 20:32:41 -0000 1.2 @@ -27,7 +27,7 @@ cfg.addToolbarElement("clientsidespellcheck", "print", 1); } -}; +} ClientsideSpellcheck._pluginInfo = { name : "ClientsideSpellcheck", Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/ContextMenu/context-menu.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/ContextMenu/context-menu.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/ContextMenu/context-menu.js 2 Nov 2005 08:55:59 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/ContextMenu/context-menu.js 11 Nov 2005 20:32:41 -0000 1.2 @@ -12,7 +12,7 @@ function ContextMenu(editor) { this.editor = editor; -}; +} ContextMenu._pluginInfo = { name : "ContextMenu", @@ -60,7 +60,7 @@ function tableOperation(opcode) { tbo.buttonPress(editor, opcode); - }; + } function insertPara(after) { var el = currentTarget; @@ -80,7 +80,7 @@ range.collapse(true); range.select(); } - }; + } for (; target; target = target.parentNode) { var tag = target.tagName; @@ -258,7 +258,7 @@ r.y += tmp.y; } return r; - }; + } function documentClick(ev) { ev || (ev = window.event); if (!self.currentMenu) { @@ -271,7 +271,7 @@ self.closeMenu(); //HTMLArea._stopEvent(ev); //return false; - }; + } var keys = []; function keyPress(ev) { ev || (ev = window.event); @@ -286,7 +286,7 @@ if (k[0].toLowerCase() == key) k[1].__msh.activate(); } - }; + } self.closeMenu = function() { self.currentMenu.parentNode.removeChild(self.currentMenu); self.currentMenu = null; @@ -296,7 +296,7 @@ HTMLArea._removeEvent(self.editordoc, "keypress", keyPress); if (HTMLArea.is_ie) self.iePopup.hide(); - }; + } var target = HTMLArea.is_ie ? ev.srcElement : ev.target; var ifpos = getPos(self.editor._htmlArea);//_iframe); var x = ev.clientX + ifpos.x; @@ -445,4 +445,4 @@ HTMLArea._stopEvent(ev); return false; -}; +}; \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/DoubleClick/double-click.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/DoubleClick/double-click.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/DoubleClick/double-click.js 2 Nov 2005 08:55:59 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/DoubleClick/double-click.js 11 Nov 2005 20:32:41 -0000 1.2 @@ -48,7 +48,7 @@ img: [ function(e) {e.execCommand("insertimage");} ], td: [ function(e) {e.execCommand("inserttable");} ] }; -}; +} DoubleClick.prototype.onGenerate = function() { var self = this; Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/DynamicCSS/dynamiccss.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/DynamicCSS/Attic/dynamiccss.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/DynamicCSS/dynamiccss.js 2 Nov 2005 08:55:59 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/DynamicCSS/dynamiccss.js 11 Nov 2005 20:32:41 -0000 1.2 @@ -25,7 +25,7 @@ }; cfg.registerDropdown(css_class); cfg.addToolbarElement(["T[CSS]", "DynamicCSS-class", "separator"] , "formatblock", -1); -}; +} DynamicCSS.parseStyleSheet=function(editor){ iframe = editor._iframe.contentWindow.document; Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/EditTag/edit-tag.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/EditTag/edit-tag.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/EditTag/edit-tag.js 2 Nov 2005 08:55:59 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/EditTag/edit-tag.js 11 Nov 2005 20:32:42 -0000 1.2 @@ -20,11 +20,11 @@ action : function(editor) { self.buttonPress(editor); } - }) + }); cfg.addToolbarElement("edittag", "htmlmode",1); -}; +} EditTag._pluginInfo = { name : "EditTag", Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/EnterParagraphs/enter-paragraphs.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/EnterParagraphs/enter-paragraphs.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/EnterParagraphs/enter-paragraphs.js 2 Nov 2005 08:56:00 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/EnterParagraphs/enter-paragraphs.js 11 Nov 2005 20:32:42 -0000 1.2 @@ -113,7 +113,7 @@ this.onKeyPress = this.__onKeyPress; } - }; // end of constructor. + } // end of constructor. // ------------------------------------------------------------------ @@ -1084,4 +1084,4 @@ }; // end of handleEnter() -// END +// END \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Equation/equation.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Equation/Attic/equation.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Equation/equation.js 2 Nov 2005 08:56:00 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Equation/equation.js 11 Nov 2005 20:32:42 -0000 1.2 @@ -27,9 +27,9 @@ action : function(editor, id) { self.buttonPress(editor, id); } - }) + }); cfg.addToolbarElement("equation", "inserthorizontalrule", -1); -}; +} Equation._pluginInfo = { name : "Equation", Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Equation/popups/operations.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Equation/popups/operations.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Equation/popups/operations.html 2 Nov 2005 08:56:00 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Equation/popups/operations.html 11 Nov 2005 20:32:42 -0000 1.2 @@ -25,7 +25,7 @@ __dlg_init(); var selected_op="none"; document.getElementById("cancel").focus(); -}; +} function SelectOperation(sop,sop_name) { document.getElementById('less_equal').style.backgroundColor='ButtonFace'; @@ -53,7 +53,7 @@ function onCancel() { __dlg_close(null); return false; -}; +} @@ -86,4 +86,4 @@ - + \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Filter/filter.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Filter/filter.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Filter/filter.js 2 Nov 2005 08:56:00 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Filter/filter.js 11 Nov 2005 20:32:42 -0000 1.2 @@ -18,7 +18,7 @@ action : function(editor) { self.buttonPress(editor); } - }) + }); //cfg.Filters = ["Paragraph","Word"]; for (var i = 0; i < editor.config.Filters.length; i++) { self.add(editor.config.Filters[i]); Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Filter/filters/paragraph.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Filter/filters/paragraph.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Filter/filters/paragraph.js 2 Nov 2005 08:56:00 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Filter/filters/paragraph.js 11 Nov 2005 20:32:42 -0000 1.2 @@ -3,4 +3,4 @@ html = html.replace(/<\/\s*p\s*>/gi, ''); html = html.trim(); return html; -} \ No newline at end of file +}; \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Filter/filters/word.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Filter/filters/word.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Filter/filters/word.js 2 Nov 2005 08:56:00 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Filter/filters/word.js 11 Nov 2005 20:32:42 -0000 1.2 @@ -50,4 +50,4 @@ html = html.trim(); return html; -} \ No newline at end of file +}; \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FindReplace/find-replace.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FindReplace/find-replace.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FindReplace/find-replace.js 2 Nov 2005 08:56:00 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FindReplace/find-replace.js 11 Nov 2005 20:32:42 -0000 1.2 @@ -13,7 +13,7 @@ editor.imgURL("ed_find.gif", "FindReplace"), false, function(editor) { self.buttonPress(editor); }); cfg.addToolbarElement(["FR-findreplace","separator"], ["formatblock","fontsize","fontname"], -1); -}; +} FindReplace.prototype.buttonPress = function(editor) { FindReplace.editor = editor; Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FindReplace/fr_engine.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FindReplace/fr_engine.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FindReplace/fr_engine.js 2 Nov 2005 08:56:00 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FindReplace/fr_engine.js 11 Nov 2005 20:32:42 -0000 1.2 @@ -49,7 +49,7 @@ } spanWalker(params['fr_pattern'],params['fr_replacement'],params['fr_replaceall']); -}; +} function spanWalker(pattern,replacement,replaceall) { var foundtrue = false; @@ -95,7 +95,7 @@ } else { message += '"'+pattern+'" '+_lc("not found"); } alert(message+'.'); } -}; +} function clearDoc() { var doc = editor._doc.body.innerHTML; @@ -107,9 +107,9 @@ matches = 0; replaces = 0; disab("fr_hiliteall,fr_clear",true); -}; +} -function clearMarks() { +function clearMarks() { var getall = editor._doc.body.getElementsByTagName("span"); for (var i = 0; i < getall.length; i++) { var elm = getall[i]; @@ -120,7 +120,7 @@ objStyle.fontWeight = ""; } } -}; +} function hiliteAll() { var getall = editor._doc.body.getElementsByTagName("span"); @@ -133,17 +133,17 @@ objStyle.fontWeight = "bold"; } } -}; +} function resetContents() { if(buffer == null) return; var transp = editor._doc.body.innerHTML; editor._doc.body.innerHTML = buffer; buffer = transp; -}; +} function disab(elms,toset) { var names = elms.split(/[,; ]+/); for(var i = 0; i < names.length; i++) document.getElementById(names[i]).disabled = toset; -}; +} \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FindReplace/popups/find_replace.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FindReplace/popups/find_replace.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FindReplace/popups/find_replace.html 2 Nov 2005 08:56:00 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FindReplace/popups/find_replace.html 11 Nov 2005 20:32:43 -0000 1.2 @@ -40,13 +40,13 @@ } document.body.onkeypress = __dlg_key_press; -}; +} function onCancel() { clearDoc(); __dlg_close(null); return false; -}; +} function onOK() { var required = {'fr_pattern' : _lc("Enter the text you want to find")}; @@ -66,7 +66,7 @@ } execSearch(param); return false; -}; +} function __dlg_key_press(ev) { ev || (ev = window.event); @@ -81,7 +81,7 @@ return false; } return true; -}; +} @@ -159,4 +159,4 @@ - + \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FormOperations/form-operations.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FormOperations/form-operations.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FormOperations/form-operations.js 2 Nov 2005 08:56:00 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FormOperations/form-operations.js 11 Nov 2005 20:32:43 -0000 1.2 @@ -163,7 +163,7 @@ }, 'form' ]; -}; +} FormOperations.prototype.onGenerate = function() { @@ -466,7 +466,7 @@ 'button_name' : this.deformatName(input, input.name), 'button_value' : input.value, 'button_type' : input.type.toLowerCase() - } + }; this.panel.setValues(vals); var i = input; @@ -751,4 +751,4 @@ } return name; -}; +}; \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/forms.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/Attic/forms.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/forms.js 2 Nov 2005 08:56:01 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/forms.js 11 Nov 2005 20:32:43 -0000 1.2 @@ -26,7 +26,7 @@ } // add a new line in the toolbar cfg.toolbar.push(toolbar); -}; +} Forms._pluginInfo = { name : "Forms", @@ -173,7 +173,7 @@ var a_options = new Array(); for (var i=0; i<=node.options.length-1; i++) { a_options[i] = new optionValues(node.options[i].text, node.options[i].value); - }; + } outparam.f_options = a_options; break; case "text": @@ -267,7 +267,7 @@ outparam.f_for = ""; outparam.f_text = ""; outparam.f_legend = ""; - }; + } editor._popupDialog("plugin://Forms/" + tagName + ".html", function(param) { if (param) { if(param["f_cols"]) Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/fieldset.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/fieldset.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/fieldset.html 2 Nov 2005 08:56:01 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/fieldset.html 11 Nov 2005 20:32:43 -0000 1.2 @@ -13,20 +13,20 @@ var param = window.dialogArguments; document.getElementById("f_text").value = param["f_text"]; document.getElementById("f_text").focus(); -}; +} function onOK() { // pass data back to the calling window var param = new Object(); param["f_text"] = document.getElementById("f_text").value; __dlg_close(param); return false; -}; +} function onCancel() { __dlg_close(null); return false; -}; +} @@ -43,4 +43,4 @@ - + \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/form.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/form.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/form.html 2 Nov 2005 08:56:01 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/form.html 11 Nov 2005 20:32:43 -0000 1.2 @@ -18,7 +18,7 @@ document.getElementById(fields[i]).value = param[fields[i]]; } document.getElementById("f_name").focus(); -}; +} function onOK() { var required = { @@ -39,12 +39,12 @@ } __dlg_close(param); return false; -}; +} function onCancel() { __dlg_close(null); return false; -}; +} @@ -87,4 +87,4 @@ - + \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/input.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/input.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/input.html 2 Nov 2005 08:56:01 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/input.html 11 Nov 2005 20:32:43 -0000 1.2 @@ -72,7 +72,7 @@ } window.resizeTo(320,height); document.getElementById("f_name").focus(); -}; +} function onOK() { var el = document.getElementById("f_name"); @@ -99,12 +99,12 @@ } __dlg_close(param); return false; -}; +} function onCancel() { __dlg_close(null); return false; -}; +} @@ -176,4 +176,4 @@ - + \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/label.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/label.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/label.html 2 Nov 2005 08:56:01 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/label.html 11 Nov 2005 20:32:43 -0000 1.2 @@ -17,7 +17,7 @@ document.getElementById(fields[i]).value = param[fields[i]]; } document.getElementById("f_text").focus(); -}; +} function onOK() { // pass data back to the calling window @@ -28,12 +28,12 @@ } __dlg_close(param); return false; -}; +} function onCancel() { __dlg_close(null); return false; -}; +} @@ -56,4 +56,4 @@ - + \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/select.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/select.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/select.html 2 Nov 2005 08:56:01 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/select.html 11 Nov 2005 20:32:43 -0000 1.2 @@ -28,7 +28,7 @@ document.getElementById("f_select").options[i] = new Option(param.f_options[i].text, param.f_options[i].value); } document.getElementById("f_name").focus(); -}; +} function onOK() { var el = document.getElementById("f_name"); @@ -64,12 +64,12 @@ param["f_options"] = optionNodes; __dlg_close(param); return false; -}; +} function onCancel() { __dlg_close(null); return false; -}; +} //functions to build select options list @@ -206,4 +206,4 @@ - + \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/textarea.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/textarea.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/textarea.html 2 Nov 2005 08:56:01 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Forms/popups/textarea.html 11 Nov 2005 20:32:43 -0000 1.2 @@ -24,7 +24,7 @@ } } document.getElementById("f_name").focus(); -}; +} function onOK() { var el = document.getElementById("f_name"); @@ -50,12 +50,12 @@ } __dlg_close(param); return false; -}; +} function onCancel() { __dlg_close(null); return false; -}; +} @@ -110,4 +110,4 @@ - + \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FullPage/full-page.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FullPage/full-page.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FullPage/full-page.js 2 Nov 2005 08:56:01 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FullPage/full-page.js 11 Nov 2005 20:32:43 -0000 1.2 @@ -26,7 +26,7 @@ // add a new line in the toolbar cfg.addToolbarElement(["separator","FP-docprop"],"separator",-1); -}; +} FullPage._pluginInfo = { name : "FullPage", @@ -134,7 +134,7 @@ link.rel = alt ? "alternate stylesheet" : "stylesheet"; head.appendChild(link); return link; - }; + } function createMeta(httpEquiv, name, content) { var meta = doc.createElement("meta"); if (httpEquiv!="") meta.httpEquiv = httpEquiv; @@ -143,7 +143,7 @@ meta.content = content; head.appendChild(meta); return meta; - }; + } if (!style1 && params.f_base_style) style1 = createLink(false); Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FullPage/popups/docprop.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FullPage/popups/docprop.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FullPage/popups/docprop.html 2 Nov 2005 08:56:01 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/FullPage/popups/docprop.html 11 Nov 2005 20:32:43 -0000 1.2 @@ -44,7 +44,7 @@ document.getElementById("f_title").focus(); document.getElementById("f_title").select(); -}; +} function onOK() { var required = { @@ -65,12 +65,12 @@ } __dlg_close(param); return false; -}; +} function onCancel() { __dlg_close(null); return false; -}; +} + + +
+ +
+ + Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/fullscreen.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/fullscreen.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/fullscreen.tcl 11 Nov 2005 20:32:46 -0000 1.1 @@ -0,0 +1,22 @@ +ad_page_contract { + +} { + textarea_id:notnull + community_id:integer,notnull +} + +# select the correct language file for htmlarea + +switch [lang::user::language -site_wide] { + en - + de { + set htmlarea_lang_file [lang::user::language -site_wide] + } + default { + set htmlarea_lang_file "en" + } +} + + + +ad_return_template Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/oacs-fs.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/oacs-fs.css,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/oacs-fs.css 11 Nov 2005 20:32:46 -0000 1.1 @@ -0,0 +1,20 @@ +/* styles for the LearnAtWU /HTMLArea */ +ilink { + background-image:url(/resources/acs-subsite/action-link-marker.png); + padding-left:12px; + background-repeat:no-repeat; + background-position:left; + border-bottom:1px dotted red; + color:red; + display:inline; +} + +keyref { + background-image:url(/resources/acs-subsite/action-link-marker.png); + padding-left:12px; + background-repeat:no-repeat; + background-position:left; + border-bottom:1px dotted green; + color:green; + display:inline; +} \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/oacs-fs.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/Attic/oacs-fs.js,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/oacs-fs.js 11 Nov 2005 20:32:46 -0000 1.1 @@ -0,0 +1,297 @@ +// File-Selector Plugin for xinha +// Developed in the Learn@WU Project of the +// Vienna University of Economics and Business Administration +// www.wu-wien.ac.at +// +// Authors: G�nter Ernst guenter.ernst@wu-wien.ac.at +// Gustaf Neumann (cleanup and addons) +// +// Distributed under the same terms as HTMLArea itself. +// This notice MUST stay intact for use (see license.txt). +// + +// HTMLArea.loadStyle("oacs-fs.css", "OacsFs"); + +OacsFs._pluginInfo = { + name : "OacsFs", + version : "0.2", + developer : "Guenter Ernst", + developer_url : "http://learn.wu-wien.ac.at", + c_owner : "Guenter Ernst", + sponsor : "Wirtschaftsuniversit�t Wien", + sponsor_url : "http://www.wu-wien.ac.at", + license : "htmlArea" +}; + +function OacsFs(editor) { + var args = arguments; + this.editor = editor; + var ArgsString = args[1].toString(); + var additionalArgs = ArgsString.split(","); + OacsFs.fs_package_id = this.editor.config.fs_package_id; + OacsFs.folder_id = this.editor.config.folder_id; + OacsFs.file_types = this.editor.config.file_types; + OacsFs.fullscreen_mode = additionalArgs[1]; + + var cfg = editor.config; + var tt = OacsFs.I18N; + var bl = OacsFs.btnList; + var self = this; + + //alert(this.editor.config.fs_package_id); + + // register the toolbar buttons provided by this plugin + for (var i = 0; i < bl.length; ++i) { + var btn = bl[i]; + var id = "LW-" + btn[0]; + cfg.registerButton(id, HTMLArea._lc(btn[1], "OacsFs"), editor.imgURL(btn[0] + ".gif", "OacsFs"), false, + function(editor, id) { + // dispatch button press event + self.buttonPress(editor, id); + }); + + switch (id) { + case "LW-insert-ilink": + cfg.addToolbarElement(id, "createlink", +1); + break; + case "LW-insert-image": + cfg.addToolbarElement(id, "insertimage", +1); + break; + } + } + cfg.hideSomeButtons(" insertimage "); + cfg.pageStyle = "@import url(" + _editor_url + + "plugins/OacsFs/oacs-fs.css) screen; " +}; + +OacsFs.btnList = [ + ["insert-ilink", "Insert Internal Link"], + ["insert-image", "Insert Image"], + ]; + +OacsFs.prototype.buttonPress = function(editor, id) { + OacsFs.editor = editor; + switch (id) { + case "LW-insert-ilink": + this.insertInternalLink(); + break; + case "LW-insert-image": + this.insertImage(); + break; + case "LW-close": + window.close(); + break; + } +}; + +// Called when the user clicks on "InsertLink" button. If the link is already +// there, it will just modify it's properties. +OacsFs.prototype.insertInternalLink = function(link) { + var editor = OacsFs.editor; // for nested functions + var outparam = null; + + if (typeof link == "undefined") { + link = editor.getParentElement(); + if (link && !/^a$/i.test(link.tagName)) + link = null; + } + if (link) { + outparam = { + f_href : HTMLArea.is_ie ? editor.stripBaseURL(link.href) : + link.getAttribute("href"), + f_title : link.title, + f_target : link.target, + f_usetarget : link.f_usetarget + }; + } else { + outparam = { + f_href : '', + f_title : '', + f_target : '', + f_usetarget : '' + }; + } + + // normally, allow-tcl-page is turned of, so the link shows under /resources + // the tcl source code, but not the result. + // var PopupUrl = _editor_url + + // "plugins/OacsFs/popups/insert-image.tcl?fs_package_id=" + + // fs_package_id; + + var PopupUrl = "./xinha/insert-ilink?"; + if (typeof OacsFs.fs_package_id != "undefined") { + PopupUrl = PopupUrl + "&fs_package_id=" + OacsFs.fs_package_id; + } + if (typeof OacsFs.folder_id != "undefined") { + PopupUrl = PopupUrl + "&folder_id=" + OacsFs.folder_id; + } + if (typeof OacsFs.file_types != "undefined") { + PopupUrl = PopupUrl + "&file_types=" + OacsFs.file_types; + } + + Dialog(PopupUrl, function(param) { + if (!param) { // user must have pressed Cancel + return false; + } + var ilink = editor._doc.createElement("a"); + ilink.href = param.f_href.trim(); + ilink.innerHTML = param.f_title.trim(); + ilink.title = param.f_title.trim(); + ilink.setAttribute("target", param.f_target.trim()); + //ilink.setAttribute("use_target",param.f_usetarget.trim()); + + if (!link || link == null) { + if (HTMLArea.is_ie) { + editor.insertHTML(ilink.outerHTML); + } else { + editor.insertNodeAtSelection(ilink); + } + } else { + var parent = link.parentNode; + parent.replaceChild(ilink, link); + } + }, outparam); +}; + + +OacsFs.prototype.insertInternalLinkTlf = function(link) { + var editor = OacsFs.editor; + var outparam = null; + + if (typeof link == "undefined") { + link = editor.getParentElement(); + if (link && /^a$/i.test(link.tagName)) { + alert("This is an external link and cannot be edited"); + return false; + } + if (link && ((/^ilink$/i.test(link.tagName)== false) && + (/^keyref$/i.test(link.tagName) == false) )) + link = null; + } + + + if (link) { + outparam = { + f_title : link.getAttribute("title"), + f_area : link.getAttribute("area"), + f_restype : link.getAttribute("restype"), + f_shortname : link.getAttribute("shortname"), + f_presentation: link.getAttribute("presentation"), + f_label : link.innerHTML + }; + } + + + var PopupUrl = "./xinha/insert-ilink?"; + if (typeof OacsFs.fs_package_id != "undefined") { + PopupUrl = PopupUrl + "&fs_package_id=" + OacsFs.fs_package_id; + } + if (typeof OacsFs.folder_id != "undefined") { + PopupUrl = PopupUrl + "&folder_id=" + OacsFs.folder_id; + } + + Dialog(PopupUrl, function(param) { + if (!param) + return false; + + // create new ilink + var iLinkTagName; + if (param.f_restype.trim()== "glo") { + iLinkTagName = "keyref"; + } else { + iLinkTagName = "ilink"; + } + + var iLink = editor._doc.createElement(iLinkTagName); + iLink.innerHTML = param.f_title.trim(); + iLink.title = param.f_title.trim(); + iLink.setAttribute("area", param.f_area.trim()); + iLink.setAttribute("shortname",param.f_shortname.trim()); + iLink.setAttribute("restype",param.f_restype.trim()); + + // + if (!link || link == null) { + if (HTMLArea.is_ie) { + editor.insertHTML(iLink.outerHTML); + } else { + editor.insertNodeAtSelection(iLink); + } + } else { + var iLinkParent = link.parentNode; + iLinkParent.replaceChild(iLink, link); + } + // var selection = editor._getSelection(); + // selection.removeAllRanges(); + editor.updateToolbar(); + }, outparam); +}; + + +// Called when the user clicks on "InsertImage" button. If an image is already +// there, it will just modify it's properties. +OacsFs.prototype.insertImage = function(image) { + var editor = OacsFs.editor; // for nested functions + var fs_package_id = OacsFs.fs_package_id; + var outparam = null; + if (typeof image == "undefined") { + image = editor.getParentElement(); + if (image && !/^img$/i.test(image.tagName)) + image = null; + } + if (image) outparam = { + f_url : HTMLArea.is_ie ? editor.stripBaseURL(image.src) : + image.getAttribute("src"), + f_alt : image.alt, + f_border : image.border, + f_align : image.align, + f_vert : image.vspace, + f_horiz : image.hspace + }; + + // normally, allow tcl page is turned of, so the link shows under /resources + // the source code, but not the result. + // var PopupUrl = _editor_url + + // "plugins/OacsFs/popups/insert-image.tcl?fs_package_id=" + + // fs_package_id; + + var PopupUrl = "./xinha/insert-image?"; + if (typeof OacsFs.fs_package_id != "undefined") { + PopupUrl = PopupUrl + "&fs_package_id=" + OacsFs.fs_package_id; + } + if (typeof OacsFs.folder_id != "undefined") { + PopupUrl = PopupUrl + "&folder_id=" + OacsFs.folder_id; + } + + Dialog(PopupUrl, function(param) { + if (!param) { // user must have pressed Cancel + return false; + } + var img = image; + if (!img) { + var sel = editor._getSelection(); + var range = editor._createRange(sel); + editor._doc.execCommand("insertimage", false, param.f_url); + if (HTMLArea.is_ie) { + img = range.parentElement(); + // wonder if this works... + if (img.tagName.toLowerCase() != "img") { + img = img.previousSibling; + } + } else { + img = range.startContainer.previousSibling; + } + } else { + img.src = param.f_url; + } + for (field in param) { + var value = param[field]; + switch (field) { + case "f_alt" : img.alt = value; break; + case "f_border" : img.border = parseInt(value || "0"); break; + case "f_align" : img.align = value; break; + case "f_vert" : img.vspace = parseInt(value || "0"); break; + case "f_horiz" : img.hspace = parseInt(value || "0"); break; + } + } + }, outparam); +}; Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/img/close.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/img/close.gif,v diff -u Binary files differ Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/img/insert-ilink.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/img/insert-ilink.gif,v diff -u Binary files differ Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/img/insert-image.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/img/insert-image.gif,v diff -u Binary files differ Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/img/qmark.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/img/qmark.gif,v diff -u Binary files differ Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/img/up.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/img/up.gif,v diff -u Binary files differ Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/blank.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/blank.html,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/blank.html 11 Nov 2005 20:32:47 -0000 1.1 @@ -0,0 +1 @@ \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.adp 11 Nov 2005 20:32:47 -0000 1.1 @@ -0,0 +1,161 @@ + + + @HTML_Title@ + + + + + + + + + +
@HTML_Title@
+
@HTML_Context@
+ +
+ @HTML_Legend@ + +
@up_name@
+ +
@folder_name@
+
+ +
+
+ + + + + + + + + + + +
+
+ @HTML_Preview@ + +
+ 		+ +
+ @HTML_UploadTitle@ + + + + + + + + + +
+ + + + + + +
@formerror.upload_file@
+ +
+ +
+ +
+ +
+
+ + +
+
+ + + + Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.tcl 11 Nov 2005 20:32:47 -0000 1.1 @@ -0,0 +1,304 @@ +ad_page_contract { + @author Guenter Ernst guenter.ernst@wu-wien.ac.at + @author Gustaf Neumann neumann@wu-wien.ac.at + @creation-date 13.10.2005 + @cvs-id $Id: file-selector.tcl,v 1.1 2005/11/11 20:32:47 gustafn Exp $ +} { + {fs_package_id:integer,notnull,optional} + {folder_id:integer,optional} + {orderby:optional} + {selector_type "image"} + {file_types "*"} +} + +if {![info exists fs_package_id]} { + # we have not filestore package_id. This must be the first call. + if {[info exists folder_id]} { + # get package_id from folder_id + foreach {fs_package_id root_folder_id} \ + [fs::get_folder_package_and_root $folder_id] break + } else { + # get package_id from package name + set key file-storage + set id [apm_version_id_from_package_key $key] + set mount_url [site_node::get_children -all -package_key $key -node_id $id] + array set site_node [site_node::get -url $mount_url] + set fs_package_id $site_node(package_id) + } +} + +if {![info exists folder_id]} { + set folder_id [fs_get_root_folder -package_id $fs_package_id] + set root_folder_id $folder_id +} + +if {![fs_folder_p $folder_id]} { + ad_complain [_ file-storage.lt_The_specified_folder__1] + return +} + +# now we have at least a valid folder_id and a valid fs_package_id +if {![info exists root_folder_id]} { + set root_folder_id [fs_get_root_folder -package_id $fs_package_id] +} + +set fs_url [site_node::get_url_from_object_id -object_id $fs_package_id] + +# # Don't allow delete if root folder +set root_folder_p [expr {$folder_id == $root_folder_id}] + +set user_id [ad_conn user_id] +permission::require_permission \ + -party_id $user_id -object_id $folder_id \ + -privilege "read" + +set up_url {} + +if { !$root_folder_p} { + set parent_folder_id [fs::get_parent -item_id $folder_id] + set up_name [fs::get_object_name -object_id $parent_folder_id] + set up_url [export_vars -base file-selector \ + {fs_package_id {folder_id $parent_folder_id} + selector_type file_types}] +} + + +# if user has write permission, create image upload form, +if {[permission::permission_p -party_id $user_id -object_id $folder_id \ + -privilege "write"]} { + set write_p 1 + ad_form \ + -name upload_form \ + -mode edit \ + -export {fs_package_id folder_id orderby selector_type file_types} \ + -html { enctype multipart/form-data } \ + -form { + {upload_file:file(file) {html {size 30}} } + {ok_btn:text(submit) {label "[_ acs-templating.HTMLArea_SelectUploadBtn]"} + } + } \ + -on_submit { + # check file name + if {$upload_file eq ""} { + template::form::set_error upload_form upload_file \ + [_ acs-templating.HTMLArea_SpecifyUploadFilename] + break + } + + # check quota + set maximum_folder_size [ad_parameter "MaximumFolderSize"] + + if { $maximum_folder_size ne "" } { + set max [ad_parameter "MaximumFolderSize"] + if { $folder_size+[file size ${upload_file.tmpfile}] > $max } { + template::form::set_error upload_form upload_file \ + [_ file-storage.out_of_space] + break + } + } + + set file_name [template::util::file::get_property filename $upload_file] + set upload_tmpfile [template::util::file::get_property tmp_filename $upload_file] + set mime_type [template::util::file::get_property mime_type $upload_file] + + if {$selector_type eq "image" && ![string match image/* $mime_type]} { + template::form::set_error upload_form upload_file \ + [_ acs-templating.HTMLArea_SelectImageUploadNoImage] + break + } + + set existing_file_id [fs::get_item_id -name $file_name -folder_id $folder_id] + + if {$existing_file_id ne ""} { + # write new revision + fs::add_file \ + -name $file_name \ + -item_id $existing_file_id \ + -parent_id $folder_id \ + -tmp_filename $upload_tmpfile \ + -creation_user $user_id \ + -creation_ip [ad_conn peeraddr] \ + -package_id $package_id + } else { + # write file + fs::add_file \ + -name $file_name \ + -parent_id $folder_id \ + -tmp_filename $upload_tmpfile \ + -creation_user $user_id \ + -creation_ip [ad_conn peeraddr] \ + -package_id $package_id + } + + } +} else { + set write_p 0 +} + + +# display the contents + +set folder_name [lang::util::localize [fs::get_object_name -object_id $folder_id]] +set content_size_total 0 + +set folder_path [db_exec_plsql get_folder_path { + select content_item__get_path(:folder_id, :root_folder_id) +}] + + +# -pass_to_urls {c} + +template::list::create \ + -name contents \ + -multirow contents \ + -pass_properties {fs_package_id selector_type folder_id} \ + -key object_id \ + -html {width 100%}\ + -filters {folder_id {} file_types {} selector_type {} fs_package_id {}} \ + -elements { + name { + label "[_ file-storage.Name]" + display_template { + + + + + + + #file-storage.@contents.type@# + onclick="selectImage('@contents.object_id@','@contents.file_url@','@contents.type@');return false;">@contents.name@ + } + orderby_desc {name desc} + orderby_asc {name asc} + html {nowrap ""} + } + content_size_pretty { + label "[_ file-storage.Size]" + orderby_desc {content_size desc} + orderby_asc {content_size asc} + } + type { + label "[_ file-storage.Type]" + orderby_desc {type desc} + orderby_asc {type asc} + } + last_modified_pretty { + label "[_ file-storage.Last_Modified]" + orderby_desc {last_modified_ansi desc} + orderby_asc {last_modified_ansi asc} + html {nowrap ""} + } + } + +set order_by_clause [expr {[exists_and_not_null orderby] ? + [template::list::orderby_clause -orderby -name contents] : + " order by fs_objects.sort_key, fs_objects.name asc"}] + + +if {$selector_type eq "image"} { + set file_types "image/%" +} +set filter_clause [expr {$file_types eq "*" ? "" : + "and (type like '$file_types' or type = 'folder')" }] + +set fs_sql "select object_id, name, live_revision, type, title, + to_char(last_modified, 'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi, + content_size, url, sort_key, file_upload_name, + case + when :folder_path is null + then fs_objects.name + else :folder_path || '/' || name + end as file_url, + case + when last_modified >= (now() - cast('99999' as interval)) + then 1 + else 0 + end as new_p + from fs_objects + where parent_id = :folder_id + and exists (select 1 + from acs_object_party_privilege_map m + where m.object_id = fs_objects.object_id + and m.party_id = :user_id + and m.privilege = 'read') + $filter_clause + $order_by_clause" + +db_multirow -extend { + icon last_modified_pretty content_size_pretty + properties_link properties_url folder_p title +} contents get_fs_contents $fs_sql { + set last_modified_ansi [lc_time_system_to_conn $last_modified_ansi] + set last_modified_pretty [lc_time_fmt $last_modified_ansi "%x %X"] + set content_size_pretty [lc_numeric $content_size] + + if {$type eq "folder"} { + # append content_size_pretty " [_ file-storage.items]" + set content_size_pretty "" + } else { + append content_size_pretty " [_ file-storage.bytes]" + } + if {$title eq ""} {set title $name} + + set file_upload_name [fs::remove_special_file_system_characters \ + -string $file_upload_name] + + if { ![empty_string_p $content_size] } { + incr content_size_total $content_size + } + + set name [lang::util::localize $name] + + switch -- $type { + folder { + set folder_p 1 + set icon /resources/file-storage/folder.gif + set file_url [export_vars -base file-selector \ + {fs_package_id {folder_id $object_id} + selector_type file_types}] + } + url { + set folder_p 1 + set icon /resources/url-button.gif + set file_url $fs_url/$url + } + default { + set folder_p 0 + set icon /resources/file-storage/file.gif + set file_url ${fs_url}view/$file_url + } + } + + + # We need to encode the hashes in any i18n message keys (.LRN plays + # this trick on some of its folders). If we don't, the hashes will cause + # the path to be chopped off (by ns_conn url) at the leftmost hash. + regsub -all {\#} $file_url {%23} file_url +} + +set HTML_NothingSelected [_ acs-templating.HTMLArea_SelectImageNothingSelected] +switch $selector_type { + "image" { + set HTML_Title [_ acs-templating.HTMLArea_SelectImageTitle] + set HTML_Legend [_ acs-templating.HTMLArea_SelectImage] + set HTML_Preview [_ acs-templating.HTMLArea_SelectImagePreview] + set HTML_UploadTitle [_ acs-templating.HTMLArea_SelectImageUploadTitle] + set HTML_Context "COMMUNITY NAME" + } + "file" { + set HTML_Title [_ acs-templating.HTMLArea_SelectFileTitle] + set HTML_Legend [_ acs-templating.HTMLArea_SelectFile] + set HTML_Preview [_ acs-templating.HTMLArea_SelectImagePreview] + set HTML_UploadTitle [_ acs-templating.HTMLArea_SelectFileUploadTitle] + set HTML_Context "COMMUNITY NAME" + } +} + + +ad_return_template Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-ilink.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-ilink.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-ilink.adp 11 Nov 2005 20:32:47 -0000 1.1 @@ -0,0 +1,213 @@ + + + #acs-templating.HTMLArea_InsertModifyLink# + + + + + + + + + + + +
#acs-templating.HTMLArea_InsertModifyLink#
+
+
+ + + + + + + + + + + + + + + #acs-templating.HTMLArea_OpenFileStorage# + + + +
URL:
Title (tooltip):
Target: + + + + +
+ +
+ + + + + + +
+ +
+ + Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-ilink.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-ilink.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-ilink.tcl 11 Nov 2005 20:32:47 -0000 1.1 @@ -0,0 +1,21 @@ +ad_page_contract { + @author Guenter Ernst guenter.ernst@wu-wien.ac.at, + @author Gustaf Neumann neumann@wu-wien.ac.at + @creation-date 13.07.2004 + @cvs-id $Id: insert-ilink.tcl,v 1.1 2005/11/11 20:32:47 gustafn Exp $ +} { + {fs_package_id:integer,optional} + {folder_id:integer,optional} + {file_types *} +} + +set selector_type "file" +set file_selector_link [export_vars -base file-selector \ + {fs_package_id folder_id selector_type file_types}] +set fs_found 1 + +#set user_id [ad_verify_and_get_user_id] +#permission::require_permission -party_id $user_id -object_id $fs_package_id \ +# -privilege "admin" + +ad_return_template Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-ilink.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-ilink.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-ilink.xql 11 Nov 2005 20:32:47 -0000 1.1 @@ -0,0 +1,43 @@ + + + + + + select + lro.lr_object_id, + lro.lr_title, + lro.restype, + lro.shortname, + lro.last_modified, + lro.is_active, + lro.pretty_name, + dcc.community_key as area + from + lr_objects_developers_view lro inner join dotlrn_communities_core dcc + on lro.community_id = dcc.community_id + where + lro.lr_object_id [template::list::page_where_clause -name "resource_list"] + order by lro.lr_title + + + + + + select + lro.lr_object_id + from + lr_objects_developers_view lro + [expr {[exists_and_not_null cs]?" ,lr_concept__all_objects lrc":""}] + where + lro.community_id = :c + and lro.restype = :restype + and lro.is_active = :is_active + [expr {[exists_and_not_null q]?"and (lower(lro.lr_title) like '%' || :q || '%' or lower(lro.shortname) like '%' || :q || '%')":"" }] + [expr {[exists_and_not_null cs]?" and lrc.lr_object_id = lro.lr_object_id and lrc.lr_concept_id = :cs":""}] + [template::list::filter_where_clauses -and -name "resource_list"] + order by lro.lr_title + + + + + Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-image.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-image.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-image.adp 11 Nov 2005 20:32:47 -0000 1.1 @@ -0,0 +1,235 @@ + + + #acs-templating.HTMLArea_InsertImageTitle# + + + + + + + + + + + +
#acs-templating.HTMLArea_InsertImageTitle#
+ +
+ +
+ + + + + + + + + + + + + + +
#acs-templating.HTMLArea_ImageURL# + +
#acs-templating.HTMLArea_ImageAlternateText#
+ + + + + #acs-templating.HTMLArea_OpenFileStorage# +
+
+

+ + + + + + +
+
+ Layout + + + + + + + + + + +
#acs-templating.HTMLArea_ImageAlignment# + +
#acs-templating.HTMLArea_ImageBorderSize#
+
+ 		+
+ #acs-templating.HTMLArea_ImageSpacing# + + + + + + + + + + +
#acs-templating.HTMLArea_ImageSpacingHorizontal#
#acs-templating.HTMLArea_ImageSpacingVertical#
+
+
+ + + + + + + +
+ Image Preview:
+ + 		+
+ +
+

+ + + Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-image.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-image.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/insert-image.tcl 11 Nov 2005 20:32:47 -0000 1.1 @@ -0,0 +1,14 @@ +ad_page_contract { + @author Guenter Ernst guenter.ernst@wu-wien.ac.at, + @author Gustaf Neumann neumann@wu-wien.ac.at + @creation-date 13.07.2004 + @cvs-id $Id: insert-image.tcl,v 1.1 2005/11/11 20:32:47 gustafn Exp $ +} { + {fs_package_id:integer,optional} + {folder_id:integer,optional} +} + +set selector_type "image" +set file_selector_link [export_vars -base file-selector \ + {fs_package_id folder_id selector_type}] +set fs_found 1 Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/PasteText/paste-text.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/PasteText/paste-text.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/PasteText/paste-text.js 2 Nov 2005 08:56:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/PasteText/paste-text.js 11 Nov 2005 20:32:47 -0000 1.2 @@ -16,11 +16,11 @@ action : function(editor) { self.buttonPress(editor); } - }) + }); cfg.addToolbarElement("pastetext", ["paste", "killword"], 1); -}; +} PasteText._pluginInfo = { name : "PasteText", Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/QuickTag/quick-tag.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/QuickTag/quick-tag.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/QuickTag/quick-tag.js 2 Nov 2005 08:56:28 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/QuickTag/quick-tag.js 11 Nov 2005 20:32:47 -0000 1.2 @@ -19,7 +19,7 @@ } }); cfg.addToolbarElement("quickeditor", "htmlmode", 1); -}; +} QuickTag.prototype.buttonPress = function(editor) { var self = this; Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/QuickTag/popups/quicktag.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/QuickTag/popups/quicktag.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/QuickTag/popups/quicktag.html 2 Nov 2005 08:56:28 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/QuickTag/popups/quicktag.html 11 Nov 2005 20:32:47 -0000 1.2 @@ -33,17 +33,17 @@ document.getElementById('bt_colors').style.display = 'none'; document.body.onkeypress = __dlg_key_press; -}; +} function onCancel() { __dlg_close(null); return false; -}; +} function quoteTest(val) { var er = /^\w+\s*(\w+=\"[^\"]*\"\s*|\w+=\'[^\']*\'\s*)*$/; return er.test(val); -}; +} function onOK() { var el = document.getElementById('tagopen'); @@ -71,7 +71,7 @@ __dlg_close(param); return false; -}; +} function __dlg_key_press(ev) { ev || (ev = window.event); @@ -84,7 +84,7 @@ return false; } return true; -}; +} function selchange() { var toadd = document.getElementById('selectag').value; @@ -149,8 +149,8 @@ function addchanges() { document.getElementById('tagopen').focus(); document.getElementById('tagopen').value += toadd; - }; -}; + } +} function captureClasses() { var cont = 0; @@ -193,7 +193,7 @@ } } return cont; -}; +} function choice_dropdown(e) { if (document.all) Key = e.keyCode; @@ -222,7 +222,7 @@ att = curTag; createDropdown(att); -}; +} function createDropdown(type) { var _div = document.getElementById('showselect'); @@ -270,15 +270,15 @@ opt.value = obj[i]; _sel.appendChild(opt); } - }; -}; + } +} function colors() { var colloc = window.location.toString().replace(/plugins.+$/,"") + "popups/select_color.html"; window.open(colloc, 'colors', "toolbar=no,location=no,directories=no," + "status=no,menubar=no,scrollbars=no,resizable=no,width=240,height=182"); -}; +} // simulation of Dialog._return - select_color.html needs it. var Dialog = new Object(); @@ -353,4 +353,4 @@
- + \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-check-logic.php =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-check-logic.php,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-check-logic.php 2 Nov 2005 08:56:28 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-check-logic.php 11 Nov 2005 20:32:48 -0000 1.2 @@ -163,4 +163,4 @@ echo '
'.$dictionaries.'
'; echo ''; -?> +?> \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-check-ui.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-check-ui.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-check-ui.html 2 Nov 2005 08:56:28 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-check-ui.html 11 Nov 2005 20:32:48 -0000 1.2 @@ -104,7 +104,7 @@ - Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-check-ui.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-check-ui.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-check-ui.js 2 Nov 2005 08:56:28 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-check-ui.js 11 Nov 2005 20:32:48 -0000 1.2 @@ -46,14 +46,14 @@ // HTML to such extent that our poor Perl parser doesn't understand it // anymore. return window.opener.HTMLArea.getHTML(frame.contentWindow.document.body, false, editor); -}; +} function recheckClicked() { document.getElementById("status").innerHTML = _lc("Please wait: changing dictionary to") + ': "' + document.getElementById("f_dictionary").value + '".'; var field = document.getElementById("f_content"); field.value = makeCleanDoc(true); field.form.submit(); -}; +} function saveClicked() { if (modified) { @@ -81,7 +81,7 @@ window.close(); } return false; -}; +} function cancelClicked() { var ok = true; @@ -92,7 +92,7 @@ window.close(); } return false; -}; +} function replaceWord(el) { var replacement = document.getElementById("v_replacement").value; @@ -109,7 +109,7 @@ } to_r_list.push([el.innerHTML, replacement]); el.innerHTML = replacement; -}; +} function replaceClicked() { replaceWord(currentElement); @@ -127,14 +127,14 @@ } wrongWords[index].__msh_wordClicked(true); return false; -}; +} function revertClicked() { document.getElementById("v_replacement").value = currentElement.__msh_origWord; replaceWord(currentElement); currentElement.className = "HA-spellcheck-error HA-spellcheck-current"; return false; -}; +} function replaceAllClicked() { var replacement = document.getElementById("v_replacement").value; @@ -164,24 +164,24 @@ replaceClicked(); } return false; -}; +} function ignoreClicked() { document.getElementById("v_replacement").value = currentElement.__msh_origWord; replaceClicked(); return false; -}; +} function ignoreAllClicked() { document.getElementById("v_replacement").value = currentElement.__msh_origWord; replaceAllClicked(); return false; -}; +} function learnClicked() { to_p_dict.push(currentElement.__msh_origWord); return ignoreAllClicked(); -}; +} function internationalizeWindow() { var types = ["div", "span", "button"]; @@ -196,7 +196,7 @@ } } } -}; +} function initDocument() { internationalizeWindow(); @@ -254,7 +254,7 @@ select.onchange = function() { document.getElementById("f_dictionary").value = this.value; }; -}; +} function getAbsolutePos(el) { var r = { x: el.offsetLeft, y: el.offsetTop }; @@ -264,7 +264,7 @@ r.y += tmp.y; } return r; -}; +} function wordClicked(scroll) { var self = this; @@ -337,15 +337,15 @@ select.style.display = "none"; select.style.display = "block"; return false; -}; +} function wordMouseOver() { this.className += " HA-spellcheck-hover"; -}; +} function wordMouseOut() { this.className = this.className.replace(/\s*HA-spellcheck-hover\s*/g, " "); -}; +} function displayInfo() { var info = frame.contentWindow.spellcheck_info; @@ -359,7 +359,7 @@ alert(txt); } return false; -}; +} function finishedSpellChecking() { // initialization of global variables @@ -442,4 +442,4 @@ return false; }; } -}; \ No newline at end of file +} \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-checker.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-checker.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-checker.js 2 Nov 2005 08:56:28 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/SpellChecker/spell-checker.js 11 Nov 2005 20:32:48 -0000 1.2 @@ -26,7 +26,7 @@ }); cfg.addToolbarElement("SC-spell-check", "htmlmode", 1); -}; +} SpellChecker._pluginInfo = { name : "SpellChecker", Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Stylist/stylist.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Stylist/Attic/stylist.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Stylist/stylist.js 2 Nov 2005 08:56:28 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Stylist/stylist.js 11 Nov 2005 20:32:48 -0000 1.2 @@ -503,7 +503,7 @@ } } ); -}; +} Stylist._pluginInfo = { Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/TableOperations/table-operations.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/TableOperations/table-operations.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/TableOperations/table-operations.js 2 Nov 2005 08:56:29 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/TableOperations/table-operations.js 11 Nov 2005 20:32:48 -0000 1.2 @@ -42,7 +42,7 @@ // add a new line in the toolbar cfg.toolbar.push(toolbar); -}; +} TableOperations._pluginInfo = { name : "TableOperations", @@ -168,7 +168,7 @@ function selected(val) { return val ? " selected" : ""; - }; + } // dialog contents dialog.content.style.width = "400px"; @@ -321,7 +321,7 @@ function selected(val) { return val ? " selected" : ""; - }; + } // dialog contents dialog.content.style.width = "400px"; @@ -391,7 +391,7 @@ td.rowSpan = 1; td.innerHTML = mozbr; } - }; + } function splitRow(td) { var n = parseInt("" + td.rowSpan); @@ -410,7 +410,7 @@ } editor.forceRedraw(); editor.updateToolbar(); - }; + } function splitCol(td) { var nc = parseInt("" + td.colSpan); @@ -425,7 +425,7 @@ } editor.forceRedraw(); editor.updateToolbar(); - }; + } function splitCell(td) { var nc = parseInt("" + td.colSpan); @@ -435,7 +435,7 @@ while (nc-- > 0) { splitRow(items[index++]); } - }; + } function selectNextNode(el) { var node = el.nextSibling; @@ -452,7 +452,7 @@ node = el.parentNode; } editor.selectNodeContents(node); - }; + } switch (button_id) { // ROWS @@ -505,18 +505,20 @@ } var rows = td.parentNode.parentNode.rows; var index = td.cellIndex; + var lastColumn = (td.parentNode.cells.length == index + 1); for (var i = rows.length; --i >= 0;) { - /* - var tr = rows; - var otd = tr.insertCell(index + (/after/.test(button_id) ? 1 : 0)); - otd.innerHTML = mozbr; - */ - var tr = rows[i]; - var ref = tr.cells[index + (/after/.test(button_id) ? 1 : 0)]; + var tr = rows[i]; var otd = editor._doc.createElement("td"); otd.innerHTML = mozbr; - tr.insertBefore(otd, ref); - + if (lastColumn && HTMLArea.is_ie) + { + tr.insertBefore(otd); + } + else + { + var ref = tr.cells[index + (/after/.test(button_id) ? 1 : 0)]; + tr.insertBefore(otd, ref); + } } editor.focusEditor(); break; @@ -956,7 +958,7 @@ input.focus(); input.select(); } - }; + } select.onchange = function() { setCharVisibility(this.value == "char"); }; setCharVisibility(select.value == "char"); @@ -1106,7 +1108,7 @@ el.select(); } } - }; + } select.onchange = function() { setBorderFieldsStatus(this.value == "none"); }; input = doc.createElement("input"); @@ -1175,4 +1177,4 @@ return fieldset; }; -//// END GENERIC CODE ------------------------------------------------------- +//// END GENERIC CODE ------------------------------------------------------- \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Template/template.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Template/template.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Template/template.js 2 Nov 2005 08:56:30 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Template/template.js 11 Nov 2005 20:32:48 -0000 1.2 @@ -20,9 +20,9 @@ action : function(editor) { self.buttonPress(editor); } - }) + }); cfg.addToolbarElement("template", "inserthorizontalrule", 1); -}; +} Template._pluginInfo = { name : "Template", Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Template/popups/template.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Template/popups/template.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Template/popups/template.html 2 Nov 2005 08:56:30 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Template/popups/template.html 11 Nov 2005 20:32:48 -0000 1.2 @@ -10,20 +10,20 @@ __dlg_init(); window.resizeTo(400, 200); document.getElementById("cancel").focus(); -}; +} function onOK(sel) { // pass data back to the calling window var param = new Object(); param["templ"] = sel; __dlg_close(param); return false; -}; +} function onCancel() { __dlg_close(null); return false; -}; +} Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/UnFormat/un-format.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/UnFormat/un-format.js,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/UnFormat/un-format.js 2 Nov 2005 08:56:30 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/UnFormat/un-format.js 11 Nov 2005 20:32:48 -0000 1.2 @@ -17,7 +17,7 @@ }); cfg.addToolbarElement("unformat", "killword", 1); -}; +} UnFormat._pluginInfo = { name : "UnFormat", Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/UnFormat/popups/unformat.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/UnFormat/popups/unformat.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/UnFormat/popups/unformat.html 2 Nov 2005 08:56:30 -0000 1.1 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/UnFormat/popups/unformat.html 11 Nov 2005 20:32:48 -0000 1.2 @@ -19,7 +19,7 @@ function Init() { __dlg_translate('UnFormat'); __dlg_init(); -}; +} function onOK() { var param = new Object(); @@ -40,12 +40,12 @@ __dlg_close(param); return false; -}; +} function onCancel() { __dlg_close(null); return false; -}; +} @@ -82,4 +82,4 @@ - + \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/editor_help.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/editor_help.html,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/editor_help.html 2 Nov 2005 09:20:05 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/editor_help.html 11 Nov 2005 20:32:49 -0000 1.3 @@ -10,13 +10,13 @@ __dlg_translate('HTMLArea'); __dlg_init(); window.resizeTo(400, 480); -}; +} function onCancel() { __dlg_close(null); return false; -}; +} Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/insert_image.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/insert_image.html,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/insert_image.html 2 Nov 2005 09:20:05 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/insert_image.html 11 Nov 2005 20:32:49 -0000 1.3 @@ -13,7 +13,7 @@ HTMLArea = window.opener.HTMLArea; function i18n(str) { return (HTMLArea._lc(str, 'HTMLArea')); -}; +} function Init() { __dlg_translate('HTMLArea'); @@ -32,7 +32,7 @@ window.ipreview.location.replace(param.f_url); } document.getElementById("f_url").focus(); -}; +} function onOK() { var required = { @@ -57,12 +57,12 @@ } __dlg_close(param); return false; -}; +} function onCancel() { __dlg_close(null); return false; -}; +} function onPreview() { var f_url = document.getElementById("f_url"); @@ -74,7 +74,7 @@ } window.ipreview.location.replace(url); return false; -}; +} Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/insert_table.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/insert_table.html,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/insert_table.html 2 Nov 2005 09:20:05 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/insert_table.html 11 Nov 2005 20:32:49 -0000 1.3 @@ -13,7 +13,7 @@ HTMLArea = window.opener.HTMLArea; function i18n(str) { return (HTMLArea._lc(str, 'HTMLArea')); -}; +} function Init() { HTMLArea = window.opener.HTMLArea; // load the HTMLArea plugin and lang file @@ -25,7 +25,7 @@ document.getElementById("f_align").selectedIndex = 1; document.getElementById("f_align").selectedIndex = 0; document.getElementById("f_rows").focus(); -}; +} function onOK() { var required = { @@ -50,12 +50,12 @@ } __dlg_close(param); return false; -}; +} function onCancel() { __dlg_close(null); return false; -}; +} Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/link.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/link.html,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/link.html 2 Nov 2005 09:20:05 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/link.html 11 Nov 2005 20:32:49 -0000 1.3 @@ -12,7 +12,7 @@ function i18n(str) { return (HTMLArea._lc(str, 'HTMLArea')); -}; +} function onTargetChanged() { var f = document.getElementById("f_other_target"); @@ -21,7 +21,7 @@ f.select(); f.focus(); } else f.style.visibility = "hidden"; -}; +} function Init() { __dlg_translate('HTMLArea'); @@ -63,7 +63,7 @@ target_select.onchange = onTargetChanged; document.getElementById("f_href").focus(); document.getElementById("f_href").select(); -}; +} function onOK() { var required = { @@ -91,12 +91,12 @@ param.f_target = document.getElementById("f_other_target").value; __dlg_close(param); return false; -}; +} function onCancel() { __dlg_close(null); return false; -}; +} @@ -133,4 +133,4 @@ - + \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/popup.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/popup.js,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/popup.js 2 Nov 2005 09:20:05 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/popup.js 11 Nov 2005 20:32:49 -0000 1.3 @@ -20,7 +20,7 @@ r.y += tmp.y; } return r; -}; +} function comboSelectValue(c, val) { var ops = c.getElementsByTagName("option"); @@ -29,11 +29,11 @@ op.selected = (op.value == val); } c.value = val; -}; +} function __dlg_onclose() { opener.Dialog._return(null); -}; +} function __dlg_init(bottom) { if(window.opener._editor_skin != "") { @@ -82,7 +82,7 @@ window.moveTo(x, y); } HTMLArea.addDom0Event(document.body, 'keypress', __dlg_close_on_esc); -}; +} function __dlg_translate(context) { var types = ["input", "select", "legend", "span", "option", "td", "button", "div", "label"]; @@ -103,13 +103,13 @@ } } document.title = HTMLArea._lc(document.title, context); -}; +} // closes the dialog and passes the return info upper. function __dlg_close(val) { opener.Dialog._return(val); window.close(); -}; +} function __dlg_close_on_esc(ev) { ev || (ev = window.event); @@ -118,4 +118,4 @@ return false; } return true; -}; +} \ No newline at end of file Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/blue-look/skin.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/blue-look/skin.css,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/blue-look/skin.css 2 Nov 2005 09:20:05 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/blue-look/skin.css 11 Nov 2005 20:32:49 -0000 1.3 @@ -11,6 +11,7 @@ padding:2px; -moz-border-radius:3px; margin:4px; + height:25px; } .htmlarea .toolbar .button Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/blue-metallic/skin.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/blue-metallic/skin.css,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/blue-metallic/skin.css 2 Nov 2005 09:20:05 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/blue-metallic/skin.css 11 Nov 2005 20:32:49 -0000 1.3 @@ -10,6 +10,7 @@ padding:2px; -moz-border-radius:4px; margin:4px; + height:25px; } .htmlarea .toolbar .button { Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/green-look/skin.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/green-look/skin.css,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/green-look/skin.css 2 Nov 2005 09:20:05 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/green-look/skin.css 11 Nov 2005 20:32:49 -0000 1.3 @@ -10,6 +10,7 @@ padding:2px; -moz-border-radius:3px; margin:4px; + height:25px; } .htmlarea .toolbar .button { Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/inditreuse/skin.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/inditreuse/skin.css,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/inditreuse/skin.css 2 Nov 2005 09:20:06 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/inditreuse/skin.css 11 Nov 2005 20:32:49 -0000 1.3 @@ -7,6 +7,7 @@ margin-top:2px; margin-bottom:2px; background-image:url(button-background.png); + height:25px; } .htmlarea .toolbar .button { width:20px; Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/titan/skin.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/titan/skin.css,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/titan/skin.css 2 Nov 2005 09:20:06 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/titan/skin.css 11 Nov 2005 20:32:49 -0000 1.3 @@ -7,6 +7,7 @@ margin-top:2px; margin-bottom:2px; background-image:url(button-background.png); + height:25px; } .htmlarea .toolbar .button { width:20px; Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/xp-blue/skin.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/xp-blue/skin.css,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/xp-blue/skin.css 2 Nov 2005 09:20:06 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/xp-blue/skin.css 11 Nov 2005 20:32:49 -0000 1.3 @@ -7,6 +7,7 @@ margin-top:2px; margin-bottom:2px; background-image:url(button-background.png); + height:25px; } .htmlarea .toolbar .button { width:20px; Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/xp-green/skin.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/xp-green/skin.css,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/xp-green/skin.css 2 Nov 2005 09:20:06 -0000 1.2 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/skins/xp-green/skin.css 11 Nov 2005 20:32:50 -0000 1.3 @@ -7,6 +7,7 @@ margin-top:2px; margin-bottom:2px; background-image:url(button-background.png); + height:25px; } .htmlarea .toolbar .button { width:20px;