From duncan at codespeak.net Fri Feb 1 10:23:21 2008 From: duncan at codespeak.net (duncan at codespeak.net) Date: Fri, 1 Feb 2008 10:23:21 +0100 (CET) Subject: [kupu-checkins] r51164 - kupu/trunk/kupu/common Message-ID: <20080201092321.378411684CF@codespeak.net> Author: duncan Date: Fri Feb 1 10:23:20 2008 New Revision: 51164 Modified: kupu/trunk/kupu/common/kupueditor.js Log: Plone ticket 7494: Insert internal link using IE links in the wrong place Putting focus back into the iframe triggered the 'save selection' code before the original selection had been restored. Modified resumeEditing to not mark editing as resumed until selection has been restored, and modified _saveSelection to not save it when editing is suspended. Modified: kupu/trunk/kupu/common/kupueditor.js ============================================================================== --- kupu/trunk/kupu/common/kupueditor.js (original) +++ kupu/trunk/kupu/common/kupueditor.js Fri Feb 1 10:23:20 2008 @@ -638,6 +638,8 @@ }; this._isDocumentSelected = function() { + if (this.suspended) return false; + var editable_body = this.getInnerDocument().getElementsByTagName('body')[0]; try { var selrange = this.getInnerDocument().selection.createRange(); @@ -895,7 +897,6 @@ if (!this.suspended) { return; } - this.suspended = false; this.clearClass('kupu-modal'); for (var id in this.tools) { this.tools[id].enable(); @@ -911,6 +912,7 @@ this.focusDocument(); this.getSelection().restoreRange(this._previous_range); } + this.suspended = false; }; this.newElement = function(tagName) { return newDocumentElement(this.getInnerDocument(), tagName, arguments); From duncan at codespeak.net Fri Feb 1 10:25:29 2008 From: duncan at codespeak.net (duncan at codespeak.net) Date: Fri, 1 Feb 2008 10:25:29 +0100 (CET) Subject: [kupu-checkins] r51165 - in kupu/trunk/kupu: . doc Message-ID: <20080201092529.BFD8D1684CF@codespeak.net> Author: duncan Date: Fri Feb 1 10:25:29 2008 New Revision: 51165 Modified: kupu/trunk/kupu/doc/CHANGES.txt kupu/trunk/kupu/version.txt Log: Update version number and CHANGES.doc Modified: kupu/trunk/kupu/doc/CHANGES.txt ============================================================================== --- kupu/trunk/kupu/doc/CHANGES.txt (original) +++ kupu/trunk/kupu/doc/CHANGES.txt Fri Feb 1 10:25:29 2008 @@ -10,6 +10,7 @@ - Plone tickets * 7473 Kupu full screen mode looks broken + * 7494 Insert internal link using IE links in the wrong place * 7680 Kupu stripping out anchor to top of current page * 7713 Kupu browser "Home" link goes to Plone root and not content root. Modified: kupu/trunk/kupu/version.txt ============================================================================== --- kupu/trunk/kupu/version.txt (original) +++ kupu/trunk/kupu/version.txt Fri Feb 1 10:25:29 2008 @@ -1 +1 @@ -kupu 1.4.7 +kupu 1.4.8 From duncan at codespeak.net Fri Feb 1 16:01:13 2008 From: duncan at codespeak.net (duncan at codespeak.net) Date: Fri, 1 Feb 2008 16:01:13 +0100 (CET) Subject: [kupu-checkins] r51186 - kupu/tag/kupu-1.4.8 Message-ID: <20080201150113.E99F216845F@codespeak.net> Author: duncan Date: Fri Feb 1 16:01:12 2008 New Revision: 51186 Added: kupu/tag/kupu-1.4.8/ - copied from r51185, kupu/trunk/kupu/ Log: Branched for 1.4.8 From timte at codespeak.net Mon Feb 4 12:05:03 2008 From: timte at codespeak.net (timte at codespeak.net) Date: Mon, 4 Feb 2008 12:05:03 +0100 (CET) Subject: [kupu-checkins] r51242 - kupu/trunk/kupu/plone Message-ID: <20080204110503.2E7DC16845E@codespeak.net> Author: timte Date: Mon Feb 4 12:05:01 2008 New Revision: 51242 Modified: kupu/trunk/kupu/plone/kupu_config.pt Log: Fix for tableless layout in plone 2.5 Modified: kupu/trunk/kupu/plone/kupu_config.pt ============================================================================== --- kupu/trunk/kupu/plone/kupu_config.pt (original) +++ kupu/trunk/kupu/plone/kupu_config.pt Mon Feb 4 12:05:01 2008 @@ -16,7 +16,8 @@
+ tal:define="errors python:request.get('errors', {});" + id="content"> From kupu-checkins at codespeak.net Thu Feb 7 16:17:26 2008 From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net) Date: Thu, 7 Feb 2008 16:17:26 +0100 (CET) Subject: [kupu-checkins] Expert Advice: This Years Product Tips Message-ID: <20080207051705.5815.qmail@djs178.neoplus.adsl.tpnet.pl> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20080207/8e883557/attachment.htm From mihxil at codespeak.net Thu Feb 7 16:43:31 2008 From: mihxil at codespeak.net (mihxil at codespeak.net) Date: Thu, 7 Feb 2008 16:43:31 +0100 (CET) Subject: [kupu-checkins] r51319 - kupu/trunk/kupu Message-ID: <20080207154331.03D78168512@codespeak.net> Author: mihxil Date: Thu Feb 7 16:43:30 2008 New Revision: 51319 Modified: kupu/trunk/kupu/make-jspx.xsl Log: didn't work, because attributes can contains spaces Modified: kupu/trunk/kupu/make-jspx.xsl ============================================================================== --- kupu/trunk/kupu/make-jspx.xsl (original) +++ kupu/trunk/kupu/make-jspx.xsl Thu Feb 7 16:43:30 2008 @@ -17,7 +17,7 @@ This means that also the fmt-tags must be available, so your html.kupu must specificy something like: - + - + - ${_} + ${translation} @@ -105,7 +105,7 @@ - + From mihxil at codespeak.net Fri Feb 8 10:25:18 2008 From: mihxil at codespeak.net (mihxil at codespeak.net) Date: Fri, 8 Feb 2008 10:25:18 +0100 (CET) Subject: [kupu-checkins] r51331 - kupu/trunk/kupu/common Message-ID: <20080208092518.7B6BE16852E@codespeak.net> Author: mihxil Date: Fri Feb 8 10:25:16 2008 New Revision: 51331 Modified: kupu/trunk/kupu/common/kupudrawers.js Log: Just added some checks to avoid javascript errors if your are not (yet) using new features, and hence some elements are missing in the html Modified: kupu/trunk/kupu/common/kupudrawers.js ============================================================================== --- kupu/trunk/kupu/common/kupudrawers.js (original) +++ kupu/trunk/kupu/common/kupudrawers.js Fri Feb 8 10:25:16 2008 @@ -5,7 +5,7 @@ * This software is distributed under the terms of the Kupu * License. See LICENSE.txt for license text. For a list of Kupu * Contributors see CREDITS.txt. - * + * *****************************************************************************/ // $Id$ @@ -21,7 +21,7 @@ */ this.drawers = {}; this.current_drawer = null; - + this.initialize = function(editor) { this.editor = editor; this.isIE = this.editor.getBrowserName() == 'IE'; @@ -84,7 +84,7 @@ proto.createContent = function() { /* fill the drawer with some content */ - // here's where any intelligence and XSLT transformation and such + // here's where any intelligence and XSLT transformation and such // is done this.element.style.display = 'block'; this.focusElement(); @@ -242,7 +242,7 @@ }; proto.anchorText = function(a) { - // Text inside anchor, or immediate sibling block tag, or parent block. + // Text inside anchor, or immediate sibling block tag, or parent block. var blocktag = /^div|p|body|td|h.$/i; var txt = ''; var prefix = '#' + a.name; @@ -315,7 +315,7 @@ function LinkDrawer(elementid, tool) { /* Link drawer */ DrawerWithAnchors.call(this, elementid, tool); - + var input = getBaseTagClass(this.element, 'input', 'kupu-linkdrawer-input'); var embed = getBaseTagClass(this.element, 'textarea', 'kupu-embed-input'); var preview = getBaseTagClass(this.element, 'iframe', 'kupu-linkdrawer-preview'); @@ -324,11 +324,16 @@ this.anchorui = getBaseTagClass(this.element, 'tr', 'kupu-linkdrawer-anchors'); this.target = ''; this.panel = getBaseTagClass(this.element, 'div', 'kupu-panels'); - var tabs = getBaseTagClass(this.element, 'ul', 'kupu-tabs').getElementsByTagName('a'); - for (var i = 0; i < tabs.length; i++) { - addEventHandler(tabs[i], 'click', this.switchMode, this); + var kuputabs = getBaseTagClass(this.element, 'ul', 'kupu-tabs'); + if (kuputabs) { + var tabs = kuputabs.getElementsByTagName('a'); + for (var i = 0; i < tabs.length; i++) { + addEventHandler(tabs[i], 'click', this.switchMode, this); + } + } + if (embed) { + addEventHandler(embed, 'click', function() { if(embed.defaultValue==embed.value) {embed.select();} }); } - addEventHandler(embed, 'click', function() { if(embed.defaultValue==embed.value) {embed.select();} }); this.selChange = function() { var anchor = this.getFragment(); @@ -403,7 +408,7 @@ var current = bits.length > 1 ? bits[bits.length-1] : ''; return current; } - + this.getMode = function() { return !!(/addlink/.test(this.panel.className)); }; @@ -489,7 +494,7 @@ }; fixClasses(addclassselect); fixClasses(editclassselect); - + var table = editor.getNearestParentOfType(selNode, 'table'); var show, hide; if (!table) { @@ -578,11 +583,11 @@ TableDrawer.prototype = new Drawer; function LibraryDrawer(tool, xsluri, libsuri, searchuri, baseelement, selecturi) { - /* a drawer that loads XSLT and XML from the server + /* a drawer that loads XSLT and XML from the server and converts the XML to XHTML for the drawer using the XSLT there are 2 types of XML file loaded from the server: the first - contains a list of 'libraries', partitions for the data items, + contains a list of 'libraries', partitions for the data items, and the second a list of data items for a certain library all XML loading is done async, since sync loading can freeze Mozilla @@ -626,17 +631,17 @@ this.libsuri = libsuri; this.searchuri = searchuri; this.selecturi = selecturi; - + // marker that gets set when a new image has been uploaded this.shared.newimages = null; // the following vars will be available after this.initialize() // has been called - + // this will be filled by this._libXslCallback() this.shared.xsl = null; - // this will be filled by this.loadLibraries(), which is called - // somewhere further down the chain starting with + // this will be filled by this.loadLibraries(), which is called + // somewhere further down the chain starting with // this._libsXslCallback() this.xmldata = null; @@ -663,7 +668,7 @@ this._libsXslCallback = function(dom) { /* callback for when the xsl for the libs is loaded - + this is called on init and since the initial libs need to be loaded as well (and everything is async with callbacks so there's no way to wait until the XSL is loaded) this @@ -672,7 +677,7 @@ this.shared.xsl = dom; Sarissa.getDomDocument(); /* Work round Sarissa initialisation glitch */ - // Change by Paul to have cached xslt transformers for reuse of + // Change by Paul to have cached xslt transformers for reuse of // multiple transforms and also xslt params try { var xsltproc = new XSLTProcessor(); @@ -715,8 +720,8 @@ } // load the initial XML if(!this.xmldata) { - // Do a meaningful test to see if this is IE5.5 or some other - // editor-enabled version whose XML support isn't good enough + // Do a meaningful test to see if this is IE5.5 or some other + // editor-enabled version whose XML support isn't good enough // for the drawers if (!window.XSLTProcessor) { alert("This function requires better XML support in your browser."); @@ -862,7 +867,7 @@ this.selectLibrary = function(id) { /* unselect the currently selected lib and select a new one - the selected lib (libraries pane) will have a specific CSS class + the selected lib (libraries pane) will have a specific CSS class (selected) */ // remove selection in the DOM @@ -882,7 +887,7 @@ var items_xpath = "items"; var items_node = libnode.selectSingleNode(items_xpath); - + if (items_node && !this.shared.newimages) { // The library has already been loaded before or was // already provided with an items list. No need to do @@ -901,7 +906,7 @@ }; }; this.flagSelectedLib = function(id) { - // instead of running the full transformations again we get a + // instead of running the full transformations again we get a // reference to the element and set the classname... var newseldiv = document.getElementById(id); if (newseldiv) { @@ -1011,7 +1016,7 @@ // First turn off current selection, if any this.removeSelection(); - + var leafnode_path = "//"+tag+"[@id='" + id + "']"; var leafnode = this.xmldata.selectSingleNode(leafnode_path); @@ -1108,7 +1113,7 @@ this.removeSelection = function() { // Mark the drawer as having no selection if (!this.xmldata) return; - + if (!this.multiple) { var items = this.xmldata.selectNodes('//resource[@checked]'); for (var i = 0; i < items.length; i++) { @@ -1294,7 +1299,7 @@ // library as selected this.deselectActiveCollection(); resultlib.setAttribute("selected", "1"); - + // now hook the result library into our DOM if (this.editor.getBrowserName() == 'IE') { resultlib = resultlib.cloneNode(true); @@ -1330,7 +1335,7 @@ with the DOM as the first argument and the uri loaded as the second - note that this method should be called in the context of an + note that this method should be called in the context of an xmlhttp object */ if (xmlhttp.readyState == 4) { @@ -1427,7 +1432,7 @@ } ImageLibraryDrawer.prototype.createContent.call(this); }; - + // upload, on submit/insert press this.uploadImage = function() { var form = document.getElementById('kupu_upload_form'); @@ -1435,22 +1440,22 @@ if (form.node_prop_title.value == "") { alert("Please enter a title for the image you are uploading"); - return; + return; }; form.node_prop_desc.value = form.node_prop_desc.value.replace(/^\xa0|\xa0$/g,''); form.submit(); }; - + // called for example when no permission to upload for some reason this.cancelUpload = function(msg) { - var s = this.xmldata.selectSingleNode('/libraries/*[@selected]'); + var s = this.xmldata.selectSingleNode('/libraries/*[@selected]'); s.removeAttribute("selected"); this.updateDisplay(); if (msg != '') { alert(msg); }; }; - + // called by onLoad within document sent by server this.finishUpload = function(url) { this.editor.resumeEditing(); @@ -1462,7 +1467,7 @@ this.shared.newimages = 1; this.drawertool.closeDrawer(); }; - + this.save = function() { this.editor.resumeEditing(); @@ -1470,7 +1475,7 @@ from the drawer */ var selxpath = '//resource[@selected]'; var selnode = this.xmldata.selectSingleNode(selxpath); - + // If no image resource is selected, check for upload if (!selnode) { var uploadbutton = this.xmldata.selectSingleNode("/libraries/*[@selected]//uploadbutton"); @@ -1565,7 +1570,7 @@ var name = getFromSelector('link_name').value; var node = getFromSelector('link_target'); var target = node && node.value; - + this.tool.createLink(uri, null, name, target, title, 'internal-link'); this.drawertool.closeDrawer(); }; @@ -1672,12 +1677,12 @@ }; var div = el('div', {className: "kupu-bm-level" + paras[i][1] }, [el('label', inner)]); - + this.paralist.appendChild(div); }; }; this.createContent = function() { - this.fillList(); + this.fillList(); this.element.style.display = 'block'; this.focusElement(); }; @@ -1685,7 +1690,7 @@ var mode = this.getMode(); var selected = this.paralist.getElementsByTagName('input'); var ed = this.editor; - + ed.resumeEditing(); if (mode==2) { From mihxil at codespeak.net Fri Feb 8 13:14:52 2008 From: mihxil at codespeak.net (mihxil at codespeak.net) Date: Fri, 8 Feb 2008 13:14:52 +0100 (CET) Subject: [kupu-checkins] r51332 - kupu/trunk/kupu/mmbase Message-ID: <20080208121452.A969E168522@codespeak.net> Author: mihxil Date: Fri Feb 8 13:14:51 2008 New Revision: 51332 Modified: kupu/trunk/kupu/mmbase/body.kupu Log: added some support for 'templates' argument Modified: kupu/trunk/kupu/mmbase/body.kupu ============================================================================== --- kupu/trunk/kupu/mmbase/body.kupu (original) +++ kupu/trunk/kupu/mmbase/body.kupu Fri Feb 8 13:14:51 2008 @@ -20,7 +20,11 @@ ${header.referer} ${header.referer} + ${mm:directory(header.referer)} ${mm:directory(referrer)}/${param.wizard}.xml + + ${templates}/${param.wizard}.xml + @@ -59,7 +63,7 @@ - + @@ -78,7 +82,7 @@
-
+
From mihxil at codespeak.net Fri Feb 8 13:48:48 2008 From: mihxil at codespeak.net (mihxil at codespeak.net) Date: Fri, 8 Feb 2008 13:48:48 +0100 (CET) Subject: [kupu-checkins] r51333 - kupu/trunk/kupu/mmbase Message-ID: <20080208124848.DAFF4168512@codespeak.net> Author: mihxil Date: Fri Feb 8 13:48:46 2008 New Revision: 51333 Modified: kupu/trunk/kupu/mmbase/node.jspx Log: not every node has a title Modified: kupu/trunk/kupu/mmbase/node.jspx ============================================================================== --- kupu/trunk/kupu/mmbase/node.jspx (original) +++ kupu/trunk/kupu/mmbase/node.jspx Fri Feb 8 13:48:46 2008 @@ -22,7 +22,8 @@ -
+ +
@@ -60,4 +61,4 @@ - \ No newline at end of file + From kupu-checkins at codespeak.net Wed Feb 13 20:28:35 2008 From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net) Date: Wed, 13 Feb 2008 20:28:35 +0100 (CET) Subject: [kupu-checkins] February 73% OFF Message-ID: <20080213112757.8879.qmail@dsl85-107-19247.ttnet.net.tr> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20080213/0322d4f0/attachment.htm From wiggy at codespeak.net Sun Feb 24 16:08:39 2008 From: wiggy at codespeak.net (wiggy at codespeak.net) Date: Sun, 24 Feb 2008 16:08:39 +0100 (CET) Subject: [kupu-checkins] r51835 - kupu/branch/kupu-1.4/plone/profiles/default Message-ID: <20080224150839.7A423168450@codespeak.net> Author: wiggy Date: Sun Feb 24 16:08:37 2008 New Revision: 51835 Added: kupu/branch/kupu-1.4/plone/profiles/default/metadata.xml (contents, props changed) Log: Add metadata.xml Added: kupu/branch/kupu-1.4/plone/profiles/default/metadata.xml ============================================================================== --- (empty file) +++ kupu/branch/kupu-1.4/plone/profiles/default/metadata.xml Sun Feb 24 16:08:37 2008 @@ -0,0 +1,4 @@ + + + 1.4.4 + From kupu-checkins at codespeak.net Thu Feb 28 04:42:51 2008 From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net) Date: Thu, 28 Feb 2008 05:42:51 +0200 Subject: [kupu-checkins] Sale 79% OFF Message-ID: <20080228074251.3083.qmail@dsl85-106-43896.ttnet.net.tr> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20080228/1ebeb69d/attachment.htm