From duncan at codespeak.net Thu Jan 3 16:07:35 2008 From: duncan at codespeak.net (duncan at codespeak.net) Date: Thu, 3 Jan 2008 16:07:35 +0100 (CET) Subject: [kupu-checkins] r50289 - kupu/tag/kupu-1.4.7 Message-ID: <20080103150735.81D411684C7@codespeak.net> Author: duncan Date: Thu Jan 3 16:07:33 2008 New Revision: 50289 Added: kupu/tag/kupu-1.4.7/ - copied from r50288, kupu/trunk/kupu/ Log: Tag new build 1.4.7 From duncan at codespeak.net Fri Jan 4 19:07:24 2008 From: duncan at codespeak.net (duncan at codespeak.net) Date: Fri, 4 Jan 2008 19:07:24 +0100 (CET) Subject: [kupu-checkins] r50331 - kupu/trunk/kupu Message-ID: <20080104180724.EE2711684C4@codespeak.net> Author: duncan Date: Fri Jan 4 19:07:24 2008 New Revision: 50331 Modified: kupu/trunk/kupu/version.txt Log: Plone ticket #7530: forgot to update version.txt. :( Modified: kupu/trunk/kupu/version.txt ============================================================================== --- kupu/trunk/kupu/version.txt (original) +++ kupu/trunk/kupu/version.txt Fri Jan 4 19:07:24 2008 @@ -1 +1 @@ -kupu 1.4.6 +kupu 1.4.7 From duncan at codespeak.net Fri Jan 4 19:28:12 2008 From: duncan at codespeak.net (duncan at codespeak.net) Date: Fri, 4 Jan 2008 19:28:12 +0100 (CET) Subject: [kupu-checkins] r50335 - kupu/tag/kupu-1.4.7 Message-ID: <20080104182812.151FE16843F@codespeak.net> Author: duncan Date: Fri Jan 4 19:28:11 2008 New Revision: 50335 Modified: kupu/tag/kupu-1.4.7/version.txt Log: Merge from trunk: Plone ticket #7530: forgot to update version.txt. :( Modified: kupu/tag/kupu-1.4.7/version.txt ============================================================================== --- kupu/tag/kupu-1.4.7/version.txt (original) +++ kupu/tag/kupu-1.4.7/version.txt Fri Jan 4 19:28:11 2008 @@ -1 +1 @@ -kupu 1.4.6 +kupu 1.4.7 From kupu-checkins at codespeak.net Tue Jan 29 16:12:24 2008 From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net) Date: Tue, 29 Jan 2008 16:12:24 +0100 (CET) Subject: [kupu-checkins] Your Featured Products for the Week‏‏ Message-ID: <20080129051212.2983.qmail@ppp-77-234-234-9.dsidata.sk> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20080129/820325d5/attachment.htm From duncan at codespeak.net Tue Jan 29 16:34:41 2008 From: duncan at codespeak.net (duncan at codespeak.net) Date: Tue, 29 Jan 2008 16:34:41 +0100 (CET) Subject: [kupu-checkins] r51112 - kupu/trunk/kupu/plone Message-ID: <20080129153441.9CD0D168413@codespeak.net> Author: duncan Date: Tue Jan 29 16:34:39 2008 New Revision: 51112 Modified: kupu/trunk/kupu/plone/html2captioned.py Log: Plone ticket: 7728 turning on "Link using UIDs" breaks indexing of rich text fields that contain unicode characters out of the 128 range The transform now utf8 encodes the result if it was unicode. Modified: kupu/trunk/kupu/plone/html2captioned.py ============================================================================== --- kupu/trunk/kupu/plone/html2captioned.py (original) +++ kupu/trunk/kupu/plone/html2captioned.py Tue Jan 29 16:34:39 2008 @@ -192,7 +192,8 @@ return match.group(0) html = UID_PATTERN.sub(replaceUids, html) - + if isinstance(html, unicode): + html = html.encode('utf8') # Indexing requires a string result. idata.setData(html) return idata From duncan at codespeak.net Tue Jan 29 17:12:10 2008 From: duncan at codespeak.net (duncan at codespeak.net) Date: Tue, 29 Jan 2008 17:12:10 +0100 (CET) Subject: [kupu-checkins] r51113 - kupu/trunk/kupu/plone/kupu_plone_layer Message-ID: <20080129161210.5F11A16841E@codespeak.net> Author: duncan Date: Tue Jan 29 17:12:09 2008 New Revision: 51113 Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js Log: Fix tab key which wasn't taking you out of kupu to next/previous field. However, plone ticket #7727 might result in tab behaviour changing again. Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js ============================================================================== --- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js (original) +++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js Tue Jan 29 17:12:09 2008 @@ -289,24 +289,35 @@ function tabHandler(event) { event = event||window.event; if (event.keyCode!=9) { return; } + console.log("tab!"); if (!(/kupu-fulleditor-zoomed/.test(document.body.className))) { var form = textarea.form; var els = form.elements; - var target, targindex; - var mytabindex = iframe.tabIndex; - for (var i = 0; i < els.length; i++) { - var el = els[i]; - if (el.tabIndex && el.tabIndex > mytabindex && !el.disabled && el.offsetWidth && el.offsetHeight) { - if (!targindex || el.tabIndex < targindex) { + var target; + if (event.shiftKey) { // shift-tab goes backwards. + for (var i = 0; i < els.length; i++) { + var el = els[i]; + if (!el.disabled && el.offsetWidth && el.offsetHeight) { target = el; - targindex = el.tabIndex; + } + if (els[i]===textarea) break; + } + } else { // tab forwards + for (var i = 0; i < els.length; i++) { + if (els[i]===textarea) break; + } + for (;i < els.length; i++) { + var el = els[i]; + if (!el.disabled && el.offsetWidth && el.offsetHeight) { + target = el; + break; } } } if (target) { window.focus(); target.focus(); - } + } else { return; }; } if (event.preventDefault) { event.preventDefault(); event.stopPropagation();} event.returnValue = false; From duncan at codespeak.net Tue Jan 29 17:13:48 2008 From: duncan at codespeak.net (duncan at codespeak.net) Date: Tue, 29 Jan 2008 17:13:48 +0100 (CET) Subject: [kupu-checkins] r51114 - kupu/trunk/kupu/plone/kupu_plone_layer Message-ID: <20080129161348.CE70D168403@codespeak.net> Author: duncan Date: Tue Jan 29 17:13:48 2008 New Revision: 51114 Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js Log: Removed spurious debug message Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js ============================================================================== --- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js (original) +++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js Tue Jan 29 17:13:48 2008 @@ -289,7 +289,6 @@ function tabHandler(event) { event = event||window.event; if (event.keyCode!=9) { return; } - console.log("tab!"); if (!(/kupu-fulleditor-zoomed/.test(document.body.className))) { var form = textarea.form; var els = form.elements; From duncan at codespeak.net Wed Jan 30 11:18:07 2008 From: duncan at codespeak.net (duncan at codespeak.net) Date: Wed, 30 Jan 2008 11:18:07 +0100 (CET) Subject: [kupu-checkins] r51120 - in kupu/trunk/kupu/plone: . kupu_plone_layer profiles/default Message-ID: <20080130101807.11DF316844C@codespeak.net> Author: duncan Date: Wed Jan 30 11:18:06 2008 New Revision: 51120 Modified: kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py kupu/trunk/kupu/plone/plonelibrarytool.py kupu/trunk/kupu/plone/profiles/default/kupu.xml Log: Plone ticket 7713 Kupu browser "Home" link goes to Plone root and not content root. Added suggested patch (but with fallback to portal_url for backwards compatability. Modified: kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py ============================================================================== --- kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py (original) +++ kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py Wed Jan 30 11:18:06 2008 @@ -88,9 +88,9 @@ LIBRARIES = ( dict(id="root", title="string:Home", - uri="string:${portal_url}", - src="string:${portal_url}/kupucollection.xml", - icon="string:${portal_url}/misc_/CMFPlone/plone_icon"), + uri="string:${globals_view/navigationRootUrl|portal_url}", + src="string:${globals_view/navigationRootUrl|portal_url}/kupucollection.xml", + icon="string:${globals_view/navigationRootUrl|portal_url}/misc_/CMFPlone/plone_icon"), dict(id="current", title="string:Current folder", uri="string:${folder_url}", Modified: kupu/trunk/kupu/plone/plonelibrarytool.py ============================================================================== --- kupu/trunk/kupu/plone/plonelibrarytool.py (original) +++ kupu/trunk/kupu/plone/plonelibrarytool.py Wed Jan 30 11:18:06 2008 @@ -52,9 +52,9 @@ _default_libraries = ( dict(id="root", title="string:Home", - uri="string:${portal_url}", - src="string:${portal_url}/kupucollection.xml", - icon="string:${portal_url}/misc_/CMFPlone/plone_icon"), + uri="string:${globals_view/navigationRootUrl|portal_url}", + src="string:${globals_view/navigationRootUrl|portal_url}/kupucollection.xml", + icon="string:${globals_view/navigationRootUrl|portal_url}/misc_/CMFPlone/plone_icon"), dict(id="current", title="string:Current folder", uri="string:${folder_url}", Modified: kupu/trunk/kupu/plone/profiles/default/kupu.xml ============================================================================== --- kupu/trunk/kupu/plone/profiles/default/kupu.xml (original) +++ kupu/trunk/kupu/plone/profiles/default/kupu.xml Wed Jan 30 11:18:06 2008 @@ -28,9 +28,9 @@ list-style-type float - Author: duncan Date: Thu Jan 31 17:00:24 2008 New Revision: 51158 Modified: kupu/trunk/kupu/doc/CHANGES.txt kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js kupu/trunk/kupu/plone/plonedrawers.py Log: Plone ticket 7680: Kupu stripping out anchor to top of current page Links to the current page now set href="#" instead of href="". Modified: kupu/trunk/kupu/doc/CHANGES.txt ============================================================================== --- kupu/trunk/kupu/doc/CHANGES.txt (original) +++ kupu/trunk/kupu/doc/CHANGES.txt Thu Jan 31 17:00:24 2008 @@ -2,6 +2,19 @@ Kupu changes ============ +- 1.4.8 + + - Tabbing key now takes you to next/previous field. However, plone + ticket #7727 might result in tab behaviour changing again. + + - Plone tickets + + * 7680 Kupu stripping out anchor to top of current page + * 7713 Kupu browser "Home" link goes to Plone root and not content + root. + * 7728 turning on "Link using UIDs" breaks indexing of rich text + fields that contain unicode characters out of the 128 range + - 1.4.7 - Added metadata.xml file to the Plone GenericSetup profile. Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js ============================================================================== --- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js (original) +++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js Thu Jan 31 17:00:24 2008 @@ -66,7 +66,7 @@ path[i++] = '#'; } str = path.join('/'); - if (anchor) { + if (anchor || str=="") { str = [str,anchor].join('#'); } str = tag + str+'"'; Modified: kupu/trunk/kupu/plone/plonedrawers.py ============================================================================== --- kupu/trunk/kupu/plone/plonedrawers.py (original) +++ kupu/trunk/kupu/plone/plonedrawers.py Thu Jan 31 17:00:24 2008 @@ -646,15 +646,15 @@ src = src[len(base):].lstrip('/') try: obj = portal.restrictedTraverse(src) + if portal_types: + while not shasattr(obj.aq_base, 'portal_type'): + obj = obj.aq_parent + while obj.portal_type not in portal_types: + obj = obj.aq_parent + if obj is portal: + return [] except (KeyError, AttributeError): return [] - if portal_types: - while not shasattr(obj.aq_base, 'portal_type'): - obj = obj.aq_parent - while obj.portal_type not in portal_types: - obj = obj.aq_parent - if obj is portal: - return [] else: # src= ... src = src.split(' ') # src is a list of uids. From duncan at codespeak.net Thu Jan 31 17:17:21 2008 From: duncan at codespeak.net (duncan at codespeak.net) Date: Thu, 31 Jan 2008 17:17:21 +0100 (CET) Subject: [kupu-checkins] r51159 - in kupu/trunk/kupu: common doc Message-ID: <20080131161721.6B76A1684DE@codespeak.net> Author: duncan Date: Thu Jan 31 17:17:20 2008 New Revision: 51159 Modified: kupu/trunk/kupu/common/kupubasetools.js kupu/trunk/kupu/doc/CHANGES.txt Log: Plone ticket 7473: Kupu full screen mode looks broken Applied suggested patch Modified: kupu/trunk/kupu/common/kupubasetools.js ============================================================================== --- kupu/trunk/kupu/common/kupubasetools.js (original) +++ kupu/trunk/kupu/common/kupubasetools.js Thu Jan 31 17:17:20 2008 @@ -2741,8 +2741,6 @@ if (window.innerWidth) { var width = window.innerWidth; var height = window.innerHeight; - var tbheight = fulleditor.parentNode.getElementsByClassName('kupu-tb')[0].getHeight(); - var nheight = height - tbheight + 'px' } else if (document.documentElement) { if (!window._IE_VERSION) { _IE_VERSION = /MSIE\s*([0-9.]*)/.exec(navigator.appVersion); @@ -2750,22 +2748,20 @@ var kludge = (_IE_VERSION[1]<7)?5:0; var width = document.documentElement.offsetWidth-kludge; var height = document.documentElement.offsetHeight-kludge; - var offset = fulleditor.offsetTop; - var nheight = Math.max(height - offset -1/*top border*/, 10) + 'px'; } else { - var width = document.body.offsetWidth-5; - var height = document.body.offsetHeight-5; - var offset = fulleditor.offsetTop; - var nheight = Math.max(height - offset -1/*top border*/, 10) + 'px'; - } - width = width + 'px'; - fulleditor.style.width = width; /*IE needs this*/ - iframe.style.width = width; - iframe.style.height = nheight; - if (sourceArea) { - sourceArea.style.width = width; - sourceArea.style.height = nheight; - } + var width = document.body.offsetWidth-5; + var height = document.body.offsetHeight-5; + } + var offset = fulleditor.offsetTop; + var nheight = Math.max(height - offset -1/*top border*/, 10) + 'px'; + width = width + 'px'; + fulleditor.style.width = width; /*IE needs this*/ + iframe.style.width = width; + iframe.style.height = nheight; + if (sourceArea) { + sourceArea.style.width = width; + sourceArea.style.height = nheight; + } }; KupuZoomTool.prototype.checkfunc = function(selNode, button, editor, event) { Modified: kupu/trunk/kupu/doc/CHANGES.txt ============================================================================== --- kupu/trunk/kupu/doc/CHANGES.txt (original) +++ kupu/trunk/kupu/doc/CHANGES.txt Thu Jan 31 17:17:20 2008 @@ -9,6 +9,7 @@ - Plone tickets + * 7473 Kupu full screen mode looks broken * 7680 Kupu stripping out anchor to top of current page * 7713 Kupu browser "Home" link goes to Plone root and not content root.