From gotcha at codespeak.net Mon Mar 2 14:44:29 2009 From: gotcha at codespeak.net (gotcha at codespeak.net) Date: Mon, 2 Mar 2009 14:44:29 +0100 (CET) Subject: [kupu-checkins] r62385 - kupu/branch/gotcha-externalimages Message-ID: <20090302134429.82EEC168490@codespeak.net> Author: gotcha Date: Mon Mar 2 14:44:29 2009 New Revision: 62385 Added: kupu/branch/gotcha-externalimages/ - copied from r62384, kupu/trunk/ Log: add external image handling From gotcha at codespeak.net Mon Mar 2 14:48:42 2009 From: gotcha at codespeak.net (gotcha at codespeak.net) Date: Mon, 2 Mar 2009 14:48:42 +0100 (CET) Subject: [kupu-checkins] r62388 - kupu/branch/gotcha-externalimages/Products.kupu/Products Message-ID: <20090302134842.0F833168490@codespeak.net> Author: gotcha Date: Mon Mar 2 14:48:41 2009 New Revision: 62388 Modified: kupu/branch/gotcha-externalimages/Products.kupu/Products/ (props changed) Log: switch to branch From gotcha at codespeak.net Mon Mar 2 14:50:18 2009 From: gotcha at codespeak.net (gotcha at codespeak.net) Date: Mon, 2 Mar 2009 14:50:18 +0100 (CET) Subject: [kupu-checkins] r62390 - kupu/branch/gotcha-externalimages/Products.kupu/Products Message-ID: <20090302135018.D1D08168490@codespeak.net> Author: gotcha Date: Mon Mar 2 14:50:18 2009 New Revision: 62390 Modified: kupu/branch/gotcha-externalimages/Products.kupu/Products/EXTERNALS.txt Log: switch to branch Modified: kupu/branch/gotcha-externalimages/Products.kupu/Products/EXTERNALS.txt ============================================================================== --- kupu/branch/gotcha-externalimages/Products.kupu/Products/EXTERNALS.txt (original) +++ kupu/branch/gotcha-externalimages/Products.kupu/Products/EXTERNALS.txt Mon Mar 2 14:50:18 2009 @@ -1 +1 @@ -kupu https://codespeak.net/svn/kupu/trunk/kupu +kupu https://codespeak.net/svn/kupu/branch/gotcha-externalimages/kupu From gotcha at codespeak.net Mon Mar 2 18:42:04 2009 From: gotcha at codespeak.net (gotcha at codespeak.net) Date: Mon, 2 Mar 2009 18:42:04 +0100 (CET) Subject: [kupu-checkins] r62420 - in kupu/branch/gotcha-externalimages/kupu: . common default plone plone/kupu_plone_layer Message-ID: <20090302174204.EF3091684BD@codespeak.net> Author: gotcha Date: Mon Mar 2 18:42:04 2009 New Revision: 62420 Modified: kupu/branch/gotcha-externalimages/kupu/common/kupudrawers.js kupu/branch/gotcha-externalimages/kupu/default/drawers.kupu kupu/branch/gotcha-externalimages/kupu/default/wire.kupu kupu/branch/gotcha-externalimages/kupu/plone/drawers.kupu kupu/branch/gotcha-externalimages/kupu/plone/helpers.py kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupuplone.css.dtml kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupuploneinit.js kupu/branch/gotcha-externalimages/kupu/version.txt Log: add external image drawer Modified: kupu/branch/gotcha-externalimages/kupu/common/kupudrawers.js ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/common/kupudrawers.js (original) +++ kupu/branch/gotcha-externalimages/kupu/common/kupudrawers.js Mon Mar 2 18:42:04 2009 @@ -461,6 +461,118 @@ LinkDrawer.prototype = new DrawerWithAnchors; +function ImageDrawer(elementid, tool) { + /* External image drawer */ + DrawerWithAnchors.call(this, elementid, tool); + + var urlinput = getBaseTagClass(this.element, 'input', 'kupu-imagedrawer-urlinput'); + var altinput = getBaseTagClass(this.element, 'input', 'kupu-imagedrawer-altinput'); + var preview = getBaseTagClass(this.element, 'iframe', 'kupu-imagedrawer-preview'); + var watermark = getBaseTagClass(this.element, 'div', 'watermark'); + this.anchorframe = preview; + this.anchorui = getBaseTagClass(this.element, 'tr', 'kupu-imagedrawer-anchors'); + this.target = ''; + this.panel = getBaseTagClass(this.element, 'div', 'kupu-panels'); + 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); + } + } + + this.selChange = function() { + var anchor = this.getFragment(); + + urlinput.value = urlinput.value.replace(/#[^#]*$/, ''); + if (anchor) { + urlinput.value += anchor; + } + }; + this.addSelectEvent(); + + this.createContent = function() { + /* display the drawer */ + var ed = this.editor; + var currnode = ed.getSelectedNode(); + var imagel = ed.getNearestParentOfType(currnode, 'img'); + urlinput.value = ""; + + this.preview(); + if (imagel) { + urlinput.value = imagel.getAttribute('src'); + altinput.value = imagel.getAttribute('alt'); + } else { + urlinput.value = 'http://'; + altinput.value = ''; + }; + this.element.style.display = 'block'; + this.hideAnchors(); + this.focusElement(); + }; + + this.save = function() { + /* add or modify an image */ + this.editor.resumeEditing(); + var url = urlinput.value; + var alt = altinput.value; + this.tool.createImage(url, alt, 'external-image'); + urlinput.value = ''; + altinput.value = ''; + // XXX when reediting a link, the drawer does not close for + // some weird reason. BUG! Close the drawer manually until we + // find a fix: + this.drawertool.closeDrawer(); + }; + + + function currentAnchor() { + var bits = urlinput.value.split('#'); + var current = bits.length > 1 ? bits[bits.length-1] : ''; + return current; + } + + this.preview = function() { + var ok = false; + watermark.style.display=''; + if (/^http(s?):\x2f\x2f./.test(urlinput.value)) { + try { + preview.src = urlinput.value; + ok = true; + } catch(e) { alert('Preview blew up"'+urlinput.value+'"');}; + } else { + preview.src = ''; + if (urlinput.value.strip()) { + alert(_('Can only preview web urls')); + } + } + if (ok) { + this.showAnchors(currentAnchor()); + if (this.editor.getBrowserName() == 'IE') { + preview.width = "800"; + preview.height = "365"; + preview.style.zoom = "60%"; + }; + }; + }; + + this.preview_loaded = function() { + watermark.style.display = (/^http(s?):\x2f\x2f./.test(urlinput.value))?'none':''; + var here = urlinput.value; + try { + var there = preview.contentWindow.location.href; + } catch(e) { return; } + + if (there && here != there && !(/^about:/.test(there))) { + urlinput.value = there; + } + this.showAnchors(currentAnchor()); + }; + addEventHandler(preview, "load", this.preview_loaded, this); +}; + +ImageDrawer.prototype = new DrawerWithAnchors; + function TableDrawer(elementid, tool) { /* Table drawer */ this.element = getFromSelector(elementid); Modified: kupu/branch/gotcha-externalimages/kupu/default/drawers.kupu ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/default/drawers.kupu (original) +++ kupu/branch/gotcha-externalimages/kupu/default/drawers.kupu Mon Mar 2 18:42:04 2009 @@ -136,6 +136,67 @@ + +
+

External Image

+ +
+ + + + + + + + + + + + + + + + +
+
+ + + Insert the image from this URL: + +
+ + 		+ +
+
+ + + Image ALT text: + +
+ +
+
Preview
+ +
+ +
+ + +
+ +
+
+ +

Table

Modified: kupu/branch/gotcha-externalimages/kupu/default/wire.kupu ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/default/wire.kupu (original) +++ kupu/branch/gotcha-externalimages/kupu/default/wire.kupu Mon Mar 2 18:42:04 2009 @@ -67,6 +67,7 @@ + Modified: kupu/branch/gotcha-externalimages/kupu/plone/drawers.kupu ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/plone/drawers.kupu (original) +++ kupu/branch/gotcha-externalimages/kupu/plone/drawers.kupu Mon Mar 2 18:42:04 2009 @@ -22,6 +22,11 @@ id="kupu-imagelibdrawer-button" title="Insert image" i18n:attributes="title title_insert_image;" >  + + @@ -251,6 +294,64 @@
+
+

External Image

+ +
+ + + + + + + + + + + + + + + + +
+
+ + + Insert the image from this URL: + +
+ + 		+ +
+
+ + + Image ALT text: + +
+ +
+
Preview
+ +
+ +
+ + +
+ +
+
+

Table

Modified: kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupuplone.css.dtml ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupuplone.css.dtml (original) +++ kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupuplone.css.dtml Mon Mar 2 18:42:04 2009 @@ -173,6 +173,7 @@ button.kupu-exthyperlink { background-position: 0 -120px; } button.kupu-exthyperlink-pressed { border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;; } button.kupu-image { background-position: 0 -140px; } +button.kupu-extimage { background-position: 0 -140px; } button.kupu-indent { background-position: 0 -160px; } button.kupu-outdent { background-position: 0 -180px; } Modified: kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupuploneinit.js ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupuploneinit.js (original) +++ kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupuploneinit.js Mon Mar 2 18:42:04 2009 @@ -222,6 +222,10 @@ opendrawer('imagelibdrawer')); kupu.registerTool('imagelibdrawerbutton', imagelibdrawerbutton); + var imagedrawerbutton = new KupuButton(prefix+'button.kupu-extimage', + opendrawer('imagedrawer')); + kupu.registerTool('imagedrawerbutton', imagedrawerbutton); + var linklibdrawerbutton = new KupuButton(prefix+'button.kupu-inthyperlink', opendrawer('linklibdrawer')); kupu.registerTool('linklibdrawerbutton', linklibdrawerbutton); @@ -267,6 +271,9 @@ select_prefix+image_resource); drawertool.registerDrawer(prefix+'imagelibdrawer', imagelibdrawer, kupu); + var imagedrawer = new ImageDrawer(prefix+'div.kupu-imagedrawer', imagetool); + drawertool.registerDrawer(prefix+'imagedrawer', imagedrawer, kupu); + var linkdrawer = new LinkDrawer(prefix+'div.kupu-linkdrawer', linktool); drawertool.registerDrawer(prefix+'linkdrawer', linkdrawer, kupu); Modified: kupu/branch/gotcha-externalimages/kupu/version.txt ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/version.txt (original) +++ kupu/branch/gotcha-externalimages/kupu/version.txt Mon Mar 2 18:42:04 2009 @@ -1 +1 @@ -kupu 1.4.12 +kupu 1.4.13 From kupu-checkins at codespeak.net Mon Mar 2 19:03:49 2009 From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net) Date: Mon, 2 Mar 2009 19:03:49 +0100 (CET) Subject: [kupu-checkins] 12 attempts to enter mail account Message-ID: <20090302180349.08BC416856E@codespeak.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20090302/a1d1e180/attachment.htm From gotcha at codespeak.net Wed Mar 4 17:24:35 2009 From: gotcha at codespeak.net (gotcha at codespeak.net) Date: Wed, 4 Mar 2009 17:24:35 +0100 (CET) Subject: [kupu-checkins] r62536 - in kupu/branch/gotcha-externalimages/kupu: common default plone/kupu_plone_layer Message-ID: <20090304162435.1110C168518@codespeak.net> Author: gotcha Date: Wed Mar 4 17:24:34 2009 New Revision: 62536 Modified: kupu/branch/gotcha-externalimages/kupu/common/kupudrawers.js kupu/branch/gotcha-externalimages/kupu/common/kupudrawerstyles.css kupu/branch/gotcha-externalimages/kupu/default/drawers.kupu kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html Log: fix styling and preview Modified: kupu/branch/gotcha-externalimages/kupu/common/kupudrawers.js ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/common/kupudrawers.js (original) +++ kupu/branch/gotcha-externalimages/kupu/common/kupudrawers.js Wed Mar 4 17:24:34 2009 @@ -467,7 +467,7 @@ var urlinput = getBaseTagClass(this.element, 'input', 'kupu-imagedrawer-urlinput'); var altinput = getBaseTagClass(this.element, 'input', 'kupu-imagedrawer-altinput'); - var preview = getBaseTagClass(this.element, 'iframe', 'kupu-imagedrawer-preview'); + var preview = getBaseTagClass(this.element, 'img', 'kupu-imagedrawer-preview'); var watermark = getBaseTagClass(this.element, 'div', 'watermark'); this.anchorframe = preview; this.anchorui = getBaseTagClass(this.element, 'tr', 'kupu-imagedrawer-anchors'); @@ -535,6 +535,7 @@ this.preview = function() { var ok = false; watermark.style.display=''; + preview.style.display = 'none'; if (/^http(s?):\x2f\x2f./.test(urlinput.value)) { try { preview.src = urlinput.value; @@ -558,15 +559,16 @@ this.preview_loaded = function() { watermark.style.display = (/^http(s?):\x2f\x2f./.test(urlinput.value))?'none':''; - var here = urlinput.value; - try { - var there = preview.contentWindow.location.href; - } catch(e) { return; } - - if (there && here != there && !(/^about:/.test(there))) { - urlinput.value = there; - } - this.showAnchors(currentAnchor()); + watermark.innerHTML = 'Preview'; + var MAXIMUM = 200; + if (preview.height > MAXIMUM) { + preview.height = MAXIMUM; + } + var top = (MAXIMUM - preview.height) / 2; + if (top < 0) + {top = 0;} + preview.style.top = top + "px"; + preview.style.display = ''; }; addEventHandler(preview, "load", this.preview_loaded, this); }; Modified: kupu/branch/gotcha-externalimages/kupu/common/kupudrawerstyles.css ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/common/kupudrawerstyles.css (original) +++ kupu/branch/gotcha-externalimages/kupu/common/kupudrawerstyles.css Wed Mar 4 17:24:34 2009 @@ -69,6 +69,8 @@ border: 0; } .kupu-alt-row input { width: 220px; } +.kupu-imagedrawer-altinput, +.kupu-imagedrawer-urlinput, .kupu-linkdrawer-input { width: 500px; } @@ -76,8 +78,16 @@ width: 500px; height: 20em; } + +.kupu-imagedrawer-preview { + position: relative; + text-align:center; + top: 0px; +} + +.kupu-imagedrawer-previewcontainer, iframe.kupu-linkdrawer-preview { - width: 100%; height:20em; + width: 100%; height:200px; } .kupu-preview-row { float: right; @@ -285,12 +295,15 @@ .kupu-linkdrawer-addlink .kupu-embed, .kupu-linkdrawer-embed .kupu-addlink { display: none; } +.kupu-imagedrawer-addimage .watermark, .kupu-linkdrawer-addlink .watermark { position: relative; text-align:center; top: 98px; font-size: 20pt; + z-index: 10; } +.kupu-imagedrawer-addimage .watermark span, .kupu-linkdrawer-addlink .watermark span { background-color: white; opacity:0.5; Modified: kupu/branch/gotcha-externalimages/kupu/default/drawers.kupu ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/default/drawers.kupu (original) +++ kupu/branch/gotcha-externalimages/kupu/default/drawers.kupu Wed Mar 4 17:24:34 2009 @@ -91,8 +91,7 @@
Preview
- @@ -143,7 +142,7 @@
@@ -179,10 +178,9 @@ - Modified: kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html (original) +++ kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html Wed Mar 4 17:24:34 2009 @@ -2,7 +2,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -299,7 +299,7 @@
+
Preview
- +
@@ -335,10 +335,9 @@ - From mihxil at codespeak.net Sun Mar 8 11:26:43 2009 From: mihxil at codespeak.net (mihxil at codespeak.net) Date: Sun, 8 Mar 2009 11:26:43 +0100 (CET) Subject: [kupu-checkins] r62731 - kupu/trunk/kupu/mmbase Message-ID: <20090308102643.4C2E016842D@codespeak.net> Author: mihxil Date: Sun Mar 8 11:26:41 2009 New Revision: 62731 Modified: kupu/trunk/kupu/mmbase/drawers.kupu kupu/trunk/kupu/mmbase/kupuinit.js Log: avoid errors if certain relations are not possible (like object -idrel-> images. Simply remove the needed tools then. Modified: kupu/trunk/kupu/mmbase/drawers.kupu ============================================================================== --- kupu/trunk/kupu/mmbase/drawers.kupu (original) +++ kupu/trunk/kupu/mmbase/drawers.kupu Sun Mar 8 11:26:41 2009 @@ -24,9 +24,15 @@ - + + + + + + + Modified: kupu/trunk/kupu/mmbase/kupuinit.js ============================================================================== --- kupu/trunk/kupu/mmbase/kupuinit.js (original) +++ kupu/trunk/kupu/mmbase/kupuinit.js Sun Mar 8 11:26:41 2009 @@ -19,6 +19,8 @@ function initKupu(iframe) { + + // first we create a logger var l = new PlainLogger('kupu-toolbox-debuglog', 5); @@ -77,10 +79,12 @@ var redobutton = new KupuButton('kupu-redo-button', execCommand('redo')); kupu.registerTool('redobutton', redobutton); - var removeimagebutton = new KupuRemoveElementButton('kupu-removeimage-button', - 'img', - 'kupu-removeimage'); - kupu.registerTool('removeimagebutton', removeimagebutton); + if (document.getElementById("kupu-image-float-select")) { + var removeimagebutton = new KupuRemoveElementButton('kupu-removeimage-button', + 'img', + 'kupu-removeimage'); + kupu.registerTool('removeimagebutton', removeimagebutton); + } var removelinkbutton = new KupuRemoveElementButton('kupu-removelink-button', 'a', @@ -108,15 +112,17 @@ var linktoolbox = new LinkToolBox("kupu-link-input", "kupu-link-button", 'kupu-toolbox-links', 'kupu-toolbox', 'kupu-toolbox-active'); linktool.registerToolBox('linktoolbox', linktoolbox); - var imagetool = new ImageTool(); - // remove 'create image' from context menu, it doesn't work, and there are 2 wokring methods. - imagetool.createContextMenuElements = function(selNode, event) { - return []; - }; - kupu.registerTool('imagetool', imagetool); - var imagetoolbox = new ImageToolBox('kupu-image-input', 'kupu-image-addbutton', - 'kupu-image-float-select', 'kupu-toolbox-images', 'kupu-toolbox', 'kupu-toolbox-active'); - imagetool.registerToolBox('imagetoolbox', imagetoolbox); + if (document.getElementById("kupu-image-float-select")) { + var imagetool = new ImageTool(); + // remove 'create image' from context menu, it doesn't work, and there are 2 wokring methods. + imagetool.createContextMenuElements = function(selNode, event) { + return []; + }; + kupu.registerTool('imagetool', imagetool); + var imagetoolbox = new ImageToolBox('kupu-image-input', 'kupu-image-addbutton', + 'kupu-image-float-select', 'kupu-toolbox-images', 'kupu-toolbox', 'kupu-toolbox-active'); + imagetool.registerToolBox('imagetoolbox', imagetoolbox); + } var tabletool = new TableTool(); kupu.registerTool('tabletool', tabletool); @@ -131,12 +137,14 @@ 'kupu-toolbox', 'kupu-toolbox-active'); tabletool.registerToolBox('tabletoolbox', tabletoolbox); - var divstool = new DivsTool(); - kupu.registerTool('divstool', divstool); - - var divstoolbox = new DivsToolBox('kupu-div-addbutton', - 'kupu-divs-float-select', 'kupu-toolbox-divs', 'kupu-toolbox', 'kupu-toolbox-active'); - divstool.registerToolBox('divstoolbox', divstoolbox); + if (document.getElementById('kupu-toolbox-divs')) { + var divstool = new DivsTool(); + kupu.registerTool('divstool', divstool); + + var divstoolbox = new DivsToolBox('kupu-div-addbutton', + 'kupu-divs-float-select', 'kupu-toolbox-divs', 'kupu-toolbox', 'kupu-toolbox-active'); + divstool.registerToolBox('divstoolbox', divstoolbox); + } if (document.getElementById('kupu-toolbox-flash')) { var flashtool = new FlashTool(); @@ -175,10 +183,10 @@ drawertool.openDrawer(drawerid); }; }; - - var imagelibdrawerbutton = new KupuButton('kupu-imagelibdrawer-button', opendrawer('imagelibdrawer')); - kupu.registerTool('imagelibdrawerbutton', imagelibdrawerbutton); - + if (document.getElementById("kupu-image-float-select")) { + var imagelibdrawerbutton = new KupuButton('kupu-imagelibdrawer-button', opendrawer('imagelibdrawer')); + kupu.registerTool('imagelibdrawerbutton', imagelibdrawerbutton); + } var linklibdrawerbutton = new KupuButton('kupu-linklibdrawer-button', opendrawer('linklibdrawer')); kupu.registerTool('linklibdrawerbutton', linklibdrawerbutton); @@ -204,11 +212,13 @@ conf['search_links_uri']); drawertool.registerDrawer('linklibdrawer', linklibdrawer); - var imagelibdrawer = new ImageLibraryDrawer(imagetool, - conf['image_xsl_uri'], - conf['image_libraries_uri'], - conf['search_images_uri']); - drawertool.registerDrawer('imagelibdrawer', imagelibdrawer); + if (document.getElementById("kupu-image-float-select")) { + var imagelibdrawer = new ImageLibraryDrawer(imagetool, + conf['image_xsl_uri'], + conf['image_libraries_uri'], + conf['search_images_uri']); + drawertool.registerDrawer('imagelibdrawer', imagelibdrawer); + } /* var imagelibdrawer2 = new ImageLibraryDrawer(null, @@ -218,13 +228,13 @@ drawertool.registerDrawer('nodeimagedrawer', imagelibdrawer2); */ } catch(e) { - var msg = _('There was a problem initializing the drawers. Most ' + - 'likely the XSLT or XML files aren\'t available. If this ' + - 'is not the Kupu demo version, check your files or the ' + - 'service that provide them (error: ${error}).', - {'error': (e.message || e.toString())}); - alert(msg); + alert(_('There was a problem initializing the drawers. Most ' + + 'likely the XSLT or XML files aren\'t available. If this ' + + 'is not the Kupu demo version, check your files or the ' + + 'service that provide them (error: ${error}).', + {'error': (e.message || e.toString())})); }; + var linkdrawer = new LinkDrawer('kupu-linkdrawer', linktool); drawertool.registerDrawer('linkdrawer', linkdrawer); From kupu-checkins at codespeak.net Sun Mar 8 20:25:51 2009 From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net) Date: Sun, 8 Mar 2009 20:25:51 +0100 (CET) Subject: [kupu-checkins] Be her insatiable sultan Message-ID: <20090308192551.1FDC21684CF@codespeak.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20090308/0efb96f6/attachment.htm From kupu-checkins at codespeak.net Mon Mar 9 17:11:32 2009 From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net) Date: Mon, 9 Mar 2009 17:11:32 +0100 (CET) Subject: [kupu-checkins] Come now! Accident Message-ID: <20090309161132.1AE4E169E8C@codespeak.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20090309/9aefdc1a/attachment.htm From kupu-checkins at codespeak.net Tue Mar 10 07:07:19 2009 From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net) Date: Tue, 10 Mar 2009 07:07:19 +0100 (CET) Subject: [kupu-checkins] Alternative treatments for men Message-ID: <20090310060719.1A7AF1683E9@codespeak.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20090310/634199e0/attachment-0001.htm From denys at codespeak.net Tue Mar 10 11:09:11 2009 From: denys at codespeak.net (denys at codespeak.net) Date: Tue, 10 Mar 2009 11:09:11 +0100 (CET) Subject: [kupu-checkins] r62797 - kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/plonekupuimages Message-ID: <20090310100911.D275E168503@codespeak.net> Author: denys Date: Tue Mar 10 11:09:09 2009 New Revision: 62797 Modified: kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/plonekupuimages/kupu_sprite.png Log: Updated kupu sprite Modified: kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/plonekupuimages/kupu_sprite.png ============================================================================== Binary files. No diff available. From gotcha at codespeak.net Tue Mar 10 11:16:29 2009 From: gotcha at codespeak.net (gotcha at codespeak.net) Date: Tue, 10 Mar 2009 11:16:29 +0100 (CET) Subject: [kupu-checkins] r62798 - kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer Message-ID: <20090310101629.41B85168504@codespeak.net> Author: gotcha Date: Tue Mar 10 11:16:27 2009 New Revision: 62798 Modified: kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupuplone.css.dtml Log: change CSS now that we have an image Modified: kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupuplone.css.dtml ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupuplone.css.dtml (original) +++ kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupuplone.css.dtml Tue Mar 10 11:16:27 2009 @@ -173,7 +173,7 @@ button.kupu-exthyperlink { background-position: 0 -120px; } button.kupu-exthyperlink-pressed { border-color: &dtml-buttonshadow; &dtml-buttonhighlight; &dtml-buttonhighlight; &dtml-buttonshadow;; } button.kupu-image { background-position: 0 -140px; } -button.kupu-extimage { background-position: 0 -140px; } +button.kupu-extimage { background-position: 0 -480px; } button.kupu-indent { background-position: 0 -160px; } button.kupu-outdent { background-position: 0 -180px; } From gotcha at codespeak.net Tue Mar 10 11:22:21 2009 From: gotcha at codespeak.net (gotcha at codespeak.net) Date: Tue, 10 Mar 2009 11:22:21 +0100 (CET) Subject: [kupu-checkins] r62799 - kupu/branch/gotcha-externalimages/kupu/plone Message-ID: <20090310102221.D16721684F4@codespeak.net> Author: gotcha Date: Tue Mar 10 11:22:21 2009 New Revision: 62799 Modified: kupu/branch/gotcha-externalimages/kupu/plone/drawers.kupu Log: add internal word Modified: kupu/branch/gotcha-externalimages/kupu/plone/drawers.kupu ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/plone/drawers.kupu (original) +++ kupu/branch/gotcha-externalimages/kupu/plone/drawers.kupu Tue Mar 10 11:22:21 2009 @@ -20,7 +20,7 @@ + From gotcha at codespeak.net Tue Mar 10 11:38:41 2009 From: gotcha at codespeak.net (gotcha at codespeak.net) Date: Tue, 10 Mar 2009 11:38:41 +0100 (CET) Subject: [kupu-checkins] r62802 - kupu/branch/gotcha-externalimages/kupu Message-ID: <20090310103841.282591684F3@codespeak.net> Author: gotcha Date: Tue Mar 10 11:38:40 2009 New Revision: 62802 Modified: kupu/branch/gotcha-externalimages/kupu/version.txt Log: better version number Modified: kupu/branch/gotcha-externalimages/kupu/version.txt ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/version.txt (original) +++ kupu/branch/gotcha-externalimages/kupu/version.txt Tue Mar 10 11:38:40 2009 @@ -1 +1 @@ -kupu 1.4.13 +kupu 1.4.12-extimage From gotcha at codespeak.net Tue Mar 10 11:44:22 2009 From: gotcha at codespeak.net (gotcha at codespeak.net) Date: Tue, 10 Mar 2009 11:44:22 +0100 (CET) Subject: [kupu-checkins] r62803 - kupu/branch/gotcha-externalimages/Products.kupu/docs Message-ID: <20090310104422.3595A168503@codespeak.net> Author: gotcha Date: Tue Mar 10 11:44:21 2009 New Revision: 62803 Added: kupu/branch/gotcha-externalimages/Products.kupu/docs/ kupu/branch/gotcha-externalimages/Products.kupu/docs/HISTORY.txt Log: some history in the egg Added: kupu/branch/gotcha-externalimages/Products.kupu/docs/HISTORY.txt ============================================================================== --- (empty file) +++ kupu/branch/gotcha-externalimages/Products.kupu/docs/HISTORY.txt Tue Mar 10 11:44:21 2009 @@ -0,0 +1,8 @@ +Changelog +========= + +1.4.12.extimage - 2009-03-10 +---------------------------- + +* add external image drawer + [gotcha] From gotcha at codespeak.net Tue Mar 10 11:47:22 2009 From: gotcha at codespeak.net (gotcha at codespeak.net) Date: Tue, 10 Mar 2009 11:47:22 +0100 (CET) Subject: [kupu-checkins] r62804 - kupu/tag/1.4.12-extimage Message-ID: <20090310104722.0DA5716850D@codespeak.net> Author: gotcha Date: Tue Mar 10 11:47:21 2009 New Revision: 62804 Added: kupu/tag/1.4.12-extimage/ - copied from r62803, kupu/branch/gotcha-externalimages/ Log: release From gotcha at codespeak.net Tue Mar 10 11:51:00 2009 From: gotcha at codespeak.net (gotcha at codespeak.net) Date: Tue, 10 Mar 2009 11:51:00 +0100 (CET) Subject: [kupu-checkins] r62805 - kupu/tag/1.4.12-extimage/Products.kupu/Products Message-ID: <20090310105100.7D4B1168048@codespeak.net> Author: gotcha Date: Tue Mar 10 11:51:00 2009 New Revision: 62805 Modified: kupu/tag/1.4.12-extimage/Products.kupu/Products/ (props changed) kupu/tag/1.4.12-extimage/Products.kupu/Products/EXTERNALS.txt Log: right tag Modified: kupu/tag/1.4.12-extimage/Products.kupu/Products/EXTERNALS.txt ============================================================================== --- kupu/tag/1.4.12-extimage/Products.kupu/Products/EXTERNALS.txt (original) +++ kupu/tag/1.4.12-extimage/Products.kupu/Products/EXTERNALS.txt Tue Mar 10 11:51:00 2009 @@ -1 +1 @@ -kupu https://codespeak.net/svn/kupu/branch/gotcha-externalimages/kupu +kupu https://codespeak.net/svn/kupu/tag/1.4.12-extimage/kupu From gotcha at codespeak.net Tue Mar 10 11:54:19 2009 From: gotcha at codespeak.net (gotcha at codespeak.net) Date: Tue, 10 Mar 2009 11:54:19 +0100 (CET) Subject: [kupu-checkins] r62807 - kupu/branch/gotcha-externalimages/Products.kupu/docs Message-ID: <20090310105419.194D5168505@codespeak.net> Author: gotcha Date: Tue Mar 10 11:54:18 2009 New Revision: 62807 Modified: kupu/branch/gotcha-externalimages/Products.kupu/docs/HISTORY.txt Log: finish release Modified: kupu/branch/gotcha-externalimages/Products.kupu/docs/HISTORY.txt ============================================================================== --- kupu/branch/gotcha-externalimages/Products.kupu/docs/HISTORY.txt (original) +++ kupu/branch/gotcha-externalimages/Products.kupu/docs/HISTORY.txt Tue Mar 10 11:54:18 2009 @@ -1,6 +1,10 @@ Changelog ========= + +1.4.12.extimage.1 - Unreleased +------------------------------ + 1.4.12.extimage - 2009-03-10 ---------------------------- From gotcha at codespeak.net Tue Mar 10 11:54:58 2009 From: gotcha at codespeak.net (gotcha at codespeak.net) Date: Tue, 10 Mar 2009 11:54:58 +0100 (CET) Subject: [kupu-checkins] r62808 - kupu/branch/gotcha-externalimages/kupu Message-ID: <20090310105458.A9A8D168505@codespeak.net> Author: gotcha Date: Tue Mar 10 11:54:58 2009 New Revision: 62808 Modified: kupu/branch/gotcha-externalimages/kupu/version.txt Log: finish release Modified: kupu/branch/gotcha-externalimages/kupu/version.txt ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/version.txt (original) +++ kupu/branch/gotcha-externalimages/kupu/version.txt Tue Mar 10 11:54:58 2009 @@ -1 +1 @@ -kupu 1.4.12-extimage +kupu 1.4.12-extimage.1 From kupu-checkins at codespeak.net Tue Mar 10 16:00:45 2009 From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net) Date: Tue, 10 Mar 2009 16:00:45 +0100 (CET) Subject: [kupu-checkins] Nice place to purchase cheap preparations Message-ID: <20090310150045.01A0E168048@codespeak.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20090310/4499b90c/attachment.htm From mihxil at codespeak.net Tue Mar 10 22:03:15 2009 From: mihxil at codespeak.net (mihxil at codespeak.net) Date: Tue, 10 Mar 2009 22:03:15 +0100 (CET) Subject: [kupu-checkins] r62831 - kupu/trunk/kupu/mmbase Message-ID: <20090310210315.4F2D51684E2@codespeak.net> Author: mihxil Date: Tue Mar 10 22:03:13 2009 New Revision: 62831 Modified: kupu/trunk/kupu/mmbase/body.kupu Log: it's nice to support wizard xmls but in some cases a simple 'type' argument is much simpler Modified: kupu/trunk/kupu/mmbase/body.kupu ============================================================================== --- kupu/trunk/kupu/mmbase/body.kupu (original) +++ kupu/trunk/kupu/mmbase/body.kupu Tue Mar 10 22:03:13 2009 @@ -8,6 +8,7 @@ xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0" xmlns:fn="http://java.sun.com/jsp/jstl/functions" + xmlns:c="http://java.sun.com/jsp/jstl/core" i18n:domain="kupu" > $Id$ @@ -43,9 +44,16 @@ - - ${wizard[fn:length(wizard) - 1]} - related + + + + ${wizard[fn:length(wizard) - 1]} + related + + + + + From kupu-checkins at codespeak.net Wed Mar 11 09:55:20 2009 From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net) Date: Wed, 11 Mar 2009 09:55:20 +0100 (CET) Subject: [kupu-checkins] Our department secret party Message-ID: <20090311085520.DB0951684D1@codespeak.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20090311/40941d6b/attachment.htm From kupu-checkins at codespeak.net Wed Mar 11 16:28:46 2009 From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net) Date: Wed, 11 Mar 2009 16:28:46 +0100 (CET) Subject: [kupu-checkins] Proven long-lasting effect on its dimension Message-ID: <20090311152846.7585A1683F2@codespeak.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20090311/3f885ec0/attachment-0001.htm From mihxil at codespeak.net Fri Mar 13 16:02:17 2009 From: mihxil at codespeak.net (mihxil at codespeak.net) Date: Fri, 13 Mar 2009 16:02:17 +0100 (CET) Subject: [kupu-checkins] r62937 - in kupu/trunk/kupu/mmbase: . drawers Message-ID: <20090313150217.87EBA1684DA@codespeak.net> Author: mihxil Date: Fri Mar 13 16:02:15 2009 New Revision: 62937 Modified: kupu/trunk/kupu/mmbase/drawers.kupu kupu/trunk/kupu/mmbase/drawers/flashobjects.items.jspx kupu/trunk/kupu/mmbase/drawers/images.items.jspx kupu/trunk/kupu/mmbase/drawers/library.jspx kupu/trunk/kupu/mmbase/drawers/search.library.jspx kupu/trunk/kupu/mmbase/drawers/texts.items.jspx Log: fixed some small issues, related to searching in a drawer Modified: kupu/trunk/kupu/mmbase/drawers.kupu ============================================================================== --- kupu/trunk/kupu/mmbase/drawers.kupu (original) +++ kupu/trunk/kupu/mmbase/drawers.kupu Fri Mar 13 16:02:15 2009 @@ -72,7 +72,7 @@ drawers/libraries.jspx?nodetypes=${attachment_nodetypes}&amp;source=${objectnumber}&amp;librarysize=${librarysize} drawers/search.library.jspx?kupubasedir=${kupubasedir}&amp;link_nodetypes=${inline_nodetypes}&amp;source=${objectnumber}&amp;librarysize=${librarysize} - drawers/search.library.jspx?kupubasedir=${kupubasedir}&amp;link_nodetypes=${link_nodetypes}&amp;source=${objectnumber}&amp;librarysize=${librarysize} + drawers/search.library.jspx?kupubasedir=${kupubasedir}&amp;link_nodetypes=${attachment_nodetypes}&amp;source=${objectnumber}&amp;librarysize=${librarysize} Modified: kupu/trunk/kupu/mmbase/drawers/flashobjects.items.jspx ============================================================================== --- kupu/trunk/kupu/mmbase/drawers/flashobjects.items.jspx (original) +++ kupu/trunk/kupu/mmbase/drawers/flashobjects.items.jspx Fri Mar 13 16:02:15 2009 @@ -13,7 +13,7 @@ - 100 + 100 flash Modified: kupu/trunk/kupu/mmbase/drawers/images.items.jspx ============================================================================== --- kupu/trunk/kupu/mmbase/drawers/images.items.jspx (original) +++ kupu/trunk/kupu/mmbase/drawers/images.items.jspx Fri Mar 13 16:02:15 2009 @@ -13,7 +13,7 @@ - 100 + 100 Modified: kupu/trunk/kupu/mmbase/drawers/library.jspx ============================================================================== --- kupu/trunk/kupu/mmbase/drawers/library.jspx (original) +++ kupu/trunk/kupu/mmbase/drawers/library.jspx Fri Mar 13 16:02:15 2009 @@ -18,7 +18,7 @@ <mm:nodeinfo nodetype="$nodetype" type="plural_guinodemanager" /> - ${kupubasedir}mmbase/icons/map.gif + Modified: kupu/trunk/kupu/mmbase/drawers/search.library.jspx ============================================================================== --- kupu/trunk/kupu/mmbase/drawers/search.library.jspx (original) +++ kupu/trunk/kupu/mmbase/drawers/search.library.jspx Fri Mar 13 16:02:15 2009 @@ -15,12 +15,13 @@ 50 0 images + "<mm:write referid="search" />" - icons/map.gif + Modified: kupu/trunk/kupu/mmbase/drawers/texts.items.jspx ============================================================================== --- kupu/trunk/kupu/mmbase/drawers/texts.items.jspx (original) +++ kupu/trunk/kupu/mmbase/drawers/texts.items.jspx Fri Mar 13 16:02:15 2009 @@ -10,6 +10,7 @@ + <!-- ${query.sql} --> @@ -19,8 +20,11 @@ <mm:hasfunction name="icon" inverse="true"><mm:nodeinfo type="guinodemanager" />: </mm:hasfunction> <mm:function name="gui" write="true" escape="none"><mm:isempty><mm:field name="number" /></mm:isempty></mm:function> + <jsp:text> (<mm:field name="number" />)</jsp:text> - : + + : + From kupu-checkins at codespeak.net Sun Mar 15 18:41:04 2009 From: kupu-checkins at codespeak.net (Xjvamisefq) Date: Sun, 15 Mar 2009 18:41:04 +0100 (CET) Subject: [kupu-checkins] Let's visit land of cakes tonight Message-ID: <20090315174104.13938168023@codespeak.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20090315/3be87345/attachment.htm From kupu-checkins at codespeak.net Mon Mar 16 15:33:26 2009 From: kupu-checkins at codespeak.net (MensHealth.com) Date: Mon, 16 Mar 2009 15:33:26 +0100 (CET) Subject: [kupu-checkins] itunes.com Invoice #67483 Message-ID: <20090316143326.12FD91683FA@codespeak.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20090316/a3484869/attachment.htm From gotcha at codespeak.net Mon Mar 23 17:54:42 2009 From: gotcha at codespeak.net (gotcha at codespeak.net) Date: Mon, 23 Mar 2009 17:54:42 +0100 (CET) Subject: [kupu-checkins] r63247 - in kupu/branch/gotcha-externalimages/kupu: common default plone/kupu_plone_layer Message-ID: <20090323165442.7128416844C@codespeak.net> Author: gotcha Date: Mon Mar 23 17:54:38 2009 New Revision: 63247 Modified: kupu/branch/gotcha-externalimages/kupu/common/kupudrawers.js kupu/branch/gotcha-externalimages/kupu/default/drawers.kupu kupu/branch/gotcha-externalimages/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html Log: add alignment choice Modified: kupu/branch/gotcha-externalimages/kupu/common/kupudrawers.js ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/common/kupudrawers.js (original) +++ kupu/branch/gotcha-externalimages/kupu/common/kupudrawers.js Mon Mar 23 17:54:38 2009 @@ -467,6 +467,9 @@ var urlinput = getBaseTagClass(this.element, 'input', 'kupu-imagedrawer-urlinput'); var altinput = getBaseTagClass(this.element, 'input', 'kupu-imagedrawer-altinput'); + var alignleftinput = getBaseTagClass(this.element, 'input', 'kupu-image-align-left'); + var alignrightinput = getBaseTagClass(this.element, 'input', 'kupu-image-align-right'); + var aligninlineinput = getBaseTagClass(this.element, 'input', 'kupu-image-align-inline'); var preview = getBaseTagClass(this.element, 'img', 'kupu-imagedrawer-preview'); var watermark = getBaseTagClass(this.element, 'div', 'watermark'); this.anchorframe = preview; @@ -502,21 +505,57 @@ if (imagel) { urlinput.value = imagel.getAttribute('src'); altinput.value = imagel.getAttribute('alt'); + var className = imagel.className; + var align = /\bimage-(left|right|inline)\b/.exec(className); + if (align && align.length > 1) { + var alignvalue = align[1]; + }; } else { urlinput.value = 'http://'; altinput.value = ''; + var alignvalue = 'inline'; }; + this.setAlign(alignvalue); this.element.style.display = 'block'; this.hideAnchors(); this.focusElement(); }; + this.setAlign = function(value) { + if (value == 'left') { + alignleftinput.checked = true; + alignrightinput.checked = false; + aligninlineinput.checked = false; + } else if (value == 'right') { + alignleftinput.checked = false; + alignrightinput.checked = true; + aligninlineinput.checked = false; + } else { + alignleftinput.checked = false; + alignrightinput.checked = false; + aligninlineinput.checked = true; + } + }; + + this.getAlign = function() { + if (alignleftinput.checked) { + return alignleftinput.value + } + if (aligninlineinput.checked) { + return aligninlineinput.value + } + if (alignrightinput.checked) { + return alignrightinput.value + } + }; + this.save = function() { /* add or modify an image */ this.editor.resumeEditing(); var url = urlinput.value; var alt = altinput.value; - this.tool.createImage(url, alt, 'external-image'); + var imgclass = this.getAlign() + ' external-image'; + this.tool.createImage(url, alt, imgclass); urlinput.value = ''; altinput.value = ''; // XXX when reediting a link, the drawer does not close for Modified: kupu/branch/gotcha-externalimages/kupu/default/drawers.kupu ============================================================================== --- kupu/branch/gotcha-externalimages/kupu/default/drawers.kupu (original) +++ kupu/branch/gotcha-externalimages/kupu/default/drawers.kupu Mon Mar 23 17:54:38 2009 @@ -172,6 +172,27 @@ + + + + + +
+
Preview
- +
+
+ + + Image alignment: + +
+ + + + + + + + +
+
+ + + Image alignment: + +
+ + + + + + + + +